@mysetup/mqtt 1.15.1 → 1.15.3

package/dist/mqttClient.d.ts

@@ -1,8 +1,8 @@
 import mqtt from "mqtt";
 import type { MqttClient } from "mqtt";
-export type { MqttClient };
+type MQttProtocol = "mqtt" | "mqtts" | "ws" | "wss";
 interface MqttConfigProps {
-    protocol: "mqtt" | "mqtts" | "ws" | "wss";
+    protocol: MQttProtocol;
     port: number;
     host: string;
     path: string;
@@ -13,14 +13,15 @@ interface ConnectionProps {
     clientId: string;
     config: MqttConfigProps;
     topicList: string[];
-    messageCallback?: (topic: string, message: string) => void;
+    messageCallback: (topic: string, message: string) => void;
     environment?: string | undefined;
 }
-declare const mqttSub: (topicList: string[], clientId: string, messageCallback?: (topic: string, message: string) => void, environment?: string) => void;
+declare const mqttSub: (topicList: string[], clientId: string, environment?: string) => void;
 declare const mqttUnSub: (topicList: string[], clientId: string, environment?: string) => void;
 declare const mqttDisconnect: (props: ConnectionProps, reinit: boolean, environment?: string) => void;
 declare const mqttPublish: (topic: string, message: object, clientId: string, environment?: string) => void;
 declare const mqttCreateConnection: (props: ConnectionProps) => mqtt.MqttClient | null;
 declare const getMqttClient: (id: string) => mqtt.MqttClient | null;
 export { mqttCreateConnection, mqttSub, mqttUnSub, mqttDisconnect, mqttPublish, getMqttClient, };
+export type { ConnectionProps, MqttConfigProps, MqttClient };
 //# sourceMappingURL=mqttClient.d.ts.map

package/dist/mqttClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mqttClient.d.ts","sourceRoot":"","sources":["../mqttClient.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,UAAU,eAAe;IACrB,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,eAAe;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC3D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAmED,QAAA,MAAM,OAAO,GACT,WAAW,MAAM,EAAE,EACnB,UAAU,MAAM,EAChB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,EAC1D,cAAc,MAAM,SA0BvB,CAAC;AAEF,QAAA,MAAM,SAAS,GACX,WAAW,MAAM,EAAE,EACnB,UAAU,MAAM,EAChB,cAAc,MAAM,SAoBvB,CAAC;AAEF,QAAA,MAAM,cAAc,GAChB,OAAO,eAAe,EACtB,QAAQ,OAAO,EACf,cAAc,MAAM,SAgBvB,CAAC;AAeF,QAAA,MAAM,WAAW,GACb,OAAO,MAAM,EACb,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,cAAc,MAAM,SAqBvB,CAAC;AAsBF,QAAA,MAAM,oBAAoB,GAAI,OAAO,eAAe,2BAEnD,CAAC;AAEF,QAAA,MAAM,aAAa,GAAI,IAAI,MAAM,2BAEhC,CAAC;AAOF,OAAO,EACH,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,cAAc,EACd,WAAW,EACX,aAAa,GAChB,CAAC"}
+{"version":3,"file":"mqttClient.d.ts","sourceRoot":"","sources":["../mqttClient.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGvC,KAAK,YAAY,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;AAEpD,UAAU,eAAe;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,eAAe;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,eAAe,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACpC;AAkED,QAAA,MAAM,OAAO,GACT,WAAW,MAAM,EAAE,EACnB,UAAU,MAAM,EAChB,cAAc,MAAM,SAwBvB,CAAC;AAEF,QAAA,MAAM,SAAS,GACX,WAAW,MAAM,EAAE,EACnB,UAAU,MAAM,EAChB,cAAc,MAAM,SAoBvB,CAAC;AAEF,QAAA,MAAM,cAAc,GAChB,OAAO,eAAe,EACtB,QAAQ,OAAO,EACf,cAAc,MAAM,SAgBvB,CAAC;AAEF,QAAA,MAAM,WAAW,GACb,OAAO,MAAM,EACb,SAAS,MAAM,EACf,UAAU,MAAM,EAChB,cAAc,MAAM,SAqBvB,CAAC;AAsBF,QAAA,MAAM,oBAAoB,GAAI,OAAO,eAAe,2BAEnD,CAAC;AAEF,QAAA,MAAM,aAAa,GAAI,IAAI,MAAM,2BAEhC,CAAC;AAOF,OAAO,EACH,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,cAAc,EACd,WAAW,EACX,aAAa,GAChB,CAAC;AAEF,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,CAAC"}

package/dist/mqttClient.js

@@ -27,7 +27,7 @@ var checkInitConnect = function (props) {
             logger_1.logger.info("MQTT connection successful");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "connect");
-        mqttSub(props.topicList, props.clientId, props.messageCallback, props.environment);
+        mqttSub(props.topicList, props.clientId, props.environment);
     });
     client.on("error", function (err) {
         if (props.environment === "development") {
@@ -54,12 +54,15 @@ var checkInitConnect = function (props) {
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "offline");
     });
+    client.on("message", function (topic, message) {
+        props.messageCallback(topic, message.toString());
+    });
     return client;
 };
-var mqttSub = function (topicList, clientId, messageCallback, environment) {
+var mqttSub = function (topicList, clientId, environment) {
     try {
-        var client_1 = getMqttClient(clientId);
-        client_1 === null || client_1 === void 0 ? void 0 : client_1.subscribe(topicList, { qos: 0 }, function (error, granted) {
+        var client = getMqttClient(clientId);
+        client === null || client === void 0 ? void 0 : client.subscribe(topicList, { qos: 0 }, function (error, granted) {
             if (error) {
                 logger_1.logger.error("MQTT Subscribe to topics error: ".concat(error.message));
             }
@@ -71,7 +74,6 @@ var mqttSub = function (topicList, clientId, messageCallback, environment) {
                 }
             });
             (0, cache_1.setCacheData)("subscribedTopic", grantedList);
-            messageCallback && mqttOnMessage(messageCallback, client_1);
         });
     }
     catch (error) {
@@ -117,16 +119,6 @@ var mqttDisconnect = function (props, reinit, environment) {
     }
 };
 exports.mqttDisconnect = mqttDisconnect;
-var mqttOnMessage = function (messageCallback, client) {
-    try {
-        client === null || client === void 0 ? void 0 : client.on("message", function (topic, message) {
-            messageCallback(topic, message.toString());
-        });
-    }
-    catch (error) {
-        logger_1.logger.error("MQTT On-message error: ".concat(JSON.stringify(error)));
-    }
-};
 var mqttPublish = function (topic, message, clientId, environment) {
     try {
         var client = getMqttClient(clientId);

package/dist/test/test-mqtt.js

@@ -9,13 +9,13 @@ var CLIENT_ID = "testClient-".concat(Math.random().toString(16).slice(2, 8));
     config: {
         host: String(MQTT_HOST),
         port: Number(MQTT_PORT),
-        protocol: "wss",
+        protocol: "mqtts",
         path: "",
         username: MQTT_USERNAME,
         password: MQTT_PASSWORD,
     },
     environment: String(ENVIRONMENT),
-    topicList: ["mj/ems/test"],
+    topicList: ["#"],
     messageCallback: function (topic, message) {
         logger_1.logger.info("Message received \u2192 topic: ".concat(topic, ", message: ").concat(message.toString()));
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mysetup/mqtt",
-    "version": "1.15.1",
+    "version": "1.15.3",
     "license": "MIT",
     "main": "dist/index.js",
     "files": [