node-red-contrib-esphome 0.0.8 → 0.1.0

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 (11) hide show
  1. package/README.md +7 -1
  2. package/build/lib/utils.d.ts +3 -0
  3. package/build/lib/utils.js +11 -1
  4. package/build/lib/utils.js.map +1 -1
  5. package/build/nodes/device.html +28 -1
  6. package/build/nodes/device.js +26 -4
  7. package/build/nodes/device.js.map +1 -1
  8. package/examples/LogsDEBUG.json +43 -0
  9. package/package.json +3 -3
  10. package/src/lib/utils.ts +11 -0
  11. package/src/nodes/device.ts +29 -3
package/README.md CHANGED
@@ -19,6 +19,12 @@
19
19
 
20
20
  Node-RED nodes to ESPhome devices
21
21
 
22
+ ## Changelog
23
+
24
+ #### 0.1.0
25
+ - support logs in node
26
+ - allow empty password
27
+
22
28
  ## Installation
23
29
 
24
30
  ```bash
@@ -34,7 +40,7 @@ $ npm i node-red-contrib-esphome
34
40
  - `targetTemperatureLow`- optional. float
35
41
  - `targetTemperatureHigh`- optional. float
36
42
  - `legacyAway` - optional. Boolean. Deprecated: use `preset` with AWAY
37
- - `fanMode` - optional. 0 - ON, 1 - OFF, 2 - AUTO, 3 - LOW, 4 - MEDIUM, 5 - HIGH, 6 - MIDDLE, 7 - FOCUS, 8 - DIFFUSE. See `supportedFanModesList` attr in config
43
+ - `fanMode` - optional. 0 - ON, 1 - OFF, 2 - AUTO, 3 - LOW, 4 - MEDIUM, 5 - HIGH, 6 - MIDDLE, 7 - FOCUS, 8 - DIFFUSE, 9 - QUIET. See `supportedFanModesList` attr in config
38
44
  - `swingMode` - optional. 0 - OFF, 1 - BOTH, 2 - VERTICAL, 3 - HORIZONTAL. See `supportedSwingModesList` attr in config
39
45
  - `customFanMode` - optional. string. See `supportedCustomFanModesList` attr in config
40
46
  - `preset` - optional. 0 - NONE, 1 - HOME, 2 - AWAY, 3 - BOOST, 4 - COMFORT, 5 - ECO, 6 - SLEEP, 7 - ACTIVITY. See `supportedPresetsList` attr in config
package/build/lib/utils.d.ts CHANGED
@@ -1,3 +1,6 @@
1
1
  export declare const Status: {
2
2
  [key: string]: any;
3
3
  };
4
+ export declare const LogLevel: {
5
+ [key: number]: string;
6
+ };
package/build/lib/utils.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.Status = void 0;
3
+ exports.LogLevel = exports.Status = void 0;
4
4
  exports.Status = {
5
5
  error: {
6
6
  fill: 'red',
@@ -23,4 +23,14 @@ exports.Status = {
23
23
  text: 'connected'
24
24
  }
25
25
  };
26
+ exports.LogLevel = {
27
+ 0: 'NONE',
28
+ 1: 'ERROR',
29
+ 2: 'WARN',
30
+ 3: 'INFO',
31
+ 4: 'CONFIG',
32
+ 5: 'DEBUG',
33
+ 6: 'VERBOSE',
34
+ 7: 'VERY_VERBOSE'
35
+ };
26
36
  //# sourceMappingURL=utils.js.map
package/build/lib/utils.js.map CHANGED
@@ -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"}
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"}
package/build/nodes/device.html CHANGED
@@ -4,7 +4,9 @@
4
4
  defaults: {
5
5
  name: {},
6
6
  host: {value: ''},
7
- port: {value: 6053, validate: RED.validators.number()}
7
+ port: {value: 6053, validate: RED.validators.number()},
8
+ loglevel: {value: 0},
9
+ logdump: {value: false}
8
10
  },
9
11
  paletteLabel: 'device',
10
12
  credentials: {
@@ -128,6 +130,27 @@
128
130
  <input type="password" id="node-config-input-password" placeholder="Password" />
129
131
  </div>
130
132
 
133
+ <div class="form-row">
134
+ <label for="node-config-input-loglevel"><i class="fa fa-file-o"></i> Log Level</label>
135
+ <select id="node-config-input-loglevel" style="width: 70%;">
136
+ <option value="0">NONE</option>
137
+ <option value="1">ERROR</option>
138
+ <option value="2">WARN</option>
139
+ <option value="3">INFO</option>
140
+ <option value="4">CONFIG</option>
141
+ <option value="5">DEBUG</option>
142
+ <option value="6">VERBOSE</option>
143
+ <option value="7">VERY_VERBOSE</option>
144
+ </select>
145
+ </div>
146
+
147
+ <div class="form-row">
148
+ <label for="node-config-input-logdump"><i></i> <span></span></label>
149
+ <label for="node-config-input-logdump" style="width:70%">
150
+ <input type="checkbox" id="node-config-input-logdump" style="display:inline-block; width:22px; vertical-align:top;" autocomplete="off"><span>dump config</span>
151
+ </label>
152
+ </div>
153
+
131
154
  <div class="form-row">
132
155
  <div class="form-tips"><b>Important:</b> Deploy device node to get entities list</div>
133
156
  </div>
@@ -143,5 +166,9 @@
143
166
  <dd>port</dd>
144
167
  <dt class="required">Password<span class="property-type">password</span></dt>
145
168
  <dd>password for API</dd>
169
+ <dt class="required">Log Level<span class="property-type">number</span></dt>
170
+ <dd>possible log levels</dd>
171
+ <dt class="required">Dump Config<span class="property-type">true|false</span></dt>
172
+ <dd>dump config</dd>
146
173
  </dl>
147
174
  </script>
package/build/nodes/device.js CHANGED
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
4
4
  const { Client } = require('@2colors/esphome-native-api');
5
5
  // eslint-disable-next-line @typescript-eslint/no-var-requires
6
6
  const Package = require('../../package.json');
7
+ const utils_1 = require("../lib/utils");
7
8
  module.exports = (RED) => {
8
9
  RED.nodes.registerType('esphome-device', function (config) {
9
- var _a;
10
10
  // eslint-disable-next-line @typescript-eslint/no-this-alias
11
11
  const self = this;
12
12
  self.config = config;
@@ -15,7 +15,7 @@ module.exports = (RED) => {
15
15
  self.device = {};
16
16
  self.entities = [];
17
17
  self.current_status = 'disconnected';
18
- if (!(config === null || config === void 0 ? void 0 : config.host) || !(config === null || config === void 0 ? void 0 : config.port) || !((_a = self.credentials) === null || _a === void 0 ? void 0 : _a.password)) {
18
+ if (!(config === null || config === void 0 ? void 0 : config.host) || !(config === null || config === void 0 ? void 0 : config.port)) {
19
19
  return;
20
20
  }
21
21
  self.onStatus = function (string) {
@@ -35,10 +35,15 @@ module.exports = (RED) => {
35
35
  initializeSubscribeStates: true,
36
36
  reconnect: true,
37
37
  reconnectInterval: 15 * 1000,
38
- pingInterval: 5 * 1000
38
+ pingInterval: 15 * 1000,
39
+ initializeSubscribeLogs: {
40
+ level: config.loglevel,
41
+ dumpConfig: config.logdump
42
+ }
39
43
  });
40
44
  try {
41
45
  self.client.connect();
46
+ self.client.connection.setMaxListeners(0);
42
47
  }
43
48
  catch (e) {
44
49
  self.error(e.message);
@@ -49,7 +54,7 @@ module.exports = (RED) => {
49
54
  /* empty */
50
55
  }
51
56
  else if (e.message.includes('Invalid password')) {
52
- self.error(e.message);
57
+ /* empty */
53
58
  }
54
59
  else if (e.message.includes('ECONNRESET')) {
55
60
  /* empty */
@@ -63,6 +68,7 @@ module.exports = (RED) => {
63
68
  else {
64
69
  // copy this error to issues ...
65
70
  }
71
+ self.error(e.message);
66
72
  self.onStatus('error');
67
73
  });
68
74
  self.client.on('disconnected', () => {
@@ -71,6 +77,16 @@ module.exports = (RED) => {
71
77
  self.client.on('connected', () => {
72
78
  // clear entities
73
79
  self.entities = [];
80
+ // logs to entities
81
+ if (config.loglevel > 0) {
82
+ const key = 'logs-' + config.loglevel;
83
+ self.entities.push({
84
+ key: key,
85
+ type: 'Systems',
86
+ name: 'Logs',
87
+ config: { deviceClass: utils_1.LogLevel[config.loglevel] }
88
+ });
89
+ }
74
90
  self.onStatus('connecting');
75
91
  });
76
92
  self.client.on('initialized', () => {
@@ -94,6 +110,12 @@ module.exports = (RED) => {
94
110
  /* empty */
95
111
  });
96
112
  });
113
+ if (config.loglevel > 0) {
114
+ const key = 'logs-' + config.loglevel;
115
+ self.client.on('logs', (payload) => {
116
+ self.onState(Object.assign({ key: key }, payload));
117
+ });
118
+ }
97
119
  self.on('close', () => {
98
120
  self.client.disconnect();
99
121
  });
package/build/nodes/device.js.map CHANGED
@@ -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/examples/LogsDEBUG.json ADDED
@@ -0,0 +1,43 @@
1
+ [
2
+ {
3
+ "id": "1c76c8513b203f0a",
4
+ "type": "esphome-in",
5
+ "z": "9b21668c2e9037fd",
6
+ "name": "Logs",
7
+ "device": "343b306e8ebb837a",
8
+ "entity": "logs-5",
9
+ "x": 370,
10
+ "y": 280,
11
+ "wires": [
12
+ [
13
+ "afe0128514d75dff"
14
+ ]
15
+ ]
16
+ },
17
+ {
18
+ "id": "afe0128514d75dff",
19
+ "type": "debug",
20
+ "z": "9b21668c2e9037fd",
21
+ "name": "debug 1",
22
+ "active": true,
23
+ "tosidebar": true,
24
+ "console": true,
25
+ "tostatus": false,
26
+ "complete": "payload",
27
+ "targetType": "msg",
28
+ "statusVal": "",
29
+ "statusType": "auto",
30
+ "x": 530,
31
+ "y": 280,
32
+ "wires": []
33
+ },
34
+ {
35
+ "id": "343b306e8ebb837a",
36
+ "type": "esphome-device",
37
+ "name": "esp32-test.local",
38
+ "host": "192.168.0.209",
39
+ "port": "6053",
40
+ "loglevel": "5",
41
+ "logdump": true
42
+ }
43
+ ]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-red-contrib-esphome",
3
- "version": "0.0.8",
3
+ "version": "0.1.0",
4
4
  "description": "Node-RED nodes to ESPhome devices",
5
5
  "homepage": "https://github.com/twocolors/node-red-contrib-esphome",
6
6
  "license": "MIT",
@@ -29,7 +29,7 @@
29
29
  }
30
30
  },
31
31
  "dependencies": {
32
- "@2colors/esphome-native-api":"1.0.8"
32
+ "@2colors/esphome-native-api":"1.1.0"
33
33
  },
34
34
  "devDependencies": {
35
35
  "@types/node":"^18.11.18",
@@ -41,7 +41,7 @@
41
41
  "eslint-plugin-prettier": "^4.2.1",
42
42
  "eslint-plugin-node": "^11.1.0",
43
43
  "prettier": "^2.8.1",
44
- "typescript": "^4.9.4"
44
+ "typescript": "^5.0.2"
45
45
  },
46
46
  "engines": {
47
47
  "node": ">=16"
package/src/lib/utils.ts CHANGED
@@ -20,3 +20,14 @@ export const Status: {[key: string]: any} = {
20
20
  text: 'connected'
21
21
  }
22
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/device.ts CHANGED
@@ -3,6 +3,7 @@ import {NodeAPI} from 'node-red';
3
3
  const {Client} = require('@2colors/esphome-native-api');
4
4
  // eslint-disable-next-line @typescript-eslint/no-var-requires
5
5
  const Package = require('../../package.json');
6
+ import {LogLevel} from '../lib/utils';
6
7
 
7
8
  module.exports = (RED: NodeAPI) => {
8
9
  RED.nodes.registerType(
@@ -19,7 +20,7 @@ module.exports = (RED: NodeAPI) => {
19
20
  self.entities = [];
20
21
  self.current_status = 'disconnected';
21
22
 
22
- if (!config?.host || !config?.port || !self.credentials?.password) {
23
+ if (!config?.host || !config?.port) {
23
24
  return;
24
25
  }
25
26
 
@@ -42,11 +43,16 @@ module.exports = (RED: NodeAPI) => {
42
43
  initializeSubscribeStates: true,
43
44
  reconnect: true,
44
45
  reconnectInterval: 15 * 1000,
45
- pingInterval: 5 * 1000
46
+ pingInterval: 15 * 1000,
47
+ initializeSubscribeLogs: {
48
+ level: config.loglevel,
49
+ dumpConfig: config.logdump
50
+ }
46
51
  });
47
52
 
48
53
  try {
49
54
  self.client.connect();
55
+ self.client.connection.setMaxListeners(0);
50
56
  } catch (e: any) {
51
57
  self.error(e.message);
52
58
  return;
@@ -56,7 +62,7 @@ module.exports = (RED: NodeAPI) => {
56
62
  if (e.message.includes('EHOSTUNREACH')) {
57
63
  /* empty */
58
64
  } else if (e.message.includes('Invalid password')) {
59
- self.error(e.message);
65
+ /* empty */
60
66
  } else if (e.message.includes('ECONNRESET')) {
61
67
  /* empty */
62
68
  } else if (e.message.includes('TIMEOUT')) {
@@ -66,6 +72,7 @@ module.exports = (RED: NodeAPI) => {
66
72
  } else {
67
73
  // copy this error to issues ...
68
74
  }
75
+ self.error(e.message);
69
76
  self.onStatus('error');
70
77
  });
71
78
 
@@ -76,6 +83,17 @@ module.exports = (RED: NodeAPI) => {
76
83
  self.client.on('connected', () => {
77
84
  // clear entities
78
85
  self.entities = [];
86
+ // logs to entities
87
+ if (config.loglevel > 0) {
88
+ const key = 'logs-' + config.loglevel;
89
+
90
+ self.entities.push({
91
+ key: key,
92
+ type: 'Systems',
93
+ name: 'Logs',
94
+ config: {deviceClass: LogLevel[config.loglevel]}
95
+ });
96
+ }
79
97
 
80
98
  self.onStatus('connecting');
81
99
  });
@@ -106,6 +124,14 @@ module.exports = (RED: NodeAPI) => {
106
124
  });
107
125
  });
108
126
 
127
+ if (config.loglevel > 0) {
128
+ const key = 'logs-' + config.loglevel;
129
+
130
+ self.client.on('logs', (payload: any) => {
131
+ self.onState({key: key, ...payload});
132
+ });
133
+ }
134
+
109
135
  self.on('close', () => {
110
136
  self.client.disconnect();
111
137
  });