@seriousme/opifex 1.11.1 → 1.11.3

package/server/handlers/handlePublish.ts

@@ -52,9 +52,25 @@ export async function handlePublish(
       });
       return;
     }
-    // qos 2
+
+    /*
+In the QoS 2 delivery protocol, the Receiver
+
+- MUST respond with a PUBREC containing the Packet Identifier from the incoming PUBLISH Packet,
+having accepted ownership of the Application Message.
+- Until it has received the corresponding PUBREL packet, the Receiver MUST acknowledge any subsequent
+PUBLISH packet with the same Packet Identifier by sending a PUBREC. It MUST NOT cause duplicate
+messages to be delivered to any onward recipients in this case.
+- MUST respond to a PUBREL packet by sending a PUBCOMP packet containing the same Packet Identifier as the PUBREL.
+- After it has sent a PUBCOMP, the receiver MUST treat any subsequent PUBLISH packet that contains that Packet
+Identifier as being a new publication.
+[MQTT-4.3.3-2].
+    */
     if (ctx.store) {
-      ctx.store.pendingIncoming.set(packet.id, packet);
+      if (!ctx.store.pendingIncoming.has(packet.id)) {
+        ctx.persistence.publish(packet.topic, packet);
+        ctx.store.pendingIncoming.add(packet.id);
+      }
       await ctx.send({
         type: PacketType.pubrec,
         protocolLevel: ctx.protocolLevel,

package/server/handlers/handlePubrel.ts

@@ -20,15 +20,11 @@ export async function handlePubrel(
 ): Promise<void> {
   const id = packet.id;
   if (ctx.store?.pendingIncoming.has(id)) {
-    const storedPacket = ctx.store.pendingIncoming.get(id);
-    if (storedPacket) {
-      ctx.persistence.publish(storedPacket.topic, storedPacket);
-      ctx.store.pendingIncoming.delete(id);
-      await ctx.send({
-        type: PacketType.pubcomp,
-        protocolLevel: ctx.protocolLevel,
-        id,
-      });
-    }
+    ctx.store.pendingIncoming.delete(id);
   }
+  await ctx.send({
+    type: PacketType.pubcomp,
+    protocolLevel: ctx.protocolLevel,
+    id,
+  });
 }

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();

package/trie/trie.ts

@@ -46,7 +46,7 @@ export class Trie<T> {
    */
   match(key: string): T[] {
     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);
@@ -62,7 +62,10 @@ export class Trie<T> {
       return this.#value ? this.#value : [];
     }
     const [first, ...rest] = parts;
-    return this.matchChild(first, rest);
+    if (first !== undefined) {
+      return this.matchChild(first, rest);
+    }
+    return [];
   }
 
   /**
@@ -75,11 +78,14 @@ export class Trie<T> {
       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 [];
   }
 
   /**
@@ -102,13 +108,15 @@ export class Trie<T> {
       return;
     }
     const [first, ...rest] = parts;
-    const child = this.#children.get(first);
-    if (child instanceof Trie) {
-      child._add(rest, value);
-    } else {
-      const node = new Trie<T>(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<T>(this.looseCompare);
+        this.#children.set(first, node);
+        node._add(rest, value);
+      }
     }
     return;
   }
@@ -134,11 +142,13 @@ export class Trie<T> {
       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/utils/BufferedAsyncIterable.ts

@@ -20,7 +20,7 @@ export class BufferedAsyncIterable<T> implements AsyncIterable<T> {
 
   private done = false;
 
-  #next?: Deferred<T>;
+  #next?: Deferred<T> | undefined;
 
   constructor(bufferSize: number = 2048) {
     this.buffer = new ArrayQueue();

package/benchmarks/bombing.ts

@@ -1,35 +0,0 @@
-import { loader } from "./utils.ts";
-import { runAsap } from "../dev_utils/timers.ts";
-
-loader((ClientClass) => {
-  const client = new ClientClass();
-
-  client.connect({
-    url: new URL("mqtt://127.0.0.1:1884"),
-  });
-
-  client.onConnected = () => {
-    const payload = new TextEncoder().encode("payload");
-
-    let sent = 0;
-    const interval = 5000;
-
-    const loop = () => {
-      sent++;
-      client.publish({ topic: "test", payload })
-        .then(() => runAsap(loop));
-    };
-
-    function count() {
-      console.log("sent/s", (sent / interval) * 1000);
-      sent = 0;
-    }
-
-    setInterval(count, interval);
-    loop();
-  };
-
-  client.onError = (err) => {
-    console.log("client error", err);
-  };
-});

package/benchmarks/throughputCounter.ts

@@ -1,31 +0,0 @@
-import { loader } from "./utils.ts";
-
-loader(async (ClientClass) => {
-  const client = new ClientClass();
-
-  await client.connect({
-    url: new URL("mqtt://127.0.0.1:1884"),
-  });
-
-  await client.subscribe({ subscriptions: [{ topicFilter: "test", qos: 0 }] });
-
-  let counter = 0;
-  const interval = 5000;
-
-  function count() {
-    console.log("received/s", (counter / interval) * 1000);
-    counter = 0;
-  }
-
-  setInterval(count, interval);
-
-  // // Consume using a callback
-  // client.onPacket = async (packet) => {
-  //   counter++;
-  // };
-
-  // Consume using an AsyncIterator
-  for await (const _ of client.messages()) {
-    counter++;
-  }
-});