@willieee802/zigbee-herdsman 0.19.2 → 0.34.3

package/dist/adapter/ember/adapter/oneWaitress.js

@@ -0,0 +1,226 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmberOneWaitress = void 0;
+/* istanbul ignore file */
+const es6_1 = __importDefault(require("fast-deep-equal/es6"));
+const consts_1 = require("../consts");
+const zdo_1 = require("../zdo");
+;
+/**
+ * The one waitress to rule them all. Hopefully.
+ * Careful, she'll burn you if you're late on delivery!
+ *
+ * NOTE: `messageTag` is unreliable, so not used...
+ */
+class EmberOneWaitress {
+    waiters;
+    // NOTE: for now, this could be much simpler (array-like), but more complex events might come into play
+    eventWaiters;
+    currentId;
+    currentEventId;
+    constructor() {
+        this.waiters = new Map();
+        this.eventWaiters = new Map();
+        this.currentId = 0;
+        this.currentEventId = 0;
+    }
+    /**
+     * Reject because of failed delivery notified by `ezspMessageSentHandler`.
+     * NOTE: This checks for APS sequence, which is only valid in `ezspMessageSentHandler`, not `ezspIncomingMessageHandler` (sequence from stack)
+     *
+     * @param target
+     * @param apsFrame
+     * @returns
+     */
+    deliveryFailedFor(target, apsFrame) {
+        for (const [index, waiter] of this.waiters.entries()) {
+            if (waiter.timedout) {
+                this.waiters.delete(index);
+                continue;
+            }
+            // no target in touchlink
+            // in `ezspMessageSentHandler`, the clusterId for ZDO is still the request one, so check against apsFrame, not override
+            if (((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID) || (target === waiter.matcher.target))
+                && (apsFrame.sequence === waiter.matcher.apsFrame.sequence) && (apsFrame.profileId === waiter.matcher.apsFrame.profileId)
+                && (apsFrame.clusterId === waiter.matcher.apsFrame.clusterId)) {
+                clearTimeout(waiter.timer);
+                waiter.resolved = true;
+                this.waiters.delete(index);
+                waiter.reject(new Error(`Delivery failed for ${JSON.stringify(apsFrame)}`));
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Resolve or reject ZDO response based on given status.
+     * @param status
+     * @param sender
+     * @param apsFrame
+     * @param payload
+     * @returns
+     */
+    resolveZDO(status, sender, apsFrame, payload) {
+        for (const [index, waiter] of this.waiters.entries()) {
+            if (waiter.timedout) {
+                this.waiters.delete(index);
+                continue;
+            }
+            // always a sender expected in ZDO, profileId is a bit redundant here, but...
+            if ((sender === waiter.matcher.target) && (apsFrame.profileId === waiter.matcher.apsFrame.profileId)
+                && (apsFrame.clusterId === (waiter.matcher.responseClusterId != null ?
+                    waiter.matcher.responseClusterId : waiter.matcher.apsFrame.clusterId))) {
+                clearTimeout(waiter.timer);
+                waiter.resolved = true;
+                this.waiters.delete(index);
+                if (status === zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
+                    waiter.resolve(payload);
+                }
+                else if (status === zdo_1.EmberZdoStatus.ZDP_NO_ENTRY) {
+                    // XXX: bypassing fail here since Z2M seems to trigger ZDO remove-type commands without checking current state
+                    //      Z2M also fails with ZCL payload NOT_FOUND though. This should be removed once upstream fixes that.
+                    console.log(`[ZDO] Received status ZDP_NO_ENTRY for "${sender}" cluster "${apsFrame.clusterId}". Ignoring.`);
+                    waiter.resolve(payload);
+                }
+                else {
+                    waiter.reject(new Error(`[ZDO] Failed response by NCP for "${sender}" cluster "${apsFrame.clusterId}" `
+                        + `with status=${zdo_1.EmberZdoStatus[status]}.`));
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+    resolveZCL(payload) {
+        for (const [index, waiter] of this.waiters.entries()) {
+            if (waiter.timedout) {
+                this.waiters.delete(index);
+                continue;
+            }
+            // no target in touchlink, also no APS sequence, but use the ZCL one instead
+            if (((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID) || (payload.address === waiter.matcher.target))
+                && (!waiter.matcher.zclSequence || (payload.frame.Header.transactionSequenceNumber === waiter.matcher.zclSequence))
+                && (payload.frame.Cluster.ID === waiter.matcher.apsFrame.clusterId)
+                && (payload.endpoint === waiter.matcher.apsFrame.destinationEndpoint)) {
+                clearTimeout(waiter.timer);
+                waiter.resolved = true;
+                this.waiters.delete(index);
+                waiter.resolve(payload);
+                return true;
+            }
+        }
+        return false;
+    }
+    waitFor(matcher, timeout) {
+        const id = this.currentId++;
+        this.currentId &= 0xFFFF; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
+        const promise = new Promise((resolve, reject) => {
+            const object = { matcher, resolve, reject, timedout: false, resolved: false, id };
+            this.waiters.set(id, object);
+        });
+        const start = () => {
+            const waiter = this.waiters.get(id);
+            if (waiter && !waiter.resolved && !waiter.timer) {
+                // Capture the stack trace from the caller of start()
+                const error = new Error();
+                Error.captureStackTrace(error);
+                waiter.timer = setTimeout(() => {
+                    error.message = `${JSON.stringify(matcher)} timed out after ${timeout}ms`;
+                    waiter.timedout = true;
+                    waiter.reject(error);
+                }, timeout);
+            }
+            return { promise, id };
+        };
+        return { id, start };
+    }
+    /**
+     * Shortcut that starts the timer immediately and returns the promise.
+     * No access to `id`, so no easy cancel.
+     * @param matcher
+     * @param timeout
+     * @returns
+     */
+    startWaitingFor(matcher, timeout) {
+        return this.waitFor(matcher, timeout).start().promise;
+    }
+    remove(id) {
+        const waiter = this.waiters.get(id);
+        if (waiter) {
+            if (!waiter.timedout && waiter.timer) {
+                clearTimeout(waiter.timer);
+            }
+            this.waiters.delete(id);
+        }
+    }
+    /**
+     * Matches event name with matcher's, and payload (if any in matcher) using `fast-deep-equal/es6` (all keys & values must match)
+     * @param eventName
+     * @param payload
+     * @returns
+     */
+    resolveEvent(eventName, payload) {
+        for (const [index, waiter] of this.eventWaiters.entries()) {
+            if (waiter.timedout) {
+                this.eventWaiters.delete(index);
+                continue;
+            }
+            if (eventName === waiter.matcher.eventName && (!waiter.matcher.payload || ((0, es6_1.default)(payload, waiter.matcher.payload)))) {
+                clearTimeout(waiter.timer);
+                waiter.resolved = true;
+                this.eventWaiters.delete(index);
+                waiter.resolve(payload);
+                return true;
+            }
+        }
+    }
+    waitForEvent(matcher, timeout, reason = null) {
+        // NOTE: logic is very much the same as `waitFor`, just different matcher
+        const id = this.currentEventId++;
+        this.currentEventId &= 0xFFFF; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
+        const promise = new Promise((resolve, reject) => {
+            const object = { matcher, resolve, reject, timedout: false, resolved: false, id };
+            this.eventWaiters.set(id, object);
+        });
+        const start = () => {
+            const waiter = this.eventWaiters.get(id);
+            if (waiter && !waiter.resolved && !waiter.timer) {
+                // Capture the stack trace from the caller of start()
+                const error = new Error();
+                Error.captureStackTrace(error);
+                waiter.timer = setTimeout(() => {
+                    error.message = `${reason ? reason : JSON.stringify(matcher)} timed out after ${timeout}ms`;
+                    waiter.timedout = true;
+                    waiter.reject(error);
+                }, timeout);
+            }
+            return { promise, id };
+        };
+        return { id, start };
+    }
+    /**
+     * Shortcut that starts the timer immediately and returns the promise.
+     * No access to `id`, so no easy cancel.
+     * @param matcher
+     * @param timeout
+     * @param reason If supplied, will be used as timeout label, otherwise stringified matcher is.
+     * @returns
+     */
+    startWaitingForEvent(matcher, timeout, reason = null) {
+        return this.waitForEvent(matcher, timeout, reason).start().promise;
+    }
+    removeEvent(id) {
+        const waiter = this.eventWaiters.get(id);
+        if (waiter) {
+            if (!waiter.timedout && waiter.timer) {
+                clearTimeout(waiter.timer);
+            }
+            this.eventWaiters.delete(id);
+        }
+    }
+}
+exports.EmberOneWaitress = EmberOneWaitress;
+//# sourceMappingURL=oneWaitress.js.map

package/dist/adapter/ember/adapter/oneWaitress.js.map

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

package/dist/adapter/ember/adapter/requestQueue.d.ts

@@ -0,0 +1,59 @@
+import { EmberStatus } from "../enums";
+export declare const NETWORK_BUSY_DEFER_MSEC = 500;
+export declare const NETWORK_DOWN_DEFER_MSEC = 1500;
+export declare class EmberRequestQueue {
+    private readonly dispatchInterval;
+    /** Interval handler that manages `dispatch()` */
+    private dispatchHandler;
+    /** If true, the queue is currently busy dispatching. */
+    private dispatching;
+    /** The queue holding requests to be sent. */
+    private queue;
+    /** Queue with requests that should take priority over the above queue. */
+    private priorityQueue;
+    constructor(dispatchInterval: number);
+    /**
+     * Empty each queue.
+     */
+    clear(): void;
+    /**
+     * Prevent sending requests (usually due to NCP being reset).
+     */
+    stopDispatching(): void;
+    /**
+     * Allow sending requests.
+     * Must be called after init.
+     */
+    startDispatching(): void;
+    /**
+     * Store a function in the queue to be resolved when appropriate.
+     * @param function The function to enqueue. Upon dispatch:
+     *     - if its return value is one of MAX_MESSAGE_LIMIT_REACHED, NETWORK_BUSY, NETWORK_DOWN,
+     *       queue will defer dispatching and keep the function in the queue; reject otherwise.
+     *     - if it throws, it is expected to throw `EzspStatus`, and will act same as above if one of NOT_CONNECTED, NO_TX_SPACE; reject otherwise.
+     *     - any other value will result in the function being removed from the queue.
+     * @param reject The `reject` of the Promise wrapping the `enqueue` call
+     *     (`resolve` is done in `func` directly to have typing on results & control on exec).
+     * @param prioritize If true, function will be enqueued in the priority queue. Defaults to false.
+     * @returns new length of the queue.
+     */
+    enqueue(func: () => Promise<EmberStatus>, reject: (reason: Error) => void, prioritize?: boolean): number;
+    /**
+     * Dispatch the head of the queue.
+     *
+     * If request `func` throws, catch error and reject the request. `ezsp${x}` functions throw `EzspStatus` as error.
+     *
+     * If request `func` resolves but has an error, look at what error, and determine if should retry or remove the request from queue.
+     *
+     * If request `func` resolves without error, remove request from queue.
+     *
+     * WARNING: Because of this logic for "internal retries", any error thrown by `func` will not immediatedly bubble back to Adapter/Controller
+     */
+    dispatch(): Promise<void>;
+    /**
+     * Defer dispatching for the specified duration (in msec).
+     * @param msec
+     */
+    defer(msec: number): void;
+}
+//# sourceMappingURL=requestQueue.d.ts.map

package/dist/adapter/ember/adapter/requestQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestQueue.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/requestQueue.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAa,MAAM,UAAU,CAAC;AAgBjD,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAC3C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,qBAAa,iBAAiB;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,iDAAiD;IACjD,OAAO,CAAC,eAAe,CAAiB;IACxC,wDAAwD;IACxD,OAAO,CAAC,WAAW,CAAU;IAC7B,6CAA6C;IAC7C,OAAO,CAAC,KAAK,CAA2B;IACxC,0EAA0E;IAC1E,OAAO,CAAC,aAAa,CAA2B;gBAEpC,gBAAgB,EAAE,MAAM;IAOpC;;OAEG;IACI,KAAK,IAAI,IAAI;IAKpB;;OAEG;IACI,eAAe,IAAI,IAAI;IAM9B;;;OAGG;IACI,gBAAgB,IAAI,IAAI;IAM/B;;;;;;;;;;;OAWG;IACI,OAAO,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,EAAE,UAAU,GAAE,OAAe,GAAG,MAAM;IAStH;;;;;;;;;;OAUG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAoDtC;;;OAGG;IACI,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;CAKnC"}

package/dist/adapter/ember/adapter/requestQueue.js

@@ -0,0 +1,144 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmberRequestQueue = exports.NETWORK_DOWN_DEFER_MSEC = exports.NETWORK_BUSY_DEFER_MSEC = void 0;
+/* istanbul ignore file */
+const debug_1 = __importDefault(require("debug"));
+const enums_1 = require("../enums");
+const debug = (0, debug_1.default)('zigbee-herdsman:adapter:ember:queue');
+;
+exports.NETWORK_BUSY_DEFER_MSEC = 500;
+exports.NETWORK_DOWN_DEFER_MSEC = 1500;
+class EmberRequestQueue {
+    dispatchInterval;
+    /** Interval handler that manages `dispatch()` */
+    dispatchHandler;
+    /** If true, the queue is currently busy dispatching. */
+    dispatching;
+    /** The queue holding requests to be sent. */
+    queue;
+    /** Queue with requests that should take priority over the above queue. */
+    priorityQueue;
+    constructor(dispatchInterval) {
+        this.dispatchInterval = dispatchInterval || 60;
+        this.dispatching = false;
+        this.queue = [];
+        this.priorityQueue = [];
+    }
+    /**
+     * Empty each queue.
+     */
+    clear() {
+        this.queue = [];
+        this.priorityQueue = [];
+    }
+    /**
+     * Prevent sending requests (usually due to NCP being reset).
+     */
+    stopDispatching() {
+        clearInterval(this.dispatchHandler);
+        debug(`Dispatching stopped; queue=${this.queue.length} priorityQueue=${this.priorityQueue.length}`);
+    }
+    /**
+     * Allow sending requests.
+     * Must be called after init.
+     */
+    startDispatching() {
+        this.dispatchHandler = setInterval(this.dispatch.bind(this), this.dispatchInterval);
+        debug(`Dispatching started.`);
+    }
+    /**
+     * Store a function in the queue to be resolved when appropriate.
+     * @param function The function to enqueue. Upon dispatch:
+     *     - if its return value is one of MAX_MESSAGE_LIMIT_REACHED, NETWORK_BUSY, NETWORK_DOWN,
+     *       queue will defer dispatching and keep the function in the queue; reject otherwise.
+     *     - if it throws, it is expected to throw `EzspStatus`, and will act same as above if one of NOT_CONNECTED, NO_TX_SPACE; reject otherwise.
+     *     - any other value will result in the function being removed from the queue.
+     * @param reject The `reject` of the Promise wrapping the `enqueue` call
+     *     (`resolve` is done in `func` directly to have typing on results & control on exec).
+     * @param prioritize If true, function will be enqueued in the priority queue. Defaults to false.
+     * @returns new length of the queue.
+     */
+    enqueue(func, reject, prioritize = false) {
+        debug(`Status queue=${this.queue.length} priorityQueue=${this.priorityQueue.length}.`);
+        return (prioritize ? this.priorityQueue : this.queue).push({
+            sendAttempts: 0,
+            func,
+            reject,
+        });
+    }
+    /**
+     * Dispatch the head of the queue.
+     *
+     * If request `func` throws, catch error and reject the request. `ezsp${x}` functions throw `EzspStatus` as error.
+     *
+     * If request `func` resolves but has an error, look at what error, and determine if should retry or remove the request from queue.
+     *
+     * If request `func` resolves without error, remove request from queue.
+     *
+     * WARNING: Because of this logic for "internal retries", any error thrown by `func` will not immediatedly bubble back to Adapter/Controller
+     */
+    async dispatch() {
+        if (this.dispatching) {
+            return;
+        }
+        let fromPriorityQueue = true;
+        let entry = this.priorityQueue[0]; // head of queue if any, priority first
+        if (!entry) {
+            fromPriorityQueue = false;
+            entry = this.queue[0];
+        }
+        if (entry) {
+            this.dispatching = true;
+            entry.sendAttempts++;
+            // NOTE: refer to `enqueue()` comment to keep logic in sync with expectations, adjust comment on change.
+            try {
+                const status = (await entry.func());
+                if ((status === enums_1.EmberStatus.MAX_MESSAGE_LIMIT_REACHED) || (status === enums_1.EmberStatus.NETWORK_BUSY)) {
+                    debug(`Dispatching deferred: NCP busy.`);
+                    this.defer(exports.NETWORK_BUSY_DEFER_MSEC);
+                }
+                else if (status === enums_1.EmberStatus.NETWORK_DOWN) {
+                    debug(`Dispatching deferred: Network not ready`);
+                    this.defer(exports.NETWORK_DOWN_DEFER_MSEC);
+                }
+                else {
+                    // success
+                    (fromPriorityQueue ? this.priorityQueue : this.queue).shift();
+                    if (status !== enums_1.EmberStatus.SUCCESS) {
+                        entry.reject(new Error(enums_1.EmberStatus[status]));
+                    }
+                }
+            }
+            catch (err) { // message is EzspStatus string from ezsp${x} commands, except for stuff rejected by OneWaitress, but that's never "retry"
+                if (err.message === enums_1.EzspStatus[enums_1.EzspStatus.NO_TX_SPACE]) {
+                    debug(`Dispatching deferred: Host busy.`);
+                    this.defer(exports.NETWORK_BUSY_DEFER_MSEC);
+                }
+                else if (err.message === enums_1.EzspStatus[enums_1.EzspStatus.NOT_CONNECTED]) {
+                    debug(`Dispatching deferred: Network not ready`);
+                    this.defer(exports.NETWORK_DOWN_DEFER_MSEC);
+                }
+                else {
+                    (fromPriorityQueue ? this.priorityQueue : this.queue).shift();
+                    entry.reject(err);
+                }
+            }
+            finally {
+                this.dispatching = false;
+            }
+        }
+    }
+    /**
+     * Defer dispatching for the specified duration (in msec).
+     * @param msec
+     */
+    defer(msec) {
+        this.stopDispatching();
+        setTimeout(this.startDispatching.bind(this), msec);
+    }
+}
+exports.EmberRequestQueue = EmberRequestQueue;
+//# sourceMappingURL=requestQueue.js.map

package/dist/adapter/ember/adapter/requestQueue.js.map

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

package/dist/adapter/ember/adapter/tokensManager.d.ts

@@ -0,0 +1,69 @@
+/// <reference types="node" />
+import { EmberStatus } from "../enums";
+import { Ezsp } from "../ezsp/ezsp";
+export declare class EmberTokensManager {
+    /**
+     * Host-only API to check whether the NCP uses key storage.
+     *
+     * @returns false if keys are in classic key storage, and true if they are located in PSA key storage.
+     */
+    private static ncpUsesPSAKeyStorage;
+    /**
+     * Matcher for Zigbeed tokens.
+     * @param nvm3Key
+     * @returns
+     */
+    private static getCreatorFromNvm3Key;
+    /**
+     * Saves tokens. Only for NVM3-based NCP.
+     *
+     * The binary file format to save the tokens are
+     *
+     * Number of Tokens (1 byte)
+     * Token0 (4 bytes) Token0Size(1 byte) Token0ArraySize(1 byte) Token0Data(Token0Size * Token0ArraySize)
+     * :
+     * :
+     * TokenM (4 bytes) TokenMSize(1 byte) TokenMArraySize(1 byte) TokenMData(TokenMSize * TokenMArraySize)
+     *
+     * @param localEui64 Used in place of blank `restoredEui64` keys
+     *
+     * @return Saved tokens buffer or null.
+     */
+    static saveTokens(ezsp: Ezsp, localEui64: Buffer): Promise<Buffer>;
+    /**
+     * Restores tokens. Only for NVM3-based NCP.
+     * XXX: If a previous backup from an NVM3 NCP is attempted on a non-NVM3 NCP,
+     *      it should just fail (LIBRARY_NOT_PRESENT all on token-related functions).
+     *
+     * @see EmberTokensManager.saveTokens() for format
+     *
+     * @return EmberStatus status code
+     */
+    static restoreTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<EmberStatus>;
+    /**
+     * Secure key storage needs to export the keys first so backup file has them.
+     *
+     * @param tokenData EmberTokenData* [IN/OUT]
+     * @param nvm3Key uint32_t
+     * @param index uint8_t
+     * @returns
+     */
+    private static saveKeysToData;
+    /**
+     *
+     * @param data_s EmberTokenData*
+     * @param nvm3Key uint32_t
+     * @param index uint8_t
+     * @returns
+     *
+     * @from sli_zigbee_af_trust_center_backup_restore_keys_from_data
+     */
+    private static restoreKeysFromData;
+    /**
+     * Updates zigbeed tokens from a backup of NCP tokens.
+     *
+     * @return EmberStatus status code
+     */
+    static writeNcpTokensToZigbeedTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<EmberStatus>;
+}
+//# sourceMappingURL=tokensManager.d.ts.map

package/dist/adapter/ember/adapter/tokensManager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokensManager.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/tokensManager.ts"],"names":[],"mappings":";AAKA,OAAO,EAAC,WAAW,EAAkD,MAAM,UAAU,CAAC;AAGtF,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AA+RlC,qBAAa,kBAAkB;IAE3B;;;;OAIG;mBACkB,oBAAoB;IAUzC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAUpC;;;;;;;;;;;;;;OAcG;WACiB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0E/E;;;;;;;;OAQG;WACiB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAkDrF;;;;;;;OAOG;mBACkB,cAAc;IA2HnC;;;;;;;;OAQG;mBACkB,mBAAmB;IA2HxC;;;;OAIG;WACiB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAoCxG"}