@mysetup/mqtt 1.13.2 → 1.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/mqttClient.d.ts.map +1 -1
- package/dist/mqttClient.js +40 -18
- package/dist/test/test-mqtt.d.ts +2 -0
- package/dist/test/test-mqtt.d.ts.map +1 -0
- package/dist/test/test-mqtt.js +13 -0
- package/package.json +2 -2
package/dist/mqttClient.d.ts.map
CHANGED
|
@@ -1 +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;
|
|
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"}
|
package/dist/mqttClient.js
CHANGED
|
@@ -19,14 +19,14 @@ var mqtt_1 = __importDefault(require("mqtt"));
|
|
|
19
19
|
var logger_1 = require("@mysetup/logger");
|
|
20
20
|
var cache_1 = require("@mysetup/cache");
|
|
21
21
|
var serverConnectOptions = {
|
|
22
|
-
protocol: "
|
|
23
|
-
port:
|
|
24
|
-
host: "
|
|
22
|
+
protocol: "mqtts",
|
|
23
|
+
port: 8883,
|
|
24
|
+
host: "70e21950e6974840b4ba9bb5817fe2b9.s1.eu.hivemq.cloud",
|
|
25
25
|
};
|
|
26
26
|
var webConnectOptions = {
|
|
27
27
|
protocol: "wss",
|
|
28
|
-
port:
|
|
29
|
-
host: "
|
|
28
|
+
port: 8000,
|
|
29
|
+
host: "70e21950e6974840b4ba9bb5817fe2b9.s1.eu.hivemq.cloud",
|
|
30
30
|
};
|
|
31
31
|
var mqttClientId = "";
|
|
32
32
|
var checkInitConnect = function (props) {
|
|
@@ -35,33 +35,45 @@ var checkInitConnect = function (props) {
|
|
|
35
35
|
var client = mqtt_1.default.connect(connectUrl, {
|
|
36
36
|
clientId: props.value,
|
|
37
37
|
clean: true,
|
|
38
|
-
rejectUnauthorized:
|
|
38
|
+
rejectUnauthorized: true,
|
|
39
39
|
resubscribe: true,
|
|
40
40
|
keepalive: 300,
|
|
41
|
+
username: "mj_ems_hivemq",
|
|
42
|
+
password: "Mjmqtt123",
|
|
41
43
|
});
|
|
42
44
|
mqttClientId = props.value;
|
|
43
45
|
client.setMaxListeners(100);
|
|
44
46
|
client.on("connect", function () {
|
|
45
|
-
|
|
47
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
48
|
+
logger_1.logger.info("MQTT connection successful");
|
|
49
|
+
}
|
|
46
50
|
(0, cache_1.setCacheData)("mqttClientStatus", "connect");
|
|
47
51
|
mqttSub(props.topicList, props.messageCallback, client);
|
|
48
52
|
});
|
|
49
53
|
client.on("error", function (err) {
|
|
50
|
-
|
|
54
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
55
|
+
logger_1.logger.error("MQTT Connection error: ".concat(JSON.stringify(err)));
|
|
56
|
+
}
|
|
51
57
|
(0, cache_1.setCacheData)("mqttClientStatus", "error");
|
|
52
58
|
mqttDisconnect(props, true, client);
|
|
53
59
|
});
|
|
54
60
|
client.on("reconnect", function () {
|
|
61
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
62
|
+
logger_1.logger.info("MQTT Reconnecting");
|
|
63
|
+
}
|
|
55
64
|
(0, cache_1.setCacheData)("mqttClientStatus", "reconnect");
|
|
56
|
-
logger_1.logger.info("MQTT Reconnecting");
|
|
57
65
|
});
|
|
58
66
|
client.on("close", function () {
|
|
67
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
68
|
+
logger_1.logger.info("MQTT connection closed");
|
|
69
|
+
}
|
|
59
70
|
(0, cache_1.setCacheData)("mqttClientStatus", "close");
|
|
60
|
-
logger_1.logger.info("MQTT connection closed");
|
|
61
71
|
});
|
|
62
72
|
client.on("offline", function () {
|
|
73
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
74
|
+
logger_1.logger.info("MQTT connection offline");
|
|
75
|
+
}
|
|
63
76
|
(0, cache_1.setCacheData)("mqttClientStatus", "offline");
|
|
64
|
-
logger_1.logger.info("MQTT connection offline");
|
|
65
77
|
});
|
|
66
78
|
return client;
|
|
67
79
|
};
|
|
@@ -74,7 +86,9 @@ var mqttSub = function (topicList, messageCallback, client) {
|
|
|
74
86
|
var grantedList = [];
|
|
75
87
|
granted === null || granted === void 0 ? void 0 : granted.forEach(function (element) {
|
|
76
88
|
grantedList.push(element.topic);
|
|
77
|
-
|
|
89
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
90
|
+
logger_1.logger.info("Subscribed to topics: ".concat(element.topic));
|
|
91
|
+
}
|
|
78
92
|
});
|
|
79
93
|
(0, cache_1.setCacheData)("subscribedTopic", grantedList);
|
|
80
94
|
messageCallback && mqttOnMessage(messageCallback, client);
|
|
@@ -92,9 +106,11 @@ var mqttUnSub = function (topicList, client) {
|
|
|
92
106
|
logger_1.logger.error("Unsubscribe to topics error: ".concat(error.message));
|
|
93
107
|
return;
|
|
94
108
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
109
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
110
|
+
topicList.forEach(function (topic) {
|
|
111
|
+
logger_1.logger.info("unsubscribed to topic: ".concat(topic));
|
|
112
|
+
});
|
|
113
|
+
}
|
|
98
114
|
});
|
|
99
115
|
}
|
|
100
116
|
catch (error) {
|
|
@@ -105,7 +121,9 @@ exports.mqttUnSub = mqttUnSub;
|
|
|
105
121
|
var mqttDisconnect = function (props, reinit, client) {
|
|
106
122
|
try {
|
|
107
123
|
client === null || client === void 0 ? void 0 : client.end(false, function () {
|
|
108
|
-
|
|
124
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
125
|
+
logger_1.logger.info("MQTT disconnected successfully");
|
|
126
|
+
}
|
|
109
127
|
if (reinit) {
|
|
110
128
|
cachedConnection(__assign(__assign({}, props), { value: "client".concat(Math.random().toString(36).substring(7)) }));
|
|
111
129
|
}
|
|
@@ -131,10 +149,14 @@ var memoizedDb = function () {
|
|
|
131
149
|
var cache = {};
|
|
132
150
|
return function (props) {
|
|
133
151
|
if (props.value in cache) {
|
|
134
|
-
|
|
152
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
153
|
+
logger_1.logger.info("fetching mqtt cache");
|
|
154
|
+
}
|
|
135
155
|
return cache[props.value];
|
|
136
156
|
}
|
|
137
|
-
|
|
157
|
+
if (process.env.NEXT_PUBLIC_ENVIRONMENT === "dev") {
|
|
158
|
+
logger_1.logger.info("Creating new mqtt cache");
|
|
159
|
+
}
|
|
138
160
|
var result = checkInitConnect(props);
|
|
139
161
|
cache[props.value] = result;
|
|
140
162
|
return result;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-mqtt.d.ts","sourceRoot":"","sources":["../../test/test-mqtt.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
var logger_1 = require("@mysetup/logger");
|
|
4
|
+
var mqttClient_1 = require("../mqttClient");
|
|
5
|
+
var CLIENT_ID = "testClient-".concat(Math.random().toString(16).slice(2, 8));
|
|
6
|
+
(0, mqttClient_1.mqttCreateConnection)({
|
|
7
|
+
value: CLIENT_ID,
|
|
8
|
+
option: "server",
|
|
9
|
+
topicList: ["mj/ems/08:D1:F9:A6:BB:84/"],
|
|
10
|
+
messageCallback: function (topic, message) {
|
|
11
|
+
logger_1.logger.info("Message received \u2192 topic: ".concat(topic, ", message: ").concat(message.toString()));
|
|
12
|
+
},
|
|
13
|
+
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mysetup/mqtt",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.14.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@mysetup/logger": "latest",
|
|
32
32
|
"@mysetup/prettier-config": "latest",
|
|
33
33
|
"@mysetup/tsconfig": "latest",
|
|
34
|
-
"@types/node": "^22.
|
|
34
|
+
"@types/node": "^22.16.4",
|
|
35
35
|
"eslint": "8.57.0",
|
|
36
36
|
"typescript": "^5.7.3"
|
|
37
37
|
},
|