aws-crt - npm Package Compare versions

Comparing version 1.21.8 to 1.22.0

dist.browser/browser/mqtt.js

@@ -289,3 +289,3 @@ "use strict";
             topic: _this.config.will.topic,
-            payload: (0, mqtt_shared_1.normalize_payload)(_this.config.will.payload),
+            payload: (0, mqtt_shared_1.normalize_payload_to_buffer)(_this.config.will.payload),
             qos: _this.config.will.qos,
@@ -479,2 +479,12 @@ retain: _this.config.will.retain,
                             var sub = packet[0];
+                            /*
+                             * 128 is not modeled in QoS, either on our side nor mqtt-js's side.
+                             * We have always passed this 128 to the user and it is not reasonable to extend
+                             * our output type with 128 since it's also our input type and we don't want anyone
+                             * to pass 128 to us.
+                             *
+                             * The 5 client solves this by making the output type a completely separate enum.
+                             *
+                             * By doing this cast, we make the type checker ignore this edge case.
+                             */
                             resolve({ topic: sub.topic, qos: sub.qos });
@@ -481,0 +491,0 @@ });

dist.browser/browser/mqtt5_utils.d.ts

@@ -6,2 +6,3 @@ /**
 import * as mqtt from "mqtt";
+import * as mqtt_packet from "mqtt-packet";
 import * as mqtt5 from "./mqtt5";
@@ -26,5 +27,5 @@ export declare const MAXIMUM_VARIABLE_LENGTH_INTEGER: number;
 /** @internal */
-export declare function transform_crt_user_properties_to_mqtt_js_user_properties(userProperties?: mqtt5.UserProperty[]): mqtt.UserProperties | undefined;
+export declare function transform_crt_user_properties_to_mqtt_js_user_properties(userProperties?: mqtt5.UserProperty[]): mqtt_packet.UserProperties | undefined;
 /** @internal */
-export declare function transform_mqtt_js_user_properties_to_crt_user_properties(userProperties?: mqtt.UserProperties): mqtt5.UserProperty[] | undefined;
+export declare function transform_mqtt_js_user_properties_to_crt_user_properties(userProperties?: mqtt_packet.UserProperties): mqtt5.UserProperty[] | undefined;
 /** @internal */
@@ -39,2 +40,4 @@ export declare function transform_crt_disconnect_to_mqtt_js_disconnect(disconnect: mqtt5.DisconnectPacket): mqtt.IDisconnectPacket;
 /** @internal **/
+export declare function transform_mqtt_js_suback_to_crt_suback(mqttJsSuback: mqtt_packet.ISubackPacket): mqtt5.SubackPacket;
+/** @internal **/
 export declare function transform_mqtt_js_subscription_grants_to_crt_suback(subscriptionsGranted: mqtt.ISubscriptionGrant[]): mqtt5.SubackPacket;
@@ -46,6 +49,6 @@ /** @internal */
 /** @internal **/
-export declare function transform_mqtt_js_puback_to_crt_puback(puback: mqtt.IPubackPacket): mqtt5.PubackPacket;
+export declare function transform_mqtt_js_puback_to_crt_puback(puback: mqtt_packet.IPubackPacket): mqtt5.PubackPacket;
 /** @internal **/
-export declare function transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options(unsubscribe: mqtt5.UnsubscribePacket): Object;
+export declare function transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options(unsubscribe: mqtt5.UnsubscribePacket): any;
 /** @internal **/
-export declare function transform_mqtt_js_unsuback_to_crt_unsuback(packet: mqtt.IUnsubackPacket): mqtt5.UnsubackPacket;
+export declare function transform_mqtt_js_unsuback_to_crt_unsuback(packet: mqtt_packet.IUnsubackPacket): mqtt5.UnsubackPacket;

dist.browser/browser/mqtt5_utils.js

@@ -57,3 +57,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transform_mqtt_js_unsuback_to_crt_unsuback = exports.transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options = exports.transform_mqtt_js_puback_to_crt_puback = exports.transform_mqtt_js_publish_to_crt_publish = exports.transform_crt_publish_to_mqtt_js_publish_options = exports.transform_mqtt_js_subscription_grants_to_crt_suback = exports.transform_crt_subscribe_to_mqtt_js_subscribe_options = exports.transform_crt_subscribe_to_mqtt_js_subscription_map = exports.transform_mqtt_js_disconnect_to_crt_disconnect = exports.transform_crt_disconnect_to_mqtt_js_disconnect = exports.transform_mqtt_js_user_properties_to_crt_user_properties = exports.transform_crt_user_properties_to_mqtt_js_user_properties = exports.create_mqtt_js_client_config_from_crt_client_config = exports.compute_mqtt_js_reconnect_delay_from_crt_max_delay = exports.getOrderedReconnectDelayBounds = exports.create_negotiated_settings = exports.transform_mqtt_js_connack_to_crt_connack = exports.DEFAULT_MIN_CONNECTED_TIME_TO_RESET_RECONNECT_DELAY_MS = exports.DEFAULT_MAX_RECONNECT_DELAY_MS = exports.DEFAULT_MIN_RECONNECT_DELAY_MS = exports.DEFAULT_CONNECT_TIMEOUT_MS = exports.DEFAULT_RECEIVE_MAXIMUM = exports.MAXIMUM_PACKET_SIZE = exports.MAXIMUM_VARIABLE_LENGTH_INTEGER = void 0;
+exports.transform_mqtt_js_unsuback_to_crt_unsuback = exports.transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options = exports.transform_mqtt_js_puback_to_crt_puback = exports.transform_mqtt_js_publish_to_crt_publish = exports.transform_crt_publish_to_mqtt_js_publish_options = exports.transform_mqtt_js_subscription_grants_to_crt_suback = exports.transform_mqtt_js_suback_to_crt_suback = exports.transform_crt_subscribe_to_mqtt_js_subscribe_options = exports.transform_crt_subscribe_to_mqtt_js_subscription_map = exports.transform_mqtt_js_disconnect_to_crt_disconnect = exports.transform_crt_disconnect_to_mqtt_js_disconnect = exports.transform_mqtt_js_user_properties_to_crt_user_properties = exports.transform_crt_user_properties_to_mqtt_js_user_properties = exports.create_mqtt_js_client_config_from_crt_client_config = exports.compute_mqtt_js_reconnect_delay_from_crt_max_delay = exports.getOrderedReconnectDelayBounds = exports.create_negotiated_settings = exports.transform_mqtt_js_connack_to_crt_connack = exports.DEFAULT_MIN_CONNECTED_TIME_TO_RESET_RECONNECT_DELAY_MS = exports.DEFAULT_MAX_RECONNECT_DELAY_MS = exports.DEFAULT_MIN_RECONNECT_DELAY_MS = exports.DEFAULT_CONNECT_TIMEOUT_MS = exports.DEFAULT_RECEIVE_MAXIMUM = exports.MAXIMUM_PACKET_SIZE = exports.MAXIMUM_VARIABLE_LENGTH_INTEGER = void 0;
 var mqtt_shared = __importStar(require("../common/mqtt_shared"));
@@ -145,3 +145,3 @@ var mqtt5 = __importStar(require("./mqtt5"));
         topic: crtWill.topicName,
-        payload: (_a = crtWill.payload) !== null && _a !== void 0 ? _a : "",
+        payload: (_a = crtWill.payload) !== null && _a !== void 0 ? _a : mqtt_shared.normalize_payload_to_buffer(""),
         qos: crtWill.qos,
@@ -448,2 +448,19 @@ retain: (_b = crtWill.retain) !== null && _b !== void 0 ? _b : false
 /** @internal **/
+function transform_mqtt_js_suback_to_crt_suback(mqttJsSuback) {
+    var _a, _b;
+    if (!mqttJsSuback) {
+        throw new error_1.CrtError("transform_mqtt_js_suback_to_crt_suback: mqttJsSuback not defined");
+    }
+    var crtSuback = {
+        type: mqtt5.PacketType.Suback,
+        reasonCodes: mqttJsSuback.granted.map(function (value, index, array) { return value; }),
+    };
+    if (mqttJsSuback.properties) {
+        utils.set_defined_property(crtSuback, "reasonString", (_a = mqttJsSuback.properties) === null || _a === void 0 ? void 0 : _a.reasonString);
+        utils.set_defined_property(crtSuback, "userProperties", transform_mqtt_js_user_properties_to_crt_user_properties((_b = mqttJsSuback.properties) === null || _b === void 0 ? void 0 : _b.userProperties));
+    }
+    return crtSuback;
+}
+exports.transform_mqtt_js_suback_to_crt_suback = transform_mqtt_js_suback_to_crt_suback;
+/** @internal **/
 function transform_mqtt_js_subscription_grants_to_crt_suback(subscriptionsGranted) {
@@ -571,16 +588,5 @@ if (subscriptionsGranted == null || subscriptionsGranted == undefined) {
     }
-    var reasonCodes = packet.reasonCode;
-    var codes;
-    if (Array.isArray(reasonCodes)) {
-        codes = reasonCodes;
-    }
-    else if (typeof reasonCodes == 'number') {
-        codes = [reasonCodes];
-    }
-    else {
-        codes = [];
-    }
     var crtUnsuback = {
         type: mqtt5.PacketType.Unsuback,
-        reasonCodes: codes
+        reasonCodes: packet.granted
     };
@@ -587,0 +593,0 @@ if (packet.properties) {

dist.browser/browser/mqtt5.js

@@ -392,4 +392,3 @@ "use strict";
                             var subOptions = mqtt_utils.transform_crt_subscribe_to_mqtt_js_subscribe_options(packet);
-                            // @ts-ignore
-                            _this.browserClient.subscribe(subMap, subOptions, function (error, grants) {
+                            _this.browserClient.subscribe(subMap, subOptions, function (error, grants, suback) {
                                 if (error) {
@@ -399,4 +398,10 @@ reject(error);
                                 }
-                                var suback = mqtt_utils.transform_mqtt_js_subscription_grants_to_crt_suback(grants);
-                                resolve(suback);
+                                if (suback) {
+                                    var crtSubackFromMqttjsSuback = mqtt_utils.transform_mqtt_js_suback_to_crt_suback(suback);
+                                    resolve(crtSubackFromMqttjsSuback);
+                                }
+                                else {
+                                    var crtSubackFromGrants = mqtt_utils.transform_mqtt_js_subscription_grants_to_crt_suback(grants !== null && grants !== void 0 ? grants : []);
+                                    resolve(crtSubackFromGrants);
+                                }
                             });
@@ -403,0 +408,0 @@ }

dist.browser/common/mqtt_shared.d.ts

@@ -11,3 +11,9 @@ /// <reference types="node" />
 export declare function normalize_payload(payload: any): Buffer | string;
+/**
+ * Converts payload to Buffer only, regardless of the supplied type
+ * @param payload The payload to convert
+ * @internal
+ */
+export declare function normalize_payload_to_buffer(payload: any): Buffer;
 /** @internal */
 export declare const DEFAULT_KEEP_ALIVE: number;

dist.browser/common/mqtt_shared.js

@@ -7,3 +7,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_KEEP_ALIVE = exports.normalize_payload = void 0;
+exports.DEFAULT_KEEP_ALIVE = exports.normalize_payload_to_buffer = exports.normalize_payload = void 0;
 /**
@@ -45,4 +45,18 @@ * @packageDocumentation
 exports.normalize_payload = normalize_payload;
+/**
+ * Converts payload to Buffer only, regardless of the supplied type
+ * @param payload The payload to convert
+ * @internal
+ */
+function normalize_payload_to_buffer(payload) {
+    var normalized = normalize_payload(payload);
+    if (typeof normalized === 'string') {
+        // pass string through
+        return Buffer.from(normalized);
+    }
+    return normalized;
+}
+exports.normalize_payload_to_buffer = normalize_payload_to_buffer;
 /** @internal */
 exports.DEFAULT_KEEP_ALIVE = 1200;
 //# sourceMappingURL=mqtt_shared.js.map

dist/common/mqtt_shared.d.ts

@@ -11,3 +11,9 @@ /// <reference types="node" />
 export declare function normalize_payload(payload: any): Buffer | string;
+/**
+ * Converts payload to Buffer only, regardless of the supplied type
+ * @param payload The payload to convert
+ * @internal
+ */
+export declare function normalize_payload_to_buffer(payload: any): Buffer;
 /** @internal */
 export declare const DEFAULT_KEEP_ALIVE: number;

dist/common/mqtt_shared.js

@@ -7,3 +7,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_KEEP_ALIVE = exports.normalize_payload = void 0;
+exports.DEFAULT_KEEP_ALIVE = exports.normalize_payload_to_buffer = exports.normalize_payload = void 0;
 /**
@@ -45,4 +45,18 @@ * @packageDocumentation
 exports.normalize_payload = normalize_payload;
+/**
+ * Converts payload to Buffer only, regardless of the supplied type
+ * @param payload The payload to convert
+ * @internal
+ */
+function normalize_payload_to_buffer(payload) {
+    let normalized = normalize_payload(payload);
+    if (typeof normalized === 'string') {
+        // pass string through
+        return Buffer.from(normalized);
+    }
+    return normalized;
+}
+exports.normalize_payload_to_buffer = normalize_payload_to_buffer;
 /** @internal */
 exports.DEFAULT_KEEP_ALIVE = 1200;
 //# sourceMappingURL=mqtt_shared.js.map

lib/browser/mqtt.ts

@@ -16,2 +16,3 @@ /*
 import * as mqtt from "mqtt";
+import * as mqtt_packet from "mqtt-packet";
 import * as WebsocketUtils from "./ws";
@@ -40,3 +41,3 @@ import * as auth from "./auth";
 } from "../common/mqtt";
-import { normalize_payload } from "../common/mqtt_shared";
+import {normalize_payload, normalize_payload_to_buffer} from "../common/mqtt_shared";
 
@@ -315,3 +316,3 @@ export {
             topic: this.config.will.topic,
-            payload: normalize_payload(this.config.will.payload),
+            payload: normalize_payload_to_buffer(this.config.will.payload),
             qos: this.config.will.qos,
@@ -582,3 +583,14 @@ retain: this.config.will.retain,
                 const sub = (packet as mqtt.ISubscriptionGrant[])[0];
-                resolve({ topic: sub.topic, qos: sub.qos });
+
+                /*
+                 * 128 is not modeled in QoS, either on our side nor mqtt-js's side.
+                 * We have always passed this 128 to the user and it is not reasonable to extend
+                 * our output type with 128 since it's also our input type and we don't want anyone
+                 * to pass 128 to us.
+                 *
+                 * The 5 client solves this by making the output type a completely separate enum.
+                 *
+                 * By doing this cast, we make the type checker ignore this edge case.
+                 */
+                resolve({ topic: sub.topic, qos: sub.qos as QoS });
             });
@@ -610,3 +622,3 @@ });
                     packet_id: packet
-                        ? (packet as mqtt.IUnsubackPacket).messageId
+                        ? (packet as mqtt_packet.IUnsubackPacket).messageId
                         : undefined,
@@ -613,0 +625,0 @@ });

lib/browser/mqtt5_utils.spec.ts

@@ -7,2 +7,3 @@ /*
 import * as mqtt from "mqtt";
+import * as mqtt_packet from "mqtt-packet";
 import * as mqtt5 from "./mqtt5";
@@ -12,2 +13,3 @@ import {InboundTopicAliasBehaviorType, OutboundTopicAliasBehaviorType} from "./mqtt5";
 import * as mqtt_shared from "../common/mqtt_shared";
+import {normalize_payload_to_buffer} from "../common/mqtt_shared";
 
@@ -22,3 +24,3 @@
 test('MQTT.JS User Properties to CRT User Properties single', async () => {
-    let mqttJsUserProperties : mqtt.UserProperties = {
+    let mqttJsUserProperties : mqtt_packet.UserProperties = {
         prop1 : "value1",
@@ -46,3 +48,3 @@ prop2 : "value2"
 test('MQTT.JS User Properties to CRT User Properties multi', async () => {
-    let mqttJsUserProperties : mqtt.UserProperties = {
+    let mqttJsUserProperties : mqtt_packet.UserProperties = {
         prop1 : "value1",
@@ -78,3 +80,3 @@ prop2 : ["value2_1", "value2_2", "value2_3"]
 test('CRT User Properties to MQTT.js User Properties undefined', async () => {
-    let mqttJsUserProperties : mqtt.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(undefined);
+    let mqttJsUserProperties : mqtt_packet.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(undefined);
 
@@ -90,3 +92,3 @@ expect(mqttJsUserProperties).toBeUndefined();
 
-    let mqttJsUserProperties : mqtt.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(crtUserProperties);
+    let mqttJsUserProperties : mqtt_packet.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(crtUserProperties);
 
@@ -108,5 +110,5 @@ expect(mqttJsUserProperties).toEqual(
 
-    let mqttJsUserProperties : mqtt.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(crtUserProperties);
+    let mqttJsUserProperties : mqtt_packet.UserProperties | undefined = mqtt5_utils.transform_crt_user_properties_to_mqtt_js_user_properties(crtUserProperties);
     expect(mqttJsUserProperties).toBeDefined();
-    let definedProperties : mqtt.UserProperties = mqttJsUserProperties ?? {};
+    let definedProperties : mqtt_packet.UserProperties = mqttJsUserProperties ?? {};
 
@@ -425,3 +427,3 @@ const {prop1 : propOne, prop2: propTwo, ...rest} = definedProperties;
         topic : "Ohno",
-        payload : "",
+        payload : normalize_payload_to_buffer(""),
         qos : mqtt5.QoS.AtLeastOnce,
@@ -649,4 +651,2 @@ retain : false
 
-//function transform_crt_subscribe_to_mqtt_js_subscribe_options(subscribe: mqtt5.SubscribePacket) : mqtt.IClientSubscribeOptions
-
 test('transform_crt_subscribe_to_mqtt_js_subscribe_options minimal', async() => {
@@ -704,3 +704,3 @@ let subscribe : mqtt5.SubscribePacket = {
             topic: "a/different/topic",
-            qos: mqtt5.SubackReasonCode.NotAuthorized,
+            qos: mqtt5.SubackReasonCode.UnspecifiedError,
             nl: true,
@@ -716,6 +716,44 @@ rap: true,
         type: mqtt5.PacketType.Suback,
-        reasonCodes: [2, mqtt5.SubackReasonCode.NotAuthorized]
+        reasonCodes: [2, mqtt5.SubackReasonCode.UnspecifiedError]
     });
 });
 
+test('transform_mqtt_js_suback_to_crt_suback - minimal', async() => {
+    let mqttJsSuback : mqtt_packet.ISubackPacket = {
+        cmd: "suback",
+        granted: [1]
+    };
+
+    let suback : mqtt5.SubackPacket = mqtt5_utils.transform_mqtt_js_suback_to_crt_suback(mqttJsSuback);
+
+    expect(suback).toEqual({
+        type: mqtt5.PacketType.Suback,
+        reasonCodes: [mqtt5.SubackReasonCode.GrantedQoS1]
+    });
+});
+
+test('transform_mqtt_js_suback_to_crt_suback - maximal', async() => {
+    let mqttJsSuback : mqtt_packet.ISubackPacket = {
+        cmd: "suback",
+        granted: [2, 128],
+        properties : {
+            reasonString: "Misadventure",
+            userProperties: {
+                world: ["hello"]
+            }
+        }
+    };
+
+    let suback : mqtt5.SubackPacket = mqtt5_utils.transform_mqtt_js_suback_to_crt_suback(mqttJsSuback);
+
+    expect(suback).toEqual({
+        type: mqtt5.PacketType.Suback,
+        reasonCodes: [mqtt5.SubackReasonCode.GrantedQoS2, mqtt5.SubackReasonCode.UnspecifiedError],
+        reasonString: "Misadventure",
+        userProperties: [
+            {name: "world", value: "hello"}
+        ]
+    });
+});
+
 test('transform_crt_publish_to_mqtt_js_publish_options minimal', async() => {
@@ -841,3 +879,3 @@ let publish : mqtt5.PublishPacket = {
 test('transform_mqtt_js_puback_to_crt_puback minimal', async() => {
-    let mqttJsPuback : mqtt.IPubackPacket = {
+    let mqttJsPuback : mqtt_packet.IPubackPacket = {
         cmd: 'puback'
@@ -855,3 +893,3 @@ };
 test('transform_mqtt_js_puback_to_crt_puback maximal', async() => {
-    let mqttJsPuback : mqtt.IPubackPacket = {
+    let mqttJsPuback : mqtt_packet.IPubackPacket = {
         cmd: 'puback',
@@ -909,5 +947,5 @@ reasonCode: mqtt5.PubackReasonCode.NotAuthorized,
 test('transform_mqtt_js_unsuback_to_crt_unsuback minimal', async() => {
-    let mqttJsUnsuback : mqtt.IUnsubackPacket = {
+    let mqttJsUnsuback : mqtt_packet.IUnsubackPacket = {
         cmd: 'unsuback',
-        reasonCode: mqtt5.UnsubackReasonCode.NoSubscriptionExisted
+        granted: [mqtt5.UnsubackReasonCode.NoSubscriptionExisted]
     };
@@ -924,6 +962,5 @@
 test('transform_mqtt_js_unsuback_to_crt_unsuback maximal', async() => {
-    let mqttJsUnsuback : mqtt.IUnsubackPacket = {
+    let mqttJsUnsuback : mqtt_packet.IUnsubackPacket = {
         cmd: 'unsuback',
-        // @ts-ignore
-        reasonCode: [mqtt5.UnsubackReasonCode.NoSubscriptionExisted, mqtt5.UnsubackReasonCode.ImplementationSpecificError],
+        granted: [mqtt5.UnsubackReasonCode.NoSubscriptionExisted, mqtt5.UnsubackReasonCode.ImplementationSpecificError],
         properties: {
@@ -930,0 +967,0 @@ reasonString: "Dunno",

lib/browser/mqtt5_utils.ts

@@ -8,2 +8,3 @@
 import * as mqtt from "mqtt";
+import * as mqtt_packet from "mqtt-packet";
 import * as mqtt_shared from "../common/mqtt_shared";
@@ -101,3 +102,3 @@ import * as mqtt5 from "./mqtt5";
         topic: crtWill.topicName,
-        payload: crtWill.payload ?? "",
+        payload: crtWill.payload ?? mqtt_shared.normalize_payload_to_buffer(""),
         qos: crtWill.qos,
@@ -256,3 +257,3 @@ retain: crtWill.retain ?? false
 /** @internal */
-export function transform_crt_user_properties_to_mqtt_js_user_properties(userProperties?: mqtt5.UserProperty[]) : mqtt.UserProperties | undefined {
+export function transform_crt_user_properties_to_mqtt_js_user_properties(userProperties?: mqtt5.UserProperty[]) : mqtt_packet.UserProperties | undefined {
     if (!userProperties) {
@@ -280,3 +281,3 @@ return undefined;
 /** @internal */
-export function transform_mqtt_js_user_properties_to_crt_user_properties(userProperties?: mqtt.UserProperties) : mqtt5.UserProperty[] | undefined {
+export function transform_mqtt_js_user_properties_to_crt_user_properties(userProperties?: mqtt_packet.UserProperties) : mqtt5.UserProperty[] | undefined {
     if (!userProperties) {
@@ -409,2 +410,21 @@ return undefined;
 /** @internal **/
+export function transform_mqtt_js_suback_to_crt_suback(mqttJsSuback: mqtt_packet.ISubackPacket) : mqtt5.SubackPacket {
+    if (!mqttJsSuback) {
+        throw new CrtError("transform_mqtt_js_suback_to_crt_suback: mqttJsSuback not defined");
+    }
+
+    let crtSuback : mqtt5.SubackPacket = {
+        type: mqtt5.PacketType.Suback,
+        reasonCodes : mqttJsSuback.granted.map((value, index, array) : mqtt5.SubackReasonCode => { return value as mqtt5.SubackReasonCode; }),
+    };
+
+    if (mqttJsSuback.properties) {
+        utils.set_defined_property(crtSuback, "reasonString", mqttJsSuback.properties?.reasonString);
+        utils.set_defined_property(crtSuback, "userProperties", transform_mqtt_js_user_properties_to_crt_user_properties(mqttJsSuback.properties?.userProperties));
+    }
+
+    return crtSuback;
+}
+
+/** @internal **/
 export function transform_mqtt_js_subscription_grants_to_crt_suback(subscriptionsGranted: mqtt.ISubscriptionGrant[]) : mqtt5.SubackPacket {
@@ -498,3 +518,3 @@
             if (subIdsType == 'number') {
-                crtPublish["subscriptionIdentifiers"] = [subIds];
+                crtPublish["subscriptionIdentifiers"] = [subIds as number];
             } else if (Array.isArray(subIds)) {
@@ -510,3 +530,3 @@ crtPublish["subscriptionIdentifiers"] = subIds;
 /** @internal **/
-export function transform_mqtt_js_puback_to_crt_puback(puback: mqtt.IPubackPacket) : mqtt5.PubackPacket {
+export function transform_mqtt_js_puback_to_crt_puback(puback: mqtt_packet.IPubackPacket) : mqtt5.PubackPacket {
 
@@ -531,3 +551,3 @@ if (puback == null || puback == undefined) {
 /** @internal **/
-export function transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options(unsubscribe: mqtt5.UnsubscribePacket) : Object {
+export function transform_crt_unsubscribe_to_mqtt_js_unsubscribe_options(unsubscribe: mqtt5.UnsubscribePacket) : any {
 
@@ -553,3 +573,3 @@ if (unsubscribe == null || unsubscribe == undefined) {
 /** @internal **/
-export function transform_mqtt_js_unsuback_to_crt_unsuback(packet: mqtt.IUnsubackPacket) : mqtt5.UnsubackPacket {
+export function transform_mqtt_js_unsuback_to_crt_unsuback(packet: mqtt_packet.IUnsubackPacket) : mqtt5.UnsubackPacket {
 
@@ -560,16 +580,5 @@ if (packet == null || packet == undefined) {
 
-    let reasonCodes : number | number[] | undefined = packet.reasonCode;
-
-    let codes : number[];
-    if (Array.isArray(reasonCodes)) {
-        codes = reasonCodes;
-    } else if (typeof reasonCodes == 'number') {
-        codes = [reasonCodes];
-    } else {
-        codes = [];
-    }
-
     let crtUnsuback : mqtt5.UnsubackPacket = {
         type: mqtt5.PacketType.Unsuback,
-        reasonCodes : codes
+        reasonCodes : packet.granted
     }
@@ -576,0 +585,0 @@

lib/browser/mqtt5.spec.ts

@@ -13,3 +13,3 @@ /*
 
-jest.setTimeout(10000);
+jest.setTimeout(1000000);
 
@@ -409,3 +409,3 @@ function createBrowserSpecificTestConfig (testType: test_utils.SuccessfulConnectionTestType) : mqtt5.Mqtt5ClientConfig {
 
-test_utils.conditional_test(test_utils.ClientEnvironmentalConfig.hasIotCoreEnvironment())('Sub - Pub QoS 0 - Unsub', async () => {
+test('Sub - Pub QoS 0 - Unsub', async () => {
     let topic : string = `test/${uuid()}`;
@@ -412,0 +412,0 @@ let testPayload : Buffer = Buffer.from("Derp", "utf-8");

lib/browser/mqtt5.ts

@@ -19,2 +19,3 @@ /*
 import * as mqtt from "mqtt"; /* The mqtt-js external dependency */
+import * as mqtt_packet from "mqtt-packet";
 import * as mqtt5 from "../common/mqtt5";
@@ -449,4 +450,3 @@ import {OutboundTopicAliasBehaviorType} from "../common/mqtt5";
 
-                // @ts-ignore
-                this.browserClient.subscribe(subMap, subOptions, (error, grants) => {
+                this.browserClient.subscribe(subMap, subOptions, (error, grants, suback) => {
                     if (error) {
@@ -457,4 +457,9 @@ reject(error);
 
-                    const suback: mqtt5_packet.SubackPacket = mqtt_utils.transform_mqtt_js_subscription_grants_to_crt_suback(grants);
-                    resolve(suback);
+                    if (suback) {
+                        const crtSubackFromMqttjsSuback = mqtt_utils.transform_mqtt_js_suback_to_crt_suback(suback);
+                        resolve(crtSubackFromMqttjsSuback);
+                    } else {
+                        const crtSubackFromGrants: mqtt5_packet.SubackPacket = mqtt_utils.transform_mqtt_js_subscription_grants_to_crt_suback(grants ?? []);
+                        resolve(crtSubackFromGrants);
+                    }
                 });
@@ -511,3 +516,3 @@ } catch (err) {
                     } else {
-                        const unsuback: mqtt5_packet.UnsubackPacket = mqtt_utils.transform_mqtt_js_unsuback_to_crt_unsuback(packet as mqtt.IUnsubackPacket);
+                        const unsuback: mqtt5_packet.UnsubackPacket = mqtt_utils.transform_mqtt_js_unsuback_to_crt_unsuback(packet as mqtt_packet.IUnsubackPacket);
                         resolve(unsuback);
@@ -614,3 +619,3 @@ }
 
-                            const puback: mqtt5_packet.PubackPacket = mqtt_utils.transform_mqtt_js_puback_to_crt_puback(completionPacket as mqtt.IPubackPacket);
+                            const puback: mqtt5_packet.PubackPacket = mqtt_utils.transform_mqtt_js_puback_to_crt_puback(completionPacket as mqtt_packet.IPubackPacket);
                             resolve(puback);
@@ -897,2 +902,2 @@ break;
     }
-}
+}

lib/common/mqtt_shared.ts

@@ -46,3 +46,18 @@ /*
 
+/**
+ * Converts payload to Buffer only, regardless of the supplied type
+ * @param payload The payload to convert
+ * @internal
+ */
+export function normalize_payload_to_buffer(payload: any): Buffer {
+    let normalized = normalize_payload(payload);
+    if (typeof normalized === 'string') {
+        // pass string through
+        return Buffer.from(normalized);
+    }
+
+    return normalized;
+}
+
 /** @internal */
 export const DEFAULT_KEEP_ALIVE : number = 1200;

package.json

 {
   "name": "aws-crt",
-  "version": "1.21.8",
+  "version": "1.22.0",
   "description": "NodeJS/browser bindings to the aws-c-* libraries",
@@ -31,3 +31,3 @@ "homepage": "https://github.com/awslabs/aws-crt-nodejs",
     "@types/jest": "^27.0.1",
-    "@types/node": "^10.17.54",
+    "@types/node": "^14.18.63",
     "@types/prettier": "2.6.0",
@@ -58,5 +58,5 @@ "@types/puppeteer": "^5.4.7",
     "crypto-js": "^4.2.0",
-    "mqtt": "^4.3.8",
+    "mqtt": "^5.9.1",
     "process": "^0.11.10"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

24662291

increased by0.01%

Lines of code

39462

increased by0.34%

Dependency changes

• + Added@babel/runtime@7.25.6(transitive)

• + Added@types/readable-stream@4.0.15(transitive)

• + Addedabort-controller@3.0.0(transitive)

• + Addedbl@6.0.15(transitive)

• + Addedcommist@3.2.0(transitive)

• + Addedevent-target-shim@5.0.1(transitive)

• + Addedevents@3.3.0(transitive)

• + Addedfast-unique-numbers@8.0.13(transitive)

• + Addedhelp-me@5.0.0(transitive)

• + Addedlru-cache@10.4.3(transitive)

• + Addedmqtt@5.10.1(transitive)

• + Addedmqtt-packet@9.0.0(transitive)

• + Addedreadable-stream@4.5.2(transitive)

• + Addedregenerator-runtime@0.14.1(transitive)

• + Addedsplit2@4.2.0(transitive)

• + Addedworker-timers@7.1.8(transitive)

• + Addedworker-timers-broker@6.1.8(transitive)

• + Addedworker-timers-worker@7.0.71(transitive)

• - Removedbalanced-match@1.0.2(transitive)

• - Removedbl@4.1.0(transitive)

• - Removedbrace-expansion@1.1.11(transitive)

• - Removedbuffer@5.7.1(transitive)

• - Removedcommist@1.1.0(transitive)

• - Removedconcat-map@0.0.1(transitive)

• - Removedduplexify@4.1.3(transitive)

• - Removedfs.realpath@1.0.0(transitive)

• - Removedglob@7.2.3(transitive)

• - Removedhelp-me@3.0.0(transitive)

• - Removedinflight@1.0.6(transitive)

• - Removedleven@2.1.0(transitive)

• - Removedlru-cache@6.0.0(transitive)

• - Removedminimatch@3.1.2(transitive)

• - Removedmqtt@4.3.8(transitive)

• - Removedmqtt-packet@6.10.0(transitive)

• - Removedpath-is-absolute@1.0.1(transitive)

• - Removedpump@3.0.2(transitive)

• - Removedsplit2@3.2.2(transitive)

• - Removedws@7.5.10(transitive)

• - Removedyallist@4.0.0(transitive)

• Updatedmqtt@^5.9.1