@mysetup/mqtt 1.14.2 → 1.14.3

package/dist/mqttClient.js

@@ -18,31 +18,29 @@ exports.mqttPublish = exports.getMqttClient = exports.mqttOnMessage = exports.mq
 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 _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: NEXT_PUBLIC_MQTT_HOST,
-    path: "",
+    host: MQTT_HOST,
 };
 var webConnectOptions = {
     protocol: "ws",
-    port: 1883,
-    host: NEXT_PUBLIC_MQTT_HOST,
-    path: "/mqtt",
+    port: 8083,
+    host: MQTT_HOST,
 };
 var mqttClientId = "";
 var checkInitConnect = function (props) {
-    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 _a = props.option === "web" ? webConnectOptions : serverConnectOptions, protocol = _a.protocol, host = _a.host, port = _a.port;
+    var connectUrl = "".concat(protocol, "://").concat(host, ":").concat(port);
     var client = mqtt_1.default.connect(connectUrl, {
         clientId: props.value,
         clean: false, /// for retaining previous message purpose
         rejectUnauthorized: true,
         resubscribe: true,
         keepalive: 300,
-        username: "mqttadmin",
-        password: "mqttadmin",
+        username: MQTT_USERNAME,
+        password: MQTT_PASSWORD,
     });
     mqttClientId = props.value;
     client.setMaxListeners(100);
@@ -50,33 +48,33 @@ var checkInitConnect = function (props) {
         mqttOnMessage(props.messageCallback, client); // 💡 Always attach
     }
     client.on("connect", function () {
-        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (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 (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (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 (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT Reconnecting");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "reconnect");
     });
     client.on("close", function () {
-        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT connection closed");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "close");
     });
     client.on("offline", function () {
-        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT connection offline");
         }
         (0, cache_1.setCacheData)("mqttClientStatus", "offline");
@@ -92,7 +90,7 @@ var mqttSub = function (topicList, messageCallback, client) {
             var grantedList = [];
             granted === null || granted === void 0 ? void 0 : granted.forEach(function (element) {
                 grantedList.push(element.topic);
-                if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+                if (ENVIRONMENT === "development") {
                     logger_1.logger.info("MQTT Subscribed to topics: ".concat(element.topic));
                 }
             });
@@ -112,7 +110,7 @@ var mqttUnSub = function (topicList, client) {
                 logger_1.logger.error("MQTT Unsubscribe to topics error: ".concat(error.message));
                 return;
             }
-            if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+            if (ENVIRONMENT === "development") {
                 topicList.forEach(function (topic) {
                     logger_1.logger.info("MQTT Unsubscribed to topic: ".concat(topic));
                 });
@@ -127,7 +125,7 @@ exports.mqttUnSub = mqttUnSub;
 var mqttDisconnect = function (props, reinit, client) {
     try {
         client === null || client === void 0 ? void 0 : client.end(false, function () {
-            if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+            if (ENVIRONMENT === "development") {
                 logger_1.logger.info("MQTT disconnected successfully");
             }
             if (reinit) {
@@ -155,11 +153,11 @@ 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") {
+                if (ENVIRONMENT === "development") {
                     logger_1.logger.error("MQTT Publish error: ".concat(err.message));
                 }
             }
-            else if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+            else if (ENVIRONMENT === "development") {
                 logger_1.logger.info("MQTT Payload published");
             }
         });
@@ -173,7 +171,7 @@ var memoizedDb = function () {
     var cache = {};
     return function (props) {
         if (props.value in cache) {
-            if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+            if (ENVIRONMENT === "development") {
                 logger_1.logger.info("MQTT Fetching mqtt cache");
             }
             //to invoke the message callback if it exists,when use cached value
@@ -182,7 +180,7 @@ var memoizedDb = function () {
             }
             return cache[props.value];
         }
-        if (NEXT_PUBLIC_ENVIRONMENT === "development") {
+        if (ENVIRONMENT === "development") {
             logger_1.logger.info("MQTT Creating new mqtt cache");
         }
         var result = checkInitConnect(props);

package/package.json

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