@push.rocks/smartdb 1.0.1 → 2.0.0

package/ts/ts_smartdb/server/SmartdbServer.ts

@@ -1,11 +1,4 @@
-import * as net from 'net';
-import * as fs from 'fs/promises';
-import * as plugins from '../plugins.js';
-import { WireProtocol, OP_QUERY } from './WireProtocol.js';
-import { CommandRouter } from './CommandRouter.js';
-import { MemoryStorageAdapter } from '../storage/MemoryStorageAdapter.js';
-import { FileStorageAdapter } from '../storage/FileStorageAdapter.js';
-import type { IStorageAdapter } from '../storage/IStorageAdapter.js';
+import { RustDbBridge } from '../rust-db-bridge.js';
 
 /**
  * Server configuration options
@@ -28,90 +21,41 @@ export interface ISmartdbServerOptions {
 }
 
 /**
- * Connection state for each client
- */
-interface IConnectionState {
-  id: number;
-  socket: net.Socket;
-  buffer: Buffer;
-  authenticated: boolean;
-  database: string;
-}
-
-/**
- * SmartdbServer - MongoDB Wire Protocol compatible server
+ * SmartdbServer - Wire protocol compatible database server backed by Rust
  *
- * This server implements the MongoDB wire protocol (OP_MSG) to allow
- * official MongoDB drivers to connect and perform operations.
+ * This server implements the wire protocol to allow official drivers to
+ * connect and perform operations. The core engine runs as a Rust sidecar
+ * binary managed via @push.rocks/smartrust IPC.
  *
  * @example
  * ```typescript
- * import { SmartdbServer } from '@push.rocks/smartmongo/smartdb';
+ * import { SmartdbServer } from '@push.rocks/smartdb';
  * import { MongoClient } from 'mongodb';
  *
  * const server = new SmartdbServer({ port: 27017 });
  * await server.start();
  *
- * const client = new MongoClient('mongodb://127.0.0.1:27017');
+ * const client = new MongoClient(server.getConnectionUri());
  * await client.connect();
  * ```
  */
 export class SmartdbServer {
-  private options: Required<Omit<ISmartdbServerOptions, 'socketPath'>> & { socketPath: string };
-  private server: net.Server | null = null;
-  private storage: IStorageAdapter;
-  private commandRouter: CommandRouter;
-  private connections: Map<number, IConnectionState> = new Map();
-  private connectionIdCounter = 0;
+  private options: ISmartdbServerOptions;
+  private bridge: RustDbBridge;
   private isRunning = false;
-  private startTime: Date = new Date();
-  private useSocket: boolean;
+  private resolvedConnectionUri = '';
 
   constructor(options: ISmartdbServerOptions = {}) {
-    this.useSocket = !!options.socketPath;
     this.options = {
       port: options.port ?? 27017,
       host: options.host ?? '127.0.0.1',
-      socketPath: options.socketPath ?? '',
+      socketPath: options.socketPath,
       storage: options.storage ?? 'memory',
       storagePath: options.storagePath ?? './data',
-      persistPath: options.persistPath ?? '',
+      persistPath: options.persistPath,
       persistIntervalMs: options.persistIntervalMs ?? 60000,
     };
-
-    // Create storage adapter
-    if (this.options.storage === 'file') {
-      this.storage = new FileStorageAdapter(this.options.storagePath);
-    } else {
-      this.storage = new MemoryStorageAdapter({
-        persistPath: this.options.persistPath || undefined,
-        persistIntervalMs: this.options.persistPath ? this.options.persistIntervalMs : undefined,
-      });
-    }
-
-    // Create command router
-    this.commandRouter = new CommandRouter(this.storage, this);
-  }
-
-  /**
-   * Get the storage adapter (for testing/debugging)
-   */
-  getStorage(): IStorageAdapter {
-    return this.storage;
-  }
-
-  /**
-   * Get server uptime in seconds
-   */
-  getUptime(): number {
-    return Math.floor((Date.now() - this.startTime.getTime()) / 1000);
-  }
-
-  /**
-   * Get current connection count
-   */
-  getConnectionCount(): number {
-    return this.connections.size;
+    this.bridge = new RustDbBridge();
   }
 
   /**
@@ -122,213 +66,74 @@ export class SmartdbServer {
       throw new Error('Server is already running');
     }
 
-    // Initialize storage
-    await this.storage.initialize();
-
-    // Clean up stale socket file if using Unix socket
-    if (this.useSocket && this.options.socketPath) {
-      try {
-        await fs.unlink(this.options.socketPath);
-      } catch (err: any) {
-        // Ignore ENOENT (file doesn't exist)
-        if (err.code !== 'ENOENT') {
-          throw err;
-        }
-      }
+    const spawned = await this.bridge.spawn();
+    if (!spawned) {
+      throw new Error(
+        'smartdb Rust binary not found. Set SMARTDB_RUST_BINARY env var, ' +
+        'install the platform package, or build locally with `tsrust`.'
+      );
     }
 
-    return new Promise((resolve, reject) => {
-      this.server = net.createServer((socket) => {
-        this.handleConnection(socket);
-      });
-
-      this.server.on('error', (err) => {
-        if (!this.isRunning) {
-          reject(err);
-        } else {
-          console.error('Server error:', err);
-        }
-      });
-
-      if (this.useSocket && this.options.socketPath) {
-        // Listen on Unix socket
-        this.server.listen(this.options.socketPath, () => {
-          this.isRunning = true;
-          this.startTime = new Date();
-          resolve();
-        });
-      } else {
-        // Listen on TCP
-        this.server.listen(this.options.port, this.options.host, () => {
-          this.isRunning = true;
-          this.startTime = new Date();
-          resolve();
-        });
+    // Forward unexpected exit
+    this.bridge.on('exit', (code: number | null, signal: string | null) => {
+      if (this.isRunning) {
+        console.error(`smartdb Rust process exited unexpectedly (code=${code}, signal=${signal})`);
       }
     });
+
+    // Send config, get back connectionUri
+    const result = await this.bridge.startDb({
+      port: this.options.port,
+      host: this.options.host,
+      socketPath: this.options.socketPath,
+      storage: this.options.storage ?? 'memory',
+      storagePath: this.options.storagePath,
+      persistPath: this.options.persistPath,
+      persistIntervalMs: this.options.persistIntervalMs,
+    });
+
+    this.resolvedConnectionUri = result.connectionUri;
+    this.isRunning = true;
   }
 
   /**
    * Stop the server
    */
   async stop(): Promise<void> {
-    if (!this.isRunning || !this.server) {
+    if (!this.isRunning) {
       return;
     }
 
-    // Close all connections
-    for (const conn of this.connections.values()) {
-      conn.socket.destroy();
+    try {
+      await this.bridge.stopDb();
+    } catch {
+      // Bridge may already be dead
     }
-    this.connections.clear();
-
-    // Close command router (cleans up session engine, cursors, etc.)
-    this.commandRouter.close();
-
-    // Close storage
-    await this.storage.close();
-
-    return new Promise((resolve) => {
-      this.server!.close(async () => {
-        this.isRunning = false;
-        this.server = null;
-
-        // Clean up socket file if using Unix socket
-        if (this.useSocket && this.options.socketPath) {
-          try {
-            await fs.unlink(this.options.socketPath);
-          } catch (err: any) {
-            // Ignore ENOENT (file doesn't exist)
-            if (err.code !== 'ENOENT') {
-              console.error('Failed to remove socket file:', err);
-            }
-          }
-        }
-
-        resolve();
-      });
-    });
-  }
-
-  /**
-   * Handle a new client connection
-   */
-  private handleConnection(socket: net.Socket): void {
-    const connectionId = ++this.connectionIdCounter;
-
-    const state: IConnectionState = {
-      id: connectionId,
-      socket,
-      buffer: Buffer.alloc(0),
-      authenticated: true, // No auth required for now
-      database: 'test',
-    };
-
-    this.connections.set(connectionId, state);
-
-    socket.on('data', (data) => {
-      this.handleData(state, Buffer.isBuffer(data) ? data : Buffer.from(data));
-    });
-
-    socket.on('close', () => {
-      this.connections.delete(connectionId);
-    });
-
-    socket.on('error', (err) => {
-      // Connection errors are expected when clients disconnect
-      this.connections.delete(connectionId);
-    });
-  }
-
-  /**
-   * Handle incoming data from a client
-   */
-  private handleData(state: IConnectionState, data: Buffer): void {
-    // Append new data to buffer
-    state.buffer = Buffer.concat([state.buffer, data]);
-
-    // Process messages from buffer
-    this.processMessages(state);
-  }
-
-  /**
-   * Process complete messages from the buffer
-   */
-  private async processMessages(state: IConnectionState): Promise<void> {
-    while (state.buffer.length >= 16) {
-      try {
-        const result = WireProtocol.parseMessage(state.buffer);
-
-        if (!result) {
-          // Not enough data for a complete message
-          break;
-        }
-
-        const { command, bytesConsumed } = result;
 
-        // Remove processed bytes from buffer
-        state.buffer = state.buffer.subarray(bytesConsumed);
-
-        // Process the command
-        const response = await this.commandRouter.route(command);
-
-        // Encode and send response
-        let responseBuffer: Buffer;
-        if (command.opCode === OP_QUERY) {
-          // Legacy OP_QUERY gets OP_REPLY response
-          responseBuffer = WireProtocol.encodeOpReplyResponse(
-            command.requestID,
-            [response]
-          );
-        } else {
-          // OP_MSG gets OP_MSG response
-          responseBuffer = WireProtocol.encodeOpMsgResponse(
-            command.requestID,
-            response
-          );
-        }
-
-        if (!state.socket.destroyed) {
-          state.socket.write(responseBuffer);
-        }
-      } catch (error: any) {
-        // Send error response
-        const errorResponse = WireProtocol.encodeErrorResponse(
-          0, // We don't have the requestID at this point
-          1,
-          error.message || 'Internal error'
-        );
-
-        if (!state.socket.destroyed) {
-          state.socket.write(errorResponse);
-        }
-
-        // Clear buffer on parse errors to avoid infinite loops
-        if (error.message?.includes('opCode') || error.message?.includes('section')) {
-          state.buffer = Buffer.alloc(0);
-        }
-        break;
-      }
-    }
+    this.bridge.kill();
+    this.isRunning = false;
   }
 
   /**
    * Get the connection URI for this server
    */
   getConnectionUri(): string {
-    if (this.useSocket && this.options.socketPath) {
-      // URL-encode the socket path (replace / with %2F)
+    if (this.resolvedConnectionUri) {
+      return this.resolvedConnectionUri;
+    }
+    // Fallback: compute from options
+    if (this.options.socketPath) {
       const encodedPath = encodeURIComponent(this.options.socketPath);
       return `mongodb://${encodedPath}`;
     }
-    return `mongodb://${this.options.host}:${this.options.port}`;
+    return `mongodb://${this.options.host ?? '127.0.0.1'}:${this.options.port ?? 27017}`;
   }
 
   /**
    * Get the socket path (if using Unix socket mode)
    */
   get socketPath(): string | undefined {
-    return this.useSocket ? this.options.socketPath : undefined;
+    return this.options.socketPath;
   }
 
   /**
@@ -342,13 +147,13 @@ export class SmartdbServer {
    * Get the port the server is listening on
    */
   get port(): number {
-    return this.options.port;
+    return this.options.port ?? 27017;
   }
 
   /**
    * Get the host the server is bound to
    */
   get host(): string {
-    return this.options.host;
+    return this.options.host ?? '127.0.0.1';
   }
 }

package/ts/ts_smartdb/server/index.ts

@@ -1,10 +1,3 @@
 // Server module exports
-
 export { SmartdbServer } from './SmartdbServer.js';
 export type { ISmartdbServerOptions } from './SmartdbServer.js';
-export { WireProtocol } from './WireProtocol.js';
-export { CommandRouter } from './CommandRouter.js';
-export type { ICommandHandler, IHandlerContext, ICursorState } from './CommandRouter.js';
-
-// Export handlers
-export * from './handlers/index.js';

package/dist_ts/ts_smartdb/engine/AggregationEngine.d.ts

@@ -1,66 +0,0 @@
-import type { Document, IStoredDocument, IAggregateOptions } from '../types/interfaces.js';
-/**
- * Aggregation engine using mingo for MongoDB-compatible aggregation pipeline execution
- */
-export declare class AggregationEngine {
-    /**
-     * Execute an aggregation pipeline on a collection of documents
-     */
-    static aggregate(documents: IStoredDocument[], pipeline: Document[], options?: IAggregateOptions): Document[];
-    /**
-     * Execute aggregation and return an iterator for lazy evaluation
-     */
-    static aggregateIterator(documents: IStoredDocument[], pipeline: Document[], options?: IAggregateOptions): Generator<Document>;
-    /**
-     * Execute a $lookup stage manually (for cross-collection lookups)
-     * This is used when the lookup references another collection in the same database
-     */
-    static executeLookup(documents: IStoredDocument[], lookupSpec: {
-        from: string;
-        localField: string;
-        foreignField: string;
-        as: string;
-    }, foreignCollection: IStoredDocument[]): Document[];
-    /**
-     * Execute a $graphLookup stage manually
-     */
-    static executeGraphLookup(documents: IStoredDocument[], graphLookupSpec: {
-        from: string;
-        startWith: string | Document;
-        connectFromField: string;
-        connectToField: string;
-        as: string;
-        maxDepth?: number;
-        depthField?: string;
-        restrictSearchWithMatch?: Document;
-    }, foreignCollection: IStoredDocument[]): Document[];
-    /**
-     * Execute a $facet stage manually
-     */
-    static executeFacet(documents: IStoredDocument[], facetSpec: Record<string, Document[]>): Document;
-    /**
-     * Execute a $unionWith stage
-     */
-    static executeUnionWith(documents: IStoredDocument[], otherDocuments: IStoredDocument[], pipeline?: Document[]): Document[];
-    /**
-     * Execute a $merge stage (output to another collection)
-     * Returns the documents that would be inserted/updated
-     */
-    static prepareMerge(documents: Document[], mergeSpec: {
-        into: string;
-        on?: string | string[];
-        whenMatched?: 'replace' | 'keepExisting' | 'merge' | 'fail' | Document[];
-        whenNotMatched?: 'insert' | 'discard' | 'fail';
-    }): {
-        toInsert: Document[];
-        toUpdate: Array<{
-            filter: Document;
-            update: Document;
-        }>;
-        onField: string | string[];
-        whenMatched: string | Document[];
-        whenNotMatched: string;
-    };
-    private static getNestedValue;
-    private static valuesMatch;
-}

package/dist_ts/ts_smartdb/engine/AggregationEngine.js

@@ -1,189 +0,0 @@
-import * as plugins from '../plugins.js';
-// Import mingo Aggregator
-import { Aggregator } from 'mingo';
-/**
- * Aggregation engine using mingo for MongoDB-compatible aggregation pipeline execution
- */
-export class AggregationEngine {
-    /**
-     * Execute an aggregation pipeline on a collection of documents
-     */
-    static aggregate(documents, pipeline, options) {
-        if (!pipeline || pipeline.length === 0) {
-            return documents;
-        }
-        // Create mingo aggregator with the pipeline
-        const aggregator = new Aggregator(pipeline, {
-            collation: options?.collation,
-        });
-        // Run the aggregation
-        const result = aggregator.run(documents);
-        return Array.isArray(result) ? result : [];
-    }
-    /**
-     * Execute aggregation and return an iterator for lazy evaluation
-     */
-    static *aggregateIterator(documents, pipeline, options) {
-        const aggregator = new Aggregator(pipeline, {
-            collation: options?.collation,
-        });
-        // Get the cursor from mingo
-        const cursor = aggregator.stream(documents);
-        for (const doc of cursor) {
-            yield doc;
-        }
-    }
-    /**
-     * Execute a $lookup stage manually (for cross-collection lookups)
-     * This is used when the lookup references another collection in the same database
-     */
-    static executeLookup(documents, lookupSpec, foreignCollection) {
-        const { localField, foreignField, as } = lookupSpec;
-        return documents.map(doc => {
-            const localValue = this.getNestedValue(doc, localField);
-            const matches = foreignCollection.filter(foreignDoc => {
-                const foreignValue = this.getNestedValue(foreignDoc, foreignField);
-                return this.valuesMatch(localValue, foreignValue);
-            });
-            return {
-                ...doc,
-                [as]: matches,
-            };
-        });
-    }
-    /**
-     * Execute a $graphLookup stage manually
-     */
-    static executeGraphLookup(documents, graphLookupSpec, foreignCollection) {
-        const { startWith, connectFromField, connectToField, as, maxDepth = 10, depthField, restrictSearchWithMatch, } = graphLookupSpec;
-        return documents.map(doc => {
-            const startValue = typeof startWith === 'string' && startWith.startsWith('$')
-                ? this.getNestedValue(doc, startWith.slice(1))
-                : startWith;
-            const results = [];
-            const visited = new Set();
-            const queue = [];
-            // Initialize with start value(s)
-            const startValues = Array.isArray(startValue) ? startValue : [startValue];
-            for (const val of startValues) {
-                queue.push({ value: val, depth: 0 });
-            }
-            while (queue.length > 0) {
-                const { value, depth } = queue.shift();
-                if (depth > maxDepth)
-                    continue;
-                const valueKey = JSON.stringify(value);
-                if (visited.has(valueKey))
-                    continue;
-                visited.add(valueKey);
-                // Find matching documents
-                for (const foreignDoc of foreignCollection) {
-                    const foreignValue = this.getNestedValue(foreignDoc, connectToField);
-                    if (this.valuesMatch(value, foreignValue)) {
-                        // Check restrictSearchWithMatch
-                        if (restrictSearchWithMatch) {
-                            const matchQuery = new plugins.mingo.Query(restrictSearchWithMatch);
-                            if (!matchQuery.test(foreignDoc))
-                                continue;
-                        }
-                        const resultDoc = depthField
-                            ? { ...foreignDoc, [depthField]: depth }
-                            : { ...foreignDoc };
-                        // Avoid duplicates in results
-                        const docKey = foreignDoc._id.toHexString();
-                        if (!results.some(r => r._id?.toHexString?.() === docKey)) {
-                            results.push(resultDoc);
-                            // Add connected values to queue
-                            const nextValue = this.getNestedValue(foreignDoc, connectFromField);
-                            if (nextValue !== undefined) {
-                                const nextValues = Array.isArray(nextValue) ? nextValue : [nextValue];
-                                for (const nv of nextValues) {
-                                    queue.push({ value: nv, depth: depth + 1 });
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return {
-                ...doc,
-                [as]: results,
-            };
-        });
-    }
-    /**
-     * Execute a $facet stage manually
-     */
-    static executeFacet(documents, facetSpec) {
-        const result = {};
-        for (const [facetName, pipeline] of Object.entries(facetSpec)) {
-            result[facetName] = this.aggregate(documents, pipeline);
-        }
-        return result;
-    }
-    /**
-     * Execute a $unionWith stage
-     */
-    static executeUnionWith(documents, otherDocuments, pipeline) {
-        let unionDocs = otherDocuments;
-        if (pipeline && pipeline.length > 0) {
-            unionDocs = this.aggregate(otherDocuments, pipeline);
-        }
-        return [...documents, ...unionDocs];
-    }
-    /**
-     * Execute a $merge stage (output to another collection)
-     * Returns the documents that would be inserted/updated
-     */
-    static prepareMerge(documents, mergeSpec) {
-        const onField = mergeSpec.on || '_id';
-        const whenMatched = mergeSpec.whenMatched || 'merge';
-        const whenNotMatched = mergeSpec.whenNotMatched || 'insert';
-        return {
-            toInsert: [],
-            toUpdate: [],
-            onField,
-            whenMatched,
-            whenNotMatched,
-        };
-    }
-    // ============================================================================
-    // Helper Methods
-    // ============================================================================
-    static getNestedValue(obj, path) {
-        const parts = path.split('.');
-        let current = obj;
-        for (const part of parts) {
-            if (current === null || current === undefined) {
-                return undefined;
-            }
-            current = current[part];
-        }
-        return current;
-    }
-    static valuesMatch(a, b) {
-        if (a === b)
-            return true;
-        // Handle ObjectId comparison
-        if (a instanceof plugins.bson.ObjectId && b instanceof plugins.bson.ObjectId) {
-            return a.equals(b);
-        }
-        // Handle array contains check
-        if (Array.isArray(a)) {
-            return a.some(item => this.valuesMatch(item, b));
-        }
-        if (Array.isArray(b)) {
-            return b.some(item => this.valuesMatch(a, item));
-        }
-        // Handle Date comparison
-        if (a instanceof Date && b instanceof Date) {
-            return a.getTime() === b.getTime();
-        }
-        // Handle object comparison
-        if (typeof a === 'object' && typeof b === 'object' && a !== null && b !== null) {
-            return JSON.stringify(a) === JSON.stringify(b);
-        }
-        return false;
-    }
-}
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AggregationEngine.js","sourceRoot":"","sources":["../../../ts/ts_smartdb/engine/AggregationEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AAGzC,0BAA0B;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAC5B;;OAEG;IACH,MAAM,CAAC,SAAS,CACd,SAA4B,EAC5B,QAAoB,EACpB,OAA2B;QAE3B,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,4CAA4C;QAC5C,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE;YAC1C,SAAS,EAAE,OAAO,EAAE,SAAgB;SACrC,CAAC,CAAC;QAEH,sBAAsB;QACtB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEzC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,CAAC,iBAAiB,CACvB,SAA4B,EAC5B,QAAoB,EACpB,OAA2B;QAE3B,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE;YAC1C,SAAS,EAAE,OAAO,EAAE,SAAgB;SACrC,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAE5C,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,GAAe,CAAC;QACxB,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,aAAa,CAClB,SAA4B,EAC5B,UAKC,EACD,iBAAoC;QAEpC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE,GAAG,UAAU,CAAC;QAEpD,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YACxD,MAAM,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;gBACpD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBACnE,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,EAAE,CAAC,EAAE,OAAO;aACd,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,kBAAkB,CACvB,SAA4B,EAC5B,eASC,EACD,iBAAoC;QAEpC,MAAM,EACJ,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,EAAE,EACF,QAAQ,GAAG,EAAE,EACb,UAAU,EACV,uBAAuB,GACxB,GAAG,eAAe,CAAC;QAEpB,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzB,MAAM,UAAU,GAAG,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC3E,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9C,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,OAAO,GAAe,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;YAClC,MAAM,KAAK,GAAyC,EAAE,CAAC;YAEvD,iCAAiC;YACjC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;YAC1E,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC9B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YACvC,CAAC;YAED,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,EAAG,CAAC;gBACxC,IAAI,KAAK,GAAG,QAAQ;oBAAE,SAAS;gBAE/B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBACvC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAEtB,0BAA0B;gBAC1B,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;oBAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;oBAErE,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC;wBAC1C,gCAAgC;wBAChC,IAAI,uBAAuB,EAAE,CAAC;4BAC5B,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;4BACpE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;gCAAE,SAAS;wBAC7C,CAAC;wBAED,MAAM,SAAS,GAAG,UAAU;4BAC1B,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE;4BACxC,CAAC,CAAC,EAAE,GAAG,UAAU,EAAE,CAAC;wBAEtB,8BAA8B;wBAC9B,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;wBAC5C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,EAAE,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;4BAC1D,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BAExB,gCAAgC;4BAChC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;4BACpE,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gCAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gCACtE,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;oCAC5B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC;gCAC9C,CAAC;4BACH,CAAC;wBACH,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO;gBACL,GAAG,GAAG;gBACN,CAAC,EAAE,CAAC,EAAE,OAAO;aACd,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,YAAY,CACjB,SAA4B,EAC5B,SAAqC;QAErC,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,gBAAgB,CACrB,SAA4B,EAC5B,cAAiC,EACjC,QAAqB;QAErB,IAAI,SAAS,GAAe,cAAc,CAAC;QAC3C,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CACjB,SAAqB,EACrB,SAKC;QAQD,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,IAAI,KAAK,CAAC;QACtC,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC;QACrD,MAAM,cAAc,GAAG,SAAS,CAAC,cAAc,IAAI,QAAQ,CAAC;QAE5D,OAAO;YACL,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,EAAE;YACZ,OAAO;YACP,WAAW;YACX,cAAc;SACf,CAAC;IACJ,CAAC;IAED,+EAA+E;IAC/E,iBAAiB;IACjB,+EAA+E;IAEvE,MAAM,CAAC,cAAc,CAAC,GAAQ,EAAE,IAAY;QAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,OAAO,GAAG,GAAG,CAAC;QAElB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC9C,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,MAAM,CAAC,WAAW,CAAC,CAAM,EAAE,CAAM;QACvC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEzB,6BAA6B;QAC7B,IAAI,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7E,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;QAED,8BAA8B;QAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QACnD,CAAC;QAED,yBAAyB;QACzB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAC3C,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QACrC,CAAC;QAED,2BAA2B;QAC3B,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}