zigbee-herdsman 2.1.4 → 2.1.5
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 +8 -0
- package/dist/adapter/zboss/adapter/zbossAdapter.d.ts +2 -4
- package/dist/adapter/zboss/adapter/zbossAdapter.d.ts.map +1 -1
- package/dist/adapter/zboss/adapter/zbossAdapter.js +10 -10
- package/dist/adapter/zboss/adapter/zbossAdapter.js.map +1 -1
- package/package.json +8 -8
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [2.1.5](https://github.com/Koenkk/zigbee-herdsman/compare/v2.1.4...v2.1.5) (2024-10-21)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* **ignore:** update dependencies ([#1219](https://github.com/Koenkk/zigbee-herdsman/issues/1219)) ([5f11842](https://github.com/Koenkk/zigbee-herdsman/commit/5f118426098d5bc3331db39f13fea4b52c652ebf))
|
|
9
|
+
* ZBOSS: Fix unhandled error on sendZclFrameToEndpointInternal in case of request execute time more than timeout. ([#1218](https://github.com/Koenkk/zigbee-herdsman/issues/1218)) ([346b3be](https://github.com/Koenkk/zigbee-herdsman/commit/346b3be6392f67d35fa36abd8cd9d52747641a88))
|
|
10
|
+
|
|
3
11
|
## [2.1.4](https://github.com/Koenkk/zigbee-herdsman/compare/v2.1.3...v2.1.4) (2024-10-18)
|
|
4
12
|
|
|
5
13
|
|
|
@@ -34,12 +34,10 @@ export declare class ZBOSSAdapter extends Adapter {
|
|
|
34
34
|
sendZclFrameInterPANToIeeeAddr(zclFrame: Zcl.Frame, ieeeAddress: string): Promise<void>;
|
|
35
35
|
sendZclFrameInterPANBroadcast(zclFrame: Zcl.Frame, timeout: number): Promise<ZclPayload>;
|
|
36
36
|
restoreChannelInterPAN(): Promise<void>;
|
|
37
|
-
|
|
37
|
+
private waitForInternal;
|
|
38
|
+
waitFor(networkAddress: number, endpoint: number, frameType: Zcl.FrameType, direction: Zcl.Direction, transactionSequenceNumber: number | undefined, clusterID: number, commandIdentifier: number, timeout: number): {
|
|
38
39
|
promise: Promise<ZclPayload>;
|
|
39
40
|
cancel: () => void;
|
|
40
|
-
start: () => {
|
|
41
|
-
promise: Promise<ZclPayload>;
|
|
42
|
-
};
|
|
43
41
|
};
|
|
44
42
|
private waitressTimeoutFormatter;
|
|
45
43
|
private waitressValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zbossAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/zboss/adapter/zbossAdapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AACtC,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGvC,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,QAAQ,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AAsBxC,qBAAa,YAAa,SAAQ,OAAO;IACrC,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAwC;gBAGpD,cAAc,EAAE,MAAM,CAAC,cAAc,EACrC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAC3C,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,CAAC,cAAc;YAc3B,cAAc;WAsDR,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAc3C,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAM/C,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;IAQpC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMrB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC;IAwB3D,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAKlC,MAAM,CAAC,uBAAuB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1D,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC;IAczD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9C,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK/D,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCnE,OAAO,CAChB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,GAAG,CAAC,SAAS,EACxB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,IAAI,GACtB,OAAO,CAAC,IAAI,CAAC;IACH,OAAO,CAAC,CAAC,SAAS,MAAM,QAAQ,CAAC,oBAAoB,EAC9D,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,CAAC,EACZ,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,KAAK,GACvB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAwC/B,sBAAsB,CAC/B,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,KAAK,EACnB,OAAO,EAAE,MAAM,EACf,eAAe,EAAE,OAAO,EACxB,eAAe,EAAE,OAAO,EACxB,cAAc,CAAC,EAAE,MAAM,GACxB,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YAqBf,8BAA8B;IAkG/B,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjG,iBAAiB,CAC1B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,KAAK,EACnB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,KAAK,CAAC,gBAAgB,GACpC,OAAO,CAAC,IAAI,CAAC;IAWH,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlD,8BAA8B,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAKxF,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"zbossAdapter.d.ts","sourceRoot":"","sources":["../../../../src/adapter/zboss/adapter/zbossAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -266,10 +266,10 @@ class ZBOSSAdapter extends __1.Adapter {
|
|
|
266
266
|
let response = null;
|
|
267
267
|
const command = zclFrame.command;
|
|
268
268
|
if (command.response && disableResponse === false) {
|
|
269
|
-
response = this.
|
|
269
|
+
response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, command.response, timeout);
|
|
270
270
|
}
|
|
271
271
|
else if (!zclFrame.header.frameControl.disableDefaultResponse) {
|
|
272
|
-
response = this.
|
|
272
|
+
response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, Zcl.Foundation.defaultRsp.ID, timeout);
|
|
273
273
|
}
|
|
274
274
|
try {
|
|
275
275
|
const dataConfirmResult = await this.driver.request(ieeeAddr, 0x0104, zclFrame.cluster.ID, endpoint, sourceEndpoint || 0x01, zclFrame.toBuffer());
|
|
@@ -326,20 +326,20 @@ class ZBOSSAdapter extends __1.Adapter {
|
|
|
326
326
|
async restoreChannelInterPAN() {
|
|
327
327
|
return;
|
|
328
328
|
}
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
// direction: Zcl.Direction,
|
|
332
|
-
transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
|
|
333
|
-
const payload = {
|
|
329
|
+
waitForInternal(networkAddress, endpoint, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
|
|
330
|
+
const waiter = this.waitress.waitFor({
|
|
334
331
|
address: networkAddress,
|
|
335
332
|
endpoint,
|
|
336
333
|
clusterID,
|
|
337
334
|
commandIdentifier,
|
|
338
335
|
transactionSequenceNumber,
|
|
339
|
-
};
|
|
340
|
-
const waiter = this.waitress.waitFor(payload, timeout);
|
|
336
|
+
}, timeout);
|
|
341
337
|
const cancel = () => this.waitress.remove(waiter.ID);
|
|
342
|
-
return {
|
|
338
|
+
return { start: waiter.start, cancel };
|
|
339
|
+
}
|
|
340
|
+
waitFor(networkAddress, endpoint, frameType, direction, transactionSequenceNumber, clusterID, commandIdentifier, timeout) {
|
|
341
|
+
const waiter = this.waitForInternal(networkAddress, endpoint, transactionSequenceNumber, clusterID, commandIdentifier, timeout);
|
|
342
|
+
return { cancel: waiter.cancel, promise: waiter.start().promise };
|
|
343
343
|
}
|
|
344
344
|
waitressTimeoutFormatter(matcher, timeout) {
|
|
345
345
|
return (`Timeout - ${matcher.address} - ${matcher.endpoint}` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zbossAdapter.js","sourceRoot":"","sources":["../../../../src/adapter/zboss/adapter/zbossAdapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"zbossAdapter.js","sourceRoot":"","sources":["../../../../src/adapter/zboss/adapter/zbossAdapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@serialport/parser-delimiter": "^12.0.0",
|
|
30
30
|
"@serialport/stream": "^12.0.0",
|
|
31
31
|
"bonjour-service": "^1.2.1",
|
|
32
|
-
"debounce": "^2.
|
|
32
|
+
"debounce": "^2.2.0",
|
|
33
33
|
"fast-deep-equal": "^3.1.3",
|
|
34
34
|
"mixin-deep": "^2.0.1",
|
|
35
35
|
"slip": "^1.0.2"
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
"@babel/core": "^7.25.8",
|
|
42
42
|
"@babel/preset-env": "^7.25.8",
|
|
43
43
|
"@babel/preset-typescript": "^7.25.7",
|
|
44
|
-
"@eslint/core": "^0.
|
|
45
|
-
"@eslint/js": "^9.
|
|
44
|
+
"@eslint/core": "^0.7.0",
|
|
45
|
+
"@eslint/js": "^9.13.0",
|
|
46
46
|
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
|
|
47
47
|
"@serialport/binding-mock": "^10.2.2",
|
|
48
48
|
"@types/debounce": "^1.2.4",
|
|
@@ -50,19 +50,19 @@
|
|
|
50
50
|
"@types/jest": "^29.5.13",
|
|
51
51
|
"@types/mz": "^2.7.8",
|
|
52
52
|
"@types/nedb": "^1.8.16",
|
|
53
|
-
"@types/node": "^22.7.
|
|
53
|
+
"@types/node": "^22.7.7",
|
|
54
54
|
"babel-jest": "^29.7.0",
|
|
55
|
-
"eslint": "^9.
|
|
55
|
+
"eslint": "^9.13.0",
|
|
56
56
|
"eslint-config-prettier": "^9.1.0",
|
|
57
57
|
"jest": "^29.7.0",
|
|
58
58
|
"prettier": "^3.3.3",
|
|
59
59
|
"regenerator-runtime": "^0.14.1",
|
|
60
60
|
"rimraf": "^6.0.1",
|
|
61
|
-
"typedoc": "^0.26.
|
|
61
|
+
"typedoc": "^0.26.10",
|
|
62
62
|
"typedoc-plugin-markdown": "^4.2.9",
|
|
63
63
|
"typedoc-plugin-no-inherit": "^1.4.0",
|
|
64
64
|
"typescript": "^5.6.3",
|
|
65
|
-
"typescript-eslint": "^8.
|
|
65
|
+
"typescript-eslint": "^8.10.0"
|
|
66
66
|
},
|
|
67
67
|
"homepage": "https://github.com/Koenkk/zigbee-herdsman",
|
|
68
68
|
"keywords": [
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"type": "git",
|
|
81
81
|
"url": "git+https://github.com/Koenkk/zigbee-herdsman.git"
|
|
82
82
|
},
|
|
83
|
-
"version": "2.1.
|
|
83
|
+
"version": "2.1.5",
|
|
84
84
|
"jest": {
|
|
85
85
|
"coverageThreshold": {
|
|
86
86
|
"global": {
|