@gotillit/tillit-node-red 1.2.55 → 1.2.57
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/nodes/node-api.js
CHANGED
|
@@ -52,13 +52,13 @@ var NodeApi = /** @class */ (function () {
|
|
|
52
52
|
this.node.on('input', (function (msg) { return _this.onInput(msg); }));
|
|
53
53
|
}
|
|
54
54
|
NodeApi.prototype.onInput = function (msg) {
|
|
55
|
-
var _a;
|
|
55
|
+
var _a, _b;
|
|
56
56
|
return __awaiter(this, void 0, void 0, function () {
|
|
57
|
-
var
|
|
58
|
-
return __generator(this, function (
|
|
59
|
-
switch (
|
|
57
|
+
var _c, environment, tenant, username, password, endpoint, url, ops, response, error_1;
|
|
58
|
+
return __generator(this, function (_d) {
|
|
59
|
+
switch (_d.label) {
|
|
60
60
|
case 0:
|
|
61
|
-
|
|
61
|
+
_c = this.broker, environment = _c.environment, tenant = _c.tenant, username = _c.username, password = _c.password;
|
|
62
62
|
endpoint = (_a = msg.endpoint) !== null && _a !== void 0 ? _a : this.defaultEndpoint;
|
|
63
63
|
url = (0, utils_1.hostname)(environment, tenant) + '/api/' + endpoint;
|
|
64
64
|
this.node.status({
|
|
@@ -66,9 +66,9 @@ var NodeApi = /** @class */ (function () {
|
|
|
66
66
|
shape: "ring",
|
|
67
67
|
text: "loading..."
|
|
68
68
|
});
|
|
69
|
-
|
|
69
|
+
_d.label = 1;
|
|
70
70
|
case 1:
|
|
71
|
-
|
|
71
|
+
_d.trys.push([1, 3, , 4]);
|
|
72
72
|
ops = {
|
|
73
73
|
method: this.method,
|
|
74
74
|
username: username,
|
|
@@ -84,7 +84,7 @@ var NodeApi = /** @class */ (function () {
|
|
|
84
84
|
}
|
|
85
85
|
return [4 /*yield*/, (0, got_1.default)(url, ops)];
|
|
86
86
|
case 2:
|
|
87
|
-
response =
|
|
87
|
+
response = _d.sent();
|
|
88
88
|
this.node.status({
|
|
89
89
|
fill: "green",
|
|
90
90
|
shape: "ring",
|
|
@@ -104,7 +104,7 @@ var NodeApi = /** @class */ (function () {
|
|
|
104
104
|
}
|
|
105
105
|
return [3 /*break*/, 4];
|
|
106
106
|
case 3:
|
|
107
|
-
error_1 =
|
|
107
|
+
error_1 = _d.sent();
|
|
108
108
|
this.node.status({
|
|
109
109
|
fill: "red",
|
|
110
110
|
shape: "ring",
|
|
@@ -112,7 +112,7 @@ var NodeApi = /** @class */ (function () {
|
|
|
112
112
|
});
|
|
113
113
|
this.node.send([null, {
|
|
114
114
|
topic: msg.topic,
|
|
115
|
-
payload: error_1.response.body ? JSON.parse(error_1.response.body) : { message: error_1.message }
|
|
115
|
+
payload: ((_b = error_1 === null || error_1 === void 0 ? void 0 : error_1.response) === null || _b === void 0 ? void 0 : _b.body) ? JSON.parse(error_1.response.body) : { message: error_1.message }
|
|
116
116
|
}]);
|
|
117
117
|
return [3 /*break*/, 4];
|
|
118
118
|
case 4: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-api.js","sourceRoot":"","sources":["../../src/nodes/node-api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"node-api.js","sourceRoot":"","sources":["../../src/nodes/node-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,9 +95,16 @@ var NodeBroker = /** @class */ (function (_super) {
|
|
|
95
95
|
_this.password = password !== null && password !== void 0 ? password : process.env.PASSWORD;
|
|
96
96
|
_this.tenant = tenant !== null && tenant !== void 0 ? tenant : process.env.TENANT;
|
|
97
97
|
_this.username = "".concat(username, "@").concat(tenant, ".tillit.cloud");
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
98
|
+
if (process.env.EDGE_BUCKET) {
|
|
99
|
+
_this.thingCert = (_this.workingDir + _this.clientId + '/tillitEdgeConfig/thingCert.crt');
|
|
100
|
+
_this.privKey = (_this.workingDir + _this.clientId + '/tillitEdgeConfig/privKey.key');
|
|
101
|
+
_this.rootCa = (_this.workingDir + _this.clientId + '/tillitEdgeConfig/rootCA.pem');
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
_this.thingCert = process.env.THING_CERT || n.thingCert;
|
|
105
|
+
_this.privKey = process.env.PRIV_KEY || n.privKey;
|
|
106
|
+
_this.rootCa = process.env.ROOT_CA || n.rootCa;
|
|
107
|
+
}
|
|
101
108
|
}
|
|
102
109
|
catch (e) {
|
|
103
110
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-broker.js","sourceRoot":"","sources":["../../src/nodes/node-broker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA6C;AAC7C,uDAA4D;AAC5D,+DAAgD;AAChD,kDAAkC;AAClC,qCAAyB;AAyBzB;IAAyB,8BAAY;IAkBjC,oBAAY,CAAmB,EAAE,GAAQ,EAAE,GAAQ;;QAAnD,YACI,iBAAO,
|
|
1
|
+
{"version":3,"file":"node-broker.js","sourceRoot":"","sources":["../../src/nodes/node-broker.ts"],"names":[],"mappings":"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"}
|
package/dist/nodes/node-in.js
CHANGED
|
@@ -52,6 +52,9 @@ var NodeIn = /** @class */ (function () {
|
|
|
52
52
|
shape: 'ring',
|
|
53
53
|
text: ((_b = (_a = report === null || report === void 0 ? void 0 : report.data) === null || _a === void 0 ? void 0 : _a.error) === null || _b === void 0 ? void 0 : _b.message) || report.status
|
|
54
54
|
});
|
|
55
|
+
if (report.status === 'connected') {
|
|
56
|
+
_this.startSubscription();
|
|
57
|
+
}
|
|
55
58
|
});
|
|
56
59
|
}
|
|
57
60
|
NodeIn.prototype.onMessage = function (topic, payload, dup, qos, retain) {
|
|
@@ -62,62 +65,70 @@ var NodeIn = /** @class */ (function () {
|
|
|
62
65
|
payload: json.body ? json.body : json
|
|
63
66
|
});
|
|
64
67
|
};
|
|
68
|
+
NodeIn.prototype.connectToBroker = function () {
|
|
69
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
70
|
+
var e_1;
|
|
71
|
+
return __generator(this, function (_a) {
|
|
72
|
+
switch (_a.label) {
|
|
73
|
+
case 0:
|
|
74
|
+
_a.trys.push([0, 2, , 3]);
|
|
75
|
+
return [4 /*yield*/, this.broker.connect()];
|
|
76
|
+
case 1:
|
|
77
|
+
_a.sent();
|
|
78
|
+
return [3 /*break*/, 3];
|
|
79
|
+
case 2:
|
|
80
|
+
e_1 = _a.sent();
|
|
81
|
+
this.node.status({
|
|
82
|
+
fill: "red",
|
|
83
|
+
shape: "ring",
|
|
84
|
+
text: "error connecting to broker"
|
|
85
|
+
});
|
|
86
|
+
return [3 /*break*/, 3];
|
|
87
|
+
case 3: return [2 /*return*/];
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
};
|
|
65
92
|
NodeIn.prototype.startSubscription = function () {
|
|
66
93
|
return __awaiter(this, void 0, void 0, function () {
|
|
67
|
-
var
|
|
94
|
+
var topic, e_2, error_1;
|
|
68
95
|
var _this = this;
|
|
69
96
|
return __generator(this, function (_a) {
|
|
70
97
|
switch (_a.label) {
|
|
71
98
|
case 0:
|
|
72
|
-
if (!this.broker) return [3 /*break*/,
|
|
99
|
+
if (!this.broker) return [3 /*break*/, 8];
|
|
73
100
|
this.node.status({
|
|
74
101
|
fill: "yellow",
|
|
75
102
|
shape: "ring",
|
|
76
103
|
text: "subscribing..."
|
|
77
104
|
});
|
|
105
|
+
topic = this.broker.tenant + this.topic;
|
|
78
106
|
_a.label = 1;
|
|
79
107
|
case 1:
|
|
80
108
|
_a.trys.push([1, 3, , 4]);
|
|
81
|
-
return [4 /*yield*/, this.broker.
|
|
109
|
+
return [4 /*yield*/, this.broker.mqttClient.unsubscribe(topic)];
|
|
82
110
|
case 2:
|
|
83
111
|
_a.sent();
|
|
84
112
|
return [3 /*break*/, 4];
|
|
85
113
|
case 3:
|
|
86
|
-
e_1 = _a.sent();
|
|
87
|
-
this.node.status({
|
|
88
|
-
fill: "red",
|
|
89
|
-
shape: "ring",
|
|
90
|
-
text: "error connecting to broker"
|
|
91
|
-
});
|
|
92
|
-
return [3 /*break*/, 4];
|
|
93
|
-
case 4:
|
|
94
|
-
topic = this.broker.tenant + this.topic;
|
|
95
|
-
_a.label = 5;
|
|
96
|
-
case 5:
|
|
97
|
-
_a.trys.push([5, 7, , 8]);
|
|
98
|
-
return [4 /*yield*/, this.broker.mqttClient.unsubscribe(topic)];
|
|
99
|
-
case 6:
|
|
100
|
-
_a.sent();
|
|
101
|
-
return [3 /*break*/, 8];
|
|
102
|
-
case 7:
|
|
103
114
|
e_2 = _a.sent();
|
|
104
115
|
console.error('Error unsubscribing');
|
|
105
116
|
console.error(e_2);
|
|
106
|
-
return [3 /*break*/,
|
|
107
|
-
case
|
|
108
|
-
_a.trys.push([
|
|
117
|
+
return [3 /*break*/, 4];
|
|
118
|
+
case 4:
|
|
119
|
+
_a.trys.push([4, 6, , 7]);
|
|
109
120
|
return [4 /*yield*/, this.broker.mqttClient.subscribe(topic, aws_iot_device_sdk_v2_1.mqtt.QoS.AtLeastOnce, function (topic, payload, dup, qos, retain) {
|
|
110
121
|
_this.onMessage(topic, payload, dup, qos, retain);
|
|
111
122
|
})];
|
|
112
|
-
case
|
|
123
|
+
case 5:
|
|
113
124
|
_a.sent();
|
|
114
125
|
this.node.status({
|
|
115
126
|
fill: "green",
|
|
116
127
|
shape: "ring",
|
|
117
128
|
text: "subscribed"
|
|
118
129
|
});
|
|
119
|
-
return [3 /*break*/,
|
|
120
|
-
case
|
|
130
|
+
return [3 /*break*/, 7];
|
|
131
|
+
case 6:
|
|
121
132
|
error_1 = _a.sent();
|
|
122
133
|
this.node.status({
|
|
123
134
|
fill: "error",
|
|
@@ -129,17 +140,17 @@ var NodeIn = /** @class */ (function () {
|
|
|
129
140
|
shape: "ring",
|
|
130
141
|
text: error_1.message
|
|
131
142
|
});
|
|
132
|
-
return [3 /*break*/,
|
|
133
|
-
case
|
|
134
|
-
case
|
|
143
|
+
return [3 /*break*/, 7];
|
|
144
|
+
case 7: return [3 /*break*/, 9];
|
|
145
|
+
case 8:
|
|
135
146
|
this.node.error("connection is not configured");
|
|
136
147
|
this.node.status({
|
|
137
148
|
fill: "red",
|
|
138
149
|
shape: "ring",
|
|
139
150
|
text: "not configured"
|
|
140
151
|
});
|
|
141
|
-
_a.label =
|
|
142
|
-
case
|
|
152
|
+
_a.label = 9;
|
|
153
|
+
case 9: return [2 /*return*/];
|
|
143
154
|
}
|
|
144
155
|
});
|
|
145
156
|
});
|
|
@@ -150,7 +161,7 @@ var buildNodeInFunction = function (RED) { return (function awsMqttNodeIn(n) {
|
|
|
150
161
|
RED.nodes.createNode(this, n);
|
|
151
162
|
this.tillitIn = new NodeIn(n, RED, this);
|
|
152
163
|
try {
|
|
153
|
-
this.tillitIn.
|
|
164
|
+
this.tillitIn.connectToBroker().then();
|
|
154
165
|
}
|
|
155
166
|
catch (e) {
|
|
156
167
|
this.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-in.js","sourceRoot":"","sources":["../../src/nodes/node-in.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA2C;AAG3C,IAAM,OAAO,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;AAGxC;IAeI,gBAAY,CAAW,EAAE,GAAQ,EAAE,IAAS;QAA5C,
|
|
1
|
+
{"version":3,"file":"node-in.js","sourceRoot":"","sources":["../../src/nodes/node-in.ts"],"names":[],"mappings":"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"}
|