@mysetup/mqtt 1.14.0 → 1.14.2

package/dist/mqttClient.d.ts

@@ -7,12 +7,14 @@ interface ConnectionProps {
     option: MQttOptionProps;
     topicList: string[];
     messageCallback?: (topic: string, message: string) => void;
+    path?: string;
 }
 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, };
+export { mqttCreateConnection, mqttSub, mqttUnSub, mqttDisconnect, mqttOnMessage, getMqttClient, mqttPublish, };
 //# 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;AAExC,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;CAC9D;AA0ED,QAAA,MAAM,OAAO,GACT,WAAW,MAAM,EAAE,EACnB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,EAC1D,SAAS,UAAU,SAsBtB,CAAC;AAEF,QAAA,MAAM,SAAS,GAAI,WAAW,MAAM,EAAE,EAAE,SAAS,UAAU,SAgB1D,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;AAuBF,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,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,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"}

package/dist/mqttClient.js

@@ -14,63 +14,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMqttClient = exports.mqttOnMessage = exports.mqttDisconnect = exports.mqttUnSub = exports.mqttSub = exports.mqttCreateConnection = void 0;
+exports.mqttPublish = exports.getMqttClient = exports.mqttOnMessage = 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, NEXT_PUBLIC_ENVIRONMENT = _a.NEXT_PUBLIC_ENVIRONMENT, NEXT_PUBLIC_MQTT_HOST = _a.NEXT_PUBLIC_MQTT_HOST;
 var serverConnectOptions = {
-    protocol: "mqtts",
-    port: 8883,
-    host: "70e21950e6974840b4ba9bb5817fe2b9.s1.eu.hivemq.cloud",
+    protocol: "mqtt",
+    port: 1883,
+    host: NEXT_PUBLIC_MQTT_HOST,
+    path: "",
 };
 var webConnectOptions = {
-    protocol: "wss",
-    port: 8000,
-    host: "70e21950e6974840b4ba9bb5817fe2b9.s1.eu.hivemq.cloud",
+    protocol: "ws",
+    port: 1883,
+    host: NEXT_PUBLIC_MQTT_HOST,
+    path: "/mqtt",
 };
 var mqttClientId = "";
 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.option === "web" ? webConnectOptions : serverConnectOptions, protocol = _a.protocol, host = _a.host, port = _a.port, path = _a.path;
+    var connectUrl = "".concat(protocol, "://").concat(host, ":").concat(port).concat(path);
     var client = mqtt_1.default.connect(connectUrl, {
         clientId: props.value,
-        clean: true,
+        clean: false, /// for retaining previous message purpose
         rejectUnauthorized: true,
         resubscribe: true,
         keepalive: 300,
-        username: "mj_ems_hivemq",
-        password: "Mjmqtt123",
+        username: "mqttadmin",
+        password: "mqttadmin",
     });
     mqttClientId = props.value;
     client.setMaxListeners(100);
+    if (props.messageCallback) {
+        mqttOnMessage(props.messageCallback, client); // 💡 Always attach
+    }
     client.on("connect", function () {
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT connection successful");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "connect");
         mqttSub(props.topicList, props.messageCallback, client);
     });
     client.on("error", function (err) {
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
             logger_1.logger.error("MQTT Connection error: ".concat(JSON.stringify(err)));
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "error");
         mqttDisconnect(props, true, client);
     });
     client.on("reconnect", function () {
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT Reconnecting");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "reconnect");
     });
     client.on("close", function () {
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT connection closed");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "close");
     });
     client.on("offline", function () {
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT connection offline");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "offline");
@@ -81,13 +87,13 @@ var mqttSub = function (topicList, messageCallback, client) {
     try {
         client === null || client === void 0 ? void 0 : client.subscribe(topicList, { qos: 0 }, function (error, granted) {
             if (error) {
-                logger_1.logger.error("Subscribe to topics error: ".concat(error.message));
+                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 (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
-                    logger_1.logger.info("Subscribed to topics: ".concat(element.topic));
+                if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+                    logger_1.logger.info("MQTT Subscribed to topics: ".concat(element.topic));
                 }
             });
             (0, cache_1.setCacheData)("subscribedTopic", grantedList);
@@ -95,7 +101,7 @@ var mqttSub = function (topicList, messageCallback, client) {
         });
     }
     catch (error) {
-        logger_1.logger.error("Subscribed error ".concat(JSON.stringify(error)));
+        logger_1.logger.error("MQTT Subscribed error ".concat(JSON.stringify(error)));
     }
 };
 exports.mqttSub = mqttSub;
@@ -103,25 +109,25 @@ var mqttUnSub = function (topicList, client) {
     try {
         client === null || client === void 0 ? void 0 : client.unsubscribe(topicList, function (error) {
             if (error) {
-                logger_1.logger.error("Unsubscribe to topics error: ".concat(error.message));
+                logger_1.logger.error("MQTT Unsubscribe to topics error: ".concat(error.message));
                 return;
             }
-            if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+            if (NEXT_PUBLIC_ENVIRONMENT === "development") {
                 topicList.forEach(function (topic) {
-                    logger_1.logger.info("unsubscribed to topic: ".concat(topic));
+                    logger_1.logger.info("MQTT Unsubscribed to topic: ".concat(topic));
                 });
             }
         });
     }
     catch (error) {
-        logger_1.logger.error("unsubscribed error: ".concat(JSON.stringify(error)));
+        logger_1.logger.error("MQTT Unsubscribed error: ".concat(JSON.stringify(error)));
     }
 };
 exports.mqttUnSub = mqttUnSub;
 var mqttDisconnect = function (props, reinit, client) {
     try {
         client === null || client === void 0 ? void 0 : client.end(false, function () {
-            if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
+            if (NEXT_PUBLIC_ENVIRONMENT === "development") {
                 logger_1.logger.info("MQTT disconnected successfully");
             }
             if (reinit) {
@@ -130,7 +136,7 @@ var mqttDisconnect = function (props, reinit, client) {
         });
     }
     catch (error) {
-        logger_1.logger.error("disconnect error: ".concat(JSON.stringify(error)));
+        logger_1.logger.error("MQTT Disconnect error: ".concat(JSON.stringify(error)));
     }
 };
 exports.mqttDisconnect = mqttDisconnect;
@@ -141,21 +147,43 @@ var mqttOnMessage = function (messageCallback, client) {
         });
     }
     catch (error) {
-        logger_1.logger.error("MQTT onmessage error: ".concat(JSON.stringify(error)));
+        logger_1.logger.error("MQTT On-message error: ".concat(JSON.stringify(error)));
     }
 };
 exports.mqttOnMessage = mqttOnMessage;
+var mqttPublish = function (topic, message, client) {
+    try {
+        client === null || client === void 0 ? void 0 : client.publish(topic, JSON.stringify(message), { qos: 1, retain: true }, function (err) {
+            if (err) {
+                if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+                    logger_1.logger.error("MQTT Publish error: ".concat(err.message));
+                }
+            }
+            else if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+                logger_1.logger.info("MQTT Payload published");
+            }
+        });
+    }
+    catch (error) {
+        logger_1.logger.error("MQTT Publish exception: ".concat(JSON.stringify(error)));
+    }
+};
+exports.mqttPublish = mqttPublish;
 var memoizedDb = function () {
     var cache = {};
     return function (props) {
         if (props.value in cache) {
-            if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
-                logger_1.logger.info("fetching mqtt cache");
+            if (NEXT_PUBLIC_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];
         }
-        if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
-            logger_1.logger.info("Creating new mqtt cache");
+        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+            logger_1.logger.info("MQTT Creating new mqtt cache");
         }
         var result = checkInitConnect(props);
         cache[props.value] = result;

package/dist/test/test-mqtt.js

@@ -6,7 +6,7 @@ var CLIENT_ID = "testClient-".concat(Math.random().toString(16).slice(2, 8));
 (0, mqttClient_1.mqttCreateConnection)({
     value: CLIENT_ID,
     option: "server",
-    topicList: ["mj/ems/08:D1:F9:A6:BB:84/"],
+    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,43 +1,46 @@
-{
-    "name": "@mysetup/mqtt",
-    "version": "1.14.0",
-    "license": "MIT",
-    "main": "dist/index.js",
-    "files": [
-        "dist"
-    ],
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.js",
-            "require": "./dist/index.js"
-        },
-        "./package.json": "./package.json"
-    },
-    "scripts": {
-        "lint": "eslint .",
-        "typecheck": "tsc --noEmit",
-        "build": "rm -rf ./dist && tsc",
-        "format": "prettier --write \"**/*.{ts,tsx,md,js}\"",
-        "checks": "pnpm typecheck && pnpm lint",
-        "clean": "rm -rf node_modules .swc dist pnpm-lock.yaml && echo \"✅  Successfully removed \""
-    },
-    "dependencies": {
-        "mqtt": "^5.10.3"
-    },
-    "devDependencies": {
-        "@mysetup/cache": "latest",
-        "@mysetup/eslint-config": "latest",
-        "@mysetup/logger": "latest",
-        "@mysetup/prettier-config": "latest",
-        "@mysetup/tsconfig": "latest",
-        "@types/node": "^22.16.4",
-        "eslint": "8.57.0",
-        "typescript": "^5.7.3"
-    },
-    "prettier": "@mysetup/prettier-config",
-    "engines": {
-        "node": ">=18.0.0"
-    },
-    "packageManager": "pnpm@9.9.0"
-}
+{
+    "name": "@mysetup/mqtt",
+    "version": "1.14.2",
+    "license": "MIT",
+    "main": "dist/index.js",
+    "files": [
+        "dist"
+    ],
+    "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
+            "require": "./dist/index.js"
+        },
+        "./package.json": "./package.json"
+    },
+    "scripts": {
+        "dev": "nodemon",
+        "lint": "eslint .",
+        "typecheck": "tsc --noEmit",
+        "build": "rm -rf ./dist && tsc",
+        "format": "prettier --write \"**/*.{ts,tsx,md,js}\"",
+        "checks": "pnpm typecheck && pnpm lint",
+        "clean": "rm -rf node_modules .swc dist pnpm-lock.yaml && echo \"✅  Successfully removed \""
+    },
+    "dependencies": {
+        "mqtt": "^5.10.3"
+    },
+    "devDependencies": {
+        "@mysetup/cache": "latest",
+        "@mysetup/eslint-config": "latest",
+        "@mysetup/logger": "latest",
+        "@mysetup/prettier-config": "latest",
+        "@mysetup/tsconfig": "latest",
+        "@types/node": "^22.16.4",
+        "eslint": "8.57.0",
+        "nodemon": "3.1.7",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.7.3"
+    },
+    "prettier": "@mysetup/prettier-config",
+    "engines": {
+        "node": ">=18.0.0"
+    },
+    "packageManager": "pnpm@9.9.0"
+}