@willieee802/zigbee-herdsman 0.34.3 → 0.48.1

package/dist/adapter/ezsp/adapter/backup.js

@@ -1,23 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EZSPAdapterBackup = void 0;
-/* istanbul ignore file */
-const debug_1 = __importDefault(require("debug"));
 const types_1 = require("../driver/types");
 const utils_1 = require("../driver/utils");
+const mz_1 = require("mz");
+const utils_2 = require("../../../utils");
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:ezsp:backup';
 class EZSPAdapterBackup {
     driver;
     defaultPath;
-    debug = (0, debug_1.default)("zigbee-herdsman:adapter:ezsp:backup");
     constructor(driver, path) {
         this.driver = driver;
         this.defaultPath = path;
     }
     async createBackup() {
-        this.debug("creating backup");
+        logger_1.logger.debug("creating backup", NS);
         const version = await this.driver.ezsp.version();
         const linkResult = await this.driver.getKey(types_1.EmberKeyType.TRUST_CENTER_LINK_KEY);
         const netParams = await this.driver.ezsp.execCommand('getNetworkParameters');
@@ -68,6 +66,36 @@ class EZSPAdapterBackup {
             devices: []
         };
     }
+    /**
+     * Loads currently stored backup and returns it in internal backup model.
+     */
+    async getStoredBackup() {
+        try {
+            await mz_1.fs.access(this.defaultPath);
+        }
+        catch (error) {
+            return null;
+        }
+        let data;
+        try {
+            data = JSON.parse((await mz_1.fs.readFile(this.defaultPath)).toString());
+        }
+        catch (error) {
+            throw new Error('Coordinator backup is corrupted');
+        }
+        if (data.metadata?.format === "zigpy/open-coordinator-backup" && data.metadata?.version) {
+            if (data.metadata?.version !== 1) {
+                throw new Error(`Unsupported open coordinator backup version (version=${data.metadata?.version})`);
+            }
+            if (!data.metadata.internal?.ezspVersion) {
+                throw new Error(`This open coordinator backup format not for EZSP adapter`);
+            }
+            return utils_2.BackupUtils.fromUnifiedBackup(data);
+        }
+        else {
+            throw new Error("Unknown backup format");
+        }
+    }
 }
 exports.EZSPAdapterBackup = EZSPAdapterBackup;
 //# sourceMappingURL=backup.js.map

package/dist/adapter/ezsp/adapter/backup.js.map

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

package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts

@@ -1,16 +1,17 @@
 /// <reference types="node" />
 import { NetworkOptions, SerialPortOptions, Coordinator, CoordinatorVersion, NodeDescriptor, ActiveEndpoints, SimpleDescriptor, LQI, RoutingTable, NetworkParameters, StartResult, AdapterOptions } from '../../tstype';
 import Adapter from '../../adapter';
-import { ZclFrame, FrameType, Direction } from '../../../zcl';
+import * as Zcl from '../../../zspec/zcl';
 import * as Events from '../../events';
 import * as Models from "../../../models";
+import { BroadcastAddress } from '../../../zspec/enums';
 declare class EZSPAdapter extends Adapter {
     private driver;
     private waitress;
     private interpanLock;
-    private backupMan;
     private queue;
     private closing;
+    private deprecatedTimer;
     constructor(networkOptions: NetworkOptions, serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions);
     private processMessage;
     private handleDeviceJoin;
@@ -34,10 +35,10 @@ declare class EZSPAdapter extends Adapter {
     private nodeDescriptorInternal;
     activeEndpoints(networkAddress: number): Promise<ActiveEndpoints>;
     simpleDescriptor(networkAddress: number, endpointID: number): Promise<SimpleDescriptor>;
-    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: ZclFrame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameToEndpoint(ieeeAddr: string, networkAddress: number, endpoint: number, zclFrame: Zcl.Frame, timeout: number, disableResponse: boolean, disableRecovery: boolean, sourceEndpoint?: number): Promise<Events.ZclPayload>;
     private sendZclFrameToEndpointInternal;
-    sendZclFrameToGroup(groupID: number, zclFrame: ZclFrame): Promise<void>;
-    sendZclFrameToAll(endpoint: number, zclFrame: ZclFrame, sourceEndpoint: number): Promise<void>;
+    sendZclFrameToGroup(groupID: number, zclFrame: Zcl.Frame): Promise<void>;
+    sendZclFrameToAll(endpoint: number, zclFrame: Zcl.Frame, sourceEndpoint: number, destination: BroadcastAddress): Promise<void>;
     bind(destinationNetworkAddress: number, sourceIeeeAddress: string, sourceEndpoint: number, clusterID: number, destinationAddressOrGroup: string | number, type: 'endpoint' | 'group', destinationEndpoint?: number): Promise<void>;
     unbind(destinationNetworkAddress: number, sourceIeeeAddress: string, sourceEndpoint: number, clusterID: number, destinationAddressOrGroup: string | number, type: 'endpoint' | 'group', destinationEndpoint: number): Promise<void>;
     removeDevice(networkAddress: number, ieeeAddr: string): Promise<void>;
@@ -46,13 +47,15 @@ declare class EZSPAdapter extends Adapter {
     backup(): Promise<Models.Backup>;
     restoreChannelInterPAN(): Promise<void>;
     private checkInterpanLock;
-    sendZclFrameInterPANToIeeeAddr(zclFrame: ZclFrame, ieeeAddr: string): Promise<void>;
-    sendZclFrameInterPANBroadcast(zclFrame: ZclFrame, timeout: number): Promise<Events.ZclDataPayload>;
+    sendZclFrameInterPANToIeeeAddr(zclFrame: Zcl.Frame, ieeeAddr: string): Promise<void>;
+    sendZclFrameInterPANBroadcast(zclFrame: Zcl.Frame, timeout: number): Promise<Events.ZclPayload>;
+    supportsChangeChannel(): Promise<boolean>;
+    changeChannel(newChannel: number): Promise<void>;
     setTransmitPower(value: number): Promise<void>;
     setChannelInterPAN(channel: number): Promise<void>;
     private waitForInternal;
-    waitFor(networkAddress: number, endpoint: number, frameType: FrameType, direction: Direction, transactionSequenceNumber: number, clusterID: number, commandIdentifier: number, timeout: number): {
-        promise: Promise<Events.ZclDataPayload>;
+    waitFor(networkAddress: number, endpoint: number, frameType: Zcl.FrameType, direction: Zcl.Direction, transactionSequenceNumber: number, clusterID: number, commandIdentifier: number, timeout: number): {
+        promise: Promise<Events.ZclPayload>;
         cancel: () => void;
     };
     private waitressTimeoutFormatter;

package/dist/adapter/ezsp/adapter/ezspAdapter.d.ts.map

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

package/dist/adapter/ezsp/adapter/ezspAdapter.js

@@ -26,17 +26,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
 const adapter_1 = __importDefault(require("../../adapter"));
-const debug = (0, debug_1.default)("zigbee-herdsman:adapter:ezsp:debg");
 const driver_1 = require("../driver");
 const types_1 = require("../driver/types");
-const zcl_1 = require("../../../zcl");
+const Zcl = __importStar(require("../../../zspec/zcl"));
 const Events = __importStar(require("../../events"));
 const utils_1 = require("../../../utils");
 const serialPortUtils_1 = __importDefault(require("../../serialPortUtils"));
 const socketPortUtils_1 = __importDefault(require("../../socketPortUtils"));
-const backup_1 = require("./backup");
+const logger_1 = require("../../../utils/logger");
+const NS = 'zh:ezsp';
 const autoDetectDefinitions = [
     { manufacturer: 'ITEAD', vendorId: '1a86', productId: '55d4' }, // Sonoff ZBDongle-E
     { manufacturer: 'Nabu Casa', vendorId: '10c4', productId: 'ea60' }, // Home Assistant SkyConnect
@@ -45,26 +44,25 @@ class EZSPAdapter extends adapter_1.default {
     driver;
     waitress;
     interpanLock;
-    backupMan;
     queue;
     closing;
+    deprecatedTimer;
     constructor(networkOptions, serialPortOptions, backupPath, adapterOptions) {
         super(networkOptions, serialPortOptions, backupPath, adapterOptions);
         this.waitress = new utils_1.Waitress(this.waitressValidator, this.waitressTimeoutFormatter);
         this.interpanLock = false;
         this.closing = false;
         const concurrent = adapterOptions && adapterOptions.concurrent ? adapterOptions.concurrent : 8;
-        debug(`Adapter concurrent: ${concurrent}`);
+        logger_1.logger.debug(`Adapter concurrent: ${concurrent}`, NS);
         this.queue = new utils_1.Queue(concurrent);
-        this.driver = new driver_1.Driver(this.serialPortOptions, this.networkOptions, this.greenPowerGroup);
+        this.driver = new driver_1.Driver(this.serialPortOptions, this.networkOptions, this.greenPowerGroup, backupPath);
         this.driver.on('close', this.onDriverClose.bind(this));
         this.driver.on('deviceJoined', this.handleDeviceJoin.bind(this));
         this.driver.on('deviceLeft', this.handleDeviceLeft.bind(this));
         this.driver.on('incomingMessage', this.processMessage.bind(this));
-        this.backupMan = new backup_1.EZSPAdapterBackup(this.driver, backupPath);
     }
     async processMessage(frame) {
-        debug(`processMessage: ${JSON.stringify(frame)}`);
+        logger_1.logger.debug(`processMessage: ${JSON.stringify(frame)}`, NS);
         if (frame.apsFrame.profileId == 0) {
             if (frame.apsFrame.clusterId == types_1.EmberZDOCmd.Device_annce &&
                 frame.apsFrame.destinationEndpoint == 0) {
@@ -73,41 +71,30 @@ class EZSPAdapter extends adapter_1.default {
                 [nwk, rst] = types_1.uint16_t.deserialize(types_1.uint16_t, frame.message.subarray(1));
                 [ieee, rst] = types_1.EmberEUI64.deserialize(types_1.EmberEUI64, rst);
                 ieee = new types_1.EmberEUI64(ieee);
-                debug("ZDO Device announce: %s, %s", nwk, ieee.toString());
+                logger_1.logger.debug(`ZDO Device announce: ${nwk}, ${ieee.toString()}`, NS);
                 this.driver.handleNodeJoined(nwk, ieee);
             }
         }
         else if (frame.apsFrame.profileId == 260 || frame.apsFrame.profileId == 0xFFFF) {
-            try {
-                const payload = {
-                    frame: zcl_1.ZclFrame.fromBuffer(frame.apsFrame.clusterId, frame.message),
-                    address: frame.sender,
-                    endpoint: frame.apsFrame.sourceEndpoint,
-                    linkquality: frame.lqi,
-                    groupID: frame.apsFrame.groupId,
-                    wasBroadcast: false, // TODO
-                    destinationEndpoint: frame.apsFrame.destinationEndpoint,
-                };
-                this.waitress.resolve(payload);
-                this.emit(Events.Events.zclData, payload);
-            }
-            catch (error) {
-                const payload = {
-                    clusterID: frame.apsFrame.clusterId,
-                    data: frame.message,
-                    address: frame.sender,
-                    endpoint: frame.apsFrame.sourceEndpoint,
-                    linkquality: frame.lqi,
-                    groupID: frame.apsFrame.groupId,
-                    wasBroadcast: false, // TODO
-                    destinationEndpoint: frame.apsFrame.destinationEndpoint,
-                };
-                this.emit(Events.Events.rawData, payload);
-            }
+            const payload = {
+                clusterID: frame.apsFrame.clusterId,
+                header: Zcl.Header.fromBuffer(frame.message),
+                data: frame.message,
+                address: frame.sender,
+                endpoint: frame.apsFrame.sourceEndpoint,
+                linkquality: frame.lqi,
+                groupID: frame.apsFrame.groupId,
+                wasBroadcast: false, // TODO
+                destinationEndpoint: frame.apsFrame.destinationEndpoint,
+            };
+            this.waitress.resolve(payload);
+            this.emit(Events.Events.zclPayload, payload);
         }
         else if (frame.apsFrame.profileId == 0xc05e && frame.senderEui64) { // ZLL Frame
             const payload = {
-                frame: zcl_1.ZclFrame.fromBuffer(frame.apsFrame.clusterId, frame.message),
+                clusterID: frame.apsFrame.clusterId,
+                header: Zcl.Header.fromBuffer(frame.message),
+                data: frame.message,
                 address: `0x${frame.senderEui64.toString()}`,
                 endpoint: 0xFE,
                 linkquality: frame.lqi,
@@ -116,16 +103,17 @@ class EZSPAdapter extends adapter_1.default {
                 destinationEndpoint: null,
             };
             this.waitress.resolve(payload);
-            this.emit(Events.Events.zclData, payload);
+            this.emit(Events.Events.zclPayload, payload);
         }
         else if (frame.apsFrame.profileId == 0xA1E0) { // GP Frame
             // Only handle when clusterId == 33 (greenPower), some devices send messages with this profileId
             // while the cluster is not greenPower
             // https://github.com/Koenkk/zigbee2mqtt/issues/20838
             if (frame.apsFrame.clusterId === 33) {
-                const zclFrame = zcl_1.ZclFrame.create(zcl_1.FrameType.SPECIFIC, zcl_1.Direction.CLIENT_TO_SERVER, true, null, frame.apsFrame.sequence, (frame.messageType == 0xE0) ? 'commissioningNotification' : 'notification', frame.apsFrame.clusterId, frame.message);
                 const payload = {
-                    frame: zclFrame,
+                    header: Zcl.Header.fromBuffer(frame.message),
+                    clusterID: frame.apsFrame.clusterId,
+                    data: frame.message,
                     address: frame.sender,
                     endpoint: frame.apsFrame.sourceEndpoint,
                     linkquality: frame.lqi,
@@ -134,10 +122,10 @@ class EZSPAdapter extends adapter_1.default {
                     destinationEndpoint: frame.apsFrame.sourceEndpoint,
                 };
                 this.waitress.resolve(payload);
-                this.emit(Events.Events.zclData, payload);
+                this.emit(Events.Events.zclPayload, payload);
             }
             else {
-                debug(`Ignoring GP frame because clusterId is not greenPower`);
+                logger_1.logger.debug(`Ignoring GP frame because clusterId is not greenPower`, NS);
             }
         }
         this.emit('event', frame);
@@ -145,7 +133,7 @@ class EZSPAdapter extends adapter_1.default {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async handleDeviceJoin(arr) {
         const [nwk, ieee] = arr;
-        debug('Device join request received: %s %s', nwk, ieee.toString('hex'));
+        logger_1.logger.debug(`Device join request received: ${nwk} ${ieee.toString('hex')}`, NS);
         const payload = {
             networkAddress: nwk,
             ieeeAddr: `0x${ieee.toString('hex')}`,
@@ -160,7 +148,7 @@ class EZSPAdapter extends adapter_1.default {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     handleDeviceLeft(arr) {
         const [nwk, ieee] = arr;
-        debug('Device left network request received: %s %s', nwk, ieee);
+        logger_1.logger.debug(`Device left network request received: ${nwk} ${ieee}`, NS);
         const payload = {
             networkAddress: nwk,
             ieeeAddr: `0x${ieee.toString('hex')}`,
@@ -171,14 +159,22 @@ class EZSPAdapter extends adapter_1.default {
      * Adapter methods
      */
     async start() {
+        const logEzspDeprecated = () => {
+            const message = `Deprecated driver 'ezsp' currently in use, 'ember' will become the officially supported EmberZNet ` +
+                `driver in next release. If using Zigbee2MQTT see https://github.com/Koenkk/zigbee2mqtt/discussions/21462`;
+            logger_1.logger.warning(message, NS);
+        };
+        logEzspDeprecated();
+        this.deprecatedTimer = setInterval(logEzspDeprecated, 60 * 60 * 1000); // Every 60 mins
         return this.driver.startup();
     }
     async stop() {
         this.closing = true;
+        clearInterval(this.deprecatedTimer);
         await this.driver.stop();
     }
     async onDriverClose() {
-        debug(`onDriverClose()`);
+        logger_1.logger.debug(`onDriverClose()`, NS);
         if (!this.closing) {
             this.emit(Events.Events.disconnected);
         }
@@ -192,7 +188,7 @@ class EZSPAdapter extends adapter_1.default {
             return serialPortUtils_1.default.is((0, utils_1.RealpathSync)(path), autoDetectDefinitions);
         }
         catch (error) {
-            debug(`Failed to determine if path is valid: '${error}'`);
+            logger_1.logger.debug(`Failed to determine if path is valid: '${error}'`, NS);
             return false;
         }
     }
@@ -329,12 +325,12 @@ class EZSPAdapter extends adapter_1.default {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
             try {
-                debug(`Requesting 'Node Descriptor' for '${networkAddress}'`);
+                logger_1.logger.debug(`Requesting 'Node Descriptor' for '${networkAddress}'`, NS);
                 const result = await this.nodeDescriptorInternal(networkAddress);
                 return result;
             }
             catch (error) {
-                debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`);
+                logger_1.logger.debug(`Node descriptor request for '${networkAddress}' failed (${error}), retry`, NS);
                 throw error;
             }
         });
@@ -348,14 +344,14 @@ class EZSPAdapter extends adapter_1.default {
         };
     }
     async activeEndpoints(networkAddress) {
-        debug(`Requesting 'Active endpoints' for '${networkAddress}'`);
+        logger_1.logger.debug(`Requesting 'Active endpoints' for '${networkAddress}'`, NS);
         return this.queue.execute(async () => {
             const endpoints = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Active_EP_req, types_1.EmberZDOCmd.Active_EP_rsp, { dstaddr: networkAddress });
             return { endpoints: [...endpoints.activeeplist] };
         }, networkAddress);
     }
     async simpleDescriptor(networkAddress, endpointID) {
-        debug(`Requesting 'Simple Descriptor' for '${networkAddress}' endpoint ${endpointID}`);
+        logger_1.logger.debug(`Requesting 'Simple Descriptor' for '${networkAddress}' endpoint ${endpointID}`, NS);
         return this.queue.execute(async () => {
             this.checkInterpanLock();
             const descriptor = await this.driver.zdoRequest(networkAddress, types_1.EmberZDOCmd.Simple_Desc_req, types_1.EmberZDOCmd.Simple_Desc_rsp, { dstaddr: networkAddress, targetEp: endpointID });
@@ -378,16 +374,17 @@ class EZSPAdapter extends adapter_1.default {
         if (ieeeAddr == null) {
             ieeeAddr = `0x${this.driver.ieee.toString()}`;
         }
-        debug('sendZclFrameToEndpointInternal %s:%i/%i (%i,%i,%i), timeout=%i', ieeeAddr, networkAddress, endpoint, responseAttempt, dataRequestAttempt, this.queue.count(), timeout);
+        logger_1.logger.debug(`sendZclFrameToEndpointInternal ${ieeeAddr}:${networkAddress}/${endpoint} `
+            + `(${responseAttempt},${dataRequestAttempt},${this.queue.count()}), timeout=${timeout}`, NS);
         let response = null;
-        const command = zclFrame.getCommand();
+        const command = zclFrame.command;
         if (command.hasOwnProperty('response') && disableResponse === false) {
-            response = this.waitForInternal(networkAddress, endpoint, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, command.response, timeout);
+            response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, command.response, timeout);
         }
-        else if (!zclFrame.Header.frameControl.disableDefaultResponse) {
-            response = this.waitForInternal(networkAddress, endpoint, zclFrame.Header.transactionSequenceNumber, zclFrame.Cluster.ID, zcl_1.Foundation.defaultRsp.ID, timeout);
+        else if (!zclFrame.header.frameControl.disableDefaultResponse) {
+            response = this.waitForInternal(networkAddress, endpoint, zclFrame.header.transactionSequenceNumber, zclFrame.cluster.ID, Zcl.Foundation.defaultRsp.ID, timeout);
         }
-        const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, disableResponse || zclFrame.Header.frameControl.disableDefaultResponse);
+        const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, disableResponse || zclFrame.header.frameControl.disableDefaultResponse);
         frame.profileId = 0x0104;
         frame.sourceEndpoint = sourceEndpoint || 0x01;
         frame.destinationEndpoint = endpoint;
@@ -406,7 +403,7 @@ class EZSPAdapter extends adapter_1.default {
                 return result;
             }
             catch (error) {
-                debug('Response timeout (%s:%d,%d)', ieeeAddr, networkAddress, responseAttempt);
+                logger_1.logger.debug(`Response timeout (${ieeeAddr}:${networkAddress},${responseAttempt})`, NS);
                 if (responseAttempt < 1 && !disableRecovery) {
                     return this.sendZclFrameToEndpointInternal(ieeeAddr, networkAddress, endpoint, sourceEndpoint, zclFrame, timeout, disableResponse, disableRecovery, responseAttempt + 1, dataRequestAttempt, checkedNetworkAddress, discoveredRoute, assocRemove, assocRestore);
                 }
@@ -422,7 +419,7 @@ class EZSPAdapter extends adapter_1.default {
     async sendZclFrameToGroup(groupID, zclFrame) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, false);
+            const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
             frame.profileId = 0x0104;
             frame.sourceEndpoint = 0x01;
             frame.destinationEndpoint = 0x01;
@@ -436,14 +433,14 @@ class EZSPAdapter extends adapter_1.default {
             await (0, utils_1.Wait)(200);
         });
     }
-    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint) {
+    async sendZclFrameToAll(endpoint, zclFrame, sourceEndpoint, destination) {
         return this.queue.execute(async () => {
             this.checkInterpanLock();
-            const frame = this.driver.makeApsFrame(zclFrame.Cluster.ID, false);
+            const frame = this.driver.makeApsFrame(zclFrame.cluster.ID, false);
             frame.profileId = sourceEndpoint === 242 && endpoint === 242 ? 0xA1E0 : 0x0104;
             frame.sourceEndpoint = sourceEndpoint;
             frame.destinationEndpoint = endpoint;
-            frame.groupId = 0xFFFD;
+            frame.groupId = destination;
             await this.driver.mrequest(frame, zclFrame.toBuffer());
             /**
              * As a broadcast command is not confirmed and thus immidiately returns
@@ -517,11 +514,11 @@ class EZSPAdapter extends adapter_1.default {
         };
     }
     async supportsBackup() {
-        return (this.driver?.ezsp?.ezspV < 13);
+        return true;
     }
     async backup() {
         if (this.driver.ezsp.isInitialized()) {
-            return this.backupMan.createBackup();
+            return this.driver.backupMan.createBackup();
         }
     }
     async restoreChannelInterPAN() {
@@ -540,7 +537,7 @@ class EZSPAdapter extends adapter_1.default {
     }
     async sendZclFrameInterPANToIeeeAddr(zclFrame, ieeeAddr) {
         return this.queue.execute(async () => {
-            debug(`sendZclFrameInterPANToIeeeAddr to ${ieeeAddr}`);
+            logger_1.logger.debug(`sendZclFrameInterPANToIeeeAddr to ${ieeeAddr}`, NS);
             try {
                 const frame = this.driver.makeEmberIeeeRawFrame();
                 frame.ieeeFrameControl = 0xcc21;
@@ -550,7 +547,7 @@ class EZSPAdapter extends adapter_1.default {
                 frame.sourceAddress = this.driver.ieee;
                 frame.nwkFrameControl = 0x000b;
                 frame.appFrameControl = 0x03;
-                frame.clusterId = zclFrame.Cluster.ID;
+                frame.clusterId = zclFrame.cluster.ID;
                 frame.profileId = 0xc05e;
                 await this.driver.ieeerawrequest(frame, zclFrame.toBuffer());
             }
@@ -561,12 +558,12 @@ class EZSPAdapter extends adapter_1.default {
     }
     async sendZclFrameInterPANBroadcast(zclFrame, timeout) {
         return this.queue.execute(async () => {
-            debug(`sendZclFrameInterPANBroadcast`);
-            const command = zclFrame.getCommand();
+            logger_1.logger.debug(`sendZclFrameInterPANBroadcast`, NS);
+            const command = zclFrame.command;
             if (!command.hasOwnProperty('response')) {
                 throw new Error(`Command '${command.name}' has no response, cannot wait for response`);
             }
-            const response = this.waitForInternal(null, 0xFE, null, zclFrame.Cluster.ID, command.response, timeout);
+            const response = this.waitForInternal(null, 0xFE, null, zclFrame.cluster.ID, command.response, timeout);
             try {
                 const frame = this.driver.makeEmberRawFrame();
                 frame.ieeeFrameControl = 0xc801;
@@ -576,7 +573,7 @@ class EZSPAdapter extends adapter_1.default {
                 frame.ieeeAddress = this.driver.ieee;
                 frame.nwkFrameControl = 0x000b;
                 frame.appFrameControl = 0x0b;
-                frame.clusterId = zclFrame.Cluster.ID;
+                frame.clusterId = zclFrame.cluster.ID;
                 frame.profileId = 0xc05e;
                 await this.driver.rawrequest(frame, zclFrame.toBuffer());
             }
@@ -587,8 +584,15 @@ class EZSPAdapter extends adapter_1.default {
             return response.start().promise;
         });
     }
+    async supportsChangeChannel() {
+        return false;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    async changeChannel(newChannel) {
+        return Promise.reject(new Error("Not supported"));
+    }
     async setTransmitPower(value) {
-        debug(`setTransmitPower to ${value}`);
+        logger_1.logger.debug(`setTransmitPower to ${value}`, NS);
         return this.queue.execute(async () => {
             await this.driver.setRadioPower(value);
         });
@@ -618,12 +622,12 @@ class EZSPAdapter extends adapter_1.default {
             ` - ${matcher.commandIdentifier} after ${timeout}ms`;
     }
     waitressValidator(payload, matcher) {
-        const transactionSequenceNumber = payload.frame.Header.transactionSequenceNumber;
-        return (!matcher.address || payload.address === matcher.address) &&
+        return payload.header &&
+            (!matcher.address || payload.address === matcher.address) &&
             payload.endpoint === matcher.endpoint &&
-            (!matcher.transactionSequenceNumber || transactionSequenceNumber === matcher.transactionSequenceNumber) &&
-            payload.frame.Cluster.ID === matcher.clusterID &&
-            matcher.commandIdentifier === payload.frame.Header.commandIdentifier;
+            (!matcher.transactionSequenceNumber || payload.header.transactionSequenceNumber === matcher.transactionSequenceNumber) &&
+            payload.clusterID === matcher.clusterID &&
+            matcher.commandIdentifier === payload.header.commandIdentifier;
     }
 }
 exports.default = EZSPAdapter;