@seriousme/opifex 1.11.2 → 1.11.3

package/dist/trie/trie.js

@@ -36,7 +36,7 @@ export class Trie {
      */
     match(key) {
         const parts = key.split(this.separator);
-        if (parts.length > 0 && parts[0].charAt(0) === this.reservedPrefix) {
+        if (parts.length > 0 && parts[0]?.charAt(0) === this.reservedPrefix) {
             return this._matchPrefix(parts);
         }
         return this._match(parts);
@@ -51,7 +51,10 @@ export class Trie {
             return this.#value ? this.#value : [];
         }
         const [first, ...rest] = parts;
-        return this.matchChild(first, rest);
+        if (first !== undefined) {
+            return this.matchChild(first, rest);
+        }
+        return [];
     }
     /**
      * Internal method to match keys with wildcard support
@@ -63,11 +66,14 @@ export class Trie {
             return this.#value ? this.#value : [];
         }
         const [first, ...rest] = parts;
-        const exact = this.matchChild(first, rest);
-        const single = this.matchChild(this.wildcardOne, rest);
-        const subtree = this.matchChild(this.wildcardSubtree, []);
-        const results = exact.concat(single, subtree);
-        return results;
+        if (first !== undefined) {
+            const exact = this.matchChild(first, rest);
+            const single = this.matchChild(this.wildcardOne, rest);
+            const subtree = this.matchChild(this.wildcardSubtree, []);
+            const results = exact.concat(single, subtree);
+            return results;
+        }
+        return [];
     }
     /**
      * Adds a value to the trie at the specified key
@@ -88,14 +94,16 @@ export class Trie {
             return;
         }
         const [first, ...rest] = parts;
-        const child = this.#children.get(first);
-        if (child instanceof Trie) {
-            child._add(rest, value);
-        }
-        else {
-            const node = new Trie(this.looseCompare);
-            this.#children.set(first, node);
-            node._add(rest, value);
+        if (first !== undefined) {
+            const child = this.#children.get(first);
+            if (child instanceof Trie) {
+                child._add(rest, value);
+            }
+            else {
+                const node = new Trie(this.looseCompare);
+                this.#children.set(first, node);
+                node._add(rest, value);
+            }
         }
         return;
     }
@@ -119,11 +127,13 @@ export class Trie {
             return;
         }
         const [first, ...rest] = parts;
-        const node = this.#children.get(first);
-        if (node) {
-            node._remove(rest, value);
-            if (node.#value.length === 0 && this.#children.size === 0) {
-                this.#children.delete(first);
+        if (first !== undefined) {
+            const node = this.#children.get(first);
+            if (node) {
+                node._remove(rest, value);
+                if (node.#value.length === 0 && this.#children.size === 0) {
+                    this.#children.delete(first);
+                }
             }
         }
     }

package/dist/trie/trie.js.map

@@ -1 +1 @@
-{"version":3,"file":"trie.js","sourceRoot":"","sources":["../../trie/trie.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"trie.js","sourceRoot":"","sources":["../../trie/trie.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,MAAM,OAAO,IAAI;IACf,MAAM,CAAW;IACjB,SAAS,CAAuB;IACxB,SAAS,GAAG,GAAG,CAAC;IAChB,WAAW,GAAG,GAAG,CAAC;IAClB,eAAe,GAAG,GAAG,CAAC;IACtB,cAAc,GAAG,GAAG,CAAC;IACrB,YAAY,CAAU;IAE9B;;;OAGG;IACH,YAAY,YAAY,GAAG,KAAK;QAC9B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,KAAa,EAAE,KAAY;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5C,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAW;QACf,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,cAAc,EAAE,CAAC;YACpE,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACK,YAAY,CAAC,KAAY;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,KAAY;QACzB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YAC1D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACK,IAAI,CAAC,KAAY,EAAE,KAAQ;QACjC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACxC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC1B,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,IAAI,IAAI,CAAI,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,GAAW,EAAE,KAAQ;QAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACK,OAAO,CAAC,KAAY,EAAE,KAAQ;QACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACvC,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBAC1D,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,MAAM,CAAC,KAAQ;QACrB,IAAI,IAAI,CAAC,YAAY,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACnD,OAAO,CAAC,IAAI,EAAE,EAAE;gBACd,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;oBACxB,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;wBAC7B,OAAO,IAAI,CAAC;oBACd,CAAC;gBACH,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC;IAClC,CAAC;CACF"}

package/dist/utils/BufferedAsyncIterable.js.map

@@ -1 +1 @@
-{"version":3,"file":"BufferedAsyncIterable.js","sourceRoot":"","sources":["../../utils/BufferedAsyncIterable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,qBAAqB;IACxB,MAAM,CAAgB;IACtB,UAAU,CAAS;IAEnB,IAAI,GAAG,KAAK,CAAC;IAErB,KAAK,CAAe;IAEpB,YAAY,aAAqB,IAAI;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAI;QACF,oBAAoB;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAG,CAAC;QAChC,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,EAAK,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM,GAAG,QAAQ;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEQ,IAAI,GAAG,CAAC,IAAO,EAAwB,EAAE;QAChD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACzC,8EAA8E;YAC9E,6EAA6E;YAC7E,6EAA6E;YAC7E,2EAA2E;YAC3E,+EAA+E;YAC/E,oCAAoC;YACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF"}
+{"version":3,"file":"BufferedAsyncIterable.js","sourceRoot":"","sources":["../../utils/BufferedAsyncIterable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC;;;;;;;;;;;;GAYG;AACH,MAAM,OAAO,qBAAqB;IACxB,MAAM,CAAgB;IACtB,UAAU,CAAS;IAEnB,IAAI,GAAG,KAAK,CAAC;IAErB,KAAK,CAA2B;IAEhC,YAAY,aAAqB,IAAI;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;IAED,IAAI;QACF,oBAAoB;QACpB,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAG,CAAC;QAChC,CAAC;aAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,QAAQ,EAAK,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM,GAAG,QAAQ;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAEQ,IAAI,GAAG,CAAC,IAAO,EAAwB,EAAE;QAChD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;YACvB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACzC,8EAA8E;YAC9E,6EAA6E;YAC7E,6EAA6E;YAC7E,2EAA2E;YAC3E,+EAA+E;YAC/E,oCAAoC;YACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;CACF"}

package/mqttConn/mqttConn.ts

@@ -57,8 +57,9 @@ async function readByte(conn: Conn): Promise<number> {
   const buf = new Uint8Array(1);
   const bytesRead = await conn.read(buf);
   assert(bytesRead !== null, MqttConnError.UnexpectedEof);
+  assert(bytesRead !== undefined, MqttConnError.UnexpectedEof);
   assert(bytesRead !== 0, MqttConnError.UnexpectedEof);
-  return buf[0];
+  return buf[0] || 0;
 }
 
 /**
@@ -170,9 +171,11 @@ export class MqttConn implements IMqttConn {
    * @returns a Promise that resolves to AnyPacket if the connection is open
    *          and working nominally, undefined otherwise.
    */
-  #receive(): Promise<AnyPacket | undefined> {
+  async #receive(): Promise<AnyPacket | undefined> {
     if (!this._isClosed) {
-      return readPacket(this.conn, this.codecOpts).catch((err) => {
+      try {
+        return await readPacket(this.conn, this.codecOpts);
+      } catch (err) {
         if (err instanceof Error) {
           if (err.name === "PartialReadError") {
             err.message = MqttConnError.UnexpectedEof;
@@ -182,16 +185,23 @@ export class MqttConn implements IMqttConn {
         // packet too large, malformed packet or connection closed.
         this.close();
         return undefined;
-      });
+      }
     }
     return Promise.resolve(undefined);
   }
 
-  async *[Symbol.asyncIterator](): AsyncIterator<AnyPacket> {
-    let packet: AnyPacket | undefined;
-    while ((packet = await this.#receive()) !== undefined) {
-      yield packet;
+  async next(): Promise<IteratorResult<AnyPacket>> {
+    const packet = await this.#receive();
+
+    if (packet !== undefined) {
+      return { value: packet, done: false };
     }
+
+    return { value: undefined, done: true };
+  }
+
+  [Symbol.asyncIterator](): this {
+    return this;
   }
 
   /**

package/mqttPacket/BitMask.ts

@@ -1,23 +1,15 @@
 /**
  * Object containing bit mask values from 2^0 to 2^7
- * @constant
- * @type {Record<string,number>}
- * @property {number} bit0 - Represents 2^0 = 1
- * @property {number} bit1 - Represents 2^1 = 2
- * @property {number} bit2 - Represents 2^2 = 4
- * @property {number} bit3 - Represents 2^3 = 8
- * @property {number} bit4 - Represents 2^4 = 16
- * @property {number} bit5 - Represents 2^5 = 32
- * @property {number} bit6 - Represents 2^6 = 64
- * @property {number} bit7 - Represents 2^7 = 128
+ * @readonly
+ * @enum {number}
  */
-export const BitMask: Record<string, number> = {
-  bit0: 2 ** 0,
-  bit1: 2 ** 1,
-  bit2: 2 ** 2,
-  bit3: 2 ** 3,
-  bit4: 2 ** 4,
-  bit5: 2 ** 5,
-  bit6: 2 ** 6,
-  bit7: 2 ** 7,
+export const BitMask = {
+  bit0: 2 ** 0, // 1
+  bit1: 2 ** 1, // 2
+  bit2: 2 ** 2, // 4
+  bit3: 2 ** 3, // 8
+  bit4: 2 ** 4, // 16
+  bit5: 2 ** 5, // 32
+  bit6: 2 ** 6, // 64
+  bit7: 2 ** 7, // 128
 } as const;

package/mqttPacket/connect.ts

@@ -22,40 +22,40 @@ import {
 
 export type ConnectPacketV4 = {
   type: TPacketType;
-  protocolName?: string;
+  protocolName?: string | undefined;
   protocolLevel: ProtocolLevelNoV5;
-  clientId?: ClientId;
-  username?: string;
-  password?: Uint8Array;
+  clientId?: ClientId | undefined;
+  username?: string | undefined;
+  password?: Uint8Array | undefined;
   will?: {
     topic: Topic;
     payload: Payload;
-    retain?: boolean;
-    qos?: QoS;
-  };
-  clean?: boolean;
-  keepAlive?: number;
-  bridgeMode?: boolean;
+    retain?: boolean | undefined;
+    qos?: QoS | undefined;
+  } | undefined;
+  clean?: boolean | undefined;
+  keepAlive?: number | undefined;
+  bridgeMode?: boolean | undefined;
 };
 
 export type ConnectPacketV5 = {
   type: TPacketType;
-  protocolName?: string;
+  protocolName?: string | undefined;
   protocolLevel: 5;
-  clientId?: ClientId;
-  username?: string;
-  password?: Uint8Array;
+  clientId?: ClientId | undefined;
+  username?: string | undefined;
+  password?: Uint8Array | undefined;
   will?: {
     topic: Topic;
     payload: Payload;
-    retain?: boolean;
-    qos?: QoS;
-    properties?: WillProperties;
-  };
-  clean?: boolean;
-  keepAlive?: number;
-  bridgeMode?: boolean;
-  properties?: ConnectProperties;
+    retain?: boolean | undefined;
+    qos?: QoS | undefined;
+    properties?: WillProperties | undefined;
+  } | undefined;
+  clean?: boolean | undefined;
+  keepAlive?: number | undefined;
+  bridgeMode?: boolean | undefined;
+  properties?: ConnectProperties | undefined;
 };
 
 /**

package/mqttPacket/decoder.ts

@@ -107,7 +107,7 @@ export class Decoder {
    */
   getByte(): number {
     this.checkpos(this.pos);
-    return this.buf[this.pos++];
+    return this.buf[this.pos++] || 0;
   }
 
   /**

package/mqttPacket/length.ts

@@ -35,7 +35,7 @@ export function decodeLength(
   const decode = getLengthDecoder();
   const size = buf.length;
   for (let i = start; i < size; i++) {
-    const byte = buf[i];
+    const byte = buf[i] || 0;
     const { done, length, numLengthBytes } = decode(byte);
     if (done) {
       return { length, numLengthBytes };

package/mqttPacket/mod.ts

@@ -225,7 +225,7 @@ export function decode(
   const { length, numLengthBytes } = decodeLength(buffer, 1);
   const start = numLengthBytes + 1;
   const end = start + length;
-  return decodePayload(buffer[0], buffer.subarray(start, end), codecOpts);
+  return decodePayload(buffer[0] || 0, buffer.subarray(start, end), codecOpts);
 }
 
 export { getLengthDecoder } from "../mqttPacket/length.ts";

package/mqttPacket/pubblishAcks.ts

@@ -10,35 +10,40 @@ import { PacketType } from "./PacketType.ts";
 import { Decoder, DecoderError } from "./decoder.ts";
 import { Encoder } from "./encoder.ts";
 
-export type AckPacketV4<T> = {
-  type: TPacketType;
+export type AckPacketV4<T extends TPacketType> = {
+  type: T;
   protocolLevel: ProtocolLevelNoV5;
   id: PacketId;
 };
 
-export type AckPacketV5<T> = {
-  type: TPacketType;
+export type AckPacketV5<T extends TPacketType> = {
+  type: T;
   protocolLevel: 5;
   id: PacketId;
   reasonCode?: TReasonCode;
   properties?: PubackProperties;
 };
+
 /**
  * all 4 ack packets are identical except for packet type and flags of Pubrel
  */
-export type AckPacket<T> = AckPacketV4<T> | AckPacketV5<T>;
+export type AckPacket<T extends TPacketType> = AckPacketV4<T> | AckPacketV5<T>;
+
 /**
  * PubackPacket is sent to indicate publish complete (QoS 1)
  */
 export type PubackPacket = AckPacket<typeof PacketType.puback>;
+
 /**
  * Pubrec is sent to indicate publish received (QoS 2)
  */
 export type PubrecPacket = AckPacket<typeof PacketType.pubrec>;
+
 /**
  * Pubrel is sent to indicate publish release (QoS 2)
  */
 export type PubrelPacket = AckPacket<typeof PacketType.pubrel>;
+
 /**
  * Pubcomp is sent to indicate publish complete (QoS 2)
  */
@@ -97,27 +102,27 @@ export const anyAck: {
     if (codecOpts.protocolLevel !== 5) {
       decoder.done();
       return {
-        type: packetType,
+        type: packetType as AnyAckPacket["type"],
         protocolLevel: codecOpts.protocolLevel,
         id,
-      };
+      } as AnyAckPacket;
     }
     if (decoder.atEnd()) {
       return {
-        type: packetType,
+        type: packetType as AnyAckPacket["type"],
         protocolLevel: 5,
         id,
         reasonCode: 0,
-      };
+      } as AnyAckPacket;
     }
     const reasonCode = decoder.getReasonCode();
     const properties = decoder.getProperties(packetType);
     return {
-      type: packetType,
+      type: packetType as AnyAckPacket["type"],
       protocolLevel: 5,
       id,
       reasonCode,
       properties,
-    };
+    } as AnyAckPacket;
   },
 };

package/mqttPacket/publish.ts

@@ -22,21 +22,21 @@ export type PublishPacketV4 = {
   protocolLevel: ProtocolLevelNoV5;
   topic: Topic;
   payload: Payload;
-  dup?: Dup;
-  retain?: boolean;
-  qos?: QoS;
-  id?: number;
+  dup?: Dup | undefined;
+  retain?: boolean | undefined;
+  qos?: QoS | undefined;
+  id?: number | undefined;
 };
 export type PublishPacketV5 = {
   type: TPacketType;
   protocolLevel: 5;
   topic: Topic;
   payload: Payload;
-  dup?: Dup;
-  retain?: boolean;
-  qos?: QoS;
-  id?: number;
-  properties?: PublishProperties;
+  dup?: Dup | undefined;
+  retain?: boolean | undefined;
+  qos?: QoS | undefined;
+  id?: number | undefined;
+  properties?: PublishProperties | undefined;
 };
 
 export type PublishPacket = PublishPacketV4 | PublishPacketV5;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@seriousme/opifex",
-  "version": "1.11.2",
-  "description": "MQTT client & server for Deno & NodeJS",
+  "version": "1.11.3",
+  "description": "MQTT client & server for Deno & NodeJS and Bun",
   "type": "module",
   "scripts": {
     "test": "node --experimental-strip-types --test --test-skip-pattern='/^Deno/'",
@@ -68,6 +68,6 @@
   },
   "homepage": "https://github.com/seriousme/opifex#readme",
   "devDependencies": {
-    "@types/node": "^24.6.2"
+    "@types/node": "^24.12.4"
   }
 }

package/persistence/memory/memoryPersistence.ts

@@ -5,6 +5,7 @@ import type {
   IPersistence,
   IStore,
   PacketId,
+  PacketIdStore,
   PacketStore,
   PublishPacket,
   QoS,
@@ -28,14 +29,14 @@ export class MemoryStore implements IStore {
   existingSession: boolean = false;
   clientId: ClientId;
   private packetId: PacketId;
-  pendingIncoming: PacketStore;
+  pendingIncoming: PacketIdStore;
   pendingOutgoing: PacketStore;
-  pendingAckOutgoing: Set<PacketId>;
+  pendingAckOutgoing: PacketIdStore;
   subscriptions: SubscriptionStore;
 
   constructor(clientId: ClientId) {
     this.packetId = 0;
-    this.pendingIncoming = new Map();
+    this.pendingIncoming = new Set();
     this.pendingOutgoing = new Map();
     this.pendingAckOutgoing = new Set();
     this.subscriptions = new Map();

package/persistence/mod.ts

@@ -2,7 +2,12 @@
  * @module persistence
  * @description Module for handling MQTT message persistence and client management
  */
-export type { IStore, PacketStore, SubscriptionStore } from "./store.ts";
+export type {
+  IStore,
+  PacketIdStore,
+  PacketStore,
+  SubscriptionStore,
+} from "./store.ts";
 export type {
   ClientId,
   PacketId,

package/persistence/store.ts

@@ -1,15 +1,16 @@
 import type { ClientId, PacketId, PublishPacket, QoS, Topic } from "./deps.ts";
 
 export type PacketStore = Map<PacketId, PublishPacket>;
+export type PacketIdStore = Set<PacketId>;
 
 export type SubscriptionStore = Map<Topic, QoS>;
 
 export interface IStore {
   existingSession: boolean;
   clientId: ClientId;
-  pendingIncoming: PacketStore;
+  pendingIncoming: PacketIdStore;
   pendingOutgoing: PacketStore;
-  pendingAckOutgoing: Set<PacketId>;
+  pendingAckOutgoing: PacketIdStore;
   subscriptions: SubscriptionStore;
   nextId(): PacketId;
 }

package/server/context.ts

@@ -60,7 +60,7 @@ export class Context {
   handlers: Handlers;
   static clientList: Map<ClientId, Context> = new Map();
   store?: IStore;
-  will?: PublishPacket;
+  will?: PublishPacket | undefined;
   timer?: Timer;
 
   constructor(persistence: IPersistence, conn: SockConn, handlers: Handlers) {

package/server/handlers/handlePublish.ts

@@ -68,8 +68,8 @@ Identifier as being a new publication.
     */
     if (ctx.store) {
       if (!ctx.store.pendingIncoming.has(packet.id)) {
-        ctx.store.pendingIncoming.set(packet.id, packet);
         ctx.persistence.publish(packet.topic, packet);
+        ctx.store.pendingIncoming.add(packet.id);
       }
       await ctx.send({
         type: PacketType.pubrec,

package/server/test/handleConnect.test.ts

@@ -1,15 +1,11 @@
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import {
-  makeDummyQueueSockConn,
-  resolveNextTick,
-} from "../../dev_utils/mod.ts";
+import { createWebSocketPair, resolveNextTick } from "../../dev_utils/mod.ts";
 import {
   type AnyPacket,
   AuthenticationResult,
   PacketType,
 } from "../../mqttPacket/mod.ts";
-import { BufferedAsyncIterable } from "../../utils/mod.ts";
 import { MqttConn, MQTTLevel } from "../deps.ts";
 import { MqttServer } from "../mod.ts";
 import { handlers } from "./test-handlers.ts";
@@ -37,25 +33,21 @@ const disconnectPacket: AnyPacket = {
 const mqttServer = new MqttServer({ handlers });
 
 function startServer(): {
-  reader: AsyncIterator<AnyPacket>;
   mqttConn: MqttConn;
 } {
-  const reader = new BufferedAsyncIterable<Uint8Array>();
-  const writer = new BufferedAsyncIterable<Uint8Array>();
-
-  const outputConn = makeDummyQueueSockConn(writer, reader);
-  const mqttConn = new MqttConn({ conn: outputConn });
-  const inputConn = makeDummyQueueSockConn(reader, writer, () => {
+  const { input, output } = createWebSocketPair();
+  const mqttConn = new MqttConn({ conn: output });
+  input.close = () => {
     mqttConn.close();
-  });
-  mqttServer.serve(inputConn);
-  return { reader: mqttConn[Symbol.asyncIterator](), mqttConn };
+  };
+  mqttServer.serve(input);
+  return { mqttConn };
 }
 
 test("Authentication with valid username and password works", async () => {
-  const { reader, mqttConn } = startServer();
+  const { mqttConn } = startServer();
   mqttConn.send(connectPacket);
-  const { value: connack } = await reader.next();
+  const { value: connack } = await mqttConn.next();
   assert.deepStrictEqual(
     connack.type,
     PacketType.connack,
@@ -80,9 +72,9 @@ test("Authentication with valid username and password works", async () => {
 test("Authentication with invalid username fails", async () => {
   const newPacket = Object.assign({}, connectPacket);
   newPacket.username = "wrong";
-  const { reader, mqttConn } = startServer();
+  const { mqttConn } = startServer();
   mqttConn.send(newPacket);
-  const { value: connack } = await reader.next();
+  const { value: connack } = await mqttConn.next();
   assert.deepStrictEqual(
     connack.type,
     PacketType.connack,
@@ -106,9 +98,9 @@ test("Authentication with invalid username fails", async () => {
 test("Authentication with invalid password fails", async () => {
   const newPacket = Object.assign({}, connectPacket);
   newPacket.password = undefined;
-  const { reader, mqttConn } = startServer();
+  const { mqttConn } = startServer();
   mqttConn.send(newPacket);
-  const { value: connack } = await reader.next();
+  const { value: connack } = await mqttConn.next();
   assert.deepStrictEqual(
     connack.type,
     PacketType.connack,

package/socket/socket.ts

@@ -59,6 +59,9 @@ export class Conn {
 
   close() {
     if (!this.closed) {
+      try {
+        this.writer.close();
+      } catch (_err) { /* swallow any errors on close */ }
       this.closed = true;
       try {
         this.closer();