@seriousme/opifex 1.9.4 → 1.11.0

package/dist/mqttPacket/connect.js

@@ -1,25 +1,52 @@
+import { PropertySetType } from "./Properties.js";
 import { PacketType } from "./PacketType.js";
 import { BitMask } from "./BitMask.js";
-import { Encoder } from "./encoder.js";
+import { Encoder, EncoderError } from "./encoder.js";
 import { booleanFlag, Decoder, DecoderError, hasEmptyFlags, } from "./decoder.js";
 function invalidProtocolName(version, name) {
-    if (version === 4 && name !== "MQTT") {
-        return true;
+    if (version === 3 && name === "MQIsdp") {
+        return false;
     }
-    return false;
+    if (version === 4 && name === "MQTT") {
+        return false;
+    }
+    if (version === 5 && name == "MQTT") {
+        return false;
+    }
+    return true;
 }
 export const connect = {
-    encode(packet) {
+    encode(packet, codecOpts) {
         const flags = 0;
-        const protocolLevel = 4;
-        const protocolName = protocolLevel === 4 ? "MQTT" : "MQIsdp";
+        if (typeof packet.protocolLevel !== "number") {
+            throw new EncoderError("Protocol level must be a number");
+        }
+        const protocolLevel = packet.protocolLevel || 4;
+        if (protocolLevel < 3 || protocolLevel > 5) {
+            throw new EncoderError("Unsupported protocol level");
+        }
+        const protocolName = protocolLevel > 3 ? "MQTT" : "MQIsdp";
         const clientId = packet.clientId || "";
-        const usernameFlag = !!packet.username;
-        const passwordFlag = !!packet.password;
+        const usernameFlag = packet.username !== undefined;
+        if (protocolLevel === 3 && clientId === "") {
+            throw new EncoderError("Client id required for protocol level 3");
+        }
+        const passwordFlag = usernameFlag && packet.password !== undefined;
         const willRetain = !!packet.will?.retain;
         const willQoS = packet.will?.qos || 0;
-        const willFlag = !!packet.will;
+        const willFlag = packet.will !== undefined;
+        if (willFlag) {
+            if (packet.will?.topic === undefined) {
+                throw new EncoderError("Will topic must be defined");
+            }
+            if (packet.will?.payload === undefined) {
+                throw new EncoderError("Will payload must be defined");
+            }
+        }
         const cleanSession = packet.clean !== false;
+        if (!cleanSession && (clientId === "")) {
+            throw new EncoderError("Client id required for clean session");
+        }
         const connectFlags = (usernameFlag ? BitMask.bit7 : 0) +
             (passwordFlag ? BitMask.bit6 : 0) +
             (willRetain ? BitMask.bit5 : 0) +
@@ -28,30 +55,43 @@ export const connect = {
             (willFlag ? BitMask.bit2 : 0) +
             (cleanSession ? BitMask.bit1 : 0);
         const keepAlive = packet.keepAlive || 0;
-        const encoder = new Encoder();
+        const bridgeMode = !!packet.bridgeMode;
+        const rawProtocolLevel = bridgeMode ? protocolLevel + 128 : protocolLevel;
+        const encoder = new Encoder(packet.type);
         encoder
             .setUtf8String(protocolName)
-            .setByte(protocolLevel)
+            .setByte(rawProtocolLevel)
             .setByte(connectFlags)
-            .setInt16(keepAlive)
-            .setUtf8String(clientId);
-        if (packet.will) {
+            .setInt16(keepAlive);
+        if (packet.protocolLevel === 5) {
+            encoder.setProperties(packet.properties || {}, PropertySetType.connect, codecOpts.maxOutgoingPacketSize);
+        }
+        encoder.setUtf8String(clientId);
+        if (packet.will !== undefined && packet.will.topic !== undefined &&
+            packet.will.payload !== undefined) {
+            if (packet.protocolLevel === 5) {
+                encoder.setProperties(packet.will?.properties || {}, PropertySetType.will, codecOpts.maxOutgoingPacketSize);
+            }
             encoder.setTopic(packet.will.topic).setByteArray(packet.will.payload);
         }
-        if (packet.username) {
+        if (packet.username !== undefined) {
             encoder.setUtf8String(packet.username);
         }
-        if (packet.password) {
+        if (passwordFlag && packet.password !== undefined) {
             encoder.setByteArray(packet.password);
         }
-        return { flags, bytes: encoder.done() };
+        return encoder.done(flags);
     },
-    decode(buffer, flags) {
-        const decoder = new Decoder(buffer);
-        const protocolName = decoder.getUtf8String();
-        const protocolLevel = decoder.getByte();
+    decode(buffer, flags, _codecOpts, packetType) {
+        const decoder = new Decoder(packetType, buffer);
+        const protocolName = decoder.getUTF8String();
+        const rawProtocolLevel = decoder.getByte();
+        const bridgeMode = rawProtocolLevel > 128;
+        const protocolLevel = bridgeMode
+            ? rawProtocolLevel - 128
+            : rawProtocolLevel;
         if (invalidProtocolName(protocolLevel, protocolName)) {
-            throw new DecoderError("Invalid protocol name");
+            throw new DecoderError("Invalid protocol name or level");
         }
         const connectFlags = decoder.getByte();
         const usernameFlag = booleanFlag(connectFlags, BitMask.bit7);
@@ -70,18 +110,30 @@ export const connect = {
         if (willQoS !== 0 && willQoS !== 1 && willQoS !== 2) {
             throw new DecoderError("Invalid will qos");
         }
+        if (!usernameFlag && passwordFlag) {
+            throw new DecoderError("Password without username");
+        }
         const keepAlive = decoder.getInt16();
-        const clientId = decoder.getUtf8String();
+        const isV5 = protocolLevel === 5;
+        let properties;
+        if (isV5) {
+            properties = decoder.getProperties(PropertySetType.connect);
+        }
+        const clientId = decoder.getUTF8String();
+        let willProperties;
         let willTopic;
         let willPayload;
         if (willFlag) {
+            if (isV5) {
+                willProperties = decoder.getProperties(PropertySetType.will);
+            }
             willTopic = decoder.getTopic();
             willPayload = decoder.getByteArray();
         }
         let username;
         let password;
         if (usernameFlag) {
-            username = decoder.getUtf8String();
+            username = decoder.getUTF8String();
         }
         if (passwordFlag) {
             password = decoder.getByteArray();
@@ -93,13 +145,39 @@ export const connect = {
         if (clientId.length === 0 && cleanSession === false) {
             throw new DecoderError("Clean session must be true if clientID is empty");
         }
-        return {
+        let bridgeModeProp = {};
+        if (bridgeMode) {
+            bridgeModeProp = { bridgeMode };
+        }
+        const commonProps = {
             type: PacketType.connect,
             protocolName: protocolName,
-            protocolLevel,
             clientId: clientId,
-            username: username ? username : undefined,
+            username,
             password: password ? password : undefined,
+            clean: cleanSession,
+            keepAlive,
+            ...bridgeModeProp,
+        };
+        if (isV5) {
+            return {
+                ...commonProps,
+                protocolLevel: 5,
+                will: willFlag
+                    ? {
+                        topic: willTopic || "",
+                        payload: willPayload || Uint8Array.from([0]),
+                        retain: willRetain,
+                        qos: willQoS,
+                        properties: willProperties,
+                    }
+                    : undefined,
+                properties,
+            };
+        }
+        return {
+            ...commonProps,
+            protocolLevel: protocolLevel,
             will: willFlag
                 ? {
                     topic: willTopic || "",
@@ -108,8 +186,6 @@ export const connect = {
                     qos: willQoS,
                 }
                 : undefined,
-            clean: cleanSession,
-            keepAlive,
         };
     },
 };

package/dist/mqttPacket/connect.js.map

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

package/dist/mqttPacket/decoder.d.ts

@@ -1,4 +1,5 @@
-import type { TBitMask, Topic, TopicFilter } from "./types.ts";
+import type { TBitMask, Topic, TopicFilter, TPacketType, TReasonCode, UTF8StringPair } from "./types.ts";
+import type { PropsByPacketSetType } from "./Properties.ts";
 /**
  * Checks if a specific bit flag is set in a byte using a bitmask
  * @param byte - The byte to check
@@ -28,6 +29,7 @@ export declare class DecoderError extends Error {
  * Decoder class for parsing MQTT packets
  */
 export declare class Decoder {
+    private packetType;
     private buf;
     private pos;
     private len;
@@ -36,7 +38,7 @@ export declare class Decoder {
      * @param buf - The buffer to decode
      * @param pos - Starting position in the buffer (default: 0)
      */
-    constructor(buf: Uint8Array, pos?: number);
+    constructor(packetType: TPacketType, buf: Uint8Array, pos?: number);
     /**
      * Checks if the current position is valid
      * @param pos - Position to check
@@ -53,6 +55,18 @@ export declare class Decoder {
      * @returns The 16-bit integer value
      */
     getInt16(): number;
+    /**
+     * Gets a 4 byte integer from the buffer (for v5)
+     * @returns The 32 bit integer value
+     */
+    getInt32(): number;
+    /**
+     * Gets a variable byte integer from the buffer (for v5)
+     * its like the length decoder in length.ts but this one works directly on the buffer
+     * @returns The decoded variable byte integer
+     * @throws {DecoderError} If malformed variable byte integer
+     */
+    getVariableByteInteger(): number;
     /**
      * Gets a byte array from the buffer
      * @returns A subarray of the buffer
@@ -62,7 +76,12 @@ export declare class Decoder {
      * Gets a UTF-8 string from the buffer
      * @returns The decoded UTF-8 string
      */
-    getUtf8String(): string;
+    getUTF8String(): string;
+    /**
+     * Gets a UTF-8 string pair from the buffer (for v5)
+     * @returns The decoded UTF-8 pair as [name,value]
+     */
+    getUTF8StringPair(): UTF8StringPair;
     /**
      * Gets a topic from the buffer
      * @returns The decoded topic
@@ -80,6 +99,26 @@ export declare class Decoder {
      * @returns The remaining bytes as a subarray
      */
     getRemainder(): Uint8Array<ArrayBufferLike>;
+    /**
+     * Gets a single property
+     * @param id
+     * @returns
+     */
+    private getProperty;
+    /**
+     * Gets all properties from the buffer
+     * and validates if they are allowed for this type of packet
+     * @param propertySetType
+     * @returns
+     * @throws {DecoderError} If properties are invalid
+     */
+    getProperties<T extends keyof PropsByPacketSetType>(propertySetType: T): PropsByPacketSetType[T];
+    /**
+     * Gets a reason code from the buffer
+     * @returns The decoded reason code
+     * @throws {DecoderError} If reason code is invalid
+     */
+    getReasonCode(): TReasonCode;
     /**
      * Checks if decoder has reached the end of the buffer
      * @returns True if at end, false otherwise

package/dist/mqttPacket/decoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../mqttPacket/decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAI/D;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CAIhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAIjD;AAED;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,GAAG,CAAS;IAEpB;;;;OAIG;gBACS,GAAG,EAAE,UAAU,EAAE,GAAG,GAAE,MAAU;IAM5C;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAM3B;;;OAGG;IACH,OAAO,IAAI,MAAM;IAKjB;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAMlB;;;OAGG;IACH,YAAY,IAAI,UAAU;IAS1B;;;OAGG;IACH,aAAa,IAAI,MAAM;IAKvB;;;;OAIG;IACH,QAAQ,IAAI,KAAK;IAUjB;;;;OAIG;IACH,cAAc,IAAI,WAAW;IAU7B;;;OAGG;IACH,YAAY;IAOZ;;;OAGG;IACH,KAAK,IAAI,OAAO;IAOhB;;;;OAIG;IACH,IAAI,IAAI,OAAO;CAMhB"}
+{"version":3,"file":"decoder.d.ts","sourceRoot":"","sources":["../../mqttPacket/decoder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,KAAK,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACX,cAAc,EACf,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAEV,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAazB;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,CAIhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAIjD;AAED;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,OAAO,EAAE,MAAM;CAI5B;AAED;;GAEG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,UAAU,CAAc;IAChC,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,GAAG,CAAS;IAEpB;;;;OAIG;gBACS,UAAU,EAAE,WAAW,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,GAAE,MAAU;IAOrE;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAM3B;;;OAGG;IACH,OAAO,IAAI,MAAM;IAKjB;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAMlB;;;OAGG;IACH,QAAQ,IAAI,MAAM;IAMlB;;;;;OAKG;IACH,sBAAsB,IAAI,MAAM;IAehC;;;OAGG;IACH,YAAY,IAAI,UAAU;IAS1B;;;OAGG;IACH,aAAa,IAAI,MAAM;IAKvB;;;OAGG;IACH,iBAAiB,IAAI,cAAc;IAMnC;;;;OAIG;IACH,QAAQ,IAAI,KAAK;IAUjB;;;;OAIG;IACH,cAAc,IAAI,WAAW;IAU7B;;;OAGG;IACH,YAAY;IAOZ;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAuBnB;;;;;;OAMG;IACH,aAAa,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAChD,eAAe,EAAE,CAAC,GACjB,oBAAoB,CAAC,CAAC,CAAC;IAkD1B;;;;OAIG;IACH,aAAa,IAAI,WAAW;IAQ5B;;;OAGG;IACH,KAAK,IAAI,OAAO;IAOhB;;;;OAIG;IACH,IAAI,IAAI,OAAO;CAMhB"}

package/dist/mqttPacket/decoder.js

@@ -1,5 +1,10 @@
 import { invalidTopic, invalidTopicFilter } from "./validators.js";
+import { isValidReasonCode } from "./ReasonCode.js";
+import { propertyByNumber, PropertyByPropertySetType, propertyKind, propertyToId, propertyToKind, } from "./Properties.js";
 const utf8Decoder = new TextDecoder("utf-8");
+const userPropID = propertyToId.userProperty;
+const subIdentID = propertyToId.subscriptionIdentifier;
+const subIdentsID = propertyToId.subscriptionIdentifiers;
 /**
  * Checks if a specific bit flag is set in a byte using a bitmask
  * @param byte - The byte to check
@@ -42,6 +47,7 @@ export class DecoderError extends Error {
  * Decoder class for parsing MQTT packets
  */
 export class Decoder {
+    packetType;
     buf;
     pos;
     len;
@@ -50,7 +56,8 @@ export class Decoder {
      * @param buf - The buffer to decode
      * @param pos - Starting position in the buffer (default: 0)
      */
-    constructor(buf, pos = 0) {
+    constructor(packetType, buf, pos = 0) {
+        this.packetType = packetType;
         this.buf = buf;
         this.pos = pos;
         this.len = buf.length;
@@ -82,6 +89,35 @@ export class Decoder {
         const lsb = this.getByte();
         return (msb << 8) | lsb;
     }
+    /**
+     * Gets a 4 byte integer from the buffer (for v5)
+     * @returns The 32 bit integer value
+     */
+    getInt32() {
+        const msb = this.getInt16();
+        const lsb = this.getInt16();
+        return (msb << 16) | lsb;
+    }
+    /**
+     * Gets a variable byte integer from the buffer (for v5)
+     * its like the length decoder in length.ts but this one works directly on the buffer
+     * @returns The decoded variable byte integer
+     * @throws {DecoderError} If malformed variable byte integer
+     */
+    getVariableByteInteger() {
+        let num = 0;
+        let multiplier = 1;
+        let byte;
+        do {
+            byte = this.getByte();
+            num += (byte & 127) * multiplier;
+            if (multiplier > 128 * 128 * 128) {
+                throw new DecoderError("Malformed Variable Byte Integer");
+            }
+            multiplier *= 128;
+        } while ((byte & 128) !== 0);
+        return num;
+    }
     /**
      * Gets a byte array from the buffer
      * @returns A subarray of the buffer
@@ -98,17 +134,26 @@ export class Decoder {
      * Gets a UTF-8 string from the buffer
      * @returns The decoded UTF-8 string
      */
-    getUtf8String() {
+    getUTF8String() {
         const str = utf8Decoder.decode(this.getByteArray());
         return str;
     }
+    /**
+     * Gets a UTF-8 string pair from the buffer (for v5)
+     * @returns The decoded UTF-8 pair as [name,value]
+     */
+    getUTF8StringPair() {
+        const name = utf8Decoder.decode(this.getByteArray());
+        const value = utf8Decoder.decode(this.getByteArray());
+        return [name, value];
+    }
     /**
      * Gets a topic from the buffer
      * @returns The decoded topic
      * @throws {DecoderError} If topic is invalid
      */
     getTopic() {
-        const topic = this.getUtf8String();
+        const topic = this.getUTF8String();
         if (invalidTopic(topic)) {
             throw new DecoderError("Topic must contain valid UTF-8 and contain more than 1 byte and no wildcards");
         }
@@ -120,7 +165,7 @@ export class Decoder {
      * @throws {DecoderError} If topic filter is invalid
      */
     getTopicFilter() {
-        const topicFilter = this.getUtf8String();
+        const topicFilter = this.getUTF8String();
         if (invalidTopicFilter(topicFilter)) {
             throw new DecoderError("Topicfilter must contain valid UTF-8 and contain more than 1 byte and valid wildcards");
         }
@@ -136,6 +181,92 @@ export class Decoder {
         this.pos = end;
         return this.buf.subarray(start, end);
     }
+    /**
+     * Gets a single property
+     * @param id
+     * @returns
+     */
+    getProperty(id) {
+        switch (propertyToKind[id]) {
+            case propertyKind.boolean:
+                return !!this.getByte();
+            case propertyKind.byte:
+                return this.getByte();
+            case propertyKind.int16:
+                return this.getInt16();
+            case propertyKind.int32:
+                return this.getInt32();
+            case propertyKind.varInt:
+                return this.getVariableByteInteger();
+            case propertyKind.byteArray:
+                return this.getByteArray();
+            case propertyKind.utf8string:
+                return this.getUTF8String();
+        }
+        // deno-coverage-ignore
+        throw new DecoderError("Invalid property kind");
+    }
+    /**
+     * Gets all properties from the buffer
+     * and validates if they are allowed for this type of packet
+     * @param propertySetType
+     * @returns
+     * @throws {DecoderError} If properties are invalid
+     */
+    getProperties(propertySetType) {
+        const allowedProps = PropertyByPropertySetType[propertySetType];
+        const properties = {};
+        const propLength = this.getVariableByteInteger();
+        const endPos = this.pos + propLength;
+        const userProps = [];
+        const subIdents = [];
+        while (this.pos < endPos) {
+            const id = this.getVariableByteInteger();
+            const label = propertyByNumber[id];
+            if (id === subIdentID && allowedProps.includes(subIdentsID)) {
+                subIdents.push(this.getVariableByteInteger());
+                continue;
+            }
+            if (!allowedProps.includes(id)) {
+                throw new DecoderError(`Property type ${label ? label : id} not allowed at byte ${this.pos}`);
+            }
+            if (id === userPropID) {
+                const stringPair = this.getUTF8StringPair();
+                userProps.push(stringPair);
+                continue;
+            }
+            const value = this.getProperty(id);
+            // deno-lint-ignore no-explicit-any
+            if (properties[label] !== undefined) {
+                throw new DecoderError(`Property ${label} only allowed once`);
+            }
+            else {
+                // deno-lint-ignore no-explicit-any
+                properties[label] = value;
+            }
+        }
+        if (userProps.length > 0) {
+            // deno-lint-ignore no-explicit-any
+            properties.userProperty = userProps;
+        }
+        if (subIdents.length > 0) {
+            // deno-lint-ignore no-explicit-any
+            properties.subscriptionIdentifiers = subIdents;
+        }
+        return properties;
+    }
+    /**
+     * Gets a reason code from the buffer
+     * @returns The decoded reason code
+     * @throws {DecoderError} If reason code is invalid
+     */
+    getReasonCode() {
+        const reasonCode = this.getByte();
+        if (!isValidReasonCode(this.packetType, reasonCode)) {
+            throw new DecoderError("Invalid reason code");
+        }
+        return reasonCode;
+    }
     /**
      * Checks if decoder has reached the end of the buffer
      * @returns True if at end, false otherwise

package/dist/mqttPacket/decoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../mqttPacket/decoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEnE,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AAC7C;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY,EAAE,IAAc;IACtD,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,GAAe;IACxC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,KAAa;IACzC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;QAChB,MAAM,IAAI,YAAY,CAAC,4BAA4B,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;IAC7B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,OAAO;IACV,GAAG,CAAa;IAChB,GAAG,CAAS;IACZ,GAAG,CAAS;IAEpB;;;;OAIG;IACH,YAAY,GAAe,EAAE,MAAc,CAAC;QAC1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC;IACxB,CAAC;IAED;;;;OAIG;IACH,QAAQ,CAAC,GAAW;QAClB,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,MAAM,IAAI,YAAY,CAAC,kBAAkB,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,QAAQ;QACN,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,YAAY;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAC3B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACpD,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;;;OAIG;IACH,QAAQ;QACN,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,YAAY,CACpB,8EAA8E,CAC/E,CAAC;QACJ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACzC,IAAI,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,YAAY,CACpB,uFAAuF,CACxF,CAAC;QACJ,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,YAAY;QACV,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,IAAI,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;CACF"}
+{"version":3,"file":"decoder.js","sourceRoot":"","sources":["../../mqttPacket/decoder.ts"],"names":[],"mappings":"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"}

package/dist/mqttPacket/disconnect.d.ts

@@ -1,16 +1,22 @@
-import type { TPacketType } from "./types.ts";
+import type { CodecOpts, ProtocolLevelNoV5, TPacketType, TReasonCode } from "./types.ts";
+import type { DisconnectProperties } from "./Properties.ts";
+export type DisconnectPacketv4 = {
+    type: TPacketType;
+    protocolLevel: ProtocolLevelNoV5;
+};
+export type DisconnectPacketv5 = {
+    type: TPacketType;
+    protocolLevel: 5;
+    reasonCode: TReasonCode;
+    properties?: DisconnectProperties;
+};
 /**
  * DisconnectPacket is the final control packet sent from the client to the server.
  * It indicates that the client is disconnecting cleanly.
  */
-export type DisconnectPacket = {
-    type: TPacketType;
-};
+export type DisconnectPacket = DisconnectPacketv4 | DisconnectPacketv5;
 export declare const disconnect: {
-    encode(_packet: DisconnectPacket): {
-        flags: number;
-        bytes: number[];
-    };
-    decode(buffer: Uint8Array, _flags: number): DisconnectPacket;
+    encode(_packet: DisconnectPacket, _codecOpts: CodecOpts): Uint8Array;
+    decode(buffer: Uint8Array, _flags: number, codecOpts: CodecOpts, packetType: TPacketType): DisconnectPacket;
 };
 //# sourceMappingURL=disconnect.d.ts.map

package/dist/mqttPacket/disconnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"disconnect.d.ts","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE;IACvB,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACtE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC;CAa9D,CAAC"}
+{"version":3,"file":"disconnect.d.ts","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EACT,iBAAiB,EACjB,WAAW,EACX,WAAW,EACZ,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAI5D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,CAAC,EAAE,oBAAoB,CAAC;CACnC,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,gBAAgB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAIvE,eAAO,MAAM,UAAU,EAAE;IACvB,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,SAAS,GAAG,UAAU,CAAC;IACrE,MAAM,CACJ,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,WAAW,GACtB,gBAAgB,CAAC;CA4DrB,CAAC"}

package/dist/mqttPacket/disconnect.js

@@ -1,14 +1,53 @@
 import { PacketType } from "./PacketType.js";
-import { isEmptyBuf } from "./decoder.js";
+import { Decoder, hasEmptyFlags, isEmptyBuf } from "./decoder.js";
+import { Encoder } from "./encoder.js";
+import { ReasonCode } from "./ReasonCode.js";
+const DISCONNECT_PACKET = new Uint8Array([PacketType.disconnect << 4, 0]);
 export const disconnect = {
-    encode(_packet) {
-        const flags = 0;
-        return { flags, bytes: [] };
+    encode(packet, codecOpts) {
+        if (packet.protocolLevel !== 5) {
+            return DISCONNECT_PACKET;
+        }
+        const reasonCode = packet.reasonCode || ReasonCode.normalDisconnection;
+        const encoder = new Encoder(packet.type);
+        // see MQTT v5 3.14.2.1
+        // if remaining length is less than 1 the value of 0x00 (normal disconnect) is used.
+        if (reasonCode === ReasonCode.normalDisconnection &&
+            Object.keys(packet.properties || {}).length === 0) {
+            return encoder.done(0);
+        }
+        encoder
+            .setReasonCode(reasonCode);
+        if (packet.properties) {
+            encoder.setProperties(packet.properties, packet.type, codecOpts.maxOutgoingPacketSize);
+        }
+        return encoder.done(0);
     },
-    decode(buffer, _flags) {
-        isEmptyBuf(buffer);
+    decode(buffer, flags, codecOpts, packetType) {
+        hasEmptyFlags(flags);
+        if (codecOpts.protocolLevel !== 5) {
+            isEmptyBuf(buffer);
+            return {
+                type: PacketType.disconnect,
+                protocolLevel: codecOpts.protocolLevel,
+            };
+        }
+        const decoder = new Decoder(packetType, buffer);
+        if (decoder.atEnd()) {
+            return {
+                type: PacketType.disconnect,
+                protocolLevel: 5,
+                reasonCode: 0,
+            };
+        }
+        const reasonCode = decoder.getReasonCode();
+        const properties = decoder.getProperties(PacketType.disconnect);
+        decoder.done();
         return {
             type: PacketType.disconnect,
+            protocolLevel: 5,
+            reasonCode,
+            properties,
         };
     },
 };

package/dist/mqttPacket/disconnect.js.map

@@ -1 +1 @@
-{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAW1C,MAAM,CAAC,MAAM,UAAU,GAGnB;IACF,MAAM,CAAC,OAAyB;QAC9B,MAAM,KAAK,GAAG,CAAC,CAAC;QAChB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,MAAkB,EAAE,MAAc;QACvC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnB,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"disconnect.js","sourceRoot":"","sources":["../../mqttPacket/disconnect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAQlE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAoB7C,MAAM,iBAAiB,GAAG,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,UAAU,GAQnB;IACF,MAAM,CAAC,MAAwB,EAAE,SAAoB;QACnD,IAAI,MAAM,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,UAAU,CAAC,mBAAmB,CAAC;QACvE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,uBAAuB;QACvB,oFAAoF;QACpF,IACE,UAAU,KAAK,UAAU,CAAC,mBAAmB;YAC7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,EACjD,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,OAAO;aACJ,aAAa,CAAC,UAAU,CAAC,CAAC;QAC7B,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO,CAAC,aAAa,CACnB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,IAAI,EACX,SAAS,CAAC,qBAAqB,CAChC,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,MAAM,CACJ,MAAkB,EAClB,KAAa,EACb,SAAS,EACT,UAAuB;QAEvB,aAAa,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE,CAAC;YAClC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,UAAU;gBAC3B,aAAa,EAAE,SAAS,CAAC,aAAa;aACvC,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,UAAU;gBAC3B,aAAa,EAAE,CAAC;gBAChB,UAAU,EAAE,CAAC;aACd,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAChE,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,UAAU;YAC3B,aAAa,EAAE,CAAC;YAChB,UAAU;YACV,UAAU;SACX,CAAC;IACJ,CAAC;CACF,CAAC"}