homebridge 2.0.0-beta.34 → 2.0.0-beta.36

package/dist/matter/MatterAPIImpl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatterAPIImpl.d.ts","sourceRoot":"","sources":["../../src/matter/MatterAPIImpl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAKzF,OAAO,EAAgB,QAAQ,EAAe,eAAe,EAA6B,MAAM,YAAY,CAAA;AA8B5G;;;;GAIG;AACH,qBAAa,aAAc,YAAW,SAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,aAAa;IAE/C;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IA4CzB;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IAoB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAW3B;;OAEG;IACH,IAAI,IAAI,sDAEP;IAED;;OAEG;IACH,IAAI,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uFA+PkiC,uBAAuB;;4EAAmL,uBAAuB;;;;;;;;;;4EAAkpB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;yFAAyxC,uBAAuB;;8EAAuL,uBAAuB;;;oFAAwO,uBAAuB;;;;;;;;;;;;;wFAAm3B,uBAAuB;;;;;;;;;;8EAAymB,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MA7PjsK;IAED;;OAEG;IACH,IAAI,QAAQ,oBAEX;IAED;;OAEG;IACH,IAAI,YAAY;;;;;;;;;;;;;;;;;;;;;;MAEf;IAED;;OAEG;IACH,IAAI,KAAK,oBAER;IAED;;;;;OAKG;IACG,2BAA2B,CAC/B,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,eAAe,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC;IA8EhB;;;OAGG;IACG,yBAAyB,CAAC,WAAW,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E;;;OAGG;IACG,6BAA6B,CACjC,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,WAAW,EAAE,eAAe,EAAE,GAC7B,OAAO,CAAC,IAAI,CAAC;IAmChB;;;OAGG;IACG,oBAAoB,CACxB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IA2BhB;;;;OAIG;IACG,iBAAiB,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;CAqChD"}

package/dist/matter/MatterAPIImpl.js

@@ -0,0 +1,305 @@
+/**
+ * Matter API Implementation
+ *
+ * This class implements the Matter API facade, keeping Matter-specific logic
+ * separate from the core HomebridgeAPI class.
+ *
+ * Benefits:
+ * - Reduces changes to core api.ts file
+ * - Lazy-loads Matter code only when used
+ * - Clear separation between HAP and Matter
+ * - Easier to test in isolation
+ * - Validates accessories before registration
+ * - Provides detailed error messages for debugging
+ */
+import { Logger } from '../logger.js';
+import { clusterNames, clusters, deviceTypes, MatterTypes } from './index.js';
+const log = Logger.internal;
+/**
+ * Device types that require dedicated external bridges
+ * These devices must be published on their own bridge (not added to main/child bridge)
+ */
+const EXTERNAL_DEVICE_TYPES = [
+    deviceTypes.RoboticVacuumCleaner,
+];
+/**
+ * Check if a device type requires external bridge publishing
+ */
+function requiresExternalBridge(deviceType) {
+    // Compare device type IDs for exact match
+    return EXTERNAL_DEVICE_TYPES.some(externalType => externalType.deviceType === deviceType.deviceType);
+}
+/**
+ * Validation error for Matter accessories
+ */
+class MatterAccessoryValidationError extends Error {
+    accessory;
+    constructor(message, accessory) {
+        super(message);
+        this.accessory = accessory;
+        this.name = 'MatterAccessoryValidationError';
+    }
+}
+/**
+ * Implementation of the Matter API
+ * Delegates to the HomebridgeAPI instance for event emission and server access
+ * Provides validation and coordination for Matter accessory operations
+ */
+export class MatterAPIImpl {
+    api;
+    constructor(api) {
+        this.api = api;
+    }
+    /**
+     * Validate a Matter accessory has required fields
+     * @throws MatterAccessoryValidationError if validation fails
+     */
+    validateAccessory(accessory, context) {
+        if (!accessory.uuid) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory missing required 'uuid' field`, accessory);
+        }
+        if (!accessory.displayName) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory '${accessory.uuid}' missing required 'displayName' field`, accessory);
+        }
+        if (!accessory.deviceType) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory '${accessory.displayName}' (${accessory.uuid}) missing required 'deviceType' field`, accessory);
+        }
+        if (!accessory.manufacturer) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory '${accessory.displayName}' (${accessory.uuid}) missing required 'manufacturer' field`, accessory);
+        }
+        if (!accessory.model) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory '${accessory.displayName}' (${accessory.uuid}) missing required 'model' field`, accessory);
+        }
+        if (!accessory.serialNumber) {
+            throw new MatterAccessoryValidationError(`${context}: Matter accessory '${accessory.displayName}' (${accessory.uuid}) missing required 'serialNumber' field`, accessory);
+        }
+    }
+    /**
+     * Validate an array of accessories, logging errors for invalid ones
+     * @returns Array of valid accessories only
+     */
+    validateAccessories(accessories, context) {
+        const validAccessories = [];
+        for (const accessory of accessories) {
+            try {
+                this.validateAccessory(accessory, context);
+                validAccessories.push(accessory);
+            }
+            catch (error) {
+                if (error instanceof MatterAccessoryValidationError) {
+                    log.error(error.message);
+                    log.error('This accessory will not be registered. Please fix the issue in your plugin.');
+                }
+                else {
+                    log.error(`${context}: Unexpected error validating accessory:`, error);
+                }
+            }
+        }
+        return validAccessories;
+    }
+    /**
+     * Validate cluster name is valid
+     */
+    validateClusterName(clusterName, context) {
+        // Check if cluster name is in the known cluster names
+        const validClusterNames = Object.values(clusterNames);
+        if (!validClusterNames.includes(clusterName)) {
+            log.warn(`${context}: Unknown cluster name '${clusterName}'. This might cause issues. `
+                + `Valid clusters: ${validClusterNames.join(', ')}`);
+        }
+    }
+    /**
+     * UUID generator (alias of api.hap.uuid for convenience)
+     */
+    get uuid() {
+        return this.api.hap.uuid;
+    }
+    /**
+     * Matter device types for creating accessories
+     */
+    get deviceTypes() {
+        return deviceTypes;
+    }
+    /**
+     * Matter clusters - Direct access to Matter.js cluster definitions
+     */
+    get clusters() {
+        return clusters;
+    }
+    /**
+     * Matter cluster names for type safety and autocomplete
+     */
+    get clusterNames() {
+        return clusterNames;
+    }
+    /**
+     * Matter types - Access to Matter.js cluster type definitions and enums
+     */
+    get types() {
+        return MatterTypes;
+    }
+    /**
+     * Register Matter platform accessories
+     * Automatically handles external accessories (e.g., RoboticVacuumCleaner) that need dedicated bridges
+     * Validates accessories before registration
+     * Returns a promise that resolves when all accessories are fully registered
+     */
+    async registerPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (accessories.length === 0) {
+            log.warn(`${pluginIdentifier}: Attempted to register 0 Matter accessories`);
+            return;
+        }
+        // Validate all accessories before registration
+        const validAccessories = this.validateAccessories(accessories, `registerPlatformAccessories (${pluginIdentifier}/${platformName})`);
+        if (validAccessories.length === 0) {
+            log.error(`${pluginIdentifier}: All ${accessories.length} Matter accessories failed validation`);
+            return;
+        }
+        if (validAccessories.length < accessories.length) {
+            log.warn(`${pluginIdentifier}: ${accessories.length - validAccessories.length} of ${accessories.length} Matter accessories failed validation`);
+        }
+        // Split accessories into normal (bridge) and external (standalone) based on device type
+        const normalAccessories = [];
+        const externalAccessories = [];
+        for (const accessory of validAccessories) {
+            if (requiresExternalBridge(accessory.deviceType)) {
+                externalAccessories.push(accessory);
+            }
+            else {
+                normalAccessories.push(accessory);
+            }
+        }
+        // Handle normal accessories (added to bridge)
+        if (normalAccessories.length > 0) {
+            // Add plugin/platform association
+            normalAccessories.forEach((accessory) => {
+                const internal = accessory;
+                internal._associatedPlugin = pluginIdentifier;
+                internal._associatedPlatform = platformName;
+            });
+            log.debug(`${pluginIdentifier}: Registering ${normalAccessories.length} Matter accessor${normalAccessories.length === 1 ? 'y' : 'ies'} for platform '${platformName}'`);
+            this.api.emit("registerMatterPlatformAccessories" /* InternalAPIEvent.REGISTER_MATTER_PLATFORM_ACCESSORIES */, pluginIdentifier, platformName, normalAccessories);
+        }
+        // Handle external accessories (standalone bridges)
+        if (externalAccessories.length > 0) {
+            // Add plugin association (no platform for external)
+            externalAccessories.forEach((accessory) => {
+                const internal = accessory;
+                internal._associatedPlugin = pluginIdentifier;
+            });
+            log.debug(`${pluginIdentifier}: Publishing ${externalAccessories.length} external Matter accessor${externalAccessories.length === 1 ? 'y' : 'ies'} (${externalAccessories.map(a => a.displayName).join(', ')})`);
+            // Create a promise to track when external publishing completes
+            const registrationId = `${pluginIdentifier}-${Date.now()}-${Math.random()}`;
+            const registrationPromise = new Promise((resolve) => {
+                // Store the resolve function so it can be called when publishing completes
+                this.api._pendingExternalRegistrations.set(registrationId, resolve);
+            });
+            // Emit event with registration ID
+            this.api.emit("publishExternalMatterAccessories" /* InternalAPIEvent.PUBLISH_EXTERNAL_MATTER_ACCESSORIES */, externalAccessories, registrationId);
+            // Wait for external publishing to complete
+            await registrationPromise;
+        }
+    }
+    /**
+     * Update Matter platform accessories in the cache
+     * Similar to api.updatePlatformAccessories() for HAP accessories
+     */
+    async updatePlatformAccessories(accessories) {
+        if (accessories.length === 0) {
+            log.warn('Attempted to update 0 Matter platform accessories');
+            return;
+        }
+        log.debug(`Updating ${accessories.length} Matter platform accessor${accessories.length === 1 ? 'y' : 'ies'} in cache`);
+        // Emit event for Server/ChildBridgeFork to handle
+        this.api.emit("updateMatterPlatformAccessories" /* InternalAPIEvent.UPDATE_MATTER_PLATFORM_ACCESSORIES */, accessories);
+    }
+    /**
+     * Unregister Matter platform accessories
+     * Automatically handles external accessories (e.g., RoboticVacuumCleaner) that have dedicated bridges
+     */
+    async unregisterPlatformAccessories(pluginIdentifier, platformName, accessories) {
+        if (accessories.length === 0) {
+            log.warn(`${pluginIdentifier}: Attempted to unregister 0 Matter accessories`);
+            return;
+        }
+        // Split accessories into normal (bridge) and external (standalone) based on device type
+        const normalAccessories = [];
+        const externalAccessories = [];
+        for (const accessory of accessories) {
+            if (requiresExternalBridge(accessory.deviceType)) {
+                externalAccessories.push(accessory);
+            }
+            else {
+                normalAccessories.push(accessory);
+            }
+        }
+        // Handle normal accessories (on bridge)
+        if (normalAccessories.length > 0) {
+            log.debug(`${pluginIdentifier}: Unregistering ${normalAccessories.length} Matter accessor${normalAccessories.length === 1 ? 'y' : 'ies'} from platform '${platformName}'`);
+            this.api.emit("unregisterMatterPlatformAccessories" /* InternalAPIEvent.UNREGISTER_MATTER_PLATFORM_ACCESSORIES */, pluginIdentifier, platformName, normalAccessories);
+        }
+        // Handle external accessories (standalone bridges)
+        if (externalAccessories.length > 0) {
+            log.debug(`${pluginIdentifier}: Unregistering ${externalAccessories.length} external Matter accessor${externalAccessories.length === 1 ? 'y' : 'ies'} (${externalAccessories.map(a => a.displayName).join(', ')})`);
+            this.api.emit("unregisterExternalMatterAccessories" /* InternalAPIEvent.UNREGISTER_EXTERNAL_MATTER_ACCESSORIES */, externalAccessories);
+        }
+    }
+    /**
+     * Update a Matter accessory's cluster state
+     * Validates inputs before updating
+     */
+    async updateAccessoryState(uuid, cluster, attributes, partId) {
+        // Validate inputs
+        if (!uuid) {
+            log.error('updateAccessoryState: uuid parameter is required');
+            return;
+        }
+        if (!cluster) {
+            log.error(`updateAccessoryState: cluster parameter is required for accessory ${uuid}`);
+            return;
+        }
+        if (!attributes || Object.keys(attributes).length === 0) {
+            log.warn(`updateAccessoryState: No attributes provided for accessory ${uuid}, cluster ${cluster}`);
+            return;
+        }
+        // Validate cluster name (warning only, don't block)
+        this.validateClusterName(cluster, `updateAccessoryState (${uuid})`);
+        log.debug(`Updating Matter accessory state: uuid=${uuid}, cluster=${cluster}, attributes=${Object.keys(attributes).join(', ')}${partId ? `, partId=${partId}` : ''}`);
+        this.api.emit("updateMatterAccessoryState" /* InternalAPIEvent.UPDATE_MATTER_ACCESSORY_STATE */, uuid, cluster, attributes, partId);
+    }
+    /**
+     * Get a Matter accessory's current cluster state
+     * Checks both external servers and main bridge server
+     * Validates inputs before retrieving state
+     */
+    async getAccessoryState(uuid, cluster, partId) {
+        // Validate inputs
+        if (!uuid) {
+            log.error('getAccessoryState: uuid parameter is required');
+            return undefined;
+        }
+        if (!cluster) {
+            log.error(`getAccessoryState: cluster parameter is required for accessory ${uuid}`);
+            return undefined;
+        }
+        // Validate cluster name (warning only, don't block)
+        this.validateClusterName(cluster, `getAccessoryState (${uuid})`);
+        log.debug(`Getting Matter accessory state: uuid=${uuid}, cluster=${cluster}${partId ? `, partId=${partId}` : ''}`);
+        // Check external servers first (for accessories like robot vacuums)
+        const matterManager = this.api._matterManager;
+        if (matterManager?.externalMatterServers) {
+            const externalServer = matterManager.externalMatterServers.get(uuid);
+            if (externalServer) {
+                return externalServer.getAccessoryState(uuid, cluster, partId);
+            }
+        }
+        // Otherwise, try the main bridge server
+        const matterServer = this.api._matterServer;
+        if (!matterServer) {
+            log.debug(`getAccessoryState: Matter server not available for accessory ${uuid}`);
+            return undefined;
+        }
+        return matterServer.getAccessoryState(uuid, cluster, partId);
+    }
+}
+//# sourceMappingURL=MatterAPIImpl.js.map

package/dist/matter/MatterAPIImpl.js.map

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

package/dist/matter/MatterBridgeManager.d.ts

@@ -0,0 +1,91 @@
+/**
+ * Matter Bridge Manager
+ *
+ * Manages Matter server lifecycle and accessories for the main Homebridge bridge.
+ * This class extracts Matter-specific logic from server.ts to minimize changes to core files.
+ */
+import type { HomebridgeAPI } from '../api.js';
+import type { HomebridgeConfig } from '../bridgeService.js';
+import type { ExternalPortService } from '../externalPortService.js';
+import type { HomebridgeOptions } from '../server.js';
+import type { InternalMatterAccessory } from './types.js';
+import { PluginManager } from '../pluginManager.js';
+/**
+ * Matter server status information for IPC communication
+ */
+export interface MatterStatusInfo {
+    enabled: boolean;
+    port?: number;
+    setupUri?: string;
+    pin?: string;
+    serialNumber?: string;
+    commissioned?: boolean;
+    deviceCount?: number;
+}
+/**
+ * Manages Matter server and accessories for the main bridge
+ */
+export declare class MatterBridgeManager {
+    private readonly config;
+    private readonly api;
+    private readonly externalPortService;
+    private readonly pluginManager;
+    private readonly options;
+    private matterServer?;
+    private readonly externalMatterServers;
+    constructor(config: HomebridgeConfig, api: HomebridgeAPI, externalPortService: ExternalPortService, pluginManager: PluginManager, options: HomebridgeOptions);
+    /**
+     * Collect all configured Matter ports from config to avoid conflicts
+     */
+    static collectConfiguredMatterPorts(config: HomebridgeConfig): number[];
+    /**
+     * Initialize Matter server for main bridge if enabled
+     */
+    initialize(): Promise<void>;
+    /**
+     * Handle external Matter accessories - each gets its own dedicated Matter server
+     * This is required for devices like Robotic Vacuum Cleaners that Apple Home
+     * requires to be on their own bridge.
+     */
+    handlePublishExternalAccessories(accessories: InternalMatterAccessory[], registrationId: string): Promise<void>;
+    /**
+     * Handle registration of Matter platform accessories
+     */
+    handleRegisterPlatformAccessories(pluginIdentifier: string, platformName: string, accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle unregistration of Matter platform accessories
+     */
+    handleUnregisterPlatformAccessories(pluginIdentifier: string, platformName: string, accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle unregistration of external Matter accessories
+     * Stops dedicated servers and cleans up storage
+     */
+    handleUnregisterExternalAccessories(accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle updating Matter platform accessories in the cache
+     * Checks both external servers and main bridge server
+     */
+    handleUpdatePlatformAccessories(accessories: InternalMatterAccessory[]): Promise<void>;
+    /**
+     * Handle Matter accessory state updates
+     * Checks both external servers and main bridge server
+     */
+    handleUpdateAccessoryState(uuid: string, cluster: string, attributes: Record<string, unknown>, partId?: string): Promise<void>;
+    /**
+     * Restore cached Matter accessories (matching HAP pattern)
+     */
+    restoreCachedAccessories(keepOrphaned: boolean): void;
+    /**
+     * Get Matter server status information for IPC communication
+     */
+    getMatterStatus(): MatterStatusInfo;
+    /**
+     * Trigger Matter status update (called when commissioning changes)
+     */
+    onCommissioningChanged(callback: () => void): void;
+    /**
+     * Teardown Matter servers
+     */
+    teardown(): Promise<void>;
+}
+//# sourceMappingURL=MatterBridgeManager.d.ts.map

package/dist/matter/MatterBridgeManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MatterBridgeManager.d.ts","sourceRoot":"","sources":["../../src/matter/MatterBridgeManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAA;AAMzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAQnD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAS5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,OAAO,CAAC,YAAY,CAAC,CAAc;IAInC,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAuC;gBAG1D,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,aAAa,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,iBAAiB;IAG7C;;OAEG;IACH,MAAM,CAAC,4BAA4B,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAsBvE;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0GjC;;;;OAIG;IACG,gCAAgC,CAAC,WAAW,EAAE,uBAAuB,EAAE,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyDrH;;OAEG;IACG,iCAAiC,CAAC,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9I;;OAEG;IACG,mCAAmC,CAAC,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQhJ;;;OAGG;IACG,mCAAmC,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyChG;;;OAGG;IACG,+BAA+B,CAAC,WAAW,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5F;;;OAGG;IACG,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpI;;OAEG;IACH,wBAAwB,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI;IAmDrD;;OAEG;IACH,eAAe,IAAI,gBAAgB;IA0BnC;;OAEG;IACH,sBAAsB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAMlD;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAuBhC"}