@1mcp/agent 0.11.0 → 0.13.0

package/README.md

@@ -16,25 +16,29 @@ A unified Model Context Protocol server implementation that aggregates multiple
 - Provides a standardized way for AI models to interact with external tools and resources
 - Supports dynamic configuration reloading without server restart
 - Handles graceful shutdown and resource cleanup
+- Includes comprehensive authentication and security features
+- Supports advanced filtering, pagination, and request optimization
 
 ## Quick Start
 
 To enable Cursor to use existing MCP servers already configured in Claude Desktop, follow these steps:
 
 1. Run the 1MCP server with the Claude Desktop config file:
+
 ```bash
 npx -y @1mcp/agent --config ~/Library/Application\ Support/Claude/claude_desktop_config.json
 ```
 
 2. Add the 1MCP server to your Cursor config file (`~/.cursor/mcp.json`):
+
 ```json
 {
-    "mcpServers": {
-        "1mcp": {
-            "type": "http",
-            "url": "http://localhost:3050/sse"
-        }
+  "mcpServers": {
+    "1mcp": {
+      "type": "http",
+      "url": "http://localhost:3050/sse"
     }
+  }
 }
 ```
 
@@ -59,27 +63,26 @@ npx -y @1mcp/agent --help
 ```
 
 Available options:
-- `--transport, -t`: Choose transport type ("stdio" or "http", default: "http")
-- `--config, -c`: Use a specific config file
-- `--port, -P`: Change HTTP port (default: 3050)
-- `--host, -H`: Change HTTP host (default: localhost)
-- `--tags, -g`: Filter servers by tags (see Tags section below)
-- `--pagination, -p`: Enable pagination for client/server lists (boolean, default: false)
-- `--auth`: Enable authentication (OAuth 2.1) (boolean, default: false)
-- `--session-ttl`: Session expiry time in minutes (number, default: 1440)
-- `--session-storage-path`: Custom session storage directory path (string, default: undefined)
-- `--help, -h`: Show help
-
-Example with environment variables:
-```bash
-# Using environment variables
-ONE_MCP_PORT=3051 ONE_MCP_TAGS=network,filesystem npx -y @1mcp/agent
 
-# Or in your shell configuration
-export ONE_MCP_PORT=3051
-export ONE_MCP_TAGS=network,filesystem
-npx -y @1mcp/agent
-```
+| Option (CLI)                 | Environment Variable               | Description                                           |  Default  | Deprecated? |
+| :--------------------------- | :--------------------------------- | :---------------------------------------------------- | :-------: | :---------: |
+| `--transport`, `-t`          | `ONE_MCP_TRANSPORT`                | Choose transport type ("stdio", "http", or "sse")     |  "http"   |             |
+| `--config`, `-c`             | `ONE_MCP_CONFIG`                   | Use a specific config file                            |           |             |
+| `--port`, `-P`               | `ONE_MCP_PORT`                     | Change HTTP port                                      |   3050    |             |
+| `--host`, `-H`               | `ONE_MCP_HOST`                     | Change HTTP host                                      | localhost |             |
+| `--tags`, `-g`               | `ONE_MCP_TAGS`                     | Filter servers by tags                                |           |             |
+| `--pagination`, `-p`         | `ONE_MCP_PAGINATION`               | Enable pagination for client/server lists (boolean)   |   false   |             |
+| `--auth`                     | `ONE_MCP_AUTH`                     | Enable authentication (OAuth 2.1)                     |   false   |     Yes     |
+| `--enable-auth`              | `ONE_MCP_ENABLE_AUTH`              | Enable authentication (OAuth 2.1)                     |   false   |             |
+| `--enable-scope-validation`  | `ONE_MCP_ENABLE_SCOPE_VALIDATION`  | Enable tag-based scope validation (boolean)           |   true    |             |
+| `--enable-enhanced-security` | `ONE_MCP_ENABLE_ENHANCED_SECURITY` | Enable enhanced security middleware (boolean)         |   false   |             |
+| `--session-ttl`              | `ONE_MCP_SESSION_TTL`              | Session expiry time in minutes (number)               |   1440    |             |
+| `--session-storage-path`     | `ONE_MCP_SESSION_STORAGE_PATH`     | Custom session storage directory path (string)        |           |             |
+| `--rate-limit-window`        | `ONE_MCP_RATE_LIMIT_WINDOW`        | OAuth rate limit window in minutes (number)           |    15     |             |
+| `--rate-limit-max`           | `ONE_MCP_RATE_LIMIT_MAX`           | Maximum requests per OAuth rate limit window (number) |    100    |             |
+| `--help`, `-h`               |                                    | Show help                                             |           |             |
+
+> 💡 **Note:** Deprecated options are provided for backward compatibility. Prefer using the non-deprecated options for new configurations.
 
 ## Docker
 
@@ -100,24 +103,13 @@ docker run -i ghcr.io/1mcp-app/agent --transport stdio
 ```
 
 Available image tags:
+
 - `latest`: Latest stable release
 - `vX.Y.Z`: Specific version (e.g. `v1.0.0`)
 - `sha-<commit>`: Specific commit
 
-### Environment Variables
+Example:
 
-You can configure 1MCP using environment variables prefixed with `ONE_MCP_`:
-- `ONE_MCP_TRANSPORT`: Transport type ("stdio" or "http", default: "http")
-- `ONE_MCP_PORT`: HTTP port (default: 3050)
-- `ONE_MCP_HOST`: HTTP host (default: "localhost")
-- `ONE_MCP_CONFIG`: Path to config file
-- `ONE_MCP_TAGS`: Comma-separated list of tags to filter servers
-- `ONE_MCP_PAGINATION`: Enable pagination for client/server lists (boolean, default: false)
-- `ONE_MCP_AUTH`: Enable authentication (OAuth 2.1) (boolean, default: false)
-- `ONE_MCP_SESSION_TTL`: Session expiry time in minutes (number, default: 1440)
-- `ONE_MCP_SESSION_STORAGE_PATH`: Custom session storage directory path (string, default: undefined)
-
-Example with environment variables:
 ```bash
 docker run -p 3051:3051 \
   -e ONE_MCP_PORT=3051 \
@@ -132,6 +124,7 @@ Tags help you control which MCP servers are available to different clients. Thin
 #### How to Use Tags
 
 1. **In your server config**: Add tags to each server to describe its capabilities
+
 ```json
 {
   "mcpServers": {
@@ -152,6 +145,7 @@ Tags help you control which MCP servers are available to different clients. Thin
 ```
 
 2. **When starting 1MCP in stdio mode**: You can filter servers by tags
+
 ```bash
 # Only start servers with the "network" tag
 npx -y @1mcp/agent --transport stdio --tags "network"
@@ -161,18 +155,20 @@ npx -y @1mcp/agent --transport stdio --tags "network,filesystem"
 ```
 
 3. **When using SSE transport**: Clients can request servers with specific tags
+
 ```json
 {
-    "mcpServers": {
-        "1mcp": {
-            "type": "http",
-            "url": "http://localhost:3050/sse?tags=network"  // Only connect to network-capable servers
-        }
+  "mcpServers": {
+    "1mcp": {
+      "type": "http",
+      "url": "http://localhost:3050/sse?tags=network" // Only connect to network-capable servers
     }
+  }
 }
 ```
 
 Example tags:
+
 - `network`: For servers that make web requests
 - `filesystem`: For servers that handle file operations
 - `memory`: For servers that provide memory/storage
@@ -195,17 +191,12 @@ The server automatically manages configuration in a global location:
   "mcpServers": {
     "mcp-server-fetch": {
       "command": "uvx",
-      "args": [
-        "mcp-server-fetch"
-      ],
+      "args": ["mcp-server-fetch"],
       "disabled": false
     },
     "server-memory": {
       "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-memory"
-      ],
+      "args": ["-y", "@modelcontextprotocol/server-memory"],
       "disabled": false
     }
   }
@@ -271,21 +262,25 @@ sequenceDiagram
 ## Development
 
 Install dependencies:
+
 ```bash
 pnpm install
 ```
 
 Build the server:
+
 ```bash
 pnpm build
 ```
 
 For development with auto-rebuild:
+
 ```bash
 pnpm watch
 ```
 
 Run the server:
+
 ```bash
 pnpm dev
 ```

package/build/auth/clientSessionManager.d.ts

@@ -0,0 +1,94 @@
+import { ClientSessionData } from './sessionTypes.js';
+/**
+ * ClientSessionManager handles file-based client session storage with automatic cleanup.
+ *
+ * This class manages OAuth 2.1 client sessions using the local filesystem.
+ * It provides automatic cleanup of expired sessions and supports configurable
+ * storage locations separate from server sessions.
+ *
+ * Features:
+ * - File-based client session storage with JSON format
+ * - Automatic cleanup of expired client sessions
+ * - Server name sanitization for safe filenames
+ * - Configurable storage directory
+ * - Unified session data per server
+ *
+ * @example
+ * ```typescript
+ * const clientSessionManager = new ClientSessionManager();
+ * const sessionData = { serverName: 'test', ... };
+ * clientSessionManager.createClientSession('test', sessionData);
+ * const session = clientSessionManager.getClientSession('test');
+ * ```
+ */
+export declare class ClientSessionManager {
+    private clientSessionStoragePath;
+    /**
+     * Creates a new ClientSessionManager instance.
+     *
+     * Initializes the client session storage directory.
+     *
+     * @param clientSessionStoragePath - Optional custom path for client session storage
+     */
+    constructor(clientSessionStoragePath?: string);
+    /**
+     * Gets the client session storage path.
+     *
+     * @returns The absolute path to the client session storage directory
+     */
+    getClientSessionStoragePath(): string;
+    /**
+     * Ensures the client session storage directory exists.
+     *
+     * Creates the directory structure if it doesn't exist, including
+     * parent directories as needed.
+     *
+     * @throws Error if directory creation fails
+     */
+    private ensureClientSessionDirectory;
+    /**
+     * Gets the file path for a client session.
+     *
+     * @param serverName - The server name for the client session
+     * @returns Full file path for the client session file
+     */
+    private getClientSessionFilePath;
+    /**
+     * Creates or updates a client session.
+     *
+     * @param serverName - The server name for the client session
+     * @param clientSessionData - The client session data to store
+     * @returns The server name
+     * @throws Error if client session creation fails
+     */
+    createClientSession(serverName: string, clientSessionData: ClientSessionData): string;
+    /**
+     * Retrieves client session data by server name.
+     *
+     * @param serverName - The server name to retrieve client session for
+     * @returns Client session data if valid and not expired, null otherwise
+     */
+    getClientSession(serverName: string): ClientSessionData | null;
+    /**
+     * Deletes a client session by server name.
+     *
+     * @param serverName - The server name to delete client session for
+     * @returns True if client session was deleted, false if it didn't exist
+     */
+    deleteClientSession(serverName: string): boolean;
+    /**
+     * Cleans up expired client sessions.
+     *
+     * Scans the client session storage directory and removes all expired
+     * client session files. Also handles corrupted files by removing them
+     * to prevent future errors.
+     */
+    cleanupExpiredClientSessions(): void;
+    /**
+     * Lists all client session files in the storage directory.
+     *
+     * @returns Array of server names that have client sessions
+     */
+    listClientSessions(): string[];
+}
+//# sourceMappingURL=clientSessionManager.d.ts.map

package/build/auth/clientSessionManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clientSessionManager.d.ts","sourceRoot":"","sources":["../../src/auth/clientSessionManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGtD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,wBAAwB,CAAS;IAEzC;;;;;;OAMG;gBACS,wBAAwB,CAAC,EAAE,MAAM;IAK7C;;;;OAIG;IACI,2BAA2B,IAAI,MAAM;IAI5C;;;;;;;OAOG;IACH,OAAO,CAAC,4BAA4B;IAYpC;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IAgBhC;;;;;;;OAOG;IACI,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,MAAM;IAY5F;;;;;OAKG;IACI,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI;IAsBrE;;;;;OAKG;IACI,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAevD;;;;;;OAMG;IACI,4BAA4B,IAAI,IAAI;IAyC3C;;;;OAIG;IACI,kBAAkB,IAAI,MAAM,EAAE;CAetC"}

package/build/auth/clientSessionManager.js

@@ -0,0 +1,220 @@
+import fs from 'fs';
+import path from 'path';
+import logger from '../logger/logger.js';
+import { getGlobalConfigDir } from '../constants.js';
+import { sanitizeServerName } from '../utils/sanitization.js';
+/**
+ * ClientSessionManager handles file-based client session storage with automatic cleanup.
+ *
+ * This class manages OAuth 2.1 client sessions using the local filesystem.
+ * It provides automatic cleanup of expired sessions and supports configurable
+ * storage locations separate from server sessions.
+ *
+ * Features:
+ * - File-based client session storage with JSON format
+ * - Automatic cleanup of expired client sessions
+ * - Server name sanitization for safe filenames
+ * - Configurable storage directory
+ * - Unified session data per server
+ *
+ * @example
+ * ```typescript
+ * const clientSessionManager = new ClientSessionManager();
+ * const sessionData = { serverName: 'test', ... };
+ * clientSessionManager.createClientSession('test', sessionData);
+ * const session = clientSessionManager.getClientSession('test');
+ * ```
+ */
+export class ClientSessionManager {
+    clientSessionStoragePath;
+    /**
+     * Creates a new ClientSessionManager instance.
+     *
+     * Initializes the client session storage directory.
+     *
+     * @param clientSessionStoragePath - Optional custom path for client session storage
+     */
+    constructor(clientSessionStoragePath) {
+        this.clientSessionStoragePath = clientSessionStoragePath || path.join(getGlobalConfigDir(), 'clientSessions');
+        this.ensureClientSessionDirectory();
+    }
+    /**
+     * Gets the client session storage path.
+     *
+     * @returns The absolute path to the client session storage directory
+     */
+    getClientSessionStoragePath() {
+        return this.clientSessionStoragePath;
+    }
+    /**
+     * Ensures the client session storage directory exists.
+     *
+     * Creates the directory structure if it doesn't exist, including
+     * parent directories as needed.
+     *
+     * @throws Error if directory creation fails
+     */
+    ensureClientSessionDirectory() {
+        try {
+            if (!fs.existsSync(this.clientSessionStoragePath)) {
+                fs.mkdirSync(this.clientSessionStoragePath, { recursive: true });
+                logger.info(`Created client session storage directory: ${this.clientSessionStoragePath}`);
+            }
+        }
+        catch (error) {
+            logger.error(`Failed to create client session directory: ${error}`);
+            throw error;
+        }
+    }
+    /**
+     * Gets the file path for a client session.
+     *
+     * @param serverName - The server name for the client session
+     * @returns Full file path for the client session file
+     */
+    getClientSessionFilePath(serverName) {
+        const sanitizedServerName = sanitizeServerName(serverName);
+        const fileName = `oauth_${sanitizedServerName}.json`;
+        const filePath = path.resolve(this.clientSessionStoragePath, fileName);
+        // Additional security check: ensure resolved path is within client session storage
+        const normalizedStoragePath = path.resolve(this.clientSessionStoragePath);
+        const normalizedFilePath = path.resolve(filePath);
+        if (!normalizedFilePath.startsWith(normalizedStoragePath + path.sep)) {
+            throw new Error('Invalid client session file path: outside storage directory');
+        }
+        return filePath;
+    }
+    /**
+     * Creates or updates a client session.
+     *
+     * @param serverName - The server name for the client session
+     * @param clientSessionData - The client session data to store
+     * @returns The server name
+     * @throws Error if client session creation fails
+     */
+    createClientSession(serverName, clientSessionData) {
+        try {
+            const filePath = this.getClientSessionFilePath(serverName);
+            fs.writeFileSync(filePath, JSON.stringify(clientSessionData, null, 2));
+            logger.info(`Created/updated client session for server: ${serverName}`);
+            return serverName;
+        }
+        catch (error) {
+            logger.error(`Failed to create client session for ${serverName}: ${error}`);
+            throw error;
+        }
+    }
+    /**
+     * Retrieves client session data by server name.
+     *
+     * @param serverName - The server name to retrieve client session for
+     * @returns Client session data if valid and not expired, null otherwise
+     */
+    getClientSession(serverName) {
+        try {
+            const filePath = this.getClientSessionFilePath(serverName);
+            if (!fs.existsSync(filePath)) {
+                return null;
+            }
+            const data = fs.readFileSync(filePath, 'utf8');
+            const clientSessionData = JSON.parse(data);
+            if (clientSessionData.expires < Date.now()) {
+                this.deleteClientSession(serverName);
+                return null;
+            }
+            return clientSessionData;
+        }
+        catch (error) {
+            logger.error(`Failed to read client session for ${serverName}: ${error}`);
+            return null;
+        }
+    }
+    /**
+     * Deletes a client session by server name.
+     *
+     * @param serverName - The server name to delete client session for
+     * @returns True if client session was deleted, false if it didn't exist
+     */
+    deleteClientSession(serverName) {
+        try {
+            const filePath = this.getClientSessionFilePath(serverName);
+            if (fs.existsSync(filePath)) {
+                fs.unlinkSync(filePath);
+                logger.info(`Deleted client session for server: ${serverName}`);
+                return true;
+            }
+            return false;
+        }
+        catch (error) {
+            logger.error(`Failed to delete client session for ${serverName}: ${error}`);
+            return false;
+        }
+    }
+    /**
+     * Cleans up expired client sessions.
+     *
+     * Scans the client session storage directory and removes all expired
+     * client session files. Also handles corrupted files by removing them
+     * to prevent future errors.
+     */
+    cleanupExpiredClientSessions() {
+        try {
+            if (!fs.existsSync(this.clientSessionStoragePath)) {
+                return;
+            }
+            const files = fs.readdirSync(this.clientSessionStoragePath);
+            let cleanedCount = 0;
+            for (const file of files) {
+                if (file.endsWith('.json') && file.startsWith('oauth_')) {
+                    const filePath = path.join(this.clientSessionStoragePath, file);
+                    try {
+                        const data = fs.readFileSync(filePath, 'utf8');
+                        const clientSessionData = JSON.parse(data);
+                        if (clientSessionData.expires < Date.now()) {
+                            fs.unlinkSync(filePath);
+                            cleanedCount++;
+                        }
+                    }
+                    catch (error) {
+                        logger.warn(`Failed to process client session file ${file}: ${error}`);
+                        // Remove corrupted files
+                        try {
+                            fs.unlinkSync(filePath);
+                            cleanedCount++;
+                        }
+                        catch (unlinkError) {
+                            logger.error(`Failed to remove corrupted client session file ${file}: ${unlinkError}`);
+                        }
+                    }
+                }
+            }
+            if (cleanedCount > 0) {
+                logger.info(`Cleaned up ${cleanedCount} expired client sessions`);
+            }
+        }
+        catch (error) {
+            logger.error(`Failed to cleanup expired client sessions: ${error}`);
+        }
+    }
+    /**
+     * Lists all client session files in the storage directory.
+     *
+     * @returns Array of server names that have client sessions
+     */
+    listClientSessions() {
+        try {
+            if (!fs.existsSync(this.clientSessionStoragePath)) {
+                return [];
+            }
+            const files = fs.readdirSync(this.clientSessionStoragePath);
+            return files
+                .filter((file) => file.endsWith('.json') && file.startsWith('oauth_'))
+                .map((file) => file.substring(6, file.length - 5)); // Remove 'oauth_' prefix and '.json' suffix
+        }
+        catch (error) {
+            logger.error(`Failed to list client sessions: ${error}`);
+            return [];
+        }
+    }
+}
+//# sourceMappingURL=clientSessionManager.js.map

package/build/auth/clientSessionManager.js.map

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

package/build/auth/sdkOAuthClientProvider.d.ts

@@ -0,0 +1,93 @@
+import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import type { OAuthClientMetadata, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth.js';
+/**
+ * OAuth client configuration for connecting to downstream MCP servers
+ */
+export interface OAuthClientConfig {
+    clientId?: string;
+    clientSecret?: string;
+    scopes?: string[];
+    redirectUrl: string;
+}
+/**
+ * SDK-compatible OAuth client provider that replaces the custom implementation.
+ *
+ * This provider implements the OAuth 2.1 Authorization Code Grant flow using
+ * the SDK's OAuthClientProvider interface while maintaining compatibility with
+ * the existing session storage system.
+ */
+export declare class SDKOAuthClientProvider implements OAuthClientProvider {
+    private _clientMetadata;
+    private _clientInfo?;
+    private _tokens?;
+    private _codeVerifier?;
+    private _state?;
+    private sessionManager;
+    private serverName;
+    private config;
+    private _authorizationUrl?;
+    constructor(serverName: string, config: OAuthClientConfig, sessionStoragePath?: string);
+    get redirectUrl(): string;
+    get clientMetadata(): OAuthClientMetadata;
+    /**
+     * Returns current client registration information
+     */
+    clientInformation(): OAuthClientInformationFull | undefined;
+    /**
+     * Saves client registration information from dynamic registration
+     */
+    saveClientInformation(clientInfo: OAuthClientInformationFull): void;
+    /**
+     * Returns current OAuth tokens
+     */
+    tokens(): OAuthTokens | undefined;
+    /**
+     * Saves OAuth tokens after successful authorization
+     */
+    saveTokens(tokens: OAuthTokens): void;
+    /**
+     * Stores authorization URL instead of prompting user in console
+     */
+    redirectToAuthorization(authorizationUrl: URL): void;
+    /**
+     * Gets the current authorization URL
+     */
+    getAuthorizationUrl(): string | undefined;
+    /**
+     * Clears the stored authorization URL
+     */
+    clearAuthorizationUrl(): void;
+    /**
+     * Saves PKCE code verifier for the authorization session
+     */
+    saveCodeVerifier(codeVerifier: string): void;
+    /**
+     * Returns the PKCE code verifier for token exchange
+     */
+    codeVerifier(): string | Promise<string>;
+    /**
+     * Returns the OAuth state parameter for CSRF protection
+     */
+    state(): string | Promise<string>;
+    /**
+     * Custom resource validation (optional)
+     */
+    validateResourceURL(serverUrl: string | URL, resource?: string): Promise<URL | undefined>;
+    /**
+     * Load persisted OAuth data from unified client session storage
+     */
+    private loadPersistedData;
+    /**
+     * Persist all OAuth data to unified client session storage
+     */
+    private persistAllData;
+    /**
+     * Check if OAuth tokens are expired
+     */
+    private isTokenExpired;
+    /**
+     * Clean up resources
+     */
+    shutdown(): void;
+}
+//# sourceMappingURL=sdkOAuthClientProvider.d.ts.map

package/build/auth/sdkOAuthClientProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sdkOAuthClientProvider.d.ts","sourceRoot":"","sources":["../../src/auth/sdkOAuthClientProvider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,KAAK,EACV,mBAAmB,EACnB,0BAA0B,EAC1B,WAAW,EACZ,MAAM,0CAA0C,CAAC;AAMlD;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,qBAAa,sBAAuB,YAAW,mBAAmB;IAChE,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,WAAW,CAAC,CAA6B;IACjD,OAAO,CAAC,OAAO,CAAC,CAAc;IAC9B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,iBAAiB,CAAC,CAAS;gBAEvB,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,EAAE,MAAM;IAqBtF,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,cAAc,IAAI,mBAAmB,CAExC;IAED;;OAEG;IACH,iBAAiB,IAAI,0BAA0B,GAAG,SAAS;IAI3D;;OAEG;IACH,qBAAqB,CAAC,UAAU,EAAE,0BAA0B,GAAG,IAAI;IAMnE;;OAEG;IACH,MAAM,IAAI,WAAW,GAAG,SAAS;IAIjC;;OAEG;IACH,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,IAAI;IAMrC;;OAEG;IACH,uBAAuB,CAAC,gBAAgB,EAAE,GAAG,GAAG,IAAI;IAIpD;;OAEG;IACH,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAIzC;;OAEG;IACH,qBAAqB,IAAI,IAAI;IAI7B;;OAEG;IACH,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI;IAK5C;;OAEG;IACH,YAAY,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIxC;;OAEG;IACH,KAAK,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAQjC;;OAEG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAS/F;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAiCzB;;OAEG;IACH,OAAO,CAAC,cAAc;IAwBtB;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;OAEG;IACH,QAAQ,IAAI,IAAI;CAMjB"}