zigbee-herdsman 0.40.2 → 0.41.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.
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +15 -0
- package/dist/adapter/adapter.d.ts +2 -4
- package/dist/adapter/adapter.d.ts.map +1 -1
- package/dist/adapter/adapter.js +15 -17
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts +1 -2
- package/dist/adapter/deconz/adapter/deconzAdapter.d.ts.map +1 -1
- package/dist/adapter/deconz/adapter/deconzAdapter.js +65 -65
- package/dist/adapter/deconz/adapter/deconzAdapter.js.map +1 -1
- package/dist/adapter/deconz/driver/driver.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/driver.js +44 -44
- package/dist/adapter/deconz/driver/driver.js.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.d.ts.map +1 -1
- package/dist/adapter/deconz/driver/frameParser.js +43 -43
- package/dist/adapter/deconz/driver/frameParser.js.map +1 -1
- package/dist/adapter/deconz/driver/parser.js +6 -6
- package/dist/adapter/deconz/driver/parser.js.map +1 -1
- package/dist/adapter/deconz/driver/writer.js +3 -3
- package/dist/adapter/deconz/driver/writer.js.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.d.ts +1 -2
- package/dist/adapter/ember/adapter/emberAdapter.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/emberAdapter.js +144 -149
- package/dist/adapter/ember/adapter/emberAdapter.js.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/oneWaitress.js +3 -1
- package/dist/adapter/ember/adapter/oneWaitress.js.map +1 -1
- package/dist/adapter/ember/adapter/requestQueue.js +9 -12
- package/dist/adapter/ember/adapter/requestQueue.js.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.d.ts.map +1 -1
- package/dist/adapter/ember/adapter/tokensManager.js +23 -20
- package/dist/adapter/ember/adapter/tokensManager.js.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.d.ts.map +1 -1
- package/dist/adapter/ember/ezsp/ezsp.js +139 -138
- package/dist/adapter/ember/ezsp/ezsp.js.map +1 -1
- package/dist/adapter/ember/uart/ash.d.ts.map +1 -1
- package/dist/adapter/ember/uart/ash.js +71 -75
- package/dist/adapter/ember/uart/ash.js.map +1 -1
- package/dist/adapter/ember/uart/parser.d.ts.map +1 -1
- package/dist/adapter/ember/uart/parser.js +3 -6
- package/dist/adapter/ember/uart/parser.js.map +1 -1
- package/dist/adapter/ember/uart/queues.d.ts.map +1 -1
- package/dist/adapter/ember/uart/queues.js +3 -1
- package/dist/adapter/ember/uart/queues.js.map +1 -1
- package/dist/adapter/ember/uart/writer.d.ts.map +1 -1
- package/dist/adapter/ember/uart/writer.js +3 -6
- package/dist/adapter/ember/uart/writer.js.map +1 -1
- package/dist/adapter/ezsp/adapter/backup.d.ts +0 -1
- package/dist/adapter/ezsp/adapter/backup.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/backup.js +3 -7
- package/dist/adapter/ezsp/adapter/backup.js.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts +1 -2
- package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map +1 -1
- package/dist/adapter/ezsp/adapter/ezspAdapter.js +23 -22
- package/dist/adapter/ezsp/adapter/ezspAdapter.js.map +1 -1
- package/dist/adapter/ezsp/driver/driver.d.ts +1 -3
- package/dist/adapter/ezsp/driver/driver.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/driver.js +67 -64
- package/dist/adapter/ezsp/driver/driver.js.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/ezsp.js +61 -50
- package/dist/adapter/ezsp/driver/ezsp.js.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/multicast.js +8 -12
- package/dist/adapter/ezsp/driver/multicast.js.map +1 -1
- package/dist/adapter/ezsp/driver/parser.js +5 -5
- package/dist/adapter/ezsp/driver/parser.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/basic.js +1 -1
- package/dist/adapter/ezsp/driver/types/basic.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/named.js +2 -2
- package/dist/adapter/ezsp/driver/types/named.js.map +1 -1
- package/dist/adapter/ezsp/driver/types/struct.js +2 -2
- package/dist/adapter/ezsp/driver/types/struct.js.map +1 -1
- package/dist/adapter/ezsp/driver/uart.d.ts.map +1 -1
- package/dist/adapter/ezsp/driver/uart.js +46 -46
- package/dist/adapter/ezsp/driver/uart.js.map +1 -1
- package/dist/adapter/ezsp/driver/writer.js +3 -6
- package/dist/adapter/ezsp/driver/writer.js.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts +0 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/adapter-backup.js +25 -29
- package/dist/adapter/z-stack/adapter/adapter-backup.js.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.d.ts +1 -4
- package/dist/adapter/z-stack/adapter/manager.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/manager.js +51 -60
- package/dist/adapter/z-stack/adapter/manager.js.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts +1 -2
- package/dist/adapter/z-stack/adapter/zStackAdapter.d.ts.map +1 -1
- package/dist/adapter/z-stack/adapter/zStackAdapter.js +23 -22
- package/dist/adapter/z-stack/adapter/zStackAdapter.js.map +1 -1
- package/dist/adapter/z-stack/unpi/parser.js +6 -6
- package/dist/adapter/z-stack/unpi/parser.js.map +1 -1
- package/dist/adapter/z-stack/unpi/writer.js +4 -7
- package/dist/adapter/z-stack/unpi/writer.js.map +1 -1
- package/dist/adapter/z-stack/znp/znp.d.ts.map +1 -1
- package/dist/adapter/z-stack/znp/znp.js +18 -25
- package/dist/adapter/z-stack/znp/znp.js.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts +1 -2
- package/dist/adapter/zigate/adapter/zigateAdapter.d.ts.map +1 -1
- package/dist/adapter/zigate/adapter/zigateAdapter.js +50 -50
- package/dist/adapter/zigate/adapter/zigateAdapter.js.map +1 -1
- package/dist/adapter/zigate/driver/frame.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/frame.js +8 -8
- package/dist/adapter/zigate/driver/frame.js.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/ziGateObject.js +5 -4
- package/dist/adapter/zigate/driver/ziGateObject.js.map +1 -1
- package/dist/adapter/zigate/driver/zigate.d.ts.map +1 -1
- package/dist/adapter/zigate/driver/zigate.js +23 -23
- package/dist/adapter/zigate/driver/zigate.js.map +1 -1
- package/dist/controller/controller.d.ts +1 -3
- package/dist/controller/controller.d.ts.map +1 -1
- package/dist/controller/controller.js +47 -56
- package/dist/controller/controller.js.map +1 -1
- package/dist/controller/database.d.ts.map +1 -1
- package/dist/controller/database.js +3 -5
- package/dist/controller/database.js.map +1 -1
- package/dist/controller/greenPower.d.ts.map +1 -1
- package/dist/controller/greenPower.js +13 -20
- package/dist/controller/greenPower.js.map +1 -1
- package/dist/controller/helpers/requestQueue.d.ts.map +1 -1
- package/dist/controller/helpers/requestQueue.js +15 -25
- package/dist/controller/helpers/requestQueue.js.map +1 -1
- package/dist/controller/model/device.d.ts.map +1 -1
- package/dist/controller/model/device.js +44 -49
- package/dist/controller/model/device.js.map +1 -1
- package/dist/controller/model/endpoint.d.ts.map +1 -1
- package/dist/controller/model/endpoint.js +14 -18
- package/dist/controller/model/endpoint.js.map +1 -1
- package/dist/controller/model/group.d.ts.map +1 -1
- package/dist/controller/model/group.js +8 -11
- package/dist/controller/model/group.js.map +1 -1
- package/dist/controller/touchlink.js +21 -24
- package/dist/controller/touchlink.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/dist/utils/logger.d.ts +9 -0
- package/dist/utils/logger.d.ts.map +1 -0
- package/dist/utils/logger.js +14 -0
- package/dist/utils/logger.js.map +1 -0
- package/dist/zcl/buffaloZcl.d.ts.map +1 -1
- package/dist/zcl/buffaloZcl.js +3 -9
- package/dist/zcl/buffaloZcl.js.map +1 -1
- package/package.json +4 -4
- package/dist/adapter/zigate/debug.d.ts +0 -8
- package/dist/adapter/zigate/debug.d.ts.map +0 -1
- package/dist/adapter/zigate/debug.js +0 -20
- package/dist/adapter/zigate/debug.js.map +0 -1
- package/dist/controller/logger-stub.d.ts +0 -7
- package/dist/controller/logger-stub.d.ts.map +0 -1
- package/dist/controller/logger-stub.js +0 -3
- package/dist/controller/logger-stub.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ziGateObject.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/ziGateObject.ts"],"names":[],"mappings":";;;;;AAAA,0BAA0B;AAC1B,oBAAoB;AACpB,oDAAkC;AAClC,oEAAoE;AAEpE,+CAAoE;AACpE,+CAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"ziGateObject.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/ziGateObject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zigate.d.ts","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"zigate.d.ts","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":";;AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAG5C,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAS,iBAAiB,EAAqB,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAC9F,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAQ,qBAAqB,EAA4B,MAAM,eAAe,CAAC;AAiBtF,KAAK,eAAe,GAAG;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,KAAK,EAAE,qBAAqB,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAC;AAWF,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,YAAY;IAC5C,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,WAAW,CAAU;IAI7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,KAAK,CAAQ;IAEd,SAAS,EAAE,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1C,OAAO,CAAC,QAAQ,CAA0C;gBAEvC,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;IAaxD,WAAW,CACpB,IAAI,EAAE,iBAAiB,EACvB,OAAO,CAAC,EAAE,mBAAmB,EAC7B,OAAO,CAAC,EAAE,MAAM,EAChB,eAAe,CAAC,EAAE,MAAM,EACxB,eAAe,GAAE,OAAe,GACjC,OAAO,CAAC,YAAY,CAAC;WAmEJ,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAI3C,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAK9C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAIf,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwB5B,OAAO,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,GAAE,MAAyB,GACvE;QAAE,KAAK,EAAE,MAAM;YAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE;YAIjE,cAAc;YAsCd,cAAc;IA0C5B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,YAAY;IA+DpB,OAAO,CAAC,wBAAwB;IAIhC,OAAO,CAAC,iBAAiB;CAmB5B"}
|
|
@@ -7,7 +7,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
const parser_delimiter_1 = require("@serialport/parser-delimiter");
|
|
9
9
|
const events_1 = require("events");
|
|
10
|
-
const debug_1 = require("../debug");
|
|
11
10
|
const serialPort_1 = require("../../serialPort");
|
|
12
11
|
const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
|
|
13
12
|
const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
|
|
@@ -20,7 +19,8 @@ const waitress_1 = __importDefault(require("../../../utils/waitress"));
|
|
|
20
19
|
const commandType_1 = require("./commandType");
|
|
21
20
|
const frame_1 = __importDefault(require("./frame"));
|
|
22
21
|
const buffalo_1 = require("../../../buffalo");
|
|
23
|
-
const
|
|
22
|
+
const logger_1 = require("../../../utils/logger");
|
|
23
|
+
const NS = 'zh:zigate:driver';
|
|
24
24
|
const autoDetectDefinitions = [
|
|
25
25
|
{ manufacturer: 'zigate_PL2303', vendorId: '067b', productId: '2303' },
|
|
26
26
|
{ manufacturer: 'zigate_cp2102', vendorId: '10c4', productId: 'ea60' },
|
|
@@ -66,16 +66,16 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
66
66
|
const waitersId = [];
|
|
67
67
|
return await this.queue.execute(async () => {
|
|
68
68
|
try {
|
|
69
|
-
debug
|
|
69
|
+
logger_1.logger.debug('Send command \x1b[32m>>>> '
|
|
70
70
|
+ constants_1.ZiGateCommandCode[code]
|
|
71
71
|
+ ' 0x' + zeroPad(code)
|
|
72
|
-
+
|
|
72
|
+
+ ` <<<<\x1b[0m \nPayload: ${JSON.stringify(payload)}`, NS);
|
|
73
73
|
const ziGateObject = ziGateObject_1.default.createRequest(code, payload);
|
|
74
74
|
const frame = ziGateObject.toZiGateFrame();
|
|
75
|
-
debug.
|
|
75
|
+
logger_1.logger.debug(`${JSON.stringify(frame)}`, NS);
|
|
76
76
|
const sendBuffer = frame.toBuffer();
|
|
77
|
-
debug
|
|
78
|
-
debug
|
|
77
|
+
logger_1.logger.debug(`<-- send command ${sendBuffer.toString('hex')}`, NS);
|
|
78
|
+
logger_1.logger.debug(`DisableResponse: ${disableResponse}`, NS);
|
|
79
79
|
if (!disableResponse && Array.isArray(ziGateObject.command.response)) {
|
|
80
80
|
ziGateObject.command.response.forEach((rules) => {
|
|
81
81
|
let waiter = this.waitress.waitFor({ ziGateObject, rules, extraParameters }, timeout || timeouts.default);
|
|
@@ -107,7 +107,7 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
107
107
|
return Promise.race(waiters);
|
|
108
108
|
}
|
|
109
109
|
catch (e) {
|
|
110
|
-
|
|
110
|
+
logger_1.logger.error(`sendCommand error ${e}`, NS);
|
|
111
111
|
return Promise.reject(new Error('sendCommand error: ' + e));
|
|
112
112
|
}
|
|
113
113
|
});
|
|
@@ -123,7 +123,7 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
123
123
|
return this.portType === 'serial' ? this.openSerialPort() : this.openSocketPort();
|
|
124
124
|
}
|
|
125
125
|
async close() {
|
|
126
|
-
|
|
126
|
+
logger_1.logger.info('closing', NS);
|
|
127
127
|
this.queue.clear();
|
|
128
128
|
if (this.initialized) {
|
|
129
129
|
this.portWrite = null;
|
|
@@ -161,7 +161,7 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
161
161
|
this.portWrite = this.serialPort;
|
|
162
162
|
try {
|
|
163
163
|
await this.serialPort.asyncOpen();
|
|
164
|
-
debug
|
|
164
|
+
logger_1.logger.debug('Serialport opened', NS);
|
|
165
165
|
this.serialPort.once('close', this.onPortClose.bind(this));
|
|
166
166
|
this.serialPort.once('error', this.onPortError.bind(this));
|
|
167
167
|
this.initialized = true;
|
|
@@ -176,7 +176,7 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
176
176
|
}
|
|
177
177
|
async openSocketPort() {
|
|
178
178
|
const info = socketPortUtils_1.default.parseTcpPath(this.path);
|
|
179
|
-
debug
|
|
179
|
+
logger_1.logger.debug(`Opening TCP socket with ${info.host}:${info.port}`, NS);
|
|
180
180
|
this.socketPort = new net_1.default.Socket();
|
|
181
181
|
this.socketPort.setNoDelay(true);
|
|
182
182
|
this.socketPort.setKeepAlive(true, 15000);
|
|
@@ -185,18 +185,18 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
185
185
|
this.portWrite = this.socketPort;
|
|
186
186
|
return new Promise((resolve, reject) => {
|
|
187
187
|
this.socketPort.on('connect', function () {
|
|
188
|
-
debug
|
|
188
|
+
logger_1.logger.debug('Socket connected', NS);
|
|
189
189
|
});
|
|
190
190
|
// eslint-disable-next-line
|
|
191
191
|
const self = this;
|
|
192
192
|
this.socketPort.on('ready', async function () {
|
|
193
|
-
debug
|
|
193
|
+
logger_1.logger.debug('Socket ready', NS);
|
|
194
194
|
self.initialized = true;
|
|
195
195
|
resolve();
|
|
196
196
|
});
|
|
197
197
|
this.socketPort.once('close', this.onPortClose.bind(this));
|
|
198
198
|
this.socketPort.on('error', (error) => {
|
|
199
|
-
|
|
199
|
+
logger_1.logger.error(`Socket error ${error}`, NS);
|
|
200
200
|
// reject(new Error(`Error while opening socket`));
|
|
201
201
|
reject();
|
|
202
202
|
self.initialized = false;
|
|
@@ -205,25 +205,25 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
205
205
|
});
|
|
206
206
|
}
|
|
207
207
|
onPortError(error) {
|
|
208
|
-
|
|
208
|
+
logger_1.logger.error(`Port error: ${error}`, NS);
|
|
209
209
|
}
|
|
210
210
|
onPortClose() {
|
|
211
|
-
debug
|
|
211
|
+
logger_1.logger.debug('Port closed', NS);
|
|
212
212
|
this.initialized = false;
|
|
213
213
|
this.emit('close');
|
|
214
214
|
}
|
|
215
215
|
onSerialData(buffer) {
|
|
216
216
|
try {
|
|
217
|
-
// debug
|
|
217
|
+
// logger.debug(`--- parseNext `, buffer, NS);
|
|
218
218
|
const frame = new frame_1.default(buffer);
|
|
219
219
|
if (!(frame instanceof frame_1.default))
|
|
220
220
|
return; // @Todo fix
|
|
221
221
|
const code = frame.readMsgCode();
|
|
222
222
|
const msgName = (constants_1.ZiGateMessageCode[code] ? constants_1.ZiGateMessageCode[code] : '') + ' 0x' + zeroPad(code);
|
|
223
|
-
debug
|
|
223
|
+
logger_1.logger.debug(`--> parsed frame \x1b[1;34m>>>> ${msgName} <<<<\x1b[0m `, NS);
|
|
224
224
|
try {
|
|
225
225
|
const ziGateObject = ziGateObject_1.default.fromZiGateFrame(frame);
|
|
226
|
-
debug.
|
|
226
|
+
logger_1.logger.debug(`${JSON.stringify(ziGateObject.payload)}`, NS);
|
|
227
227
|
this.waitress.resolve(ziGateObject);
|
|
228
228
|
switch (code) {
|
|
229
229
|
case constants_1.ZiGateMessageCode.DataIndication:
|
|
@@ -243,12 +243,12 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
243
243
|
this.emit('received', { ziGateObject, zclFrame });
|
|
244
244
|
}
|
|
245
245
|
catch (error) {
|
|
246
|
-
|
|
246
|
+
logger_1.logger.error("could not parse zclFrame: " + error, NS);
|
|
247
247
|
this.emit('receivedRaw', { ziGateObject });
|
|
248
248
|
}
|
|
249
249
|
break;
|
|
250
250
|
default:
|
|
251
|
-
|
|
251
|
+
logger_1.logger.error("not implemented profile: " + ziGateObject.payload.profileID, NS);
|
|
252
252
|
}
|
|
253
253
|
break;
|
|
254
254
|
case constants_1.ZiGateMessageCode.LeaveIndication:
|
|
@@ -260,11 +260,11 @@ class ZiGate extends events_1.EventEmitter {
|
|
|
260
260
|
}
|
|
261
261
|
}
|
|
262
262
|
catch (error) {
|
|
263
|
-
|
|
263
|
+
logger_1.logger.error(`Parsing error: ${error}`, NS);
|
|
264
264
|
}
|
|
265
265
|
}
|
|
266
266
|
catch (error) {
|
|
267
|
-
|
|
267
|
+
logger_1.logger.error(`Error while parsing Frame '${error.stack}'`, NS);
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
270
|
waitressTimeoutFormatter(matcher, timeout) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zigate.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"zigate.js","sourceRoot":"","sources":["../../../../src/adapter/zigate/driver/zigate.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { TsType as AdapterTsType } from '../adapter';
|
|
|
4
4
|
import { Device } from './model';
|
|
5
5
|
import { DeviceType } from './tstype';
|
|
6
6
|
import Group from './model/group';
|
|
7
|
-
import { LoggerStub } from "./logger-stub";
|
|
8
7
|
interface Options {
|
|
9
8
|
network: AdapterTsType.NetworkOptions;
|
|
10
9
|
serialPort: AdapterTsType.SerialPortOptions;
|
|
@@ -35,13 +34,12 @@ declare class Controller extends events.EventEmitter {
|
|
|
35
34
|
private touchlink;
|
|
36
35
|
private stopping;
|
|
37
36
|
private networkParametersCached;
|
|
38
|
-
private logger?;
|
|
39
37
|
/**
|
|
40
38
|
* Create a controller
|
|
41
39
|
*
|
|
42
40
|
* To auto detect the port provide `null` for `options.serialPort.path`
|
|
43
41
|
*/
|
|
44
|
-
constructor(options: Options
|
|
42
|
+
constructor(options: Options);
|
|
45
43
|
/**
|
|
46
44
|
* Start the Herdsman controller
|
|
47
45
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller/controller.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAC,MAAM,IAAI,aAAa,EAAmC,MAAM,YAAY,CAAC;AACrF,OAAO,EAAS,MAAM,EAAC,MAAM,SAAS,CAAC;AAGvC,OAAO,EAAW,UAAU,EAAkD,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/controller/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,6 @@ const model_1 = require("./model");
|
|
|
33
33
|
const helpers_1 = require("./helpers");
|
|
34
34
|
const Events = __importStar(require("./events"));
|
|
35
35
|
const tstype_1 = require("./tstype");
|
|
36
|
-
const debug_1 = __importDefault(require("debug"));
|
|
37
36
|
const fs_1 = __importDefault(require("fs"));
|
|
38
37
|
const zcl_1 = require("../zcl");
|
|
39
38
|
const touchlink_1 = __importDefault(require("./touchlink"));
|
|
@@ -44,12 +43,14 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
44
43
|
// @ts-ignore
|
|
45
44
|
const mixin_deep_1 = __importDefault(require("mixin-deep"));
|
|
46
45
|
const group_1 = __importDefault(require("./model/group"));
|
|
46
|
+
const logger_1 = require("../utils/logger");
|
|
47
|
+
const NS = 'zh:controller';
|
|
47
48
|
async function catcho(func, errorMessage) {
|
|
48
49
|
try {
|
|
49
50
|
await func();
|
|
50
51
|
}
|
|
51
52
|
catch (error) {
|
|
52
|
-
|
|
53
|
+
logger_1.logger.error(`${errorMessage}: ${error}`, NS);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
const DefaultOptions = {
|
|
@@ -67,10 +68,6 @@ const DefaultOptions = {
|
|
|
67
68
|
adapter: { disableLED: false },
|
|
68
69
|
acceptJoiningDeviceHandler: null,
|
|
69
70
|
};
|
|
70
|
-
const debug = {
|
|
71
|
-
error: (0, debug_1.default)('zigbee-herdsman:controller:error'),
|
|
72
|
-
log: (0, debug_1.default)('zigbee-herdsman:controller:log'),
|
|
73
|
-
};
|
|
74
71
|
/**
|
|
75
72
|
* @noInheritDoc
|
|
76
73
|
*/
|
|
@@ -91,17 +88,15 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
91
88
|
touchlink;
|
|
92
89
|
stopping;
|
|
93
90
|
networkParametersCached;
|
|
94
|
-
logger;
|
|
95
91
|
/**
|
|
96
92
|
* Create a controller
|
|
97
93
|
*
|
|
98
94
|
* To auto detect the port provide `null` for `options.serialPort.path`
|
|
99
95
|
*/
|
|
100
|
-
constructor(options
|
|
96
|
+
constructor(options) {
|
|
101
97
|
super();
|
|
102
98
|
this.stopping = false;
|
|
103
99
|
this.options = (0, mixin_deep_1.default)(JSON.parse(JSON.stringify(DefaultOptions)), options);
|
|
104
|
-
this.logger = logger;
|
|
105
100
|
// Validate options
|
|
106
101
|
for (const channel of this.options.network.channelList) {
|
|
107
102
|
if (channel < 11 || channel > 26) {
|
|
@@ -115,8 +110,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
115
110
|
throw new Error(`ExtendedPanID must be 8 digits long, got ${this.options.network.extendedPanID.length}.`);
|
|
116
111
|
}
|
|
117
112
|
if (this.options.network.panID >= 0xFFFF || this.options.network.panID <= 0) {
|
|
118
|
-
throw new Error(`PanID must have a value of 0x0001 (1) - 0xFFFE (65534),
|
|
119
|
-
`got ${this.options.network.panID}.`);
|
|
113
|
+
throw new Error(`PanID must have a value of 0x0001 (1) - 0xFFFE (65534), got ${this.options.network.panID}.`);
|
|
120
114
|
}
|
|
121
115
|
}
|
|
122
116
|
/**
|
|
@@ -127,10 +121,10 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
127
121
|
this.database = database_1.default.open(this.options.databasePath);
|
|
128
122
|
model_1.Entity.injectDatabase(this.database);
|
|
129
123
|
// Adapter (create and inject)
|
|
130
|
-
this.adapter = await adapter_1.Adapter.create(this.options.network, this.options.serialPort, this.options.backupPath, this.options.adapter
|
|
131
|
-
debug
|
|
124
|
+
this.adapter = await adapter_1.Adapter.create(this.options.network, this.options.serialPort, this.options.backupPath, this.options.adapter);
|
|
125
|
+
logger_1.logger.debug(`Starting with options '${JSON.stringify(this.options)}'`, NS);
|
|
132
126
|
const startResult = await this.adapter.start();
|
|
133
|
-
debug
|
|
127
|
+
logger_1.logger.debug(`Started with result '${startResult}'`, NS);
|
|
134
128
|
// Check if we have to change the channel, only do this when adapter `resumed` because:
|
|
135
129
|
// - `getNetworkParameters` might be return wrong info because it needs to propogate after backup restore
|
|
136
130
|
// - If result is not `resumed` (`reset` or `restored`), the adapter should comission with the channel from `this.options.network`
|
|
@@ -142,7 +136,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
142
136
|
}
|
|
143
137
|
model_1.Entity.injectAdapter(this.adapter);
|
|
144
138
|
// log injection
|
|
145
|
-
debug
|
|
139
|
+
logger_1.logger.debug(`Injected database: ${this.database != null}, adapter: ${this.adapter != null}`, NS);
|
|
146
140
|
this.greenPower = new greenPower_1.default(this.adapter);
|
|
147
141
|
this.greenPower.on(tstype_1.GreenPowerEvents.deviceJoined, this.onDeviceJoinedGreenPower.bind(this));
|
|
148
142
|
// Register adapter events
|
|
@@ -157,7 +151,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
157
151
|
if (this.options.databaseBackupPath && fs_1.default.existsSync(this.options.databasePath)) {
|
|
158
152
|
fs_1.default.copyFileSync(this.options.databasePath, this.options.databaseBackupPath);
|
|
159
153
|
}
|
|
160
|
-
debug
|
|
154
|
+
logger_1.logger.debug('Clearing database...', NS);
|
|
161
155
|
for (const group of group_1.default.all()) {
|
|
162
156
|
group.removeFromDatabase();
|
|
163
157
|
}
|
|
@@ -171,13 +165,13 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
171
165
|
// Add coordinator to the database if it is not there yet.
|
|
172
166
|
const coordinator = await this.adapter.getCoordinator();
|
|
173
167
|
if (model_1.Device.byType('Coordinator').length === 0) {
|
|
174
|
-
debug
|
|
168
|
+
logger_1.logger.debug('No coordinator in database, querying...', NS);
|
|
175
169
|
model_1.Device.create('Coordinator', coordinator.ieeeAddr, coordinator.networkAddress, coordinator.manufacturerID, undefined, undefined, undefined, true, coordinator.endpoints);
|
|
176
170
|
}
|
|
177
171
|
// Update coordinator ieeeAddr if changed, can happen due to e.g. reflashing
|
|
178
172
|
const databaseCoordinator = model_1.Device.byType('Coordinator')[0];
|
|
179
173
|
if (databaseCoordinator.ieeeAddr !== coordinator.ieeeAddr) {
|
|
180
|
-
|
|
174
|
+
logger_1.logger.info(`Coordinator address changed, updating to '${coordinator.ieeeAddr}'`, NS);
|
|
181
175
|
databaseCoordinator.changeIeeeAddress(coordinator.ieeeAddr);
|
|
182
176
|
}
|
|
183
177
|
// Set backup timer to 1 day.
|
|
@@ -252,7 +246,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
252
246
|
this.emit(Events.Events.permitJoinChanged, data);
|
|
253
247
|
}
|
|
254
248
|
else {
|
|
255
|
-
debug
|
|
249
|
+
logger_1.logger.debug('Disable joining', NS);
|
|
256
250
|
await this.greenPower.permitJoin(0, null);
|
|
257
251
|
await this.adapter.permitJoin(0, null);
|
|
258
252
|
const data = { permitted: false, reason, timeout: this.permitJoinTimeout };
|
|
@@ -296,13 +290,13 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
296
290
|
async backup() {
|
|
297
291
|
this.databaseSave();
|
|
298
292
|
if (this.options.backupPath && await this.adapter.supportsBackup()) {
|
|
299
|
-
debug
|
|
293
|
+
logger_1.logger.debug('Creating coordinator backup', NS);
|
|
300
294
|
const backup = await this.adapter.backup(model_1.Device.all().map((d) => d.ieeeAddr));
|
|
301
295
|
const unifiedBackup = await utils_1.BackupUtils.toUnifiedBackup(backup);
|
|
302
296
|
const tmpBackupPath = this.options.backupPath + '.tmp';
|
|
303
297
|
fs_1.default.writeFileSync(tmpBackupPath, JSON.stringify(unifiedBackup, null, 2));
|
|
304
298
|
fs_1.default.renameSync(tmpBackupPath, this.options.backupPath);
|
|
305
|
-
|
|
299
|
+
logger_1.logger.info(`Wrote coordinator backup to '${this.options.backupPath}'`, NS);
|
|
306
300
|
}
|
|
307
301
|
}
|
|
308
302
|
async coordinatorCheck() {
|
|
@@ -376,7 +370,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
376
370
|
* Broadcast a network-wide channel change.
|
|
377
371
|
*/
|
|
378
372
|
async changeChannel() {
|
|
379
|
-
|
|
373
|
+
logger_1.logger.info(`Broadcasting change channel to '${this.options.network.channelList[0]}'.`, NS);
|
|
380
374
|
await this.adapter.changeChannel(this.options.network.channelList[0]);
|
|
381
375
|
this.networkParametersCached = null; // invalidate cache
|
|
382
376
|
}
|
|
@@ -387,15 +381,15 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
387
381
|
return this.adapter.setTransmitPower(value);
|
|
388
382
|
}
|
|
389
383
|
onNetworkAddress(payload) {
|
|
390
|
-
debug
|
|
384
|
+
logger_1.logger.debug(`Network address '${payload.ieeeAddr}'`, NS);
|
|
391
385
|
const device = model_1.Device.byIeeeAddr(payload.ieeeAddr);
|
|
392
386
|
if (!device) {
|
|
393
|
-
debug
|
|
387
|
+
logger_1.logger.debug(`Network address is from unknown device '${payload.ieeeAddr}'`, NS);
|
|
394
388
|
return;
|
|
395
389
|
}
|
|
396
390
|
this.selfAndDeviceEmit(device, Events.Events.lastSeenChanged, { device, reason: 'networkAddress' });
|
|
397
391
|
if (device.networkAddress !== payload.networkAddress) {
|
|
398
|
-
debug
|
|
392
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' got new networkAddress '${payload.networkAddress}'`, NS);
|
|
399
393
|
device.networkAddress = payload.networkAddress;
|
|
400
394
|
device.save();
|
|
401
395
|
const data = { device };
|
|
@@ -403,17 +397,17 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
403
397
|
}
|
|
404
398
|
}
|
|
405
399
|
onDeviceAnnounce(payload) {
|
|
406
|
-
debug
|
|
400
|
+
logger_1.logger.debug(`Device announce '${payload.ieeeAddr}'`, NS);
|
|
407
401
|
const device = model_1.Device.byIeeeAddr(payload.ieeeAddr);
|
|
408
402
|
if (!device) {
|
|
409
|
-
debug
|
|
403
|
+
logger_1.logger.debug(`Device announce is from unknown device '${payload.ieeeAddr}'`, NS);
|
|
410
404
|
return;
|
|
411
405
|
}
|
|
412
406
|
device.updateLastSeen();
|
|
413
407
|
this.selfAndDeviceEmit(device, Events.Events.lastSeenChanged, { device, reason: 'deviceAnnounce' });
|
|
414
408
|
device.implicitCheckin();
|
|
415
409
|
if (device.networkAddress !== payload.networkAddress) {
|
|
416
|
-
debug
|
|
410
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' announced with new networkAddress '${payload.networkAddress}'`, NS);
|
|
417
411
|
device.networkAddress = payload.networkAddress;
|
|
418
412
|
device.save();
|
|
419
413
|
}
|
|
@@ -421,24 +415,24 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
421
415
|
this.selfAndDeviceEmit(device, Events.Events.deviceAnnounce, data);
|
|
422
416
|
}
|
|
423
417
|
onDeviceLeave(payload) {
|
|
424
|
-
debug
|
|
418
|
+
logger_1.logger.debug(`Device leave '${payload.ieeeAddr}'`, NS);
|
|
425
419
|
const device = payload.ieeeAddr ? model_1.Device.byIeeeAddr(payload.ieeeAddr) : model_1.Device.byNetworkAddress(payload.networkAddress);
|
|
426
420
|
if (!device) {
|
|
427
|
-
debug
|
|
421
|
+
logger_1.logger.debug(`Device leave is from unknown or already deleted device '${payload.ieeeAddr ?? payload.networkAddress}'`, NS);
|
|
428
422
|
return;
|
|
429
423
|
}
|
|
430
|
-
debug
|
|
424
|
+
logger_1.logger.debug(`Removing device from database '${device.ieeeAddr}'`, NS);
|
|
431
425
|
device.removeFromDatabase();
|
|
432
426
|
const data = { ieeeAddr: device.ieeeAddr };
|
|
433
427
|
this.selfAndDeviceEmit(device, Events.Events.deviceLeave, data);
|
|
434
428
|
}
|
|
435
429
|
async onAdapterDisconnected() {
|
|
436
|
-
debug
|
|
430
|
+
logger_1.logger.debug(`Adapter disconnected`, NS);
|
|
437
431
|
await catcho(() => this.adapter.stop(), 'Failed to stop adapter on disconnect');
|
|
438
432
|
this.emit(Events.Events.adapterDisconnected);
|
|
439
433
|
}
|
|
440
434
|
async onDeviceJoinedGreenPower(payload) {
|
|
441
|
-
debug
|
|
435
|
+
logger_1.logger.debug(`Green power device '${JSON.stringify(payload)}' joined`, NS);
|
|
442
436
|
// Green power devices don't have an ieeeAddr, the sourceID is unique and static so use this.
|
|
443
437
|
let ieeeAddr = payload.sourceID.toString(16);
|
|
444
438
|
ieeeAddr = `0x${'0'.repeat(16 - ieeeAddr.length)}${ieeeAddr}`;
|
|
@@ -446,8 +440,8 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
446
440
|
const modelID = `GreenPower_${payload.deviceID}`;
|
|
447
441
|
let device = model_1.Device.byIeeeAddr(ieeeAddr, true);
|
|
448
442
|
if (!device) {
|
|
449
|
-
debug
|
|
450
|
-
debug
|
|
443
|
+
logger_1.logger.debug(`New green power device '${ieeeAddr}' joined`, NS);
|
|
444
|
+
logger_1.logger.debug(`Creating device '${ieeeAddr}'`, NS);
|
|
451
445
|
device = model_1.Device.create('GreenPower', ieeeAddr, payload.networkAddress, null, undefined, undefined, modelID, true, []);
|
|
452
446
|
device.save();
|
|
453
447
|
this.selfAndDeviceEmit(device, Events.Events.deviceJoined, { device });
|
|
@@ -455,7 +449,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
455
449
|
this.selfAndDeviceEmit(device, Events.Events.deviceInterview, deviceInterviewPayload);
|
|
456
450
|
}
|
|
457
451
|
else if (device.isDeleted) {
|
|
458
|
-
debug
|
|
452
|
+
logger_1.logger.debug(`Deleted green power device '${ieeeAddr}' joined, undeleting`, NS);
|
|
459
453
|
device.undelete(true);
|
|
460
454
|
this.selfAndDeviceEmit(device, Events.Events.deviceJoined, { device });
|
|
461
455
|
const deviceInterviewPayload = { status: 'successful', device };
|
|
@@ -467,32 +461,31 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
467
461
|
this.emit(event, data);
|
|
468
462
|
}
|
|
469
463
|
async onDeviceJoined(payload) {
|
|
470
|
-
debug
|
|
464
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' joined`, NS);
|
|
471
465
|
if (this.options.acceptJoiningDeviceHandler) {
|
|
472
466
|
if (!(await this.options.acceptJoiningDeviceHandler(payload.ieeeAddr))) {
|
|
473
|
-
debug
|
|
467
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' rejected by handler, removing it`, NS);
|
|
474
468
|
await catcho(() => this.adapter.removeDevice(payload.networkAddress, payload.ieeeAddr), 'Failed to remove rejected device');
|
|
475
469
|
return;
|
|
476
470
|
}
|
|
477
471
|
else {
|
|
478
|
-
debug
|
|
472
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' accepted by handler`, NS);
|
|
479
473
|
}
|
|
480
474
|
}
|
|
481
475
|
let device = model_1.Device.byIeeeAddr(payload.ieeeAddr, true);
|
|
482
476
|
if (!device) {
|
|
483
|
-
debug
|
|
484
|
-
debug
|
|
477
|
+
logger_1.logger.debug(`New device '${payload.ieeeAddr}' joined`, NS);
|
|
478
|
+
logger_1.logger.debug(`Creating device '${payload.ieeeAddr}'`, NS);
|
|
485
479
|
device = model_1.Device.create('Unknown', payload.ieeeAddr, payload.networkAddress, undefined, undefined, undefined, undefined, false, []);
|
|
486
480
|
this.selfAndDeviceEmit(device, Events.Events.deviceJoined, { device });
|
|
487
481
|
}
|
|
488
482
|
else if (device.isDeleted) {
|
|
489
|
-
debug
|
|
483
|
+
logger_1.logger.debug(`Deleted device '${payload.ieeeAddr}' joined, undeleting`, NS);
|
|
490
484
|
device.undelete();
|
|
491
485
|
this.selfAndDeviceEmit(device, Events.Events.deviceJoined, { device });
|
|
492
486
|
}
|
|
493
487
|
if (device.networkAddress !== payload.networkAddress) {
|
|
494
|
-
debug
|
|
495
|
-
`updating networkAddress`);
|
|
488
|
+
logger_1.logger.debug(`Device '${payload.ieeeAddr}' is already in database with different network address, updating network address`, NS);
|
|
496
489
|
device.networkAddress = payload.networkAddress;
|
|
497
490
|
device.save();
|
|
498
491
|
}
|
|
@@ -501,23 +494,22 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
501
494
|
device.implicitCheckin();
|
|
502
495
|
if (!device.interviewCompleted && !device.interviewing) {
|
|
503
496
|
const payloadStart = { status: 'started', device };
|
|
504
|
-
|
|
497
|
+
logger_1.logger.info(`Interview for '${device.ieeeAddr}' started`, NS);
|
|
505
498
|
this.selfAndDeviceEmit(device, Events.Events.deviceInterview, payloadStart);
|
|
506
499
|
try {
|
|
507
500
|
await device.interview();
|
|
508
|
-
|
|
501
|
+
logger_1.logger.info(`Succesfully interviewed '${device.ieeeAddr}'`, NS);
|
|
509
502
|
const event = { status: 'successful', device };
|
|
510
503
|
this.selfAndDeviceEmit(device, Events.Events.deviceInterview, event);
|
|
511
504
|
}
|
|
512
505
|
catch (error) {
|
|
513
|
-
|
|
506
|
+
logger_1.logger.error(`Interview failed for '${device.ieeeAddr} with error '${error}'`, NS);
|
|
514
507
|
const event = { status: 'failed', device };
|
|
515
508
|
this.selfAndDeviceEmit(device, Events.Events.deviceInterview, event);
|
|
516
509
|
}
|
|
517
510
|
}
|
|
518
511
|
else {
|
|
519
|
-
debug
|
|
520
|
-
`in progress '${device.interviewing}'`);
|
|
512
|
+
logger_1.logger.debug(`Not interviewing '${payload.ieeeAddr}', completed '${device.interviewCompleted}', in progress '${device.interviewing}'`, NS);
|
|
521
513
|
}
|
|
522
514
|
}
|
|
523
515
|
isZclDataPayload(dataPayload, type) {
|
|
@@ -528,7 +520,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
528
520
|
if (dataType === 'zcl') {
|
|
529
521
|
delete logDataPayload.frame.Cluster;
|
|
530
522
|
}
|
|
531
|
-
debug
|
|
523
|
+
logger_1.logger.debug(`Received '${dataType}' data '${JSON.stringify(logDataPayload)}'`, NS);
|
|
532
524
|
let gpDevice = null;
|
|
533
525
|
if (this.isZclDataPayload(dataPayload, dataType)) {
|
|
534
526
|
if (dataPayload.frame.Cluster.name === 'touchlink') {
|
|
@@ -556,12 +548,11 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
556
548
|
* The group ID attribute of these message defines the network address of the end device.
|
|
557
549
|
*/
|
|
558
550
|
if (device?.manufacturerName === 'LUMI' && device?.type == 'Router' && dataPayload.groupID) {
|
|
559
|
-
debug
|
|
551
|
+
logger_1.logger.debug(`Handling re-transmitted Xiaomi message ${device.networkAddress} -> ${dataPayload.groupID}`, NS);
|
|
560
552
|
device = model_1.Device.byNetworkAddress(dataPayload.groupID);
|
|
561
553
|
}
|
|
562
554
|
if (!device) {
|
|
563
|
-
debug
|
|
564
|
-
`skipping...`);
|
|
555
|
+
logger_1.logger.debug(`'${dataType}' data is from unknown device with address '${dataPayload.address}', skipping...`, NS);
|
|
565
556
|
return;
|
|
566
557
|
}
|
|
567
558
|
device.updateLastSeen();
|
|
@@ -572,8 +563,8 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
572
563
|
device.linkquality = dataPayload.linkquality;
|
|
573
564
|
let endpoint = device.getEndpoint(dataPayload.endpoint);
|
|
574
565
|
if (!endpoint) {
|
|
575
|
-
debug
|
|
576
|
-
`network address '${dataPayload.address}', creating it
|
|
566
|
+
logger_1.logger.debug(`'${dataType}' data is from unknown endpoint '${dataPayload.endpoint}' from device with ` +
|
|
567
|
+
`network address '${dataPayload.address}', creating it...`, NS);
|
|
577
568
|
endpoint = device.createEndpoint(dataPayload.endpoint);
|
|
578
569
|
}
|
|
579
570
|
// Parse command for event
|
|
@@ -617,7 +608,7 @@ class Controller extends events_1.default.EventEmitter {
|
|
|
617
608
|
data = dataPayload.frame.Payload;
|
|
618
609
|
}
|
|
619
610
|
else {
|
|
620
|
-
debug
|
|
611
|
+
logger_1.logger.debug(`Skipping command '${command.name}' because it is missing from the lookup`, NS);
|
|
621
612
|
}
|
|
622
613
|
}
|
|
623
614
|
}
|