@mysetup/mqtt 1.14.3 → 1.14.5

package/dist/mqttClient.d.ts

@@ -1,20 +1,26 @@
 import mqtt from "mqtt";
 import type { MqttClient } from "mqtt";
 export type { MqttClient };
-type MQttOptionProps = "web" | "server";
+interface MqttConfigProps {
+    protocol: string;
+    port: number;
+    host: string;
+    path: string;
+    username?: string | undefined;
+    password?: string | undefined;
+}
 interface ConnectionProps {
-    value: string;
-    option: MQttOptionProps;
+    clientId: string;
+    config: MqttConfigProps;
     topicList: string[];
     messageCallback?: (topic: string, message: string) => void;
-    path?: string;
+    environment?: string | undefined;
 }
-declare const mqttSub: (topicList: string[], messageCallback?: (topic: string, message: string) => void, client?: MqttClient) => void;
-declare const mqttUnSub: (topicList: string[], client?: MqttClient) => void;
-declare const mqttDisconnect: (props: ConnectionProps, reinit: boolean, client?: MqttClient) => void;
-declare const mqttOnMessage: (messageCallback: (topic: string, message: string) => void, client?: MqttClient) => void;
-declare const mqttPublish: (topic: string, message: object, client?: MqttClient) => void;
-declare const mqttCreateConnection: (props: ConnectionProps) => mqtt.MqttClient;
-declare const getMqttClient: () => string;
-export { mqttCreateConnection, mqttSub, mqttUnSub, mqttDisconnect, mqttOnMessage, getMqttClient, mqttPublish, };
+declare const mqttSub: (topicList: string[], clientId: string, messageCallback?: (topic: string, message: string) => void, 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, };
 //# 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,KAAK,eAAe,GAAG,KAAK,GAAG,QAAQ,CAAC;AAIxC,UAAU,eAAe;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,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,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AA8ED,QAAA,MAAM,OAAO,GACT,WAAW,MAAM,EAAE,EACnB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,EAC1D,SAAS,UAAU,SAwBtB,CAAC;AAEF,QAAA,MAAM,SAAS,GAAI,WAAW,MAAM,EAAE,EAAE,SAAS,UAAU,SAkB1D,CAAC;AAEF,QAAA,MAAM,cAAc,GAChB,OAAO,eAAe,EACtB,QAAQ,OAAO,EACf,SAAS,UAAU,SAiBtB,CAAC;AAEF,QAAA,MAAM,aAAa,GACf,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,EACzD,SAAS,UAAU,SAStB,CAAC;AAEF,QAAA,MAAM,WAAW,GAAI,OAAO,MAAM,EAAE,SAAS,MAAM,EAAE,SAAS,UAAU,SAmBvE,CAAC;AA2BF,QAAA,MAAM,oBAAoB,GAAI,OAAO,eAAe,oBAEnD,CAAC;AAEF,QAAA,MAAM,aAAa,cAElB,CAAC;AAEF,OAAO,EACH,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,cAAc,EACd,aAAa,EACb,aAAa,EACb,WAAW,GACd,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,YAAY,EAAE,UAAU,EAAE,CAAC;AAE3B,UAAU,eAAe;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;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;AAkED,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"}

package/dist/mqttClient.js

@@ -1,101 +1,76 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mqttPublish = exports.getMqttClient = exports.mqttOnMessage = exports.mqttDisconnect = exports.mqttUnSub = exports.mqttSub = exports.mqttCreateConnection = void 0;
+exports.getMqttClient = exports.mqttPublish = exports.mqttDisconnect = exports.mqttUnSub = exports.mqttSub = exports.mqttCreateConnection = void 0;
 var mqtt_1 = __importDefault(require("mqtt"));
 var logger_1 = require("@mysetup/logger");
 var cache_1 = require("@mysetup/cache");
-var _a = process.env, ENVIRONMENT = _a.ENVIRONMENT, MQTT_HOST = _a.MQTT_HOST, MQTT_USERNAME = _a.MQTT_USERNAME, MQTT_PASSWORD = _a.MQTT_PASSWORD;
-var serverConnectOptions = {
-    protocol: "mqtt",
-    port: 1883,
-    host: MQTT_HOST,
-};
-var webConnectOptions = {
-    protocol: "ws",
-    port: 8083,
-    host: MQTT_HOST,
-};
-var mqttClientId = "";
+var mqttClientCache = {};
 var checkInitConnect = function (props) {
-    var _a = props.option === "web" ? webConnectOptions : serverConnectOptions, protocol = _a.protocol, host = _a.host, port = _a.port;
-    var connectUrl = "".concat(protocol, "://").concat(host, ":").concat(port);
+    var _a = props.config, protocol = _a.protocol, host = _a.host, port = _a.port, path = _a.path, username = _a.username, password = _a.password;
+    var connectUrl = "".concat(protocol, "://").concat(host, ":").concat(port).concat(path);
     var client = mqtt_1.default.connect(connectUrl, {
-        clientId: props.value,
+        clientId: props.clientId,
         clean: false, /// for retaining previous message purpose
         rejectUnauthorized: true,
         resubscribe: true,
         keepalive: 300,
-        username: MQTT_USERNAME,
-        password: MQTT_PASSWORD,
+        username: username,
+        password: password,
     });
-    mqttClientId = props.value;
     client.setMaxListeners(100);
-    if (props.messageCallback) {
-        mqttOnMessage(props.messageCallback, client); // 💡 Always attach
-    }
     client.on("connect", function () {
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.info("MQTT connection successful");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "connect");
-        mqttSub(props.topicList, props.messageCallback, client);
+        mqttSub(props.topicList, props.clientId, props.messageCallback, props.environment);
     });
     client.on("error", function (err) {
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.error("MQTT Connection error: ".concat(JSON.stringify(err)));
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "error");
-        mqttDisconnect(props, true, client);
+        mqttDisconnect(props, true);
     });
     client.on("reconnect", function () {
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.info("MQTT Reconnecting");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "reconnect");
     });
     client.on("close", function () {
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.info("MQTT connection closed");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "close");
     });
     client.on("offline", function () {
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.info("MQTT connection offline");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "offline");
     });
     return client;
 };
-var mqttSub = function (topicList, messageCallback, client) {
+var mqttSub = function (topicList, clientId, messageCallback, environment) {
     try {
-        client === null || client === void 0 ? void 0 : client.subscribe(topicList, { qos: 0 }, function (error, granted) {
+        var client_1 = getMqttClient(clientId);
+        client_1 === null || client_1 === void 0 ? void 0 : client_1.subscribe(topicList, { qos: 0 }, function (error, granted) {
             if (error) {
                 logger_1.logger.error("MQTT Subscribe to topics error: ".concat(error.message));
             }
             var grantedList = [];
             granted === null || granted === void 0 ? void 0 : granted.forEach(function (element) {
                 grantedList.push(element.topic);
-                if (ENVIRONMENT === "development") {
+                if (environment === "development") {
                     logger_1.logger.info("MQTT Subscribed to topics: ".concat(element.topic));
                 }
             });
             (0, cache_1.setCacheData)("subscribedTopic", grantedList);
-            messageCallback && mqttOnMessage(messageCallback, client);
+            messageCallback && mqttOnMessage(messageCallback, client_1);
         });
     }
     catch (error) {
@@ -103,14 +78,15 @@ var mqttSub = function (topicList, messageCallback, client) {
     }
 };
 exports.mqttSub = mqttSub;
-var mqttUnSub = function (topicList, client) {
+var mqttUnSub = function (topicList, clientId, environment) {
     try {
+        var client = getMqttClient(clientId);
         client === null || client === void 0 ? void 0 : client.unsubscribe(topicList, function (error) {
             if (error) {
                 logger_1.logger.error("MQTT Unsubscribe to topics error: ".concat(error.message));
                 return;
             }
-            if (ENVIRONMENT === "development") {
+            if (environment === "development") {
                 topicList.forEach(function (topic) {
                     logger_1.logger.info("MQTT Unsubscribed to topic: ".concat(topic));
                 });
@@ -122,14 +98,16 @@ var mqttUnSub = function (topicList, client) {
     }
 };
 exports.mqttUnSub = mqttUnSub;
-var mqttDisconnect = function (props, reinit, client) {
+var mqttDisconnect = function (props, reinit, environment) {
     try {
+        var client = getMqttClient(props.clientId);
         client === null || client === void 0 ? void 0 : client.end(false, function () {
-            if (ENVIRONMENT === "development") {
+            if (environment === "development") {
                 logger_1.logger.info("MQTT disconnected successfully");
             }
+            removeMqttClient(props.clientId);
             if (reinit) {
-                cachedConnection(__assign(__assign({}, props), { value: "client".concat(Math.random().toString(36).substring(7)) }));
+                cachedConnection(props);
             }
         });
     }
@@ -148,16 +126,16 @@ var mqttOnMessage = function (messageCallback, client) {
         logger_1.logger.error("MQTT On-message error: ".concat(JSON.stringify(error)));
     }
 };
-exports.mqttOnMessage = mqttOnMessage;
-var mqttPublish = function (topic, message, client) {
+var mqttPublish = function (topic, message, clientId, environment) {
     try {
+        var client = getMqttClient(clientId);
         client === null || client === void 0 ? void 0 : client.publish(topic, JSON.stringify(message), { qos: 1, retain: true }, function (err) {
             if (err) {
-                if (ENVIRONMENT === "development") {
+                if (environment === "development") {
                     logger_1.logger.error("MQTT Publish error: ".concat(err.message));
                 }
             }
-            else if (ENVIRONMENT === "development") {
+            else if (environment === "development") {
                 logger_1.logger.info("MQTT Payload published");
             }
         });
@@ -168,23 +146,18 @@ var mqttPublish = function (topic, message, client) {
 };
 exports.mqttPublish = mqttPublish;
 var memoizedDb = function () {
-    var cache = {};
     return function (props) {
-        if (props.value in cache) {
-            if (ENVIRONMENT === "development") {
+        if (props.clientId in mqttClientCache) {
+            if (props.environment === "development") {
                 logger_1.logger.info("MQTT Fetching mqtt cache");
             }
-            //to invoke the message callback if it exists,when use cached value
-            if (props.messageCallback) {
-                mqttOnMessage(props.messageCallback, cache[props.value]);
-            }
-            return cache[props.value];
+            return mqttClientCache[props.clientId];
         }
-        if (ENVIRONMENT === "development") {
+        if (props.environment === "development") {
             logger_1.logger.info("MQTT Creating new mqtt cache");
         }
         var result = checkInitConnect(props);
-        cache[props.value] = result;
+        mqttClientCache[props.clientId] = result;
         return result;
     };
 };
@@ -194,7 +167,11 @@ var mqttCreateConnection = function (props) {
     return cachedConnection(props);
 };
 exports.mqttCreateConnection = mqttCreateConnection;
-var getMqttClient = function () {
-    return mqttClientId;
+var getMqttClient = function (id) {
+    return mqttClientCache[id];
 };
 exports.getMqttClient = getMqttClient;
+var removeMqttClient = function (id) {
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete mqttClientCache[id];
+};

package/dist/test/test-mqtt.js

@@ -4,8 +4,13 @@ var logger_1 = require("@mysetup/logger");
 var mqttClient_1 = require("../mqttClient");
 var CLIENT_ID = "testClient-".concat(Math.random().toString(16).slice(2, 8));
 (0, mqttClient_1.mqttCreateConnection)({
-    value: CLIENT_ID,
-    option: "server",
+    clientId: CLIENT_ID,
+    config: {
+        host: "localhost",
+        port: 1883,
+        protocol: "mqtt",
+        path: "",
+    },
     topicList: ["mj/ems/test"],
     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.14.3",
+    "version": "1.14.5",
     "license": "MIT",
     "main": "dist/index.js",
     "files": [