@1mcp/agent 0.11.0 → 0.13.0

package/build/transport/http/middlewares/securityMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"securityMiddleware.js","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/securityMiddleware.ts"],"names":[],"mappings":"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"}

package/build/transport/http/middlewares/tagsExtractor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagsExtractor.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/tagsExtractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG1D;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,QAkBpF"}

package/build/transport/http/middlewares/tagsExtractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tagsExtractor.js","sourceRoot":"","sources":["../../../../src/transport/http/middlewares/tagsExtractor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE/D;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IACnF,IAAI,IAA0B,CAAC;IAC/B,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC;QACzC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS,CAAC,aAAa;oBAC7B,OAAO,EAAE,uCAAuC;iBACjD;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnE,CAAC;IACD,oDAAoD;IACpD,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACvB,IAAI,EAAE,CAAC;AACT,CAAC"}

package/build/transport/http/routes/oauthRoutes.d.ts

@@ -0,0 +1,4 @@
+import { Router } from 'express';
+declare const router: Router;
+export default router;
+//# sourceMappingURL=oauthRoutes.d.ts.map

package/build/transport/http/routes/oauthRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauthRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqC,MAAM,SAAS,CAAC;AAmBpE,QAAA,MAAM,MAAM,EAAE,MAAiB,CAAC;AAqgBhC,eAAe,MAAM,CAAC"}

package/build/transport/http/routes/oauthRoutes.js

@@ -0,0 +1,474 @@
+import { Router } from 'express';
+import rateLimit from 'express-rate-limit';
+import logger from '../../../logger/logger.js';
+import { ServerManager } from '../../../core/server/serverManager.js';
+import { ClientStatus } from '../../../core/types/index.js';
+import { OAuthRequiredError } from '../../../core/client/clientManager.js';
+import createClient from '../../../core/client/clientFactory.js';
+import { RATE_LIMIT_CONFIG } from '../../../constants.js';
+import { AgentConfigManager } from '../../../core/server/agentConfig.js';
+import { escapeHtml, sanitizeUrlParam, sanitizeErrorMessage, sanitizeServerNameForContext, } from '../../../utils/sanitization.js';
+import { SDKOAuthServerProvider } from '../../../auth/sdkOAuthServerProvider.js';
+import { validateScopes, auditScopeOperation } from '../../../utils/scopeValidation.js';
+import { sensitiveOperationLimiter } from '../middlewares/securityMiddleware.js';
+const router = Router();
+// Rate limiter for OAuth endpoints
+const createOAuthLimiter = () => {
+    const serverConfig = AgentConfigManager.getInstance();
+    return rateLimit({
+        windowMs: serverConfig.getRateLimitWindowMs(),
+        max: serverConfig.getRateLimitMax(),
+        standardHeaders: true,
+        legacyHeaders: false,
+        message: RATE_LIMIT_CONFIG.OAUTH.MESSAGE,
+    });
+};
+router.use(createOAuthLimiter());
+/**
+ * Check if a server requires OAuth based on runtime behavior
+ * A server requires OAuth if it has ever thrown UnauthorizedError (indicated by authorizationUrl or oauthStartTime)
+ */
+function requiresOAuth(service) {
+    // The most reliable indicator: server has ever had an authorization URL
+    // This means the server threw UnauthorizedError and we captured the OAuth URL
+    if (service.authorizationUrl) {
+        return true;
+    }
+    // Secondary indicator: server has ever been in AwaitingOAuth status
+    // This means the server threw UnauthorizedError at some point
+    if (service.oauthStartTime) {
+        return true;
+    }
+    // If currently awaiting OAuth, it definitely requires OAuth
+    if (service.status === ClientStatus.AwaitingOAuth) {
+        return true;
+    }
+    return false;
+}
+/**
+ * OAuth Dashboard - Shows all services and their OAuth status
+ */
+router.get('/', async (req, res) => {
+    try {
+        const serverManager = ServerManager.current;
+        const clients = serverManager.getClients();
+        const services = Array.from(clients.entries()).map(([name, clientInfo]) => ({
+            name,
+            status: clientInfo.status,
+            authorizationUrl: clientInfo.authorizationUrl,
+            oauthStartTime: clientInfo.oauthStartTime,
+            lastError: clientInfo.lastError?.message,
+            lastConnected: clientInfo.lastConnected,
+        }));
+        const html = generateOAuthDashboard(services, req);
+        res.setHeader('Content-Type', 'text/html');
+        res.send(html);
+    }
+    catch (error) {
+        logger.error('Error serving OAuth dashboard:', error);
+        res.status(500).json({ error: 'Internal server error' });
+    }
+});
+/**
+ * Start OAuth authorization for a specific service
+ */
+const authorizeHandler = async (req, res) => {
+    try {
+        const { serverName } = req.params;
+        const serverManager = ServerManager.current;
+        const clientInfo = serverManager.getClient(serverName);
+        if (!clientInfo) {
+            res.status(404).json({ error: 'Service not found' });
+            return;
+        }
+        if (clientInfo.authorizationUrl) {
+            // Redirect to existing authorization URL
+            res.redirect(clientInfo.authorizationUrl);
+            return;
+        }
+        else {
+            // Generate new authorization URL by attempting connection
+            await initiateOAuth(serverName);
+            // Get updated client info
+            const updatedClients = serverManager.getClients();
+            const updatedClientInfo = updatedClients.get(serverName);
+            if (updatedClientInfo?.authorizationUrl) {
+                res.redirect(updatedClientInfo.authorizationUrl);
+                return;
+            }
+            else {
+                res.status(500).json({ error: 'Failed to generate OAuth URL' });
+                return;
+            }
+        }
+    }
+    catch (error) {
+        logger.error(`Error starting OAuth for ${req.params.serverName}:`, error);
+        res.status(500).json({ error: 'Failed to start OAuth flow' });
+    }
+};
+router.get('/authorize/:serverName', authorizeHandler);
+function hasFinishAuth(transport) {
+    return typeof transport === 'object' && transport !== null && typeof transport.finishAuth === 'function';
+}
+/**
+ * Handle OAuth callback and trigger reconnection
+ */
+router.get('/callback/:serverName', async (req, res) => {
+    const { serverName } = req.params;
+    const { code, error } = req.query;
+    try {
+        if (error) {
+            logger.error(`OAuth error for ${serverName}:`, error);
+            return res.redirect(`/oauth?error=${encodeURIComponent(String(error))}`);
+        }
+        if (!code) {
+            logger.error(`OAuth callback missing authorization code for ${serverName}`);
+            return res.redirect(`/oauth?error=missing_code`);
+        }
+        const serverManager = ServerManager.current;
+        const clientInfo = serverManager.getClient(serverName);
+        if (!clientInfo) {
+            logger.error(`Client ${serverName} not found in OAuth callback`);
+            return res.redirect(`/oauth?error=client_not_found`);
+        }
+        // Use type guard for transport with finishAuth
+        if (!hasFinishAuth(clientInfo.transport)) {
+            logger.error(`Transport for ${serverName} does not support finishAuth`);
+            return res.redirect(`/oauth?error=invalid_oauth_transport`);
+        }
+        // Complete the OAuth flow with the authorization code
+        await clientInfo.transport.finishAuth(String(code));
+        clientInfo.status = ClientStatus.Connected;
+        clientInfo.lastConnected = new Date();
+        clientInfo.lastError = undefined;
+        // Redirect back to dashboard with success
+        res.redirect('/oauth?success=1');
+    }
+    catch (error) {
+        logger.error(`Error handling OAuth callback for ${serverName}:`, error);
+        res.redirect(`/oauth?error=callback_failed`);
+    }
+});
+/**
+ * Restart OAuth flow for a service
+ */
+const restartHandler = async (req, res) => {
+    const { serverName } = req.params;
+    try {
+        const serverManager = ServerManager.current;
+        const clientInfo = serverManager.getClient(serverName);
+        if (!clientInfo) {
+            res.status(404).json({ error: 'Service not found' });
+            return;
+        }
+        // Clear existing OAuth data and restart flow
+        await restartOAuthFlow(serverName);
+        res.json({ success: true, message: 'OAuth flow restarted' });
+    }
+    catch (error) {
+        logger.error(`Error restarting OAuth for ${serverName}:`, error);
+        res.status(500).json({ error: 'Failed to restart OAuth flow' });
+    }
+};
+router.post('/restart/:serverName', restartHandler);
+/**
+ * Handle consent form submission for OAuth authorization
+ */
+const consentHandler = async (req, res) => {
+    try {
+        const { client_id, redirect_uri, code_challenge, code_challenge_method: _code_challenge_method, state, resource, action, scopes, } = req.body;
+        // Validate required fields
+        if (!client_id || !redirect_uri || !action) {
+            res.status(400).json({
+                error: 'invalid_request',
+                error_description: 'Missing required parameters',
+            });
+            return;
+        }
+        // Get the OAuth server provider
+        const oauthProvider = new SDKOAuthServerProvider();
+        const client = oauthProvider.clientsStore.getClient(client_id);
+        if (!client) {
+            res.status(400).json({
+                error: 'invalid_client',
+                error_description: 'Client not found',
+            });
+            return;
+        }
+        // Ensure client is properly typed
+        const typedClient = client;
+        if (action === 'deny') {
+            // User denied the authorization
+            auditScopeOperation('authorization_denied', {
+                clientId: client_id,
+                success: false,
+                error: 'User denied authorization',
+            });
+            const redirectUrl = new URL(redirect_uri);
+            redirectUrl.searchParams.set('error', 'access_denied');
+            redirectUrl.searchParams.set('error_description', 'User denied the request');
+            if (state) {
+                redirectUrl.searchParams.set('state', state);
+            }
+            logger.info(`OAuth authorization denied by user for client ${client_id}`);
+            res.redirect(redirectUrl.toString());
+            return;
+        }
+        if (action === 'approve') {
+            // User approved the authorization
+            const selectedScopes = Array.isArray(scopes) ? scopes : scopes ? [scopes] : [];
+            // Validate selected scopes
+            const validation = validateScopes(selectedScopes);
+            if (!validation.isValid) {
+                res.status(400).json({
+                    error: 'invalid_scope',
+                    error_description: `Invalid scopes: ${validation.errors.join(', ')}`,
+                });
+                return;
+            }
+            // Reconstruct authorization params for the approve method
+            const authParams = {
+                scopes: selectedScopes,
+                redirectUri: redirect_uri,
+                codeChallenge: code_challenge,
+                state,
+                resource: resource ? new URL(resource) : undefined,
+            };
+            // Use the OAuth provider to approve the authorization
+            await oauthProvider.approveAuthorization(typedClient, authParams, validation.validScopes, res);
+            return;
+        }
+        // Invalid action
+        res.status(400).json({
+            error: 'invalid_request',
+            error_description: 'Invalid action',
+        });
+    }
+    catch (error) {
+        logger.error('Error handling consent form:', error);
+        res.status(500).json({
+            error: 'server_error',
+            error_description: 'Internal server error',
+        });
+    }
+};
+router.post('/consent', sensitiveOperationLimiter, consentHandler);
+/**
+ * Initiate OAuth flow for a service
+ */
+async function initiateOAuth(serverName) {
+    const serverManager = ServerManager.current;
+    const clientInfo = serverManager.getClient(serverName);
+    if (!clientInfo) {
+        throw new Error(`Service ${serverName} not found`);
+    }
+    try {
+        // Create new client and attempt connection to trigger OAuth
+        const newClient = await createClient();
+        await newClient.connect(clientInfo.transport);
+    }
+    catch (error) {
+        if (error instanceof OAuthRequiredError) {
+            // Update client info with OAuth status
+            clientInfo.status = ClientStatus.AwaitingOAuth;
+            clientInfo.oauthStartTime = new Date();
+            // Try to get authorization URL from OAuth provider
+            try {
+                const oauthProvider = clientInfo.transport.oauthProvider;
+                if (oauthProvider && typeof oauthProvider.getAuthorizationUrl === 'function') {
+                    clientInfo.authorizationUrl = oauthProvider.getAuthorizationUrl();
+                }
+            }
+            catch (urlError) {
+                logger.warn(`Could not extract authorization URL for ${serverName}:`, urlError);
+            }
+            logger.info(`OAuth initiated for ${serverName}`);
+        }
+        else {
+            throw error; // Re-throw non-OAuth errors
+        }
+    }
+}
+/**
+ * Restart OAuth flow for a service
+ */
+async function restartOAuthFlow(serverName) {
+    const serverManager = ServerManager.current;
+    const clientInfo = serverManager.getClient(serverName);
+    if (!clientInfo) {
+        throw new Error(`Service ${serverName} not found`);
+    }
+    // Clear OAuth state
+    clientInfo.authorizationUrl = undefined;
+    clientInfo.oauthStartTime = undefined;
+    clientInfo.status = ClientStatus.Disconnected;
+    // Initiate new OAuth flow
+    await initiateOAuth(serverName);
+}
+/**
+ * Generate OAuth dashboard HTML
+ */
+function generateOAuthDashboard(services, req) {
+    const servicesHtml = services
+        .map((service) => {
+        const statusIcon = getStatusIcon(service.status);
+        const statusText = getStatusText(service.status);
+        const actionButton = getActionButton(service);
+        return `
+      <tr>
+        <td>${sanitizeServerNameForContext(service.name, 'html')}</td>
+        <td>${statusIcon} ${statusText}</td>
+        <td>${service.lastConnected ? escapeHtml(new Date(service.lastConnected).toLocaleString()) : 'Never'}</td>
+        <td>${service.lastError ? sanitizeErrorMessage(service.lastError) : '-'}</td>
+        <td>${actionButton}</td>
+      </tr>
+    `;
+    })
+        .join('');
+    return `
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>1MCP OAuth Management</title>
+      <style>
+        body { font-family: Arial, sans-serif; margin: 20px; background-color: #f5f5f5; }
+        .container { max-width: 1200px; margin: 0 auto; background: white; padding: 20px; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.1); }
+        h1 { color: #333; text-align: center; margin-bottom: 30px; }
+        table { width: 100%; border-collapse: collapse; margin-top: 20px; }
+        th, td { padding: 12px; text-align: left; border-bottom: 1px solid #ddd; }
+        th { background-color: #f8f9fa; font-weight: bold; }
+        .status-connected { color: #28a745; }
+        .status-awaiting { color: #ffc107; }
+        .status-error { color: #dc3545; }
+        .status-disconnected { color: #6c757d; }
+        .btn { padding: 8px 16px; border: none; border-radius: 4px; cursor: pointer; text-decoration: none; display: inline-block; font-size: 14px; }
+        .btn-primary { background-color: #007bff; color: white; }
+        .btn-warning { background-color: #ffc107; color: black; }
+        .btn-success { background-color: #28a745; color: white; }
+        .btn:hover { opacity: 0.8; }
+        .alert { padding: 15px; margin: 20px 0; border-radius: 4px; }
+        .alert-success { background-color: #d4edda; color: #155724; border: 1px solid #c3e6cb; }
+        .alert-error { background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; }
+        .refresh-btn { float: right; margin-bottom: 20px; }
+      </style>
+    </head>
+    <body>
+      <div class="container">
+        <h1>🔐 1MCP OAuth Management</h1>
+
+        ${getAlertHtml(req)}
+
+        <button class="btn btn-primary refresh-btn" onclick="window.location.reload()">🔄 Refresh</button>
+
+        <table>
+          <thead>
+            <tr>
+              <th>Service</th>
+              <th>Status</th>
+              <th>Last Connected</th>
+              <th>Error</th>
+              <th>Actions</th>
+            </tr>
+          </thead>
+          <tbody>
+            ${servicesHtml}
+          </tbody>
+        </table>
+
+        <div style="margin-top: 30px; padding: 20px; background-color: #f8f9fa; border-radius: 4px;">
+          <h3>Instructions:</h3>
+          <ul>
+            <li><strong>Connected:</strong> Service is working properly (no authentication required)</li>
+            <li><strong>Authorized:</strong> Service is working properly (OAuth authentication completed)</li>
+            <li><strong>Awaiting OAuth:</strong> Click "Authorize" to complete authentication</li>
+            <li><strong>Error:</strong> Check error message and try "Restart OAuth" if needed</li>
+            <li><strong>Disconnected:</strong> Service is not connected</li>
+          </ul>
+        </div>
+      </div>
+
+      <script>
+        // Auto-refresh every 30 seconds
+        setTimeout(() => window.location.reload(), 30000);
+
+        function restartOAuth(serverName) {
+          fetch(\`/oauth/restart/\${serverName}\`, { method: 'POST' })
+            .then(response => response.json())
+            .then(data => {
+              if (data.success) {
+                window.location.reload();
+              } else {
+                alert('Failed to restart OAuth: ' + (data.error || 'Unknown error'));
+              }
+            })
+            .catch(error => {
+              alert('Failed to restart OAuth: ' + error.message);
+            });
+        }
+      </script>
+    </body>
+    </html>
+  `;
+}
+function getStatusIcon(status) {
+    switch (status) {
+        case ClientStatus.Connected:
+            return '✅';
+        case ClientStatus.AwaitingOAuth:
+            return '⏳';
+        case ClientStatus.Error:
+            return '❌';
+        case ClientStatus.Disconnected:
+            return '🔌';
+        default:
+            return '❓';
+    }
+}
+function getStatusText(status) {
+    switch (status) {
+        case ClientStatus.Connected:
+            return '<span class="status-connected">Connected</span>';
+        case ClientStatus.AwaitingOAuth:
+            return '<span class="status-awaiting">Awaiting OAuth</span>';
+        case ClientStatus.Error:
+            return '<span class="status-error">Error</span>';
+        case ClientStatus.Disconnected:
+            return '<span class="status-disconnected">Disconnected</span>';
+        default:
+            return '<span class="status-disconnected">Unknown</span>';
+    }
+}
+function getActionButton(service) {
+    switch (service.status) {
+        case ClientStatus.Connected:
+            // Check if server requires OAuth based on runtime behavior
+            if (requiresOAuth(service)) {
+                return '<span class="status-connected">✓ Authorized</span>';
+            }
+            else {
+                return '<span class="status-connected">✓ Connected</span>';
+            }
+        case ClientStatus.AwaitingOAuth:
+            return `<a href="/oauth/authorize/${sanitizeUrlParam(service.name)}" class="btn btn-warning">🔐 Authorize</a>`;
+        case ClientStatus.Error:
+        case ClientStatus.Disconnected:
+            return `<button onclick="restartOAuth('${sanitizeServerNameForContext(service.name, 'html')}')" class="btn btn-primary">🔄 Restart OAuth</button>`;
+        default:
+            return `<button onclick="restartOAuth('${sanitizeServerNameForContext(service.name, 'html')}')" class="btn btn-primary">🔄 Start OAuth</button>`;
+    }
+}
+function getAlertHtml(req) {
+    if (req.query.success) {
+        return '<div class="alert alert-success">✅ OAuth authorization completed successfully!</div>';
+    }
+    if (req.query.error) {
+        const error = req.query.error;
+        return `<div class="alert alert-error">❌ OAuth error: ${sanitizeErrorMessage(String(error))}</div>`;
+    }
+    return '';
+}
+export default router;
+//# sourceMappingURL=oauthRoutes.js.map

package/build/transport/http/routes/oauthRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauthRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/oauthRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqC,MAAM,SAAS,CAAC;AACpE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAC3C,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,4BAA4B,GAC7B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAEjF,MAAM,MAAM,GAAW,MAAM,EAAE,CAAC;AAEhC,mCAAmC;AACnC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IAC9B,MAAM,YAAY,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;IACtD,OAAO,SAAS,CAAC;QACf,QAAQ,EAAE,YAAY,CAAC,oBAAoB,EAAE;QAC7C,GAAG,EAAE,YAAY,CAAC,eAAe,EAAE;QACnC,eAAe,EAAE,IAAI;QACrB,aAAa,EAAE,KAAK;QACpB,OAAO,EAAE,iBAAiB,CAAC,KAAK,CAAC,OAAO;KACzC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;AAEjC;;;GAGG;AACH,SAAS,aAAa,CAAC,OAAY;IACjC,wEAAwE;IACxE,8EAA8E;IAC9E,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oEAAoE;IACpE,8DAA8D;IAC9D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4DAA4D;IAC5D,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,CAAC,aAAa,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACpD,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;QAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;QAE3C,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI;YACJ,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;YAC7C,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,OAAO;YACxC,aAAa,EAAE,UAAU,CAAC,aAAa;SACxC,CAAC,CAAC,CAAC;QAEJ,MAAM,IAAI,GAAG,sBAAsB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACnD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAC3C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACtD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,gBAAgB,GAAmB,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC7E,IAAI,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;QAClC,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;QAE5C,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,IAAI,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAChC,yCAAyC;YACzC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;aAAM,CAAC;YACN,0DAA0D;YAC1D,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;YAEhC,0BAA0B;YAC1B,MAAM,cAAc,GAAG,aAAa,CAAC,UAAU,EAAE,CAAC;YAClD,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEzD,IAAI,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;gBACxC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;gBACjD,OAAO;YACT,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC;gBAChE,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1E,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AAEvD,SAAS,aAAa,CAAC,SAAkB;IACvC,OAAO,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,IAAI,IAAI,OAAQ,SAAiB,CAAC,UAAU,KAAK,UAAU,CAAC;AACpH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IACxE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,mBAAmB,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;YACtD,OAAO,GAAG,CAAC,QAAQ,CAAC,gBAAgB,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,iDAAiD,UAAU,EAAE,CAAC,CAAC;YAC5E,OAAO,GAAG,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;QAE5C,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,8BAA8B,CAAC,CAAC;YACjE,OAAO,GAAG,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC;QACvD,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACzC,MAAM,CAAC,KAAK,CAAC,iBAAiB,UAAU,8BAA8B,CAAC,CAAC;YACxE,OAAO,GAAG,CAAC,QAAQ,CAAC,sCAAsC,CAAC,CAAC;QAC9D,CAAC;QAED,sDAAsD;QACtD,MAAM,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpD,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC;QAC3C,UAAU,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC;QACtC,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;QAEjC,0CAA0C;QAC1C,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,qCAAqC,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;QACxE,GAAG,CAAC,QAAQ,CAAC,8BAA8B,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,cAAc,GAAmB,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC3E,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;IAClC,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;QAE5C,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,6CAA6C;QAC7C,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEnC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,UAAU,GAAG,EAAE,KAAK,CAAC,CAAC;QACjE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC;IAClE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;AAEpD;;GAEG;AACH,MAAM,cAAc,GAAmB,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;IAC3E,IAAI,CAAC;QACH,MAAM,EACJ,SAAS,EACT,YAAY,EACZ,cAAc,EACd,qBAAqB,EAAE,sBAAsB,EAC7C,KAAK,EACL,QAAQ,EACR,MAAM,EACN,MAAM,GACP,GAAG,GAAG,CAAC,IAAI,CAAC;QAEb,2BAA2B;QAC3B,IAAI,CAAC,SAAS,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3C,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,iBAAiB;gBACxB,iBAAiB,EAAE,6BAA6B;aACjD,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,gCAAgC;QAChC,MAAM,aAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,gBAAgB;gBACvB,iBAAiB,EAAE,kBAAkB;aACtC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,kCAAkC;QAClC,MAAM,WAAW,GAAG,MAAuF,CAAC;QAE5G,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,gCAAgC;YAChC,mBAAmB,CAAC,sBAAsB,EAAE;gBAC1C,QAAQ,EAAE,SAAS;gBACnB,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,2BAA2B;aACnC,CAAC,CAAC;YAEH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;YAC1C,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YACvD,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,yBAAyB,CAAC,CAAC;YAC7E,IAAI,KAAK,EAAE,CAAC;gBACV,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,iDAAiD,SAAS,EAAE,CAAC,CAAC;YAC1E,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;YACrC,OAAO;QACT,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,kCAAkC;YAClC,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAE/E,2BAA2B;YAC3B,MAAM,UAAU,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;YAClD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,KAAK,EAAE,eAAe;oBACtB,iBAAiB,EAAE,mBAAmB,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACrE,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,0DAA0D;YAC1D,MAAM,UAAU,GAAG;gBACjB,MAAM,EAAE,cAAc;gBACtB,WAAW,EAAE,YAAY;gBACzB,aAAa,EAAE,cAAc;gBAC7B,KAAK;gBACL,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;aACnD,CAAC;YAEF,sDAAsD;YACtD,MAAM,aAAa,CAAC,oBAAoB,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAC/F,OAAO;QACT,CAAC;QAED,iBAAiB;QACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,iBAAiB;YACxB,iBAAiB,EAAE,gBAAgB;SACpC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;QACpD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE,cAAc;YACrB,iBAAiB,EAAE,uBAAuB;SAC3C,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,yBAAyB,EAAE,cAAc,CAAC,CAAC;AAEnE;;GAEG;AACH,KAAK,UAAU,aAAa,CAAC,UAAkB;IAC7C,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAE5C,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,CAAC;QACH,4DAA4D;QAC5D,MAAM,SAAS,GAAG,MAAM,YAAY,EAAE,CAAC;QACvC,MAAM,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;YACxC,uCAAuC;YACvC,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC;YAC/C,UAAU,CAAC,cAAc,GAAG,IAAI,IAAI,EAAE,CAAC;YAEvC,mDAAmD;YACnD,IAAI,CAAC;gBACH,MAAM,aAAa,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,CAAC;gBACzD,IAAI,aAAa,IAAI,OAAO,aAAa,CAAC,mBAAmB,KAAK,UAAU,EAAE,CAAC;oBAC7E,UAAU,CAAC,gBAAgB,GAAG,aAAa,CAAC,mBAAmB,EAAE,CAAC;gBACpE,CAAC;YACH,CAAC;YAAC,OAAO,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,IAAI,CAAC,2CAA2C,UAAU,GAAG,EAAE,QAAQ,CAAC,CAAC;YAClF,CAAC;YAED,MAAM,CAAC,IAAI,CAAC,uBAAuB,UAAU,EAAE,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,CAAC,4BAA4B;QAC3C,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,gBAAgB,CAAC,UAAkB;IAChD,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAE5C,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,YAAY,CAAC,CAAC;IACrD,CAAC;IAED,oBAAoB;IACpB,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;IACxC,UAAU,CAAC,cAAc,GAAG,SAAS,CAAC;IACtC,UAAU,CAAC,MAAM,GAAG,YAAY,CAAC,YAAY,CAAC;IAE9C,0BAA0B;IAC1B,MAAM,aAAa,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,SAAS,sBAAsB,CAAC,QAAe,EAAE,GAAY;IAC3D,MAAM,YAAY,GAAG,QAAQ;SAC1B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAE9C,OAAO;;cAEC,4BAA4B,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;cAClD,UAAU,IAAI,UAAU;cACxB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO;cAC9F,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;cACjE,YAAY;;KAErB,CAAC;IACF,CAAC,CAAC;SACD,IAAI,CAAC,EAAE,CAAC,CAAC;IAEZ,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAiCC,YAAY,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;cAeb,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCvB,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,YAAY,CAAC,SAAS;YACzB,OAAO,GAAG,CAAC;QACb,KAAK,YAAY,CAAC,aAAa;YAC7B,OAAO,GAAG,CAAC;QACb,KAAK,YAAY,CAAC,KAAK;YACrB,OAAO,GAAG,CAAC;QACb,KAAK,YAAY,CAAC,YAAY;YAC5B,OAAO,IAAI,CAAC;QACd;YACE,OAAO,GAAG,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,YAAY,CAAC,SAAS;YACzB,OAAO,iDAAiD,CAAC;QAC3D,KAAK,YAAY,CAAC,aAAa;YAC7B,OAAO,qDAAqD,CAAC;QAC/D,KAAK,YAAY,CAAC,KAAK;YACrB,OAAO,yCAAyC,CAAC;QACnD,KAAK,YAAY,CAAC,YAAY;YAC5B,OAAO,uDAAuD,CAAC;QACjE;YACE,OAAO,kDAAkD,CAAC;IAC9D,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,OAAY;IACnC,QAAQ,OAAO,CAAC,MAAM,EAAE,CAAC;QACvB,KAAK,YAAY,CAAC,SAAS;YACzB,2DAA2D;YAC3D,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC3B,OAAO,oDAAoD,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,OAAO,mDAAmD,CAAC;YAC7D,CAAC;QACH,KAAK,YAAY,CAAC,aAAa;YAC7B,OAAO,6BAA6B,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,4CAA4C,CAAC;QACjH,KAAK,YAAY,CAAC,KAAK,CAAC;QACxB,KAAK,YAAY,CAAC,YAAY;YAC5B,OAAO,kCAAkC,4BAA4B,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,uDAAuD,CAAC;QACrJ;YACE,OAAO,kCAAkC,4BAA4B,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,qDAAqD,CAAC;IACrJ,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,sFAAsF,CAAC;IAChG,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;QAC9B,OAAO,iDAAiD,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;IACtG,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,eAAe,MAAM,CAAC"}

package/build/transport/http/routes/sseRoutes.d.ts

@@ -0,0 +1,4 @@
+import { Router } from 'express';
+import { ServerManager } from '../../../core/server/serverManager.js';
+export declare function setupSseRoutes(router: Router, serverManager: ServerManager): void;
+//# sourceMappingURL=sseRoutes.d.ts.map

package/build/transport/http/routes/sseRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sseRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,SAAS,CAAC;AAKpD,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAKtE,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI,CA8DjF"}

package/build/{server → transport/http}/routes/sseRoutes.js

@@ -1,15 +1,17 @@
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { ErrorCode } from '@modelcontextprotocol/sdk/types.js';
-import logger from '../../logger/logger.js';
-import { SSE_ENDPOINT, MESSAGES_ENDPOINT } from '../../constants.js';
-import tagsExtractor from '../tagsExtractor.js';
-export function setupSseRoutes(app, serverManager, authMiddleware) {
-    app.get(SSE_ENDPOINT, authMiddleware, tagsExtractor, async (req, res) => {
+import logger from '../../../logger/logger.js';
+import { SSE_ENDPOINT, MESSAGES_ENDPOINT } from '../../../constants.js';
+import tagsExtractor from '../middlewares/tagsExtractor.js';
+import scopeAuthMiddleware, { getValidatedTags } from '../middlewares/scopeAuthMiddleware.js';
+import { sanitizeHeaders } from '../../../utils/sanitization.js';
+export function setupSseRoutes(router, serverManager) {
+    router.get(SSE_ENDPOINT, tagsExtractor, scopeAuthMiddleware, async (req, res) => {
         try {
-            logger.info('[GET] sse', { query: req.query, headers: req.headers });
+            logger.info('[GET] sse', { query: req.query, headers: sanitizeHeaders(req.headers) });
             const transport = new SSEServerTransport(MESSAGES_ENDPOINT, res);
-            // Use tags from middleware
-            const tags = res.locals.tags;
+            // Use validated tags from scope auth middleware
+            const tags = getValidatedTags(res);
             // Connect the transport using the server manager
             await serverManager.connectTransport(transport, transport.sessionId, {
                 tags,
@@ -17,7 +19,7 @@ export function setupSseRoutes(app, serverManager, authMiddleware) {
             });
             transport.onclose = () => {
                 serverManager.disconnectTransport(transport.sessionId);
-                logger.info('transport closed', transport.sessionId);
+                // Note: ServerManager already logs the disconnection
             };
         }
         catch (error) {
@@ -25,7 +27,7 @@ export function setupSseRoutes(app, serverManager, authMiddleware) {
             res.status(500).end();
         }
     });
-    app.post(MESSAGES_ENDPOINT, authMiddleware, async (req, res) => {
+    router.post(MESSAGES_ENDPOINT, async (req, res) => {
         try {
             const sessionId = req.query.sessionId;
             if (!sessionId) {

package/build/transport/http/routes/sseRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sseRoutes.js","sourceRoot":"","sources":["../../../../src/transport/http/routes/sseRoutes.ts"],"names":[],"mappings":"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"}

package/build/transport/http/routes/streamableHttpRoutes.d.ts

@@ -0,0 +1,4 @@
+import { Router } from 'express';
+import { ServerManager } from '../../../core/server/serverManager.js';
+export declare function setupStreamableHttpRoutes(router: Router, serverManager: ServerManager): void;
+//# sourceMappingURL=streamableHttpRoutes.d.ts.map

package/build/transport/http/routes/streamableHttpRoutes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamableHttpRoutes.d.ts","sourceRoot":"","sources":["../../../../src/transport/http/routes/streamableHttpRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,SAAS,CAAC;AAMpD,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAKtE,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,GAAG,IAAI,CA4H5F"}