@gotillit/tillit-node-red 1.2.1 → 1.2.3

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.
@@ -42,38 +42,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
42
42
  exports.buildApiFunction = void 0;
43
43
  var utils_1 = require("../shared/utils");
44
44
  var got_1 = __importDefault(require("got"));
45
- var buildApiFunction = function (RED) { return (function apiCall(n) {
46
- RED.nodes.createNode(this, n);
47
- this.myDevice = n.device;
48
- this.device = RED.nodes.getNode(this.myDevice);
49
- this.connection = this.device.broker;
50
- var _a = this.connection, environment = _a.environment, tenant = _a.tenant, username = _a.username, password = _a.password;
51
- var self = this;
52
- self.on("input", function (msg) {
45
+ var NodeApi = /** @class */ (function () {
46
+ function NodeApi(n, RED, node) {
47
+ var _this = this;
48
+ this.broker = RED.nodes.getNode(n.device).broker;
49
+ this.defaultEndpoint = n.endpoint;
50
+ this.method = n.method;
51
+ this.node = node;
52
+ this.node.on('input', (function (msg) { return _this.onInput(msg); }));
53
+ }
54
+ NodeApi.prototype.onInput = function (msg) {
53
55
  var _a;
54
56
  return __awaiter(this, void 0, void 0, function () {
55
- var endpoint, url, method, ops, response, error_1;
56
- return __generator(this, function (_b) {
57
- switch (_b.label) {
57
+ var _b, environment, tenant, username, password, endpoint, url, ops, response, error_1;
58
+ return __generator(this, function (_c) {
59
+ switch (_c.label) {
58
60
  case 0:
59
- endpoint = (_a = msg.endpoint) !== null && _a !== void 0 ? _a : n.endpoint;
61
+ _b = this.broker, environment = _b.environment, tenant = _b.tenant, username = _b.username, password = _b.password;
62
+ endpoint = (_a = msg.endpoint) !== null && _a !== void 0 ? _a : this.defaultEndpoint;
60
63
  url = (0, utils_1.hostname)(environment, tenant) + '/api/' + endpoint;
61
- method = n.method;
62
- self.status({
64
+ this.node.status({
63
65
  fill: "blue",
64
66
  shape: "ring",
65
67
  text: "loading..."
66
68
  });
67
- _b.label = 1;
69
+ _c.label = 1;
68
70
  case 1:
69
- _b.trys.push([1, 3, , 4]);
71
+ _c.trys.push([1, 3, , 4]);
70
72
  ops = {
71
- method: method,
73
+ method: this.method,
72
74
  username: username,
73
75
  password: password
74
76
  };
75
77
  if (msg.payload) {
76
- if (['POST', 'PUT'].includes(method)) {
78
+ if (['POST', 'PUT'].includes(this.method)) {
77
79
  ops['json'] = msg.payload;
78
80
  }
79
81
  else if (typeof msg.payload === 'object') {
@@ -82,34 +84,33 @@ var buildApiFunction = function (RED) { return (function apiCall(n) {
82
84
  }
83
85
  return [4 /*yield*/, (0, got_1.default)(url, ops)];
84
86
  case 2:
85
- response = _b.sent();
86
- // const data = await response.json();
87
- self.status({
87
+ response = _c.sent();
88
+ this.node.status({
88
89
  fill: "green",
89
90
  shape: "ring",
90
91
  text: response.statusCode
91
92
  });
92
93
  try {
93
- self.send([{
94
+ this.node.send([{
94
95
  topic: msg.topic,
95
96
  payload: response.body ? JSON.parse(response.body) : null
96
97
  }, null]);
97
98
  }
98
99
  catch (e) {
99
- self.send([null, {
100
+ this.node.send([null, {
100
101
  topic: msg.topic,
101
102
  payload: response.body
102
103
  }]);
103
104
  }
104
105
  return [3 /*break*/, 4];
105
106
  case 3:
106
- error_1 = _b.sent();
107
- self.status({
107
+ error_1 = _c.sent();
108
+ this.node.status({
108
109
  fill: "red",
109
110
  shape: "ring",
110
111
  text: error_1.message
111
112
  });
112
- self.send([null, {
113
+ this.node.send([null, {
113
114
  topic: msg.topic,
114
115
  payload: error_1.response.body ? JSON.parse(error_1.response.body) : { message: error_1.message }
115
116
  }]);
@@ -118,7 +119,13 @@ var buildApiFunction = function (RED) { return (function apiCall(n) {
118
119
  }
119
120
  });
120
121
  });
121
- });
122
+ };
123
+ return NodeApi;
124
+ }());
125
+ var buildApiFunction = function (RED) { return (function apiCall(n) {
126
+ RED.nodes.createNode(this, n);
127
+ var self = this;
128
+ this.api = new NodeApi(n, RED, self);
122
129
  }); };
123
130
  exports.buildApiFunction = buildApiFunction;
124
131
  //# sourceMappingURL=node-api.js.map
@@ -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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"}
@@ -1,4 +1,6 @@
1
+ /// <reference types="node" />
1
2
  import { TilliTConnection } from '../shared/types';
3
+ import EventEmitter from 'events';
2
4
  export interface NodeMqttClient {
3
5
  client: any;
4
6
  connected: boolean;
@@ -6,11 +8,17 @@ export interface NodeMqttClient {
6
8
  reconnect: () => Promise<boolean>;
7
9
  disconnect: () => Promise<boolean>;
8
10
  unsubscribe: (topic: string) => Promise<any>;
9
- subscribe: (topic: string, qos: '0' | '1' | '2', on_message?: any) => Promise<boolean>;
11
+ subscribe: (topic: string, qos: 0 | 1 | 2, on_message?: any) => Promise<boolean>;
12
+ publish: (topic: string, payload: any, qos: '0' | '1' | '2', flag: boolean) => Promise<any>;
10
13
  on: (event: string, listener: any) => void;
11
14
  }
12
- export interface NodeBrokerInterface {
13
- connect: (clientId: string, reconnect: any, callback: any) => void;
15
+ export interface NodeBrokerInterface extends EventEmitter {
16
+ connect: (reconnect?: boolean) => void;
14
17
  mqttClient: NodeMqttClient;
18
+ environment: string;
19
+ clientId: string;
20
+ tenant: string;
21
+ username: string;
22
+ password: string;
15
23
  }
16
24
  export declare const buildNodeBrokerFunction: (RED: any) => (n: TilliTConnection) => void;
@@ -1,85 +1,190 @@
1
1
  "use strict";
2
+ var __extends = (this && this.__extends) || (function () {
3
+ var extendStatics = function (d, b) {
4
+ extendStatics = Object.setPrototypeOf ||
5
+ ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
+ function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
+ return extendStatics(d, b);
8
+ };
9
+ return function (d, b) {
10
+ if (typeof b !== "function" && b !== null)
11
+ throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
+ extendStatics(d, b);
13
+ function __() { this.constructor = d; }
14
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
+ };
16
+ })();
17
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18
+ if (k2 === undefined) k2 = k;
19
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
20
+ }) : (function(o, m, k, k2) {
21
+ if (k2 === undefined) k2 = k;
22
+ o[k2] = m[k];
23
+ }));
24
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
25
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
26
+ }) : function(o, v) {
27
+ o["default"] = v;
28
+ });
29
+ var __importStar = (this && this.__importStar) || function (mod) {
30
+ if (mod && mod.__esModule) return mod;
31
+ var result = {};
32
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
33
+ __setModuleDefault(result, mod);
34
+ return result;
35
+ };
36
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
37
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
38
+ return new (P || (P = Promise))(function (resolve, reject) {
39
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
40
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
41
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
42
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
43
+ });
44
+ };
45
+ var __generator = (this && this.__generator) || function (thisArg, body) {
46
+ var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
47
+ return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
48
+ function verb(n) { return function (v) { return step([n, v]); }; }
49
+ function step(op) {
50
+ if (f) throw new TypeError("Generator is already executing.");
51
+ while (_) try {
52
+ if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
53
+ if (y = 0, t) op = [op[0] & 2, t.value];
54
+ switch (op[0]) {
55
+ case 0: case 1: t = op; break;
56
+ case 4: _.label++; return { value: op[1], done: false };
57
+ case 5: _.label++; y = op[1]; op = [0]; continue;
58
+ case 7: op = _.ops.pop(); _.trys.pop(); continue;
59
+ default:
60
+ if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
61
+ if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
62
+ if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
63
+ if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
64
+ if (t[2]) _.ops.pop();
65
+ _.trys.pop(); continue;
66
+ }
67
+ op = body.call(thisArg, _);
68
+ } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
69
+ if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
70
+ }
71
+ };
72
+ var __importDefault = (this && this.__importDefault) || function (mod) {
73
+ return (mod && mod.__esModule) ? mod : { "default": mod };
74
+ };
2
75
  Object.defineProperty(exports, "__esModule", { value: true });
3
76
  exports.buildNodeBrokerFunction = void 0;
4
77
  var utils_1 = require("../shared/utils");
5
78
  var edge_from_s3_1 = require("../shared/edge-from-s3");
6
79
  var aws_iot_device_sdk_v2_1 = require("aws-iot-device-sdk-v2");
7
- var NodeBroker = /** @class */ (function () {
80
+ var events_1 = __importDefault(require("events"));
81
+ var fs = __importStar(require("fs"));
82
+ var NodeBroker = /** @class */ (function (_super) {
83
+ __extends(NodeBroker, _super);
8
84
  function NodeBroker(n, RED, log) {
9
85
  var _a;
10
- this.log = log;
11
- this.workingDir = RED.settings.userDir + '/';
86
+ var _this = _super.call(this) || this;
87
+ _this.log = log;
88
+ _this.workingDir = RED.settings.userDir;
12
89
  try {
13
- this.clientId = process.env.CLIENT_ID || n.thingId;
14
- this.environment = (_a = n.environment) !== null && _a !== void 0 ? _a : process.env.ENVIRONMENT;
15
- this.endpoint = process.env.IOT_ENDPOINT || (0, utils_1.mqttEndpoint)(n.environment);
90
+ _this.clientId = process.env.CLIENT_ID || n.thingId;
91
+ _this.environment = (_a = n.environment) !== null && _a !== void 0 ? _a : process.env.ENVIRONMENT;
92
+ _this.endpoint = process.env.IOT_ENDPOINT || (0, utils_1.mqttEndpoint)(n.environment);
16
93
  var username = n.username, tenant = n.tenant, password = n.password;
17
94
  username = username !== null && username !== void 0 ? username : process.env.USERNAME;
18
- this.password = password !== null && password !== void 0 ? password : process.env.PASSWORD;
19
- this.tenant = tenant !== null && tenant !== void 0 ? tenant : process.env.TENANT;
20
- this.username = "".concat(username, "@").concat(tenant, ".tillit.cloud");
21
- this.thingCert = process.env.THING_CERT || (this.workingDir + this.clientId + '/tillitEdgeConfig/thingCert.crt');
22
- this.privKey = process.env.PRIV_KEY || (this.workingDir + this.clientId + '/tillitEdgeConfig/privKey.key');
23
- this.rootCa = process.env.ROOT_CA || (this.workingDir + this.clientId + '/tillitEdgeConfig/rootCA.pem');
24
- if (process.env.EDGE_BUCKET && n.thingId) {
25
- (0, edge_from_s3_1.downloadAndUnzipEdge)(this.workingDir, n.thingId);
26
- }
95
+ _this.password = password !== null && password !== void 0 ? password : process.env.PASSWORD;
96
+ _this.tenant = tenant !== null && tenant !== void 0 ? tenant : process.env.TENANT;
97
+ _this.username = "".concat(username, "@").concat(tenant, ".tillit.cloud");
98
+ _this.thingCert = process.env.THING_CERT || (_this.workingDir + _this.clientId + '/tillitEdgeConfig/thingCert.crt');
99
+ _this.privKey = process.env.PRIV_KEY || (_this.workingDir + _this.clientId + '/tillitEdgeConfig/privKey.key');
100
+ _this.rootCa = process.env.ROOT_CA || (_this.workingDir + _this.clientId + '/tillitEdgeConfig/rootCA.pem');
27
101
  }
28
102
  catch (e) {
29
103
  console.error(e);
30
104
  }
105
+ return _this;
31
106
  }
32
- NodeBroker.prototype.connect = function (clientId, reconnect, callback) {
107
+ NodeBroker.prototype.startConnection = function () {
108
+ var _this = this;
109
+ this.mqttClient.connect().catch(function (error) {
110
+ _this.emit('disconnected', error);
111
+ }).then(function (connected) {
112
+ _this.emit('connected');
113
+ }).catch(function (err) {
114
+ _this.emit('disconnected', err);
115
+ });
116
+ };
117
+ NodeBroker.prototype.connect = function (reconnect) {
33
118
  var _a, _b;
34
- this.log("connected: ".concat((_b = (_a = this.mqttClient) === null || _a === void 0 ? void 0 : _a.client) === null || _b === void 0 ? void 0 : _b.connected));
35
- if (!this.mqttClient || reconnect) {
36
- this.log("Attempt to connect to with " + clientId + " from: " + this.endpoint);
37
- this.log("Using the certificates that are presented as follows:");
38
- this.log(" - keyPath : " + this.privKey);
39
- this.log(" - certPath : " + this.thingCert);
40
- this.log(" - caPath : " + this.rootCa);
41
- var configBuilder = aws_iot_device_sdk_v2_1.iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(this.thingCert, this.privKey);
42
- configBuilder.with_certificate_authority_from_path(undefined, this.rootCa);
43
- configBuilder.with_clean_session(false);
44
- configBuilder.with_client_id((clientId || "test-") + Math.floor(Math.random() * 100000000));
45
- configBuilder.with_endpoint(this.endpoint);
46
- configBuilder.with_keep_alive_seconds(20);
47
- var config = configBuilder.build();
48
- var client = new aws_iot_device_sdk_v2_1.mqtt.MqttClient();
49
- this.mqttClient = client.new_connection(config);
50
- this.mqttClient.connect().catch(function (error) {
51
- console.log("Connect error: " + error);
52
- }).then(function (connected) {
53
- }).catch(function (err) {
54
- console.log(err);
119
+ return __awaiter(this, void 0, void 0, function () {
120
+ var configBuilder, config, client;
121
+ var _this = this;
122
+ return __generator(this, function (_c) {
123
+ switch (_c.label) {
124
+ case 0:
125
+ this.log("connected: ".concat((_b = (_a = this.mqttClient) === null || _a === void 0 ? void 0 : _a.client) === null || _b === void 0 ? void 0 : _b.connected));
126
+ if (!(!this.mqttClient || reconnect)) return [3 /*break*/, 3];
127
+ if (!(process.env.EDGE_BUCKET && this.clientId)) return [3 /*break*/, 2];
128
+ return [4 /*yield*/, (0, edge_from_s3_1.downloadAndUnzipEdge)(this.workingDir, this.clientId)];
129
+ case 1:
130
+ _c.sent();
131
+ _c.label = 2;
132
+ case 2:
133
+ this.log("Attempt to connect to with " + this.clientId + " from: " + this.endpoint);
134
+ this.log("Using the certificates that are presented as follows:");
135
+ this.log(" - keyPath : " + this.privKey);
136
+ if (!fs.existsSync(this.privKey)) {
137
+ this.log(" - keyPath : " + this.privKey + ' not found');
138
+ }
139
+ this.log(" - certPath : " + this.thingCert);
140
+ if (!fs.existsSync(this.thingCert)) {
141
+ this.log(" - certPath : " + this.thingCert + ' not found');
142
+ }
143
+ this.log(" - caPath : " + this.rootCa);
144
+ if (!fs.existsSync(this.rootCa)) {
145
+ this.log(" - rootCa : " + this.rootCa + ' not found');
146
+ }
147
+ configBuilder = aws_iot_device_sdk_v2_1.iot.AwsIotMqttConnectionConfigBuilder.new_mtls_builder_from_path(this.thingCert, this.privKey);
148
+ configBuilder.with_certificate_authority_from_path(undefined, this.rootCa);
149
+ configBuilder.with_clean_session(false);
150
+ configBuilder.with_client_id((this.clientId || "test-") + Math.floor(Math.random() * 100000000));
151
+ configBuilder.with_endpoint(this.endpoint);
152
+ configBuilder.with_keep_alive_seconds(20);
153
+ config = configBuilder.build();
154
+ client = new aws_iot_device_sdk_v2_1.mqtt.MqttClient();
155
+ this.mqttClient = client.new_connection(config);
156
+ if (this.mqttClient) {
157
+ this.mqttClient.on('connect', function (data) {
158
+ _this.status = 'connected';
159
+ _this.emit('statusUpdate', { status: _this.status, data: data });
160
+ });
161
+ this.mqttClient.on('interrupt', function (data) {
162
+ _this.status = 'disconnected';
163
+ _this.emit('statusUpdate', { status: _this.status, data: data });
164
+ });
165
+ this.mqttClient.on('resume', function (data) {
166
+ _this.status = 'connected';
167
+ _this.emit('statusUpdate', { status: _this.status, data: data });
168
+ });
169
+ this.mqttClient.on('error', function (data) {
170
+ _this.status = 'disconnected';
171
+ _this.emit('statusUpdate', { status: _this.status, data: data });
172
+ });
173
+ this.startConnection();
174
+ }
175
+ return [3 /*break*/, 4];
176
+ case 3:
177
+ if (this.mqttClient) {
178
+ }
179
+ _c.label = 4;
180
+ case 4: return [2 /*return*/];
181
+ }
55
182
  });
56
- var self_1 = this;
57
- if (this.mqttClient) {
58
- this.mqttClient.on('connect', function () {
59
- this.connnected = true;
60
- callback('connected');
61
- });
62
- this.mqttClient.on('interrupt', function (error) {
63
- this.connnected = false;
64
- callback('interrupt', error);
65
- });
66
- this.mqttClient.on('resume', function (error) {
67
- this.connnected = true;
68
- callback('resume', error);
69
- });
70
- this.mqttClient.on('error', function (error) {
71
- callback('error', error);
72
- });
73
- }
74
- callback('created');
75
- }
76
- else if (this.mqttClient) {
77
- callback('connected');
78
- }
183
+ });
79
184
  };
80
185
  ;
81
186
  return NodeBroker;
82
- }());
187
+ }(events_1.default));
83
188
  var buildNodeBrokerFunction = function (RED) { return (function awsNodeBroker(n) {
84
189
  RED.nodes.createNode(this, n);
85
190
  var self = this;
@@ -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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"}
@@ -42,35 +42,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
42
42
  exports.buildEventFunction = void 0;
43
43
  var utils_1 = require("../shared/utils");
44
44
  var got_1 = __importDefault(require("got"));
45
- var buildEventFunction = function (RED) { return (function apiCall(n) {
46
- RED.nodes.createNode(this, n);
47
- this.myDevice = n.device;
48
- this.device = RED.nodes.getNode(this.myDevice);
49
- this.connection = this.device.broker;
50
- var _a = this.connection, environment = _a.environment, tenant = _a.tenant, username = _a.username, password = _a.password;
51
- var self = this;
52
- var payload = {
53
- assetId: n.assetId * 1,
54
- eventTypeId: n.eventTypeId * 1,
55
- subtitle: n.subtitle,
56
- timestamp: new Date().toISOString()
57
- };
58
- self.on("input", function (msg) {
45
+ var NodeEvent = /** @class */ (function () {
46
+ function NodeEvent(n, RED, node) {
47
+ var _this = this;
48
+ this.broker = RED.nodes.getNode(n.device).broker;
49
+ this.node = node;
50
+ this.assetId = n.assetId;
51
+ this.eventTypeId = n.eventTypeId;
52
+ this.subtitle = n.subtitle;
53
+ this.node.on('input', (function (msg) { return _this.onInput(msg); }));
54
+ }
55
+ NodeEvent.prototype.onInput = function (msg) {
59
56
  return __awaiter(this, void 0, void 0, function () {
60
- var url, finalPayload, ops, response, error_1, error_2;
61
- return __generator(this, function (_a) {
62
- switch (_a.label) {
57
+ var _a, environment, tenant, username, password, payload, url, finalPayload, ops, response, error_1, error_2;
58
+ return __generator(this, function (_b) {
59
+ switch (_b.label) {
63
60
  case 0:
64
- _a.trys.push([0, 5, , 6]);
61
+ _b.trys.push([0, 5, , 6]);
62
+ _a = this.broker, environment = _a.environment, tenant = _a.tenant, username = _a.username, password = _a.password;
63
+ payload = {
64
+ assetId: this.assetId * 1,
65
+ eventTypeId: this.eventTypeId * 1,
66
+ subtitle: this.subtitle,
67
+ timestamp: new Date().toISOString()
68
+ };
65
69
  url = (0, utils_1.hostname)(environment, tenant) + '/api/core/event-instances/raise';
66
- self.status({
70
+ this.node.status({
67
71
  fill: "blue",
68
72
  shape: "ring",
69
73
  text: "sending..."
70
74
  });
71
- _a.label = 1;
75
+ _b.label = 1;
72
76
  case 1:
73
- _a.trys.push([1, 3, , 4]);
77
+ _b.trys.push([1, 3, , 4]);
74
78
  finalPayload = payload;
75
79
  if (msg.payload && typeof msg.payload === 'object') {
76
80
  finalPayload = Object.assign(payload, msg.payload);
@@ -87,42 +91,42 @@ var buildEventFunction = function (RED) { return (function apiCall(n) {
87
91
  console.log('Raising event ' + url + ' ' + JSON.stringify(finalPayload));
88
92
  return [4 /*yield*/, (0, got_1.default)(url, ops)];
89
93
  case 2:
90
- response = _a.sent();
94
+ response = _b.sent();
91
95
  // const data = await response.json();
92
- self.status({
96
+ this.node.status({
93
97
  fill: "green",
94
98
  shape: "ring",
95
99
  text: response.statusCode
96
100
  });
97
101
  try {
98
- self.send([{
102
+ this.node.send([{
99
103
  topic: msg.topic,
100
104
  payload: response.body ? JSON.parse(response.body) : null
101
105
  }, null]);
102
106
  }
103
107
  catch (e) {
104
- self.send([null, {
108
+ this.node.send([null, {
105
109
  topic: msg.topic,
106
110
  payload: response.body
107
111
  }]);
108
112
  }
109
113
  return [3 /*break*/, 4];
110
114
  case 3:
111
- error_1 = _a.sent();
112
- self.status({
115
+ error_1 = _b.sent();
116
+ this.node.status({
113
117
  fill: "red",
114
118
  shape: "ring",
115
119
  text: error_1.message
116
120
  });
117
- self.send([{
121
+ this.node.send([{
118
122
  topic: msg.topic,
119
123
  payload: error_1.response.body ? JSON.parse(error_1.response.body) : { message: error_1.message }
120
124
  }]);
121
125
  return [3 /*break*/, 4];
122
126
  case 4: return [3 /*break*/, 6];
123
127
  case 5:
124
- error_2 = _a.sent();
125
- self.status({
128
+ error_2 = _b.sent();
129
+ this.node.status({
126
130
  fill: "red",
127
131
  shape: "ring",
128
132
  text: error_2.message
@@ -132,7 +136,12 @@ var buildEventFunction = function (RED) { return (function apiCall(n) {
132
136
  }
133
137
  });
134
138
  });
135
- });
139
+ };
140
+ return NodeEvent;
141
+ }());
142
+ var buildEventFunction = function (RED) { return (function apiCall(n) {
143
+ RED.nodes.createNode(this, n);
144
+ this.tillitEvent = new NodeEvent(n, RED, this);
136
145
  }); };
137
146
  exports.buildEventFunction = buildEventFunction;
138
147
  //# sourceMappingURL=node-event.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"node-event.js","sourceRoot":"","sources":["../../src/nodes/node-event.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node-event.js","sourceRoot":"","sources":["../../src/nodes/node-event.ts"],"names":[],"mappings":"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"}