@seriousme/opifex 1.9.4 → 1.11.0

package/client/context.ts

@@ -1,29 +1,37 @@
 import {
-  type AnyPacket,
   AsyncQueue,
-  type ConnectPacket,
   Deferred,
   logger,
-  type MemoryStore,
   MqttConn,
-  type PacketId,
+  MQTTLevel,
+  nextTick,
   PacketType,
-  type PublishPacket,
-  type ReturnCodes,
-  type SockConn,
-  type SubscribePacket,
-  type TAuthenticationResult,
   Timer,
-  type UnsubscribePacket,
+} from "./deps.ts";
+import type {
+  AnyPacket,
+  ConnectPacket,
+  MemoryStore,
+  PacketId,
+  ProtocolLevel,
+  PublishPacket,
+  ReturnCodes,
+  SockConn,
+  SubscribePacket,
+  TAuthenticationResult,
+  UnsubscribePacket,
 } from "./deps.ts";
 
 import { handlePacket } from "./handlers/handlePacket.ts";
 import type { TConnectionState } from "./ConnectionState.ts";
 import { ConnectionState } from "./ConnectionState.ts";
+import type { Client } from "./client.ts";
+import { assert } from "../utils/assert.ts";
 
 export class Context {
   mqttConn?: MqttConn;
-  connectionState: TConnectionState;
+  #connectionState: TConnectionState;
+  protocolLevel: ProtocolLevel;
   pingTimer?: Timer;
   unresolvedConnect?: Deferred<TAuthenticationResult>;
   unresolvedPublish: Map<PacketId, Deferred<void>>;
@@ -31,18 +39,41 @@ export class Context {
   unresolvedUnSubscribe: Map<PacketId, Deferred<void>>;
   store: MemoryStore;
   incoming: AsyncQueue<PublishPacket>;
+  #client: Client;
 
-  constructor(store: MemoryStore) {
+  constructor(store: MemoryStore, client: Client) {
+    this.#client = client;
     this.store = store;
-    this.connectionState = ConnectionState.offline;
+    this.#connectionState = ConnectionState.offline;
+    this.protocolLevel = MQTTLevel.unknown;
     this.incoming = new AsyncQueue();
     this.unresolvedPublish = new Map();
     this.unresolvedSubscribe = new Map();
     this.unresolvedUnSubscribe = new Map();
   }
 
+  get connectionState(): TConnectionState {
+    return this.#connectionState;
+  }
+
+  set connectionState(state: TConnectionState) {
+    this.#connectionState = state;
+    switch (state) {
+      case "connected":
+        queueMicrotask(this.#client.onConnected);
+        break;
+      case "disconnected":
+        queueMicrotask(this.#client.onDisconnected);
+        break;
+    }
+  }
+
   async connect(packet: ConnectPacket) {
     this.connectionState = ConnectionState.connecting;
+    if (packet.protocolLevel === MQTTLevel.unknown) {
+      packet.protocolLevel = MQTTLevel.v4;
+    }
+    this.protocolLevel = packet.protocolLevel;
     await this.mqttConn?.send(packet);
     const keepAlive = packet.keepAlive || 0;
     if (keepAlive > 0) {
@@ -60,8 +91,12 @@ export class Context {
     }
     if (this.mqttConn) {
       this.connectionState = ConnectionState.disconnecting;
-      await this.mqttConn.send({ type: PacketType.disconnect });
+      await this.mqttConn.send({
+        type: PacketType.disconnect,
+        protocolLevel: this.protocolLevel,
+      });
       this.mqttConn.close();
+      this.protocolLevel = MQTTLevel.unknown;
     }
   }
 
@@ -73,6 +108,7 @@ export class Context {
     ) {
       await this.mqttConn?.send(packet);
       this.pingTimer?.reset();
+      await nextTick(); // Yield to allow other tasks to run
       return;
     }
     logger.debug("not connected");
@@ -80,7 +116,10 @@ export class Context {
   }
 
   sendPing() {
-    this.send({ type: PacketType.pingreq });
+    this.send({
+      type: PacketType.pingreq,
+      protocolLevel: this.protocolLevel,
+    });
   }
 
   async handleConnection(
@@ -88,20 +127,22 @@ export class Context {
     connectPacket: ConnectPacket,
   ): Promise<boolean> {
     this.mqttConn = new MqttConn({ conn });
-    if (this.mqttConn === undefined) {
-      return true;
-    }
-    logger.debug("Send connect packet");
-    await this.connect(connectPacket);
     try {
+      logger.debug("Send connect packet", connectPacket);
+      await this.connect(connectPacket);
       logger.debug("Accepting packets");
       for await (const packet of this.mqttConn) {
-        handlePacket(this, packet);
+        await handlePacket(this, packet);
       }
       logger.debug("No more packets");
     } catch (err) {
-      logger.debug(err);
-      if (this.mqttConn.isClosed) {
+      assert(
+        err instanceof Error,
+        `Caught something that is not an instance of Error: ${err}`,
+      );
+      queueMicrotask(() => this.#client.onError(err));
+      logger.debug(`error ${err}`);
+      if (!this.mqttConn.isClosed) {
         this.mqttConn.close();
       }
     }
@@ -121,11 +162,11 @@ export class Context {
     this.incoming.push(packet);
   }
 
-  publish(packet: PublishPacket): Promise<void> {
+  async publish(packet: PublishPacket): Promise<void> {
     const qos = packet.qos || 0;
     if (qos === 0) {
       packet.id = 0;
-      this.send(packet);
+      await this.send(packet);
       // return empty promise
       return Promise.resolve();
     }
@@ -133,25 +174,25 @@ export class Context {
     this.store.pendingOutgoing.set(packet.id, packet);
     const deferred = new Deferred<void>();
     this.unresolvedPublish.set(packet.id, deferred);
-    this.send(packet);
+    await this.send(packet);
     return deferred.promise;
   }
 
-  subscribe(packet: SubscribePacket): Promise<ReturnCodes> {
+  async subscribe(packet: SubscribePacket): Promise<ReturnCodes> {
     packet.id = this.store.nextId();
     this.store.pendingOutgoing.set(packet.id, packet);
     const deferred = new Deferred<ReturnCodes>();
     this.unresolvedSubscribe.set(packet.id, deferred);
-    this.send(packet);
+    await this.send(packet);
     return deferred.promise;
   }
 
-  unsubscribe(packet: UnsubscribePacket): Promise<void> {
+  async unsubscribe(packet: UnsubscribePacket): Promise<void> {
     packet.id = this.store.nextId();
     this.store.pendingOutgoing.set(packet.id, packet);
     const deferred = new Deferred<void>();
     this.unresolvedUnSubscribe.set(packet.id, deferred);
-    this.send(packet);
+    await this.send(packet);
     return deferred.promise;
   }
 

package/client/deps.ts

@@ -6,6 +6,7 @@ export type {
   Dup,
   PacketId,
   Payload,
+  ProtocolLevel,
   PubackPacket,
   PubcompPacket,
   PublishPacket,
@@ -16,6 +17,7 @@ export type {
   SubscribePacket,
   TAuthenticationResult,
   Topic,
+  TReasonCode,
   UnsubackPacket,
   UnsubscribePacket,
 } from "../mqttPacket/mod.ts";
@@ -25,8 +27,10 @@ export {
   AuthenticationResultByNumber,
   decodePayload,
   encode,
+  MQTTLevel,
   PacketNameByType,
   PacketType,
+  ReasonCodeByNumber,
 } from "../mqttPacket/mod.ts";
 
 export { MqttConn } from "../mqttConn/mqttConn.ts";
@@ -34,3 +38,4 @@ export type { SockConn } from "../socket/socket.ts";
 export { Timer } from "../timer/timer.ts";
 export { AsyncQueue, Deferred, logger } from "../utils/mod.ts";
 export { MemoryStore } from "./store/memoryStore.ts";
+export { nextTick } from "../utils/mod.ts";

package/client/handlers/handleConnack.ts

@@ -1,6 +1,7 @@
 import type { Context } from "../context.ts";
 import { ConnectionState } from "../ConnectionState.ts";
-import { AuthenticationResultByNumber, type ConnackPacket } from "../deps.ts";
+import { AuthenticationResultByNumber, ReasonCodeByNumber } from "../deps.ts";
+import type { ConnackPacket, TReasonCode } from "../deps.ts";
 
 /**
  * Handles the CONNACK packet received from the MQTT broker
@@ -9,18 +10,29 @@ import { AuthenticationResultByNumber, type ConnackPacket } from "../deps.ts";
  * @returns Promise that resolves when handling is complete
  */
 export async function handleConnack(packet: ConnackPacket, ctx: Context) {
-  if (packet.returnCode === 0) {
+  const result = packet.protocolLevel === 5
+    ? packet.reasonCode
+    : packet.returnCode;
+  if (result === 0) {
     ctx.connectionState = ConnectionState.connected;
+    if (ctx.mqttConn) {
+      ctx.mqttConn.codecOpts.protocolLevel = ctx.protocolLevel;
+    }
     ctx.pingTimer?.reset();
-    ctx.unresolvedConnect?.resolve(packet.returnCode);
+    ctx.unresolvedConnect?.resolve(result);
     // start transmitting packets that were queued before
     for await (const packet of ctx.store.pendingOutgoingPackets()) {
-      ctx.send(packet);
+      await ctx.send(packet);
     }
     return;
   }
+
+  const errMsg = packet.protocolLevel === 5
+    ? ReasonCodeByNumber[result as TReasonCode]
+    : AuthenticationResultByNumber[result];
+
   const err = new Error(
-    `Connect failed: ${AuthenticationResultByNumber[packet.returnCode]}`,
+    `Connect failed: ${errMsg}`,
   );
   ctx.connectionState = ConnectionState.disconnecting;
   ctx.pingTimer?.clear();

package/client/handlers/handlePublish.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../context.ts";
-import { PacketType, type PublishPacket } from "../deps.ts";
+import { PacketType } from "../deps.ts";
+import type { PublishPacket } from "../deps.ts";
 
 /**
  * Handles incoming MQTT publish packets based on their QoS level
@@ -20,6 +21,7 @@ export async function handlePublish(ctx: Context, packet: PublishPacket) {
       ctx.receivePublish(packet);
       await ctx.send({
         type: PacketType.puback,
+        protocolLevel: ctx.protocolLevel,
         id: packet.id,
       });
       return;
@@ -29,6 +31,7 @@ export async function handlePublish(ctx: Context, packet: PublishPacket) {
       ctx.store.pendingIncoming.set(packet.id, packet);
       await ctx.send({
         type: PacketType.pubrec,
+        protocolLevel: ctx.protocolLevel,
         id: packet.id,
       });
     }

package/client/handlers/handlePubrec.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../context.ts";
-import { PacketType, type PubrecPacket, type PubrelPacket } from "../deps.ts";
+import { PacketType } from "../deps.ts";
+import type { PubrecPacket, PubrelPacket } from "../deps.ts";
 
 /**
  * Handles PUBREC (Publish Received) packets for QoS 2 message flow
@@ -21,6 +22,7 @@ export async function handlePubrec(
   const id = packet.id;
   const ack: PubrelPacket = {
     type: PacketType.pubrel,
+    protocolLevel: ctx.protocolLevel,
     id,
   };
   if (ctx.store.pendingOutgoing.has(id)) {

package/client/handlers/handlePubrel.ts

@@ -1,5 +1,6 @@
 import type { Context } from "../context.ts";
-import { PacketType, type PubrelPacket } from "../deps.ts";
+import { PacketType } from "../deps.ts";
+import type { PubrelPacket } from "../deps.ts";
 
 /**
  * Handles a PUBREL packet in the MQTT QoS 2 flow
@@ -29,6 +30,7 @@ export async function handlePubrel(
       ctx.store.pendingIncoming.delete(id);
       await ctx.send({
         type: PacketType.pubcomp,
+        protocolLevel: ctx.protocolLevel,
         id,
       });
     }

package/client/handlers/handleSuback.ts

@@ -13,5 +13,7 @@ import type { SubackPacket } from "../deps.ts";
 export function handleSuback(ctx: Context, packet: SubackPacket): void {
   const id = packet.id;
   ctx.store.pendingOutgoing.delete(id);
-  ctx.receiveSuback(id, packet.returnCodes);
+  if (packet.protocolLevel !== 5) {
+    ctx.receiveSuback(id, packet.returnCodes);
+  }
 }

package/client/mod.ts

@@ -2,7 +2,14 @@
  *  This module provides an MQTT Client interface see the /bin folder for examples
  *  @module
  */
-export { Client, DEFAULT_URL } from "./client.ts";
+export {
+  Client,
+  DEFAULT_KEEPALIVE,
+  DEFAULT_PROTOCOLLEVEL,
+  DEFAULT_URL,
+} from "./client.ts";
+export { MQTTLevel } from "./deps.ts";
+export type { ProtocolLevel } from "./deps.ts";
 export type {
   ConnectParameters,
   PublishParameters,

package/client/store/memoryStore.ts

@@ -2,7 +2,8 @@
  * @module memoryStore
  */
 
-import { assert, type PacketId } from "./deps.ts";
+import { assert } from "./deps.ts";
+import type { PacketId } from "./deps.ts";
 
 import {
   type IStore,

package/deno/tcpClient.ts

@@ -70,6 +70,6 @@ export class TcpClient extends Client {
     if (protocol === "mqtt:") {
       return this.connectMQTT(hostname, port);
     }
-    throw `Unsupported protocol: ${protocol}`;
+    throw new Error(`Unsupported protocol: ${protocol}`);
   }
 }

package/dev_utils/dummyConn.ts

@@ -43,6 +43,21 @@ class Uint8QueuedWriter implements WritableStreamDefaultWriter {
   }
 }
 
+function readableByteStreamFromArray(readerBuffs: Array<Uint8Array>) {
+  let i = 0;
+  return new ReadableStream({
+    type: "bytes",
+    pull(controller) {
+      if (i === readerBuffs.length) {
+        controller.close();
+        controller.byobRequest?.respond(0);
+        return;
+      }
+      controller.enqueue(readerBuffs[i++]);
+    },
+  });
+}
+
 function ReadableStreamFrom(
   iterable: AsyncIterable<Uint8Array>,
 ): ReadableStream {
@@ -58,6 +73,7 @@ function ReadableStreamFrom(
 
       if (next.done) {
         controller.close();
+        controller.byobRequest?.respond(0);
         return;
       }
       controller.enqueue(next.value);
@@ -70,8 +86,7 @@ export function makeDummySockConn(
   writerBuf: Uint8Array,
   close = () => {},
 ) {
-  const readBlob = new Blob(readerBuffs);
-  const readable = readBlob.stream();
+  const readable = readableByteStreamFromArray(readerBuffs);
   const writable = new WritableStream(new Uint8Writer(writerBuf));
   return {
     readable,

package/dist/bin/conformanceServer.js

@@ -4,9 +4,10 @@
  * MQTT Server implementation with authentication and authorization
  * @module mqttServer
  */
+import { parseArgs } from "node:util";
 import { TcpServer } from "../node/tcpServer.js";
 import { AuthenticationResult } from "../server/mod.js";
-import { getArgs, logger, LogLevel, parseArgs } from "../utils/mod.js";
+import { logger, LogLevel } from "../utils/mod.js";
 /**
  * UTF-8 decoder for parsing passwords
  */
@@ -79,7 +80,7 @@ function isAuthorizedToSubscribe(ctx, topic) {
 /**
  * Parse command line arguments and start server
  */
-const { _: [portNum] } = parseArgs(getArgs());
+const { positionals: [portNum] } = parseArgs({ allowPositionals: true });
 const port = Number(portNum ?? 1883);
 const hostname = "::";
 logger.level(LogLevel.info);

package/dist/bin/conformanceServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"conformanceServer.js","sourceRoot":"","sources":["../../bin/conformanceServer.ts"],"names":[],"mappings":";AACA,iFAAiF;AAEjF;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,IAAI,CAAC;AAE3B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB;IAEpB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,mBAAmB,GAAG,GAAG,CACrG,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,oBAAoB,CAAC,EAAE,CAAC;IACjC,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,qBAAqB,CAAC;IACpD,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,aAAa,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,0BAA0B,KAAK,GAAG,CAC3F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,GAAY,EAAE,KAAY;IACzD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,4BAA4B,KAAK,GAAG,CAC7F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"conformanceServer.js","sourceRoot":"","sources":["../../bin/conformanceServer.ts"],"names":[],"mappings":"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"}

package/dist/bin/demoServer.js

@@ -3,9 +3,10 @@
  * MQTT Server implementation with authentication and authorization
  * @module mqttServer
  */
+import { parseArgs } from "node:util";
 import { TcpServer } from "../node/tcpServer.js";
 import { AuthenticationResult } from "../server/mod.js";
-import { getArgs, logger, LogLevel, parseArgs } from "../utils/mod.js";
+import { logger, LogLevel } from "../utils/mod.js";
 /**
  * UTF-8 decoder for parsing passwords
  */
@@ -78,7 +79,7 @@ function isAuthorizedToSubscribe(ctx, topic) {
 /**
  * Parse command line arguments and start server
  */
-const { _: [portNum] } = parseArgs(getArgs());
+const { positionals: [portNum] } = parseArgs({ allowPositionals: true });
 const port = Number(portNum ?? 1883);
 const hostname = "::";
 logger.level(LogLevel.info);

package/dist/bin/demoServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"demoServer.js","sourceRoot":"","sources":["../../bin/demoServer.ts"],"names":[],"mappings":";AAEA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB;IAEpB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,mBAAmB,GAAG,GAAG,CACrG,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,oBAAoB,CAAC,EAAE,CAAC;IACjC,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,qBAAqB,CAAC;IACpD,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,aAAa,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,0BAA0B,KAAK,GAAG,CAC3F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,GAAY,EAAE,KAAY;IACzD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,4BAA4B,KAAK,GAAG,CAC7F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC"}
+{"version":3,"file":"demoServer.js","sourceRoot":"","sources":["../../bin/demoServer.ts"],"names":[],"mappings":";AAEA;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5B,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/C,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAE/C;;;GAGG;AACH,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEzD;;;;GAIG;AACH,MAAM,aAAa,GAAG,KAAK,CAAC;AAE5B;;;;;;;GAOG;AACH,SAAS,eAAe,CACtB,IAAa,EACb,QAAgB,EAChB,QAAgB,EAChB,QAAoB;IAEpB,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,IAAI,CACT,uCAAuC,QAAQ,oBAAoB,QAAQ,mBAAmB,GAAG,GAAG,CACrG,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,yBAAyB;QACzB,OAAO,oBAAoB,CAAC,EAAE,CAAC;IACjC,CAAC;IACD,wDAAwD;IACxD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACnC,OAAO,oBAAoB,CAAC,qBAAqB,CAAC;IACpD,CAAC;IACD,qDAAqD;IACrD,IAAI,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,aAAa,CAAC;AAC5C,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAY,EAAE,KAAY;IACvD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,0BAA0B,KAAK,GAAG,CAC3F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAAC,GAAY,EAAE,KAAY;IACzD,MAAM,CAAC,KAAK,CACV,qCAAqC,GAAG,CAAC,KAAK,EAAE,QAAQ,4BAA4B,KAAK,GAAG,CAC7F,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,EAAE,WAAW,EAAE,CAAC,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;AACzE,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AACrC,MAAM,QAAQ,GAAG,IAAI,CAAC;AACtB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;IAClD,QAAQ,EAAE;QACR,eAAe;QACf,qBAAqB;QACrB,uBAAuB;KACxB;CACF,CAAC,CAAC;AACH,SAAS,CAAC,KAAK,EAAE,CAAC;AAClB,MAAM,CAAC,IAAI,CAAC,0BAA0B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC"}

package/dist/bin/mqtt.d.ts

@@ -1,3 +1,32 @@
 #!/usr/bin/env -S node --experimental-strip-types
+/**
+ * @fileoverview MQTT command line interface that provides publish and subscribe functionality
+ * @module mqtt-cli
+ *
+ * @description
+ * This module implements a command line interface for MQTT operations:
+ * - Publish messages to an MQTT broker
+ * - Subscribe to topics on an MQTT broker
+ *
+ * Features:
+ * - TLS support with custom certificates
+ * - Authentication with username/password
+ * - Configurable QoS levels (0-2)
+ * - Message retention
+ * - Session persistence
+ * - Custom client IDs
+ *
+ * @example
+ * # Publish a message
+ * mqtt publish -t topic -m message
+ *
+ * # Subscribe to a topic
+ * mqtt subscribe -t topic
+ *
+ * @requires node:util
+ * @requires ../client/mod.ts
+ * @requires ../node/tcpClient.ts
+ * @requires ../utils/mod.ts
+ */
 export {};
 //# sourceMappingURL=mqtt.d.ts.map

package/dist/bin/mqtt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt.d.ts","sourceRoot":"","sources":["../../bin/mqtt.ts"],"names":[],"mappings":""}
+{"version":3,"file":"mqtt.d.ts","sourceRoot":"","sources":["../../bin/mqtt.ts"],"names":[],"mappings":";AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG"}