@mysetup/mqtt 1.15.2 → 1.15.4

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.
Files changed (4) hide show
  1. package/dist/mqttClient.d.ts +2 -2
  2. package/dist/mqttClient.d.ts.map +1 -1
  3. package/dist/mqttClient.js +16 -16
  4. package/package.json +1 -1
package/dist/mqttClient.d.ts CHANGED
@@ -13,10 +13,10 @@ interface ConnectionProps {
13
13
  clientId: string;
14
14
  config: MqttConfigProps;
15
15
  topicList: string[];
16
- messageCallback?: (topic: string, message: string) => void;
16
+ messageCallback: (topic: string, message: string) => void;
17
17
  environment?: string | undefined;
18
18
  }
19
- declare const mqttSub: (topicList: string[], clientId: string, messageCallback?: (topic: string, message: string) => void, environment?: string) => void;
19
+ declare const mqttSub: (topicList: string[], clientId: string, environment?: string) => void;
20
20
  declare const mqttUnSub: (topicList: string[], clientId: string, environment?: string) => void;
21
21
  declare const mqttDisconnect: (props: ConnectionProps, reinit: boolean, environment?: string) => void;
22
22
  declare const mqttPublish: (topic: string, message: object, clientId: string, environment?: string) => void;
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,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,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;AAEF,YAAY,EAAE,eAAe,EAAE,eAAe,EAAE,UAAU,EAAE,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,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,SAuBvB,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 CHANGED
@@ -14,7 +14,7 @@ var checkInitConnect = function (props) {
14
14
  var client = mqtt_1.default.connect(connectUrl, {
15
15
  protocol: protocol,
16
16
  clientId: props.clientId,
17
- clean: false, /// for retaining previous message purpose
17
+ clean: true,
18
18
  rejectUnauthorized: false,
19
19
  resubscribe: true,
20
20
  keepalive: 300,
@@ -27,7 +27,7 @@ var checkInitConnect = function (props) {
27
27
  logger_1.logger.info("MQTT connection successful");
28
28
  }
29
29
  (0, cache_1.setCacheData)("mqttClientStatus", "connect");
30
- mqttSub(props.topicList, props.clientId, props.messageCallback, props.environment);
30
+ mqttSub(props.topicList, props.clientId, props.environment);
31
31
  });
32
32
  client.on("error", function (err) {
33
33
  if (props.environment === "development") {
@@ -54,12 +54,16 @@ var checkInitConnect = function (props) {
54
54
  }
55
55
  (0, cache_1.setCacheData)("mqttClientStatus", "offline");
56
56
  });
57
+ client.removeAllListeners("message"); //aravinthan
58
+ client.on("message", function (topic, message) {
59
+ props.messageCallback(topic, message.toString());
60
+ });
57
61
  return client;
58
62
  };
59
- var mqttSub = function (topicList, clientId, messageCallback, environment) {
63
+ var mqttSub = function (topicList, clientId, environment) {
60
64
  try {
61
- var client_1 = getMqttClient(clientId);
62
- client_1 === null || client_1 === void 0 ? void 0 : client_1.subscribe(topicList, { qos: 0 }, function (error, granted) {
65
+ var client = getMqttClient(clientId);
66
+ client === null || client === void 0 ? void 0 : client.subscribe(topicList, { qos: 0 }, function (error, granted) {
63
67
  if (error) {
64
68
  logger_1.logger.error("MQTT Subscribe to topics error: ".concat(error.message));
65
69
  }
@@ -71,7 +75,6 @@ var mqttSub = function (topicList, clientId, messageCallback, environment) {
71
75
  }
72
76
  });
73
77
  (0, cache_1.setCacheData)("subscribedTopic", grantedList);
74
- messageCallback && mqttOnMessage(messageCallback, client_1);
75
78
  });
76
79
  }
77
80
  catch (error) {
@@ -102,6 +105,13 @@ exports.mqttUnSub = mqttUnSub;
102
105
  var mqttDisconnect = function (props, reinit, environment) {
103
106
  try {
104
107
  var client = getMqttClient(props.clientId);
108
+ //aravinthan
109
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("message");
110
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("connect");
111
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("error");
112
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("close");
113
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("offline");
114
+ client === null || client === void 0 ? void 0 : client.removeAllListeners("reconnect");
105
115
  client === null || client === void 0 ? void 0 : client.end(false, function () {
106
116
  if (environment === "development") {
107
117
  logger_1.logger.info("MQTT disconnected successfully");
@@ -117,16 +127,6 @@ var mqttDisconnect = function (props, reinit, environment) {
117
127
  }
118
128
  };
119
129
  exports.mqttDisconnect = mqttDisconnect;
120
- var mqttOnMessage = function (messageCallback, client) {
121
- try {
122
- client === null || client === void 0 ? void 0 : client.on("message", function (topic, message) {
123
- messageCallback(topic, message.toString());
124
- });
125
- }
126
- catch (error) {
127
- logger_1.logger.error("MQTT On-message error: ".concat(JSON.stringify(error)));
128
- }
129
- };
130
130
  var mqttPublish = function (topic, message, clientId, environment) {
131
131
  try {
132
132
  var client = getMqttClient(clientId);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mysetup/mqtt",
3
- "version": "1.15.2",
3
+ "version": "1.15.4",
4
4
  "license": "MIT",
5
5
  "main": "dist/index.js",
6
6
  "files": [