node-red-contrib-esphome 0.1.0 → 0.1.1

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 (7) hide show
  1. package/README.md +3 -0
  2. package/build/nodes/device.html +1 -1
  3. package/build/nodes/device.js +20 -17
  4. package/build/nodes/device.js.map +1 -1
  5. package/examples/LogsDEBUG.json +32 -36
  6. package/package.json +1 -1
  7. package/src/nodes/device.ts +25 -19
package/README.md CHANGED
@@ -21,6 +21,9 @@ Node-RED nodes to ESPhome devices
21
21
 
22
22
  ## Changelog
23
23
 
24
+ #### 0.1.1
25
+ - fix logs
26
+
24
27
  #### 0.1.0
25
28
  - support logs in node
26
29
  - allow empty password
package/build/nodes/device.html CHANGED
@@ -5,7 +5,7 @@
5
5
  name: {},
6
6
  host: {value: ''},
7
7
  port: {value: 6053, validate: RED.validators.number()},
8
- loglevel: {value: 0},
8
+ loglevel: {value: '0'},
9
9
  logdump: {value: false}
10
10
  },
11
11
  paletteLabel: 'device',
package/build/nodes/device.js CHANGED
@@ -15,6 +15,7 @@ module.exports = (RED) => {
15
15
  self.device = {};
16
16
  self.entities = [];
17
17
  self.current_status = 'disconnected';
18
+ self.logger = parseInt(config === null || config === void 0 ? void 0 : config.loglevel);
18
19
  if (!(config === null || config === void 0 ? void 0 : config.host) || !(config === null || config === void 0 ? void 0 : config.port)) {
19
20
  return;
20
21
  }
@@ -25,7 +26,7 @@ module.exports = (RED) => {
25
26
  self.onState = function (object) {
26
27
  self.emit('onState', object);
27
28
  };
28
- self.client = new Client({
29
+ let options = {
29
30
  host: config.host,
30
31
  port: config.port,
31
32
  password: self.credentials.password,
@@ -35,12 +36,15 @@ module.exports = (RED) => {
35
36
  initializeSubscribeStates: true,
36
37
  reconnect: true,
37
38
  reconnectInterval: 15 * 1000,
38
- pingInterval: 15 * 1000,
39
- initializeSubscribeLogs: {
40
- level: config.loglevel,
41
- dumpConfig: config.logdump
42
- }
43
- });
39
+ pingInterval: 15 * 1000
40
+ };
41
+ if (this.logger) {
42
+ options = Object.assign(Object.assign({}, options), { initializeSubscribeLogs: {
43
+ level: config.loglevel,
44
+ dumpConfig: config.logdump
45
+ } });
46
+ }
47
+ self.client = new Client(options);
44
48
  try {
45
49
  self.client.connect();
46
50
  self.client.connection.setMaxListeners(0);
@@ -78,13 +82,14 @@ module.exports = (RED) => {
78
82
  // clear entities
79
83
  self.entities = [];
80
84
  // logs to entities
81
- if (config.loglevel > 0) {
82
- const key = 'logs-' + config.loglevel;
85
+ if (this.logger) {
83
86
  self.entities.push({
84
- key: key,
87
+ key: 'logs',
85
88
  type: 'Systems',
86
89
  name: 'Logs',
87
- config: { deviceClass: utils_1.LogLevel[config.loglevel] }
90
+ config: {
91
+ deviceClass: utils_1.LogLevel[config.loglevel]
92
+ }
88
93
  });
89
94
  }
90
95
  self.onStatus('connecting');
@@ -110,12 +115,10 @@ module.exports = (RED) => {
110
115
  /* empty */
111
116
  });
112
117
  });
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
- }
118
+ // logs
119
+ self.client.on('logs', (payload) => {
120
+ self.onState(Object.assign({ key: 'logs' }, payload));
121
+ });
119
122
  self.on('close', () => {
120
123
  self.client.disconnect();
121
124
  });
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 CHANGED
@@ -1,43 +1,39 @@
1
1
  [
2
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
- ]
3
+ "id": "d94696f33daa480b",
4
+ "type": "esphome-in",
5
+ "z": "3c118d78f5082224",
6
+ "name": "Logs",
7
+ "device": "ecc01306bd6fee0f",
8
+ "entity": "logs",
9
+ "x": 150,
10
+ "y": 200,
11
+ "wires": [["aa741845138e30ca"]]
16
12
  },
17
13
  {
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": []
14
+ "id": "aa741845138e30ca",
15
+ "type": "debug",
16
+ "z": "3c118d78f5082224",
17
+ "name": "Logs",
18
+ "active": true,
19
+ "tosidebar": true,
20
+ "console": true,
21
+ "tostatus": false,
22
+ "complete": "payload",
23
+ "targetType": "msg",
24
+ "statusVal": "",
25
+ "statusType": "auto",
26
+ "x": 300,
27
+ "y": 200,
28
+ "wires": []
33
29
  },
34
30
  {
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
31
+ "id": "ecc01306bd6fee0f",
32
+ "type": "esphome-device",
33
+ "name": "esp32-test.local",
34
+ "host": "192.168.0.209",
35
+ "port": "6053",
36
+ "loglevel": "5",
37
+ "logdump": true
42
38
  }
43
- ]
39
+ ]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-red-contrib-esphome",
3
- "version": "0.1.0",
3
+ "version": "0.1.1",
4
4
  "description": "Node-RED nodes to ESPhome devices",
5
5
  "homepage": "https://github.com/twocolors/node-red-contrib-esphome",
6
6
  "license": "MIT",
package/src/nodes/device.ts CHANGED
@@ -19,6 +19,7 @@ module.exports = (RED: NodeAPI) => {
19
19
  self.device = {};
20
20
  self.entities = [];
21
21
  self.current_status = 'disconnected';
22
+ self.logger = parseInt(config?.loglevel);
22
23
 
23
24
  if (!config?.host || !config?.port) {
24
25
  return;
@@ -33,7 +34,7 @@ module.exports = (RED: NodeAPI) => {
33
34
  self.emit('onState', object);
34
35
  };
35
36
 
36
- self.client = new Client({
37
+ let options: any = {
37
38
  host: config.host,
38
39
  port: config.port,
39
40
  password: self.credentials.password,
@@ -43,12 +44,20 @@ module.exports = (RED: NodeAPI) => {
43
44
  initializeSubscribeStates: true,
44
45
  reconnect: true,
45
46
  reconnectInterval: 15 * 1000,
46
- pingInterval: 15 * 1000,
47
- initializeSubscribeLogs: {
48
- level: config.loglevel,
49
- dumpConfig: config.logdump
50
- }
51
- });
47
+ pingInterval: 15 * 1000
48
+ };
49
+
50
+ if (this.logger) {
51
+ options = {
52
+ ...options,
53
+ initializeSubscribeLogs: {
54
+ level: config.loglevel,
55
+ dumpConfig: config.logdump
56
+ }
57
+ };
58
+ }
59
+
60
+ self.client = new Client(options);
52
61
 
53
62
  try {
54
63
  self.client.connect();
@@ -84,14 +93,14 @@ module.exports = (RED: NodeAPI) => {
84
93
  // clear entities
85
94
  self.entities = [];
86
95
  // logs to entities
87
- if (config.loglevel > 0) {
88
- const key = 'logs-' + config.loglevel;
89
-
96
+ if (this.logger) {
90
97
  self.entities.push({
91
- key: key,
98
+ key: 'logs',
92
99
  type: 'Systems',
93
100
  name: 'Logs',
94
- config: {deviceClass: LogLevel[config.loglevel]}
101
+ config: {
102
+ deviceClass: LogLevel[config.loglevel]
103
+ }
95
104
  });
96
105
  }
97
106
 
@@ -124,13 +133,10 @@ module.exports = (RED: NodeAPI) => {
124
133
  });
125
134
  });
126
135
 
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
- }
136
+ // logs
137
+ self.client.on('logs', (payload: any) => {
138
+ self.onState({key: 'logs', ...payload});
139
+ });
134
140
 
135
141
  self.on('close', () => {
136
142
  self.client.disconnect();