node-red-contrib-esphome 0.3.0 → 0.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.
@@ -4,3 +4,4 @@ export declare const Status: {
4
4
  export declare const LogLevel: {
5
5
  [key: number]: string;
6
6
  };
7
+ export declare function roundToX(num: number, X: number): number;
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.LogLevel = exports.Status = void 0;
4
+ exports.roundToX = roundToX;
4
5
  exports.Status = {
5
6
  error: {
6
7
  fill: 'red',
@@ -33,4 +34,7 @@ exports.LogLevel = {
33
34
  6: 'VERBOSE',
34
35
  7: 'VERY_VERBOSE'
35
36
  };
37
+ function roundToX(num, X) {
38
+ return Number(Math.round(Number(`${num}e+${X}`)) + `e-${X}`);
39
+ }
36
40
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAyB;IAC1C,KAAK,EAAE;QACL,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;KACd;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,cAAc;KACrB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,YAAY;KACnB;IACD,SAAS,EAAE;QACT,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,WAAW;KAClB;CACO,CAAC;AAEE,QAAA,QAAQ,GAA4B;IAC/C,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,cAAc;CACT,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;AAkCA,4BAEC;AApCY,QAAA,MAAM,GAAyB;IAC1C,KAAK,EAAE;QACL,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,OAAO;KACd;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,cAAc;KACrB;IACD,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,YAAY;KACnB;IACD,SAAS,EAAE;QACT,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,WAAW;KAClB;CACO,CAAC;AAEE,QAAA,QAAQ,GAA4B;IAC/C,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,MAAM;IACT,CAAC,EAAE,QAAQ;IACX,CAAC,EAAE,OAAO;IACV,CAAC,EAAE,SAAS;IACZ,CAAC,EAAE,cAAc;CACT,CAAC;AAEX,SAAgB,QAAQ,CAAC,GAAW,EAAE,CAAS;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;AAC/D,CAAC"}
@@ -5,7 +5,8 @@
5
5
  name: {},
6
6
  host: {value: ''},
7
7
  port: {value: 6053, validate: RED.validators.number()},
8
- reconnect: {value: 15, validate: RED.validators.number()},
8
+ ping: {value: 20, validate: RED.validators.number()},
9
+ reconnect: {value: 90, validate: RED.validators.number()},
9
10
  loglevel: {value: '0'},
10
11
  logdump: {value: false},
11
12
  ble: {value: false}
@@ -21,6 +22,15 @@
21
22
  oneditprepare: function () {
22
23
  let node = this;
23
24
 
25
+ let $ping = $('#node-config-input-ping').val();
26
+ let $reconnect = $('#node-config-input-reconnect').val();
27
+ if (!$ping) {
28
+ $('#node-config-input-ping').val('20');
29
+ }
30
+ if (!$reconnect) {
31
+ $('#node-config-input-reconnect').val('90');
32
+ }
33
+
24
34
  function toggleSelect() {
25
35
  let $val = $('#node-config-input-host').val();
26
36
  $('#node-config-input-discover').html(`<i class="fa fa-search"></i>`);
@@ -140,9 +150,14 @@
140
150
  <input type="password" id="node-config-input-password" placeholder="Deprecated" />
141
151
  </div>
142
152
 
153
+ <div class="form-row">
154
+ <label for="node-config-input-ping"><i class="fa fa-heartbeat"></i> Ping</label>
155
+ <input type="text" id="node-config-input-ping" placeholder="20 sec" />
156
+ </div>
157
+
143
158
  <div class="form-row">
144
159
  <label for="node-config-input-reconnect"><i class="fa fa-refresh"></i> Reconnect</label>
145
- <input type="text" id="node-config-input-reconnect" placeholder="15 sec" />
160
+ <input type="text" id="node-config-input-reconnect" placeholder="90 sec" />
146
161
  </div>
147
162
 
148
163
  <div class="form-row">
@@ -200,8 +215,10 @@
200
215
  <dd>encryption key for API</dd>
201
216
  <dt class="required">Password<span class="property-type">password</span></dt>
202
217
  <dd>password for API</dd>
218
+ <dt class="required">Ping<span class="property-type">number</span></dt>
219
+ <dd>Ping interval in seconds (Default: 20)</dd>
203
220
  <dt class="required">Reconnect<span class="property-type">number</span></dt>
204
- <dd>Reconnect interval in seconds (Default: 15)</dd>
221
+ <dd>Reconnect interval in seconds (Default: 90)</dd>
205
222
  <dt class="required">Log Level<span class="property-type">number</span></dt>
206
223
  <dd>possible log levels</dd>
207
224
  <dt class="required">Dump Config<span class="property-type">true|false</span></dt>
@@ -39,8 +39,8 @@ module.exports = (RED) => {
39
39
  initializeListEntities: true,
40
40
  initializeSubscribeStates: true,
41
41
  reconnect: true,
42
- reconnectInterval: ((config === null || config === void 0 ? void 0 : config.reconnect) || 15) * 1000,
43
- pingInterval: 15 * 1000,
42
+ reconnectInterval: ((config === null || config === void 0 ? void 0 : config.reconnect) || 90) * 1000,
43
+ pingInterval: ((config === null || config === void 0 ? void 0 : config.ping) || 20) * 1000,
44
44
  initializeSubscribeBLEAdvertisements: self.ble
45
45
  };
46
46
  if (self.credentials.encryptionkey) {
@@ -99,6 +99,15 @@ module.exports = (RED) => {
99
99
  type: 'Systems',
100
100
  name: 'Status'
101
101
  });
102
+ // all entities to entities
103
+ self.entities.push({
104
+ key: 'all-entities',
105
+ type: 'Systems',
106
+ name: 'Entities',
107
+ config: {
108
+ deviceClass: 'All'
109
+ }
110
+ });
102
111
  self.onStatus('connecting');
103
112
  });
104
113
  self.client.on('initialized', () => {
@@ -1 +1 @@
1
- {"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/nodes/device.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/nodes/device.ts"],"names":[],"mappings":"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"}
package/build/nodes/in.js CHANGED
@@ -39,18 +39,42 @@ module.exports = (RED) => {
39
39
  };
40
40
  const onState = (state) => {
41
41
  const payload = Object.assign({}, state);
42
- const topic = self.config.topic === undefined ? '' : self.config.topic;
43
- if (payload.key != config.entity) {
42
+ const topic = config.topic === undefined ? '' : config.topic;
43
+ // All Entities
44
+ let stateEntity = config.entity;
45
+ if (config.entity === 'all-entities') {
46
+ const system = self.deviceNode.entities.find((e) => e.key == payload.key);
47
+ if (system && system.type !== 'Systems') {
48
+ stateEntity = payload.key;
49
+ }
50
+ }
51
+ if (payload.key != stateEntity) {
44
52
  return;
45
53
  }
46
54
  delete payload.key;
47
- let text = typeof payload.state !== 'undefined' && typeof payload.state !== 'object' ? String(payload.state) : 'json';
48
- if (text && text.length > 32) {
49
- text = `${text.substring(0, 32)}...`;
55
+ const entity = self.deviceNode.entities.find((e) => e.key == stateEntity);
56
+ let text = '';
57
+ if (typeof payload.state !== 'undefined') {
58
+ if (typeof payload.state === 'object') {
59
+ text = 'json';
60
+ }
61
+ else {
62
+ if (entity.config && entity.config.accuracyDecimals >= 0) {
63
+ text = String((0, utils_1.roundToX)(payload.state, entity.config.accuracyDecimals));
64
+ }
65
+ else {
66
+ text = String(payload.state);
67
+ }
68
+ }
69
+ if (text && text.length > 32) {
70
+ text = `${text.substring(0, 32)}...`;
71
+ }
72
+ if (text && entity.config && entity.config.unitOfMeasurement) {
73
+ text = `${text} ${entity.config.unitOfMeasurement}`;
74
+ }
50
75
  }
51
- self.text_status = text;
76
+ text = config.entity === 'all-entities' ? 'Entities' : text;
52
77
  setStatus({ fill: 'yellow', shape: 'dot', text: text }, 3000);
53
- const entity = self.deviceNode.entities.find((e) => e.key == config.entity);
54
78
  self.send({
55
79
  topic: topic,
56
80
  payload: payload,
@@ -67,7 +91,7 @@ module.exports = (RED) => {
67
91
  return;
68
92
  }
69
93
  delete payload.key;
70
- setStatus({ fill: 'blue', shape: 'dot', text: 'ble' }, 3000);
94
+ setStatus({ fill: 'blue', shape: 'dot', text: 'BLE' }, 3000);
71
95
  const entity = self.deviceNode.entities.find((e) => e.key == config.entity);
72
96
  self.send({
73
97
  payload: payload,
@@ -1 +1 @@
1
- {"version":3,"file":"in.js","sourceRoot":"","sources":["../../src/nodes/in.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"in.js","sourceRoot":"","sources":["../../src/nodes/in.ts"],"names":[],"mappings":"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"}
@@ -52,7 +52,7 @@ module.exports = (RED) => {
52
52
  return;
53
53
  }
54
54
  const regexpType = /^(BinarySensor|Sensor|TextSensor)$/gi;
55
- const regexpEntity = /^(Logs|BLE|Status)$/gi;
55
+ const regexpEntity = /^(Logs|BLE|Status|Entities)$/gi;
56
56
  if (entity.type.match(regexpType) || config.entity.match(regexpEntity)) {
57
57
  done();
58
58
  return;
@@ -60,19 +60,32 @@ module.exports = (RED) => {
60
60
  const payload = msg.payload;
61
61
  let text;
62
62
  if (typeof payload.state !== 'undefined' && typeof payload.state !== 'object') {
63
- text = String(payload.state);
63
+ if (entity.config && entity.config.accuracyDecimals >= 0) {
64
+ text = String((0, utils_1.roundToX)(payload.state, entity.config.accuracyDecimals));
65
+ }
66
+ else {
67
+ text = String(payload.state);
68
+ }
64
69
  }
65
70
  else {
66
71
  if (typeof payload !== 'undefined' && typeof payload === 'object') {
67
72
  text = 'json';
68
73
  }
69
74
  else {
70
- text = String(payload);
75
+ if (entity.config && entity.config.accuracyDecimals >= 0) {
76
+ text = String((0, utils_1.roundToX)(payload, entity.config.accuracyDecimals));
77
+ }
78
+ else {
79
+ text = String(payload);
80
+ }
71
81
  }
72
82
  }
73
83
  if (text && text.length > 32) {
74
84
  text = `${text.substring(0, 32)}...`;
75
85
  }
86
+ if (text && entity.config && entity.config.unitOfMeasurement) {
87
+ text = `${text} ${entity.config.unitOfMeasurement}`;
88
+ }
76
89
  try {
77
90
  const command = capitalize(entity.type + 'CommandService');
78
91
  yield self.deviceNode.client.connection[command](Object.assign({ key: config.entity }, payload));
@@ -1 +1 @@
1
- {"version":3,"file":"out.js","sourceRoot":"","sources":["../../src/nodes/out.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,wCAAoC;AAEpC,MAAM,CAAC,OAAO,GAAG,CAAC,GAAY,EAAE,EAAE;IAChC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,EAAE,UAAqB,MAAW;QACpE,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEnC,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW;QACb,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,WAAW,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,EAAE;YAClC,MAAM,cAAc,GAAW,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;YAC9D,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,cAAc,EAAE,CAAC;oBACnB,IAAI,CAAC,MAAM,CAAC,cAAM,CAAC,cAAwB,CAAC,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC,EAAE,OAAO,CAAC,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,CAAC,MAAW,EAAE,OAAO,GAAG,CAAC,EAAE,EAAE;YAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACpB,IAAI,OAAO,EAAE,CAAC;gBACZ,WAAW,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAW,CAAC;QAE9E,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAO,GAAQ,EAAE,IAAe,EAAE,IAAe,EAAE,EAAE;YACpE,MAAM,MAAM,GAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC;YACtF,IAAI,OAAO,MAAM,IAAI,WAAW,EAAE,CAAC;gBACjC,SAAS,CAAC,cAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,MAAM,uBAAuB,CAAC,CAAC;gBAC5D,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YAED,MAAM,UAAU,GAAG,sCAAsC,CAAC;YAC1D,MAAM,YAAY,GAAG,uBAAuB,CAAC;YAC7C,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;gBACvE,IAAI,EAAE,CAAC;gBACP,OAAO;YACT,CAAC;YAED,MAAM,OAAO,GAAQ,GAAG,CAAC,OAAO,CAAC;YACjC,IAAI,IAAY,CAAC;YACjB,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9E,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAClE,IAAI,GAAG,MAAM,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACN,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;YACD,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;gBAC7B,IAAI,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC;YACvC,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,GAAG,gBAAgB,CAAC,CAAC;gBAC3D,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAE,GAAG,EAAE,MAAM,CAAC,MAAM,IAAK,OAAO,EAAE,CAAC;gBACnF,IAAI,IAAI;oBAAE,SAAS,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAC,CAAC,CAAC;YAClE,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,SAAS,CAAC,cAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,CAAC;gBACjC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;YAED,IAAI,EAAE,CAAC;QACT,CAAC,CAAA,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAE,EAAE;YAClC,SAAS,CAAC,cAAM,CAAC,MAAgB,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE9C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAM,EAAE,IAAe,EAAE,EAAE;YAC3C,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1D,IAAI,EAAE,CAAC;QACT,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"out.js","sourceRoot":"","sources":["../../src/nodes/out.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-red-contrib-esphome",
3
- "version": "0.3.0",
3
+ "version": "0.3.2",
4
4
  "description": "Node-RED nodes to ESPhome devices",
5
5
  "homepage": "https://github.com/twocolors/node-red-contrib-esphome",
6
6
  "license": "MIT",
@@ -20,7 +20,7 @@
20
20
  "prettier": "prettier --write \"**/*.{js,ts}\""
21
21
  },
22
22
  "node-red": {
23
- "version": ">=2.2.0",
23
+ "version": ">=4.0.0",
24
24
  "nodes": {
25
25
  "api": "build/nodes/api.js",
26
26
  "device": "build/nodes/device.js",
@@ -29,7 +29,7 @@
29
29
  }
30
30
  },
31
31
  "dependencies": {
32
- "@2colors/esphome-native-api": "1.3.4"
32
+ "@2colors/esphome-native-api": "1.3.5"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/node": "^24.0.1",
@@ -44,7 +44,7 @@
44
44
  "typescript": "^5.0.2"
45
45
  },
46
46
  "engines": {
47
- "node": ">=16"
47
+ "node": ">=18.5"
48
48
  },
49
49
  "keywords": [
50
50
  "node-red",
@@ -54,5 +54,10 @@
54
54
  "esp32",
55
55
  "esp8266",
56
56
  "iot"
57
+ ],
58
+ "files": [
59
+ "LICENSE",
60
+ "build",
61
+ "examples"
57
62
  ]
58
63
  }
package/.eslintrc.json DELETED
@@ -1,41 +0,0 @@
1
- {
2
- "env": {
3
- "node": true,
4
- "es6": true
5
- },
6
- "extends": [
7
- "eslint:recommended",
8
- "plugin:@typescript-eslint/eslint-recommended",
9
- "plugin:@typescript-eslint/recommended",
10
- "plugin:prettier/recommended",
11
- "prettier"
12
- ],
13
- "plugins": [
14
- "@typescript-eslint",
15
- "prettier"
16
- ],
17
- "globals": {
18
- "Atomics": "readonly",
19
- "SharedArrayBuffer": "readonly"
20
- },
21
- "parser": "@typescript-eslint/parser",
22
- "parserOptions": {
23
- "ecmaVersion": 2020
24
- },
25
- "rules": {
26
- "prettier/prettier": "error",
27
- "semi": "error",
28
- "linebreak-style": ["error", "unix"],
29
- "quotes": [
30
- "error",
31
- "single",
32
- { "avoidEscape": true }
33
- ],
34
- "indent": [
35
- "error",
36
- 2
37
- ],
38
- "@typescript-eslint/no-explicit-any": "off"
39
- },
40
- "ignorePatterns":["build"]
41
- }
@@ -1,7 +0,0 @@
1
- version: 2
2
- updates:
3
- - package-ecosystem: 'npm'
4
- directory: '/'
5
- schedule:
6
- interval: 'weekly'
7
- open-pull-requests-limit: 8
package/.gitignore DELETED
@@ -1,10 +0,0 @@
1
- .*
2
- *~
3
- !.gitignore
4
- !.github
5
-
6
- # node
7
- !.eslintrc.json
8
- !.prettierrc.json
9
- node_modules
10
- package-lock.json
package/.prettierrc.json DELETED
@@ -1,10 +0,0 @@
1
- {
2
- "tabWidth": 2,
3
- "useTabs": false,
4
- "arrowParens": "avoid",
5
- "bracketSpacing": false,
6
- "singleQuote": true,
7
- "printWidth": 120,
8
- "trailingComma": "none",
9
- "endOfLine": "lf"
10
- }
package/readme/device.png DELETED
Binary file
package/readme/flow.png DELETED
Binary file
package/src/lib/utils.ts DELETED
@@ -1,33 +0,0 @@
1
- export const Status: {[key: string]: any} = {
2
- error: {
3
- fill: 'red',
4
- shape: 'dot',
5
- text: 'error'
6
- },
7
- disconnected: {
8
- fill: 'red',
9
- shape: 'ring',
10
- text: 'disconnected'
11
- },
12
- connecting: {
13
- fill: 'yellow',
14
- shape: 'ring',
15
- text: 'connecting'
16
- },
17
- connected: {
18
- fill: 'green',
19
- shape: 'dot',
20
- text: 'connected'
21
- }
22
- } as const;
23
-
24
- export const LogLevel: {[key: number]: string} = {
25
- 0: 'NONE',
26
- 1: 'ERROR',
27
- 2: 'WARN',
28
- 3: 'INFO',
29
- 4: 'CONFIG',
30
- 5: 'DEBUG',
31
- 6: 'VERBOSE',
32
- 7: 'VERY_VERBOSE'
33
- } as const;
package/src/nodes/api.ts DELETED
@@ -1,28 +0,0 @@
1
- import {NodeAPI} from 'node-red';
2
- import express from 'express';
3
- // eslint-disable-next-line @typescript-eslint/no-var-requires
4
- const {Discovery} = require('@2colors/esphome-native-api');
5
-
6
- module.exports = (RED: NodeAPI) => {
7
- const NODE_PATH = '/esphome/';
8
-
9
- RED.httpAdmin.post(NODE_PATH + 'discovery', async (req: express.Request, res: express.Response) => {
10
- Discovery()
11
- .then((devices: Array<object>) => {
12
- res.json(devices);
13
- })
14
- .catch((e: Error) => {
15
- res.json(e);
16
- });
17
- });
18
-
19
- RED.httpAdmin.post(NODE_PATH + 'entities', async (req: express.Request, res: express.Response) => {
20
- const deviceNode = RED.nodes.getNode(req.body.deviceNode) as any;
21
-
22
- if (deviceNode) {
23
- res.json(deviceNode.entities);
24
- } else {
25
- res.json([]);
26
- }
27
- });
28
- };
@@ -1,177 +0,0 @@
1
- import {NodeAPI} from 'node-red';
2
- // eslint-disable-next-line @typescript-eslint/no-var-requires
3
- const {Client} = require('@2colors/esphome-native-api');
4
- // eslint-disable-next-line @typescript-eslint/no-var-requires
5
- const Package = require('../../package.json');
6
- import {LogLevel} from '../lib/utils';
7
-
8
- module.exports = (RED: NodeAPI) => {
9
- RED.nodes.registerType(
10
- 'esphome-device',
11
- function (this: any, config: any) {
12
- // eslint-disable-next-line @typescript-eslint/no-this-alias
13
- const self = this;
14
- self.config = config;
15
-
16
- RED.nodes.createNode(this, config);
17
-
18
- self.setMaxListeners(0);
19
- self.device = {};
20
- self.entities = [];
21
- self.current_status = 'disconnected';
22
- self.logger = parseInt(config?.loglevel);
23
- self.ble = Boolean(config?.ble);
24
-
25
- if (!config?.host || !config?.port) {
26
- return;
27
- }
28
-
29
- self.onStatus = function (string: string) {
30
- self.current_status = string;
31
- self.emit('onStatus', string);
32
-
33
- self.emit('onState', {key: 'status', state: string});
34
- };
35
-
36
- self.onState = function (object: any) {
37
- self.emit('onState', object);
38
- };
39
-
40
- self.onBle = function (object: any) {
41
- self.emit('onBle', object);
42
- };
43
-
44
- let options: any = {
45
- host: config.host,
46
- port: config.port,
47
- clientInfo: `${Package.name} ${Package.version}`,
48
- initializeDeviceInfo: true,
49
- initializeListEntities: true,
50
- initializeSubscribeStates: true,
51
- reconnect: true,
52
- reconnectInterval: (config?.reconnect || 15) * 1000,
53
- pingInterval: 15 * 1000,
54
- initializeSubscribeBLEAdvertisements: self.ble
55
- };
56
-
57
- if (self.credentials.encryptionkey) {
58
- options = {
59
- ...options,
60
- encryptionKey: self.credentials.encryptionkey
61
- };
62
- } else {
63
- options = {
64
- ...options,
65
- password: self.credentials.password
66
- };
67
- }
68
-
69
- if (self.logger) {
70
- options = {
71
- ...options,
72
- initializeSubscribeLogs: {
73
- level: config.loglevel,
74
- dumpConfig: config.logdump
75
- }
76
- };
77
- }
78
-
79
- self.client = new Client(options);
80
-
81
- try {
82
- self.client.connect();
83
- self.client.connection.setMaxListeners(0);
84
- } catch (e: any) {
85
- self.error(e.message);
86
- return;
87
- }
88
-
89
- self.client.on('error', (e: Error) => {
90
- self.error(e.message);
91
- self.onStatus('error');
92
- });
93
-
94
- self.client.on('disconnected', () => {
95
- self.onStatus('disconnected');
96
- });
97
-
98
- self.client.on('connected', () => {
99
- // clear entities
100
- self.entities = [];
101
- // logs to entities
102
- if (self.logger) {
103
- self.entities.push({
104
- key: 'logs',
105
- type: 'Systems',
106
- name: 'Logs',
107
- config: {
108
- deviceClass: LogLevel[config.loglevel]
109
- }
110
- });
111
- }
112
- // ble to entities
113
- if (self.ble) {
114
- self.entities.push({
115
- key: 'ble',
116
- type: 'Systems',
117
- name: 'BLE'
118
- });
119
- }
120
- // status to entities
121
- self.entities.push({
122
- key: 'status',
123
- type: 'Systems',
124
- name: 'Status'
125
- });
126
-
127
- self.onStatus('connecting');
128
- });
129
-
130
- self.client.on('initialized', () => {
131
- self.onStatus('connected');
132
- });
133
-
134
- self.client.on('deviceInfo', (deviceInfo: any) => {
135
- self.device = deviceInfo;
136
- });
137
-
138
- self.client.on('newEntity', (entity: any) => {
139
- self.entities.push({
140
- key: entity.id,
141
- type: entity.type,
142
- name: entity.name,
143
- config: entity.config
144
- });
145
-
146
- entity.on('state', (state: any) => {
147
- self.onState({...state});
148
- });
149
-
150
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
151
- entity.on('error', (e: Error) => {
152
- /* empty */
153
- });
154
- });
155
-
156
- // logs
157
- self.client.on('logs', (payload: any) => {
158
- self.onState({key: 'logs', ...payload});
159
- });
160
-
161
- // ble
162
- self.client.on('ble', (payload: any) => {
163
- self.onBle({key: 'ble', ...payload});
164
- });
165
-
166
- self.on('close', () => {
167
- self.client.disconnect();
168
- });
169
- },
170
- {
171
- credentials: {
172
- encryptionkey: {type: 'password'},
173
- password: {type: 'password'}
174
- }
175
- }
176
- );
177
- };
package/src/nodes/in.ts DELETED
@@ -1,117 +0,0 @@
1
- import {NodeAPI} from 'node-red';
2
- import {Status} from '../lib/utils';
3
-
4
- module.exports = (RED: NodeAPI) => {
5
- RED.nodes.registerType('esphome-in', function (this: any, config: any) {
6
- // eslint-disable-next-line @typescript-eslint/no-this-alias
7
- const self = this;
8
- self.config = config;
9
-
10
- RED.nodes.createNode(this, config);
11
-
12
- // system
13
- self.text_status = undefined;
14
-
15
- try {
16
- self.deviceNode = RED.nodes.getNode(config.device);
17
- } catch (_) {
18
- /* empty */
19
- }
20
-
21
- if (!self.deviceNode || !config.entity) {
22
- return;
23
- }
24
-
25
- const clearStatus = (timeout = 0) => {
26
- const current_status: string = self.deviceNode.current_status;
27
- setTimeout(() => {
28
- if (current_status) {
29
- if (current_status != 'connected' || self.text_status == 'connected') {
30
- self.status(Status[current_status]);
31
- }
32
- } else {
33
- self.status({});
34
- }
35
- }, timeout);
36
- };
37
-
38
- const setStatus = (status: any, timeout = 0) => {
39
- self.status(status);
40
- if (timeout) {
41
- clearStatus(timeout);
42
- }
43
- };
44
-
45
- const onState = (state: any) => {
46
- const payload: any = {...state};
47
- const topic: any = self.config.topic === undefined ? '' : self.config.topic;
48
-
49
- if (payload.key != config.entity) {
50
- return;
51
- }
52
-
53
- delete payload.key;
54
-
55
- let text: string =
56
- typeof payload.state !== 'undefined' && typeof payload.state !== 'object' ? String(payload.state) : 'json';
57
- if (text && text.length > 32) {
58
- text = `${text.substring(0, 32)}...`;
59
- }
60
- self.text_status = text;
61
- setStatus({fill: 'yellow', shape: 'dot', text: text}, 3000);
62
-
63
- const entity: any = self.deviceNode.entities.find((e: any) => e.key == config.entity);
64
-
65
- self.send({
66
- topic: topic,
67
- payload: payload,
68
- device: self.deviceNode.device,
69
- entity: entity
70
- });
71
- };
72
-
73
- const onBle = (data: any) => {
74
- let address: string = config.bleaddress;
75
- const payload: any = {...data};
76
-
77
- address = address.toLowerCase().replace(/[^a-f0-9]/g, '');
78
- payload.address = payload.address.toString(16);
79
-
80
- if (payload.address != address) {
81
- return;
82
- }
83
-
84
- delete payload.key;
85
-
86
- setStatus({fill: 'blue', shape: 'dot', text: 'ble'}, 3000);
87
-
88
- const entity: any = self.deviceNode.entities.find((e: any) => e.key == config.entity);
89
-
90
- self.send({
91
- payload: payload,
92
- device: self.deviceNode.device,
93
- entity: entity
94
- });
95
- };
96
-
97
- const onStatus = (status: string) => {
98
- setStatus(Status[status as string]);
99
- };
100
-
101
- self.onState = (state: any) => onState(state);
102
- self.deviceNode.on('onState', self.onState);
103
-
104
- self.onBle = (data: any) => onBle(data);
105
- self.deviceNode.on('onBle', self.onBle);
106
-
107
- self.onStatus = (status: string) => onStatus(status);
108
- self.deviceNode.on('onStatus', self.onStatus);
109
-
110
- self.on('close', (_: any, done: () => any) => {
111
- self.deviceNode.removeListener('onState', self.onState);
112
- self.deviceNode.removeListener('onBle', self.onBle);
113
- self.deviceNode.removeListener('onStatus', self.onStatus);
114
- done();
115
- });
116
- });
117
- };
package/src/nodes/out.ts DELETED
@@ -1,97 +0,0 @@
1
- import {NodeAPI} from 'node-red';
2
- import {Status} from '../lib/utils';
3
-
4
- module.exports = (RED: NodeAPI) => {
5
- RED.nodes.registerType('esphome-out', function (this: any, config: any) {
6
- // eslint-disable-next-line @typescript-eslint/no-this-alias
7
- const self = this;
8
- self.config = config;
9
-
10
- RED.nodes.createNode(this, config);
11
-
12
- try {
13
- self.deviceNode = RED.nodes.getNode(config.device);
14
- } catch (_) {
15
- /* empty */
16
- }
17
-
18
- if (!self.deviceNode || !config.entity) {
19
- return;
20
- }
21
-
22
- const clearStatus = (timeout = 0) => {
23
- const current_status: string = self.deviceNode.current_status;
24
- setTimeout(() => {
25
- if (current_status) {
26
- self.status(Status[current_status as string]);
27
- } else {
28
- self.status({});
29
- }
30
- }, timeout);
31
- };
32
-
33
- const setStatus = (status: any, timeout = 0) => {
34
- self.status(status);
35
- if (timeout) {
36
- clearStatus(timeout);
37
- }
38
- };
39
-
40
- const capitalize = (s: string) => (s[0].toLowerCase() + s.slice(1)) as string;
41
-
42
- self.on('input', async (msg: any, send: () => any, done: () => any) => {
43
- const entity: any = self.deviceNode.entities.find((e: any) => e.key == config.entity);
44
- if (typeof entity == 'undefined') {
45
- setStatus(Status['error'], 3000);
46
- self.error(`Entity (${config.entity}) not found on device`);
47
- done();
48
- return;
49
- }
50
-
51
- const regexpType = /^(BinarySensor|Sensor|TextSensor)$/gi;
52
- const regexpEntity = /^(Logs|BLE|Status)$/gi;
53
- if (entity.type.match(regexpType) || config.entity.match(regexpEntity)) {
54
- done();
55
- return;
56
- }
57
-
58
- const payload: any = msg.payload;
59
- let text: string;
60
- if (typeof payload.state !== 'undefined' && typeof payload.state !== 'object') {
61
- text = String(payload.state);
62
- } else {
63
- if (typeof payload !== 'undefined' && typeof payload === 'object') {
64
- text = 'json';
65
- } else {
66
- text = String(payload);
67
- }
68
- }
69
- if (text && text.length > 32) {
70
- text = `${text.substring(0, 32)}...`;
71
- }
72
-
73
- try {
74
- const command = capitalize(entity.type + 'CommandService');
75
- await self.deviceNode.client.connection[command]({key: config.entity, ...payload});
76
- if (text) setStatus({fill: 'yellow', shape: 'dot', text: text});
77
- } catch (e: any) {
78
- setStatus(Status['error'], 3000);
79
- self.error(e.message);
80
- }
81
-
82
- done();
83
- });
84
-
85
- const onStatus = (status: string) => {
86
- setStatus(Status[status as string]);
87
- };
88
-
89
- self.onStatus = (status: string) => onStatus(status);
90
- self.deviceNode.on('onStatus', self.onStatus);
91
-
92
- self.on('close', (_: any, done: () => any) => {
93
- self.deviceNode.removeListener('onStatus', self.onStatus);
94
- done();
95
- });
96
- });
97
- };
package/tsconfig.json DELETED
@@ -1,20 +0,0 @@
1
- {
2
- "compilerOptions": {
3
- "declaration": true,
4
- "esModuleInterop": true,
5
- "module": "commonjs",
6
- "moduleResolution": "node",
7
- "outDir": "build",
8
- "rootDir": "src",
9
- "sourceMap": true,
10
- "strict": true,
11
- "target": "es6"
12
- },
13
- "include": [
14
- "src"
15
- ],
16
- "exclude": [
17
- "node_modules",
18
- "build"
19
- ]
20
- }