zigbee-herdsman 0.50.1 → 0.52.0

package/dist/adapter/ember/adapter/oneWaitress.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -7,9 +30,7 @@ exports.EmberOneWaitress = exports.OneWaitressEvents = void 0;
 /* istanbul ignore file */
 const es6_1 = __importDefault(require("fast-deep-equal/es6"));
 const consts_1 = require("../../../zspec/consts");
-const zdo_1 = require("../zdo");
-const logger_1 = require("../../../utils/logger");
-const NS = 'zh:ember:waitress';
+const Zdo = __importStar(require("../../../zspec/zdo/"));
 /** Events specific to OneWaitress usage. */
 var OneWaitressEvents;
 (function (OneWaitressEvents) {
@@ -19,8 +40,6 @@ var OneWaitressEvents;
     OneWaitressEvents["STACK_STATUS_NETWORK_CLOSED"] = "STACK_STATUS_NETWORK_CLOSED";
     OneWaitressEvents["STACK_STATUS_CHANNEL_CHANGED"] = "STACK_STATUS_CHANNEL_CHANGED";
 })(OneWaitressEvents || (exports.OneWaitressEvents = OneWaitressEvents = {}));
-;
-;
 /**
  * The one waitress to rule them all. Hopefully.
  * Careful, she'll burn you if you're late on delivery!
@@ -55,9 +74,10 @@ class EmberOneWaitress {
             }
             // no target in touchlink
             // in `ezspMessageSentHandler`, the clusterId for ZDO is still the request one, so check against apsFrame, not override
-            if (((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID) || (target === waiter.matcher.target))
-                && (apsFrame.sequence === waiter.matcher.apsFrame.sequence) && (apsFrame.profileId === waiter.matcher.apsFrame.profileId)
-                && (apsFrame.clusterId === waiter.matcher.apsFrame.clusterId)) {
+            if ((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID || target === waiter.matcher.target) &&
+                apsFrame.sequence === waiter.matcher.apsFrame.sequence &&
+                apsFrame.profileId === waiter.matcher.apsFrame.profileId &&
+                apsFrame.clusterId === waiter.matcher.apsFrame.clusterId) {
                 clearTimeout(waiter.timer);
                 waiter.resolved = true;
                 this.waiters.delete(index);
@@ -75,31 +95,25 @@ class EmberOneWaitress {
      * @param payload
      * @returns
      */
-    resolveZDO(status, sender, apsFrame, payload) {
+    resolveZDO(sender, apsFrame, payload) {
         for (const [index, waiter] of this.waiters.entries()) {
             if (waiter.timedout) {
                 this.waiters.delete(index);
                 continue;
             }
             // always a sender expected in ZDO, profileId is a bit redundant here, but...
-            if ((sender === waiter.matcher.target) && (apsFrame.profileId === waiter.matcher.apsFrame.profileId)
-                && (apsFrame.clusterId === (waiter.matcher.responseClusterId != null ?
-                    waiter.matcher.responseClusterId : waiter.matcher.apsFrame.clusterId))) {
+            if (sender === waiter.matcher.target &&
+                apsFrame.profileId === waiter.matcher.apsFrame.profileId &&
+                apsFrame.clusterId ===
+                    (waiter.matcher.responseClusterId != null ? waiter.matcher.responseClusterId : waiter.matcher.apsFrame.clusterId)) {
                 clearTimeout(waiter.timer);
                 waiter.resolved = true;
                 this.waiters.delete(index);
-                if (status === zdo_1.EmberZdoStatus.ZDP_SUCCESS) {
-                    waiter.resolve(payload);
-                }
-                else if (status === zdo_1.EmberZdoStatus.ZDP_NO_ENTRY) {
-                    // XXX: bypassing fail here since Z2M seems to trigger ZDO remove-type commands without checking current state
-                    //      Z2M also fails with ZCL payload NOT_FOUND though. This should be removed once upstream fixes that.
-                    logger_1.logger.info(`[ZDO] Received status ZDP_NO_ENTRY for "${sender}" cluster "${apsFrame.clusterId}". Ignoring.`, NS);
-                    waiter.resolve(payload);
+                if (payload instanceof Zdo.StatusError || payload instanceof Error) {
+                    waiter.reject(new Error(`[ZDO] Failed response for '${sender}' cluster '${apsFrame.clusterId}' ${payload.message}.`));
                 }
                 else {
-                    waiter.reject(new Error(`[ZDO] Failed response by NCP for "${sender}" cluster "${apsFrame.clusterId}" `
-                        + `with status=${zdo_1.EmberZdoStatus[status]}.`));
+                    waiter.resolve(payload);
                 }
                 return true;
             }
@@ -115,11 +129,11 @@ class EmberOneWaitress {
                 continue;
             }
             // no target in touchlink, also no APS sequence, but use the ZCL one instead
-            if (((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID) || (payload.address === waiter.matcher.target))
-                && (!waiter.matcher.zclSequence || (payload.header.transactionSequenceNumber === waiter.matcher.zclSequence))
-                && (!waiter.matcher.commandIdentifier || (payload.header.commandIdentifier === waiter.matcher.commandIdentifier))
-                && (payload.clusterID === waiter.matcher.apsFrame.clusterId)
-                && (payload.endpoint === waiter.matcher.apsFrame.destinationEndpoint)) {
+            if ((waiter.matcher.apsFrame.profileId === consts_1.TOUCHLINK_PROFILE_ID || payload.address === waiter.matcher.target) &&
+                (!waiter.matcher.zclSequence || payload.header.transactionSequenceNumber === waiter.matcher.zclSequence) &&
+                (!waiter.matcher.commandIdentifier || payload.header.commandIdentifier === waiter.matcher.commandIdentifier) &&
+                payload.clusterID === waiter.matcher.apsFrame.clusterId &&
+                payload.endpoint === waiter.matcher.apsFrame.destinationEndpoint) {
                 clearTimeout(waiter.timer);
                 waiter.resolved = true;
                 this.waiters.delete(index);
@@ -131,7 +145,7 @@ class EmberOneWaitress {
     }
     waitFor(matcher, timeout) {
         const id = this.currentId++;
-        this.currentId &= 0xFFFF; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
+        this.currentId &= 0xffff; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
         const promise = new Promise((resolve, reject) => {
             const object = { matcher, resolve, reject, timedout: false, resolved: false, id };
             this.waiters.set(id, object);
@@ -183,7 +197,7 @@ class EmberOneWaitress {
                 this.eventWaiters.delete(index);
                 continue;
             }
-            if (eventName === waiter.matcher.eventName && (!waiter.matcher.payload || ((0, es6_1.default)(payload, waiter.matcher.payload)))) {
+            if (eventName === waiter.matcher.eventName && (!waiter.matcher.payload || (0, es6_1.default)(payload, waiter.matcher.payload))) {
                 clearTimeout(waiter.timer);
                 waiter.resolved = true;
                 this.eventWaiters.delete(index);
@@ -195,7 +209,7 @@ class EmberOneWaitress {
     waitForEvent(matcher, timeout, reason = null) {
         // NOTE: logic is very much the same as `waitFor`, just different matcher
         const id = this.currentEventId++;
-        this.currentEventId &= 0xFFFF; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
+        this.currentEventId &= 0xffff; // roll-over every so often - 65535 should be enough not to create conflicts ;-)
         const promise = new Promise((resolve, reject) => {
             const object = { matcher, resolve, reject, timedout: false, resolved: false, id };
             this.eventWaiters.set(id, object);

package/dist/adapter/ember/adapter/oneWaitress.js.map

@@ -1 +1 @@
-{"version":3,"file":"oneWaitress.js","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/oneWaitress.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oneWaitress.js","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/oneWaitress.ts"],"names":[],"mappings":"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"}

package/dist/adapter/ember/adapter/tokensManager.d.ts

@@ -1,18 +1,19 @@
-import { EmberStatus } from "../enums";
-import { Ezsp } from "../ezsp/ezsp";
+import { SLStatus } from '../enums';
+import { Ezsp } from '../ezsp/ezsp';
+import { EmberTokenData } from '../types';
 export declare class EmberTokensManager {
     /**
      * Host-only API to check whether the NCP uses key storage.
      *
      * @returns false if keys are in classic key storage, and true if they are located in PSA key storage.
      */
-    private static ncpUsesPSAKeyStorage;
+    static ncpUsesPSAKeyStorage(ezsp: Ezsp): Promise<boolean>;
     /**
      * Matcher for Zigbeed tokens.
      * @param nvm3Key
      * @returns
      */
-    private static getCreatorFromNvm3Key;
+    static getCreatorFromNvm3Key(nvm3Key: number): number;
     /**
      * Saves tokens. Only for NVM3-based NCP.
      *
@@ -36,9 +37,9 @@ export declare class EmberTokensManager {
      *
      * @see EmberTokensManager.saveTokens() for format
      *
-     * @return EmberStatus status code
+     * @return SLStatus status code
      */
-    static restoreTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<EmberStatus>;
+    static restoreTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<SLStatus>;
     /**
      * Secure key storage needs to export the keys first so backup file has them.
      *
@@ -47,7 +48,7 @@ export declare class EmberTokensManager {
      * @param index uint8_t
      * @returns
      */
-    private static saveKeysToData;
+    static saveKeysToData(ezsp: Ezsp, tokenData: EmberTokenData, nvm3Key: number, index: number): Promise<SLStatus>;
     /**
      *
      * @param data_s EmberTokenData*
@@ -57,12 +58,12 @@ export declare class EmberTokensManager {
      *
      * @from sli_zigbee_af_trust_center_backup_restore_keys_from_data
      */
-    private static restoreKeysFromData;
+    static restoreKeysFromData(ezsp: Ezsp, tokenData: EmberTokenData, nvm3Key: number, index: number): Promise<SLStatus>;
     /**
      * Updates zigbeed tokens from a backup of NCP tokens.
      *
-     * @return EmberStatus status code
+     * @return SLStatus status code
      */
-    static writeNcpTokensToZigbeedTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<EmberStatus>;
+    static writeNcpTokensToZigbeedTokens(ezsp: Ezsp, inBuffer: Buffer): Promise<SLStatus>;
 }
 //# sourceMappingURL=tokensManager.d.ts.map

package/dist/adapter/ember/adapter/tokensManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokensManager.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/tokensManager.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAkD,MAAM,UAAU,CAAC;AAGtF,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAgSlC,qBAAa,kBAAkB;IAE3B;;;;OAIG;mBACkB,oBAAoB;IAUzC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAUpC;;;;;;;;;;;;;;OAcG;WACiB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA4E/E;;;;;;;;OAQG;WACiB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAiDrF;;;;;;;OAOG;mBACkB,cAAc;IA2HnC;;;;;;;;OAQG;mBACkB,mBAAmB;IA2HxC;;;;OAIG;WACiB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;CAsCxG"}
+{"version":3,"file":"tokensManager.d.ts","sourceRoot":"","sources":["../../../../src/adapter/ember/adapter/tokensManager.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,QAAQ,EAA4B,MAAM,UAAU,CAAC;AAG7D,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAClC,OAAO,EAAC,cAAc,EAAY,MAAM,UAAU,CAAC;AA+RnD,qBAAa,kBAAkB;IAC3B;;;;OAIG;WACiB,oBAAoB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC;IAUtE;;;;OAIG;WACW,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAU5D;;;;;;;;;;;;;;OAcG;WACiB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgF/E;;;;;;;;OAQG;WACiB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiDlF;;;;;;;OAOG;WACiB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IA2H5H;;;;;;;;OAQG;WACiB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAwHjI;;;;OAIG;WACiB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAsCrG"}