@gotillit/tillit-node-red 1.3.1 → 1.3.2
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.
|
@@ -151,10 +151,11 @@ var NodeBroker = /** @class */ (function (_super) {
|
|
|
151
151
|
if (!fs.existsSync(this.rootCa)) {
|
|
152
152
|
this.log(" - rootCa : " + this.rootCa + ' not found');
|
|
153
153
|
}
|
|
154
|
+
this.log('Client id:' + this.clientId);
|
|
154
155
|
configBuilder = aws_iot_device_sdk_v2_1.iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(this.thingCert, this.privKey);
|
|
155
156
|
configBuilder.with_certificate_authority_from_path(undefined, this.rootCa);
|
|
156
157
|
configBuilder.with_clean_session(false);
|
|
157
|
-
configBuilder.with_client_id((this.clientId || "test-") +
|
|
158
|
+
configBuilder.with_client_id((this.clientId || "test-") + '-node-red');
|
|
158
159
|
configBuilder.with_endpoint(this.endpoint);
|
|
159
160
|
configBuilder.with_keep_alive_seconds(1200);
|
|
160
161
|
config = configBuilder.build();
|
|
@@ -198,15 +199,6 @@ var buildNodeBrokerFunction = function (RED) { return (function awsNodeBroker(n)
|
|
|
198
199
|
this.broker = new NodeBroker(n, RED, function (msg) { return self.log(msg); });
|
|
199
200
|
this.on('close', function () {
|
|
200
201
|
self.log("closed " + self.clientId + " ok");
|
|
201
|
-
if (self.broker.mqttClient) {
|
|
202
|
-
try {
|
|
203
|
-
self.broker.mqttClient.disconnect();
|
|
204
|
-
}
|
|
205
|
-
catch (e) {
|
|
206
|
-
console.info('MQTT not connected');
|
|
207
|
-
}
|
|
208
|
-
}
|
|
209
|
-
self.broker.mqttClient = null;
|
|
210
202
|
});
|
|
211
203
|
}); };
|
|
212
204
|
exports.buildNodeBrokerFunction = buildNodeBrokerFunction;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-broker.js","sourceRoot":"","sources":["../../src/nodes/node-broker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"node-broker.js","sourceRoot":"","sources":["../../src/nodes/node-broker.ts"],"names":[],"mappings":"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"}
|