@seriousme/opifex 1.11.3 → 2.0.3

package/dist/node/tcpClient.d.ts

@@ -13,6 +13,6 @@ export declare function getFileData(filename: string | undefined): Promise<strin
 export declare class TcpClient extends Client {
     protected connectMQTT(hostname: string, port?: number): Promise<SockConn>;
     protected connectMQTTS(hostname: string, port?: number, ca?: string[], cert?: string, key?: string): Promise<SockConn>;
-    protected createConn(protocol: string, hostname: string, port?: number, caCerts?: string[]): Promise<SockConn>;
+    protected createConn(): Promise<SockConn>;
 }
 //# sourceMappingURL=tcpClient.d.ts.map

package/dist/node/tcpClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tcpClient.d.ts","sourceRoot":"","sources":["../../node/tcpClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAK7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,+BAS7D;AAQD,qBAAa,SAAU,SAAQ,MAAM;IACnC,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,SAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBvE,SAAS,CAAC,YAAY,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,SAAO,EACX,EAAE,CAAC,EAAE,MAAM,EAAE,EACb,IAAI,CAAC,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,QAAQ,CAAC;cAqBD,UAAU,CAC3B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,CAAC,EAAE,MAAM,EAAE,GACjB,OAAO,CAAC,QAAQ,CAAC;CAWrB"}
+{"version":3,"file":"tcpClient.d.ts","sourceRoot":"","sources":["../../node/tcpClient.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAK7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,+BAS7D;AAQD,qBAAa,SAAU,SAAQ,MAAM;IACnC,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,SAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAetE;IAED,SAAS,CAAC,YAAY,CACpB,QAAQ,EAAE,MAAM,EAChB,IAAI,SAAO,EACX,EAAE,CAAC,EAAE,MAAM,EAAE,EACb,IAAI,CAAC,EAAE,MAAM,EACb,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,QAAQ,CAAC,CAoBnB;IAGD,UAAmB,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAcjD;CACF"}

package/dist/node/tcpClient.js

@@ -51,9 +51,10 @@ export class TcpClient extends Client {
         const opts = {
             host: hostname,
             port,
-            secureContext: (ca || key || cert)
-                ? tls.createSecureContext({ ca, cert, key })
-                : undefined,
+            ca,
+            key,
+            cert,
+            minVersion: "TLSv1.3",
         };
         logger.debug({ hostname, port, ca, cert });
         return new Promise((resolve, reject) => {
@@ -67,11 +68,15 @@ export class TcpClient extends Client {
             });
         });
     }
-    createConn(protocol, hostname, port, caCerts) {
-        // if you need to support alternative connection types just
-        // overload this method in your subclass
+    // overload createConn from the base client class
+    createConn() {
+        const { protocol, hostname, port: portStr } = this.connectUrl;
+        const port = Number(portStr);
+        const caCerts = this.caCerts;
+        const cert = this.cert;
+        const key = this.key;
         if (protocol === "mqtts:") {
-            return this.connectMQTTS(hostname, port, caCerts);
+            return this.connectMQTTS(hostname, port, caCerts, cert, key);
         }
         if (protocol === "mqtt:") {
             return this.connectMQTT(hostname, port);

package/dist/node/tcpClient.js.map

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

package/dist/node/tcpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tcpServer.d.ts","sourceRoot":"","sources":["../../node/tcpServer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1D,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAKF,qBAAa,SAAS;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,aAAa,CAAC;gBACV,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB;IAKlE,KAAK;IAaX,IAAI;IAIJ,IAAI,IAAI,uBAMP;IAED,IAAI,OAAO,uBAaV;CACF"}
+{"version":3,"file":"tcpServer.d.ts","sourceRoot":"","sources":["../../node/tcpServer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1D,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAKF,qBAAa,SAAS;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,aAAa,CAAC;IACtB,YAAY,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAGvE;IAEK,KAAK,kBAYV;IACD,IAAI,SAGH;IAED,IAAI,IAAI,uBAQP;IAED,IAAI,OAAO,uBAeV;CAEF"}

package/dist/node/tcpServer.js

@@ -24,17 +24,21 @@ export class TcpServer {
         return;
     }
     stop() {
+        this.mqttServer.close();
         this.server?.close();
     }
     get port() {
         const address = this.server?.address();
+        // deno-coverage-ignore-start
         if (typeof address === "object" && address !== null) {
             return address?.port;
         }
         return this.serverOptions?.port;
+        // deno-coverage-ignore-stop
     }
     get address() {
         const addressResult = this.server?.address();
+        // deno-coverage-ignore-start
         if (typeof addressResult === "object") {
             const address = addressResult?.address;
             if (address === "::") {

package/dist/node/tcpServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"tcpServer.js","sourceRoot":"","sources":["../../node/tcpServer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD;;GAEG;AACH,MAAM,OAAO,SAAS;IACZ,UAAU,CAAa;IACvB,MAAM,CAAU;IAChB,aAAa,CAAC;IACtB,YAAY,aAA4B,EAAE,WAA8B;QACtE,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAC5C,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,WAAW,CAAC;QAClB,OAAO;IACT,CAAC;IACD,IAAI;QACF,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACvC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACpD,OAAO,OAAO,EAAE,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC;IAClC,CAAC;IAED,IAAI,OAAO;QACT,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC7C,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,CAAC;YACvC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,IAAI,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,IAAI,OAAO,GAAG,CAAC;YACxB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CACF"}
+{"version":3,"file":"tcpServer.js","sourceRoot":"","sources":["../../node/tcpServer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD;;GAEG;AACH,MAAM,OAAO,SAAS;IACZ,UAAU,CAAa;IACvB,MAAM,CAAU;IAChB,aAAa,CAAC;IACtB,YAAY,aAA4B,EAAE,WAA8B;QACtE,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,IAAI,EAAE,EAAE,CAClC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAC5C,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,WAAW,CAAC;QAClB,OAAO;IACT,CAAC;IACD,IAAI;QACF,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACvC,6BAA6B;QAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACpD,OAAO,OAAO,EAAE,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC;QAChC,4BAA4B;IAC9B,CAAC;IAED,IAAI,OAAO;QACT,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC7C,6BAA6B;QAC7B,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,CAAC;YAEvC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,IAAI,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,IAAI,OAAO,GAAG,CAAC;YACxB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF"}

package/dist/node/tlsServer.d.ts

@@ -0,0 +1,19 @@
+import type { MqttServerOptions } from "../server/mod.ts";
+type ServerOptions = {
+    hostname?: string;
+    port?: number;
+    key: string;
+    cert: string;
+};
+export declare class TlsServer {
+    private mqttServer;
+    private server?;
+    private serverOptions;
+    constructor(serverOptions: ServerOptions, mqttOptions: MqttServerOptions);
+    start(): Promise<void>;
+    stop(): void;
+    get port(): number | undefined;
+    get address(): string | undefined;
+}
+export {};
+//# sourceMappingURL=tlsServer.d.ts.map

package/dist/node/tlsServer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tlsServer.d.ts","sourceRoot":"","sources":["../../node/tlsServer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAI1D,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAKF,qBAAa,SAAS;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,aAAa,CAAC;IAEtB,YAAY,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,iBAAiB,EAGvE;IAEK,KAAK,kBAmBV;IACD,IAAI,SAGH;IAED,IAAI,IAAI,uBAMP;IAED,IAAI,OAAO,uBAcV;CAEF"}

package/dist/node/tlsServer.js

@@ -0,0 +1,58 @@
+import { createServer } from "node:tls";
+import { MqttServer } from "../server/mod.js";
+import { wrapNodeSocket } from "./wrapNodeSocket.js";
+/*
+ * TCP server that wraps a MqttServer, see demoServer.ts in the /bin folder
+ */
+export class TlsServer {
+    mqttServer;
+    server;
+    serverOptions;
+    constructor(serverOptions, mqttOptions) {
+        this.mqttServer = new MqttServer(mqttOptions);
+        this.serverOptions = serverOptions;
+    }
+    async start() {
+        const tlsOptions = {
+            minVersion: "TLSv1.3",
+            key: this.serverOptions.key,
+            cert: this.serverOptions.cert,
+        };
+        this.server = createServer(tlsOptions, (sock) => this.mqttServer.serve(wrapNodeSocket(sock)));
+        const isListening = new Promise((resolve) => {
+            this.server?.on("listening", () => {
+                resolve(true);
+            });
+        });
+        this.server.listen(this.serverOptions.port, this.serverOptions.hostname);
+        await isListening;
+        return;
+    }
+    stop() {
+        this.mqttServer.close();
+        this.server?.close();
+    }
+    get port() {
+        const address = this.server?.address();
+        if (typeof address === "object" && address !== null) {
+            return address?.port;
+        }
+        return this.serverOptions?.port;
+    }
+    get address() {
+        const addressResult = this.server?.address();
+        // deno-coverage-ignore-start
+        if (typeof addressResult === "object") {
+            const address = addressResult?.address;
+            if (address === "::") {
+                return "localhost";
+            }
+            if (address?.includes(":")) {
+                return `[${address}]`;
+            }
+            return address;
+        }
+        return addressResult;
+    }
+}
+//# sourceMappingURL=tlsServer.js.map

package/dist/node/tlsServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tlsServer.js","sourceRoot":"","sources":["../../node/tlsServer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AASrD;;GAEG;AACH,MAAM,OAAO,SAAS;IACZ,UAAU,CAAa;IACvB,MAAM,CAAU;IAChB,aAAa,CAAC;IAEtB,YAAY,aAA4B,EAAE,WAA8B;QACtE,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,UAAU,GAAG;YACjB,UAAU,EAAE,SAAkB;YAC9B,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG;YAC3B,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;SAC9B,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,YAAY,CACxB,UAAU,EACV,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CACtD,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC1C,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACzE,MAAM,WAAW,CAAC;QAClB,OAAO;IACT,CAAC;IACD,IAAI;QACF,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACN,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QACvC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACpD,OAAO,OAAO,EAAE,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC;IAClC,CAAC;IAED,IAAI,OAAO;QACT,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;QAC7C,6BAA6B;QAC7B,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,aAAa,EAAE,OAAO,CAAC;YACvC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,WAAW,CAAC;YACrB,CAAC;YACD,IAAI,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC3B,OAAO,IAAI,OAAO,GAAG,CAAC;YACxB,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;CAEF"}

package/dist/node/wrapNodeSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapNodeSocket.d.ts","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAY7D;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CA4CvD"}
+{"version":3,"file":"wrapNodeSocket.d.ts","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAc7D;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAmBvD"}

package/dist/node/wrapNodeSocket.js

@@ -1,12 +1,14 @@
-import { Writable } from "node:stream";
+import { Readable, Writable } from "node:stream";
 /**
  * Closes a Node.js socket if it is not already closed
  * @param sock - The Node.js socket to close
  */
 function closer(sock) {
+    // deno-coverage-ignore-start
     if (!sock.closed) {
         sock.end();
     }
+    // deno-coverage-ignore-stop
 }
 /**
  * Wraps a Node.js socket into a standard web streams-based socket connection
@@ -14,39 +16,15 @@ function closer(sock) {
  * @returns A socket connection object with readable/writable streams and close method
  */
 export function wrapNodeSocket(socket) {
-    const readable = new ReadableStream({
-        type: "bytes",
-        start(controller) {
-            socket.on("data", (data) => {
-                controller.enqueue(data);
-                const desiredSize = controller.desiredSize ?? 0;
-                if (desiredSize <= 0) {
-                    // The internal queue is full, so propagate
-                    // the backpressure signal to the underlying source.
-                    socket.pause();
-                }
-            });
-            socket.on("error", (err) => controller.error(err));
-            socket.on("end", () => {
-                // close the controller
-                controller.close();
-                // and unlock the last BYOB read request
-                controller.byobRequest?.respond(0);
-            });
-        },
-        pull: () => {
-            socket.resume();
-        },
-        cancel: () => {
-            socket.end();
-        },
-    });
+    const readable = Readable.toWeb(socket);
     const writable = Writable.toWeb(socket);
+    // deno-coverage-ignore-start
     const remoteAddr = {
         hostname: socket.remoteAddress || "",
         port: socket.remotePort || 0,
         transport: "tcp",
     };
+    // deno-coverage-ignore-stop
     const conn = {
         readable: readable,
         writable: writable,

package/dist/node/wrapNodeSocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapNodeSocket.js","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC;;;GAGG;AACH,SAAS,MAAM,CAAC,IAAY;IAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,QAAQ,GAAG,IAAI,cAAc,CACjC;QACE,IAAI,EAAE,OAAO;QACb,KAAK,CAAC,UAAU;YACd,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAA6B,EAAE,EAAE;gBAClD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACzB,MAAM,WAAW,GAAG,UAAU,CAAC,WAAW,IAAI,CAAC,CAAC;gBAChD,IAAI,WAAW,IAAI,CAAC,EAAE,CAAC;oBACrB,2CAA2C;oBAC3C,oDAAoD;oBACpD,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACpB,uBAAuB;gBACvB,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,wCAAwC;gBACxC,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,EAAE;YACX,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,CAAC;KACF,CACF,CAAC;IACF,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,UAAU,GAAY;QAC1B,QAAQ,EAAE,MAAM,CAAC,aAAa,IAAI,EAAE;QACpC,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;QAC5B,SAAS,EAAE,KAAK;KACjB,CAAC;IAEF,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,QAAsC;QAChD,QAAQ,EAAE,QAAsC;QAChD,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3B,UAAU;KACX,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"wrapNodeSocket.js","sourceRoot":"","sources":["../../node/wrapNodeSocket.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGjD;;;GAGG;AACH,SAAS,MAAM,CAAC,IAAY;IAC1B,6BAA6B;IAC7B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,EAAE,CAAC;IACb,CAAC;IACD,4BAA4B;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAExC,6BAA6B;IAC7B,MAAM,UAAU,GAAY;QAC1B,QAAQ,EAAE,MAAM,CAAC,aAAa,IAAI,EAAE;QACpC,IAAI,EAAE,MAAM,CAAC,UAAU,IAAI,CAAC;QAC5B,SAAS,EAAE,KAAK;KACjB,CAAC;IACF,4BAA4B;IAE5B,MAAM,IAAI,GAAa;QACrB,QAAQ,EAAE,QAAsC;QAChD,QAAQ,EAAE,QAAsC;QAChD,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3B,UAAU;KACX,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/persistence/basicPersistence.d.ts

@@ -0,0 +1,36 @@
+import type { ClientId, PacketId, TopicFilter } from "./deps.ts";
+import type { ClientRegistrationResult, ClientSubscription, ExtPublishPacket, Handler, IPersistence, ShareName } from "./persistence.ts";
+import type { IStorageProvider } from "./storage.ts";
+export declare class MqttPersistence implements IPersistence {
+    private clientHandlerList;
+    private trie;
+    private packetIdCounters;
+    private storage;
+    private sharedGroupCounters;
+    constructor(storage: IStorageProvider);
+    initialize(): Promise<void>;
+    registerClient(clientId: ClientId, clientDispatch: Handler): Promise<ClientRegistrationResult>;
+    deregisterClient(clientId: ClientId): Promise<void>;
+    disconnectClient(clientId: ClientId): Promise<void>;
+    subscribe(clientId: ClientId, subscription: ClientSubscription): Promise<void>;
+    unsubscribe(clientId: ClientId, topicFilter: TopicFilter, shareName: ShareName): Promise<void>;
+    listSubscriptions(clientId: ClientId): AsyncIterableIterator<ClientSubscription>;
+    addPendingIncomingPacket(clientId: ClientId, packet: ExtPublishPacket): Promise<void>;
+    getPendingIncomingPacket(clientId: ClientId, packetId: PacketId): Promise<ExtPublishPacket | null>;
+    listPendingIncomingPackets(clientId: ClientId): AsyncIterableIterator<ExtPublishPacket>;
+    deletePendingIncomingPacket(clientId: ClientId, packetId: PacketId): Promise<boolean>;
+    addPendingOutgoingPacket(clientId: ClientId, packet: ExtPublishPacket): Promise<void>;
+    getPendingOutgoingPacket(clientId: ClientId, packetId: PacketId): Promise<ExtPublishPacket | null>;
+    updatePendingOutgoingPacket(clientId: ClientId, packetId: PacketId, dup: boolean): Promise<boolean>;
+    listPendingOutgoingPackets(clientId: ClientId): AsyncIterableIterator<ExtPublishPacket>;
+    deletePendingOutgoingPacket(clientId: ClientId, packetId: PacketId): Promise<boolean>;
+    addPendingAck(clientId: ClientId, packetId: PacketId): Promise<void>;
+    hasPendingAck(clientId: ClientId, packetId: PacketId): Promise<boolean>;
+    deletePendingAck(clientId: ClientId, packetId: PacketId): Promise<boolean>;
+    listPendingAcks(clientId: ClientId): AsyncIterableIterator<PacketId>;
+    nextPacketId(clientId: ClientId): Promise<PacketId>;
+    publish(publisherClientId: ClientId, packet: ExtPublishPacket): Promise<void>;
+    private dispatch;
+    handleRetained(clientId: ClientId, subscriptions: ClientSubscription[]): Promise<void>;
+}
+//# sourceMappingURL=basicPersistence.d.ts.map

package/dist/persistence/basicPersistence.d.ts.map

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

package/dist/persistence/basicPersistence.js

@@ -0,0 +1,306 @@
+import { PacketDirection } from "./storage.js";
+import { assert, getOrInsert, logger, Trie } from "./deps.js";
+import { MAX_PACKET_ID } from "./persistence.js";
+// consolidate the subscriptions
+function consolidateSubs(subs) {
+    let maxQos = 0;
+    let retainAsPublished = true;
+    const subscriptionIdentifiers = [];
+    for (const sub of subs) {
+        if (sub.qos > maxQos)
+            maxQos = sub.qos;
+        if (sub.subscriptionIdentifier) {
+            subscriptionIdentifiers.push(sub.subscriptionIdentifier);
+        }
+        if (sub.retainAsPublished === false)
+            retainAsPublished = false;
+    }
+    return {
+        maxQos,
+        retainAsPublished,
+        subscriptionIdentifiers,
+    };
+}
+function clonePacket(packet) {
+    if ((packet.protocolLevel === 5) && packet.properties) {
+        const newPacket = {
+            ...packet,
+            dup: false,
+        };
+        newPacket.properties = {
+            ...packet.properties,
+            subscriptionIdentifiers: undefined,
+            topicAlias: undefined,
+        };
+        return newPacket;
+    }
+    const newPacket = {
+        ...packet,
+        dup: false,
+    };
+    return newPacket;
+}
+export class MqttPersistence {
+    clientHandlerList = new Map();
+    trie = new Trie();
+    packetIdCounters = new Map();
+    storage;
+    sharedGroupCounters = new Map();
+    constructor(storage) {
+        this.storage = storage;
+    }
+    async initialize() {
+        await this.storage.initialize();
+        // Load the fast matching Trie on startup
+        for await (const { clientId } of this.storage.listAllSessions()) {
+            for await (const sub of this.storage.listSubscriptions(clientId)) {
+                const trieSub = { ...sub, clientId };
+                this.trie.add(sub.topicFilter, trieSub);
+            }
+        }
+    }
+    async registerClient(clientId, clientDispatch) {
+        this.clientHandlerList.set(clientId, clientDispatch);
+        let session = await this.storage.getSession(clientId);
+        if (session) {
+            session.existingSession = true;
+            await this.storage.saveSession(clientId, session);
+            return session;
+        }
+        session = { existingSession: false };
+        await this.storage.saveSession(clientId, session);
+        this.packetIdCounters.set(clientId, 0);
+        return session;
+    }
+    async deregisterClient(clientId) {
+        this.clientHandlerList.delete(clientId);
+        this.packetIdCounters.delete(clientId);
+        for await (const sub of this.storage.listSubscriptions(clientId)) {
+            this.trie.remove(sub.topicFilter, { clientId });
+        }
+        await this.storage.deleteSession(clientId);
+    }
+    disconnectClient(clientId) {
+        this.clientHandlerList.delete(clientId);
+        return Promise.resolve();
+    }
+    // --- Subscriptions ---
+    async subscribe(clientId, subscription) {
+        await this.storage.saveSubscription(clientId, subscription);
+        this.trie.remove(subscription.topicFilter, {
+            clientId,
+            shareName: subscription.shareName,
+        });
+        const trieSub = { ...subscription, clientId };
+        this.trie.add(subscription.topicFilter, trieSub);
+    }
+    async unsubscribe(clientId, topicFilter, shareName) {
+        await this.storage.deleteSubscription(clientId, topicFilter, shareName);
+        this.trie.remove(topicFilter, {
+            clientId,
+            shareName: shareName,
+        });
+    }
+    listSubscriptions(clientId) {
+        return this.storage.listSubscriptions(clientId);
+    }
+    async addPendingIncomingPacket(clientId, packet) {
+        logger.debug(`addPendingIncomingPacket: id ${packet.id} , topic "${packet.topic}", QoS ${packet.qos}`);
+        if (packet.id) {
+            await this.storage.savePendingPacket(clientId, PacketDirection.Incoming, packet);
+        }
+    }
+    getPendingIncomingPacket(clientId, packetId) {
+        return this.storage.getPendingPacket(clientId, PacketDirection.Incoming, packetId);
+    }
+    async *listPendingIncomingPackets(clientId) {
+        for await (const packet of this.storage.listPendingPackets(clientId, PacketDirection.Incoming)) {
+            // Clean up expired packets
+            const packetExpired = packet.expiresAtMs
+                ? Date.now() > packet.expiresAtMs
+                : false;
+            if (packetExpired) {
+                if (packet.id) {
+                    await this.storage.deletePendingPacket(clientId, PacketDirection.Incoming, packet.id);
+                }
+            }
+            else {
+                yield packet;
+            }
+        }
+    }
+    deletePendingIncomingPacket(clientId, packetId) {
+        logger.debug("delete PendingIncomingPacket: id", packetId);
+        return this.storage.deletePendingPacket(clientId, PacketDirection.Incoming, packetId);
+    }
+    async addPendingOutgoingPacket(clientId, packet) {
+        if (packet.id) {
+            logger.debug(`addPendingOutGoingPacket: id ${packet.id} , topic "${packet.topic}", QoS ${packet.qos}`);
+            await this.storage.savePendingPacket(clientId, PacketDirection.Outgoing, packet);
+        }
+    }
+    getPendingOutgoingPacket(clientId, packetId) {
+        return this.storage.getPendingPacket(clientId, PacketDirection.Outgoing, packetId);
+    }
+    async updatePendingOutgoingPacket(clientId, packetId, dup) {
+        logger.debug("updatePendingOutGoingPacket: id", packetId, ", dup", dup);
+        return await this.storage.updatePendingPacket(clientId, PacketDirection.Outgoing, packetId, dup);
+    }
+    async *listPendingOutgoingPackets(clientId) {
+        for await (const packet of this.storage.listPendingPackets(clientId, PacketDirection.Outgoing)) {
+            // Clean up
+            // - expired packets
+            const packetExpired = packet.expiresAtMs
+                ? Date.now() > packet.expiresAtMs
+                : false;
+            if (packetExpired) {
+                if (packet.id) {
+                    await this.storage.deletePendingPacket(clientId, PacketDirection.Outgoing, packet.id);
+                }
+            }
+            else {
+                yield packet;
+            }
+        }
+    }
+    deletePendingOutgoingPacket(clientId, packetId) {
+        return this.storage.deletePendingPacket(clientId, PacketDirection.Outgoing, packetId);
+    }
+    addPendingAck(clientId, packetId) {
+        return this.storage.savePendingAck(clientId, packetId);
+    }
+    hasPendingAck(clientId, packetId) {
+        return this.storage.hasPendingAck(clientId, packetId);
+    }
+    deletePendingAck(clientId, packetId) {
+        return this.storage.deletePendingAck(clientId, packetId);
+    }
+    listPendingAcks(clientId) {
+        return this.storage.listPendingAcks(clientId);
+    }
+    // --- Packet ID Assignment ---
+    async nextPacketId(clientId) {
+        const currentId = this.packetIdCounters.get(clientId) || 0;
+        let nextId = currentId;
+        do {
+            nextId++;
+            if (nextId > MAX_PACKET_ID)
+                nextId = 1;
+            const inUseOut = await this.storage.getPendingPacket(clientId, PacketDirection.Outgoing, nextId);
+            const inUseAck = await this.storage.hasPendingAck(clientId, nextId);
+            if (!inUseOut && !inUseAck) {
+                this.packetIdCounters.set(clientId, nextId);
+                return nextId;
+            }
+        } while (nextId !== currentId);
+        assert(false, "No unused packetId available");
+    }
+    // --- Publish Protocol Logic
+    async publish(publisherClientId, packet) {
+        const topic = packet.topic;
+        logger.debug(`mqttPersistence: publish "${publisherClientId}" "${topic}", ${packet.qos}`);
+        if (packet.retain) {
+            if (!packet.payload?.byteLength) {
+                await this.storage.deleteRetained(topic);
+            }
+            else {
+                await this.storage.saveRetained(topic, packet);
+            }
+        }
+        const directClients = new Map();
+        const sharedGroups = new Map();
+        for (const sub of this.trie.match(topic)) {
+            if (sub.noLocal && sub.clientId === publisherClientId)
+                continue;
+            if (sub.shareName) {
+                // Shared Subscription
+                const shareClients = getOrInsert(sharedGroups, sub.shareName, new Map());
+                getOrInsert(shareClients, sub.clientId, []).push(sub);
+            }
+            else {
+                // Standard subscription
+                getOrInsert(directClients, sub.clientId, []).push(sub);
+            }
+        }
+        for (const [clientId, subs] of directClients) {
+            const { maxQos, retainAsPublished, subscriptionIdentifiers } = consolidateSubs(subs);
+            await this.dispatch(clientId, packet, maxQos, retainAsPublished, subscriptionIdentifiers);
+        }
+        for (const [shareName, shareClients] of sharedGroups) {
+            // selects active candidates
+            const activeCandidates = [];
+            for (const clientId of shareClients.keys()) {
+                if (this.clientHandlerList.has(clientId)) {
+                    activeCandidates.push(clientId);
+                }
+            }
+            if (activeCandidates.length === 0)
+                continue;
+            // select 1 client using Round-Robin
+            const currentIndex = this.sharedGroupCounters.get(shareName) || 0;
+            const selectedClient = activeCandidates[currentIndex % activeCandidates.length];
+            this.sharedGroupCounters.set(shareName, currentIndex + 1);
+            if (selectedClient === undefined)
+                continue;
+            const { maxQos, retainAsPublished, subscriptionIdentifiers } = consolidateSubs(shareClients.get(selectedClient));
+            await this.dispatch(selectedClient, packet, maxQos, retainAsPublished, subscriptionIdentifiers);
+        }
+    }
+    async dispatch(clientId, packet, maxQos, retainAsPublished, subscriptionIdentifiers) {
+        logger.debug("mqttpersistence: dispatch", {
+            clientId,
+            topic: packet.topic,
+            maxQos,
+            retainAsPublished,
+            subscriptionIdentifiers,
+        });
+        const newPacket = clonePacket(packet);
+        if (!retainAsPublished)
+            newPacket.retain = false;
+        newPacket.qos = Math.min(packet.qos ?? 0, maxQos);
+        const qos = newPacket.qos;
+        if (subscriptionIdentifiers.length > 0) {
+            newPacket.protocolLevel = 5;
+            if (!newPacket.properties) {
+                newPacket.properties = {};
+            }
+            newPacket.properties.subscriptionIdentifiers = subscriptionIdentifiers;
+        }
+        if (qos !== 0) {
+            newPacket.id = await this.nextPacketId(clientId);
+            await this.addPendingOutgoingPacket(clientId, newPacket);
+        }
+        const clientDispatch = this.clientHandlerList.get(clientId);
+        // don't await the clientDispatch to allow for parallelism
+        if (clientDispatch) {
+            Promise.resolve(clientDispatch(newPacket)).catch((err) => {
+                logger.error("Error delivering packet to", clientId, ":", err);
+            });
+        }
+    }
+    async handleRetained(clientId, subscriptions) {
+        const clientDispatch = this.clientHandlerList.get(clientId);
+        if (!clientDispatch) {
+            return;
+        }
+        const tempTrie = new Trie();
+        for await (const sub of this.storage.listSubscriptions(clientId)) {
+            if (sub.shareName !== "")
+                continue;
+            tempTrie.add(sub.topicFilter, { clientId, ...sub });
+        }
+        const seenTopics = new Set();
+        for (const sub of subscriptions) {
+            for await (const packet of this.storage.listRetainedMatches(sub.topicFilter)) {
+                // Deduplicate retained messages per topic delivered in this batch
+                if (seenTopics.has(packet.topic))
+                    continue;
+                seenTopics.add(packet.topic);
+                const subs = tempTrie.match(packet.topic);
+                const { maxQos, retainAsPublished, subscriptionIdentifiers } = consolidateSubs(subs);
+                await this.dispatch(clientId, packet, maxQos, retainAsPublished, subscriptionIdentifiers);
+            }
+        }
+    }
+}
+//# sourceMappingURL=basicPersistence.js.map

package/dist/persistence/basicPersistence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"basicPersistence.js","sourceRoot":"","sources":["../../persistence/basicPersistence.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWjD,gCAAgC;AAChC,SAAS,eAAe,CAAC,IAAe;IACtC,IAAI,MAAM,GAAQ,CAAC,CAAC;IACpB,IAAI,iBAAiB,GAAY,IAAI,CAAC;IACtC,MAAM,uBAAuB,GAAa,EAAE,CAAC;IAC7C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,GAAG,GAAG,MAAM;YAAE,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC;QACvC,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;YAC/B,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,GAAG,CAAC,iBAAiB,KAAK,KAAK;YAAE,iBAAiB,GAAG,KAAK,CAAC;IACjE,CAAC;IACD,OAAO;QACL,MAAM;QACN,iBAAiB;QACjB,uBAAuB;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,MAAwB;IAC3C,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,CAAC,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG;YAChB,GAAG,MAAM;YACT,GAAG,EAAE,KAAK;SACX,CAAC;QACF,SAAS,CAAC,UAAU,GAAG;YACrB,GAAG,MAAM,CAAC,UAAU;YACpB,uBAAuB,EAAE,SAAS;YAClC,UAAU,EAAE,SAAS;SACtB,CAAC;QACF,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG;QAChB,GAAG,MAAM;QACT,GAAG,EAAE,KAAK;KACX,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,OAAO,eAAe;IAClB,iBAAiB,GAAG,IAAI,GAAG,EAAqB,CAAC;IACjD,IAAI,GAAG,IAAI,IAAI,EAAW,CAAC;IAC3B,gBAAgB,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC/C,OAAO,CAAmB;IAC1B,mBAAmB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAExD,YAAY,OAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAChC,yCAAyC;QACzC,IAAI,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;YAChE,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjE,MAAM,OAAO,GAAG,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAa,CAAC;gBAChD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAkB,EAClB,cAAuB;QAEvB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACrD,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;YAC/B,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAClD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAkB;QACvC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEvC,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,QAAkB;QACjC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,SAAS,CACb,QAAkB,EAClB,YAAgC;QAEhC,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE;YACzC,QAAQ;YACR,SAAS,EAAE,YAAY,CAAC,SAAS;SAClC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,EAAE,GAAG,YAAY,EAAE,QAAQ,EAAa,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,WAAW,CACf,QAAkB,EAClB,WAAwB,EACxB,SAAoB;QAEpB,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CACnC,QAAQ,EACR,WAAW,EACX,SAAS,CACV,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YAC5B,QAAQ;YACR,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CACf,QAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC5B,QAAkB,EAClB,MAAwB;QAExB,MAAM,CAAC,KAAK,CACV,gCAAgC,MAAM,CAAC,EAAE,aAAa,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,GAAG,EAAE,CACzF,CAAC;QAEF,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAClC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,MAAM,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,wBAAwB,CACtB,QAAkB,EAClB,QAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAClC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,CAAC,0BAA0B,CAC/B,QAAkB;QAElB,IAAI,KAAK,EACP,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAC7C,QAAQ,EACR,eAAe,CAAC,QAAQ,CACzB,EACD,CAAC;YACD,2BAA2B;YAC3B,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,WAAW;gBACjC,CAAC,CAAC,KAAK,CAAC;YACV,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;oBACd,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CACpC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,MAAM,CAAC,EAAE,CACV,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAED,2BAA2B,CACzB,QAAkB,EAClB,QAAkB;QAElB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CACrC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,KAAK,CAAC,wBAAwB,CAC5B,QAAkB,EAClB,MAAwB;QAExB,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACd,MAAM,CAAC,KAAK,CACV,gCAAgC,MAAM,CAAC,EAAE,aAAa,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,GAAG,EAAE,CACzF,CAAC;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAClC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,MAAM,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IAED,wBAAwB,CACtB,QAAkB,EAClB,QAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAClC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,2BAA2B,CAC/B,QAAkB,EAClB,QAAkB,EAClB,GAAY;QAEZ,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;QACxE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAC3C,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,QAAQ,EACR,GAAG,CACJ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,CAAC,0BAA0B,CAC/B,QAAkB;QAElB,IAAI,KAAK,EACP,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAC7C,QAAQ,EACR,eAAe,CAAC,QAAQ,CACzB,EACD,CAAC;YACD,WAAW;YACX,oBAAoB;YACpB,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW;gBACtC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,WAAW;gBACjC,CAAC,CAAC,KAAK,CAAC;YACV,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;oBACd,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CACpC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,MAAM,CAAC,EAAE,CACV,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC;IAED,2BAA2B,CACzB,QAAkB,EAClB,QAAkB;QAElB,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,CACrC,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,aAAa,CAAC,QAAkB,EAAE,QAAkB;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IACD,aAAa,CAAC,QAAkB,EAAE,QAAkB;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IACD,gBAAgB,CAAC,QAAkB,EAAE,QAAkB;QACrD,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IACD,eAAe,CAAC,QAAkB;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,+BAA+B;IAC/B,KAAK,CAAC,YAAY,CAAC,QAAkB;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,GAAG,CAAC;YACF,MAAM,EAAE,CAAC;YACT,IAAI,MAAM,GAAG,aAAa;gBAAE,MAAM,GAAG,CAAC,CAAC;YAEvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAClD,QAAQ,EACR,eAAe,CAAC,QAAQ,EACxB,MAAkB,CACnB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAC/C,QAAQ,EACR,MAAkB,CACnB,CAAC;YAEF,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC3B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAC5C,OAAO,MAAkB,CAAC;YAC5B,CAAC;QACH,CAAC,QAAQ,MAAM,KAAK,SAAS,EAAE;QAC/B,MAAM,CAAC,KAAK,EAAE,8BAA8B,CAAC,CAAC;IAChD,CAAC;IAED,6BAA6B;IAC7B,KAAK,CAAC,OAAO,CACX,iBAA2B,EAC3B,MAAwB;QAExB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,CAAC,KAAK,CACV,6BAA6B,iBAAiB,MAAM,KAAK,MAAM,MAAM,CAAC,GAAG,EAAE,CAC5E,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,MAAM,aAAa,GAAmB,IAAI,GAAG,EAAE,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,GAAG,EAA0B,CAAC;QAEvD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACzC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,iBAAiB;gBAAE,SAAS;YAChE,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;gBAClB,sBAAsB;gBACtB,MAAM,YAAY,GAAG,WAAW,CAC9B,YAAY,EACZ,GAAG,CAAC,SAAS,EACb,IAAI,GAAG,EAAE,CACV,CAAC;gBACF,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACxD,CAAC;iBAAM,CAAC;gBACN,wBAAwB;gBACxB,WAAW,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC;YAC7C,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,GAC1D,eAAe,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,IAAI,CAAC,QAAQ,CACjB,QAAQ,EACR,MAAM,EACN,MAAM,EACN,iBAAiB,EACjB,uBAAuB,CACxB,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,IAAI,YAAY,EAAE,CAAC;YACrD,4BAA4B;YAC5B,MAAM,gBAAgB,GAAe,EAAE,CAAC;YACxC,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACzC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;YACD,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YAE5C,oCAAoC;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAClE,MAAM,cAAc,GAClB,gBAAgB,CAAC,YAAY,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC3D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,GAAG,CAAC,CAAC,CAAC;YAC1D,IAAI,cAAc,KAAK,SAAS;gBAAE,SAAS;YAC3C,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,GAC1D,eAAe,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAE,CAAC,CAAC;YACrD,MAAM,IAAI,CAAC,QAAQ,CACjB,cAAc,EACd,MAAM,EACN,MAAM,EACN,iBAAiB,EACjB,uBAAuB,CACxB,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CACpB,QAAkB,EAClB,MAAwB,EACxB,MAAW,EACX,iBAAsC,EACtC,uBAAiC;QAEjC,MAAM,CAAC,KAAK,CACV,2BAA2B,EAC3B;YACE,QAAQ;YACR,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM;YACN,iBAAiB;YACjB,uBAAuB;SACxB,CACF,CAAC;QAEF,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,iBAAiB;YAAE,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;QACjD,SAAS,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,CAAQ,CAAC;QAEzD,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC;QAC1B,IAAI,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,SAAS,CAAC,aAAa,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;gBAC1B,SAAS,CAAC,UAAU,GAAG,EAAE,CAAC;YAC5B,CAAC;YACD,SAAS,CAAC,UAAU,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACzE,CAAC;QACD,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;YACd,SAAS,CAAC,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5D,0DAA0D;QAC1D,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACvD,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,QAAkB,EAClB,aAAmC;QAEnC,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAkB,IAAI,IAAI,EAAE,CAAC;QAC3C,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjE,IAAI,GAAG,CAAC,SAAS,KAAK,EAAE;gBAAE,SAAS;YACnC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;YAChC,IAAI,KAAK,EACP,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,WAAW,CAAC,EACjE,CAAC;gBACD,kEAAkE;gBAClE,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;oBAAE,SAAS;gBAC3C,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,GAC1D,eAAe,CAAC,IAAI,CAAC,CAAC;gBACxB,MAAM,IAAI,CAAC,QAAQ,CACjB,QAAQ,EACR,MAAM,EACN,MAAM,EACN,iBAAiB,EACjB,uBAAuB,CACxB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF"}