zigbee-herdsman 3.4.1 → 3.4.2

package/dist/controller/greenPower.js

@@ -38,8 +38,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GreenPower = void 0;
 const node_assert_1 = __importDefault(require("node:assert"));
-const node_crypto_1 = __importDefault(require("node:crypto"));
-const node_events_1 = __importDefault(require("node:events"));
+const node_crypto_1 = require("node:crypto");
+const node_events_1 = require("node:events");
+const zigbee_1 = require("zigbee-on-host/dist/zigbee/zigbee");
 const logger_1 = require("../utils/logger");
 const consts_1 = require("../zspec/consts");
 const enums_1 = require("../zspec/enums");
@@ -47,160 +48,234 @@ const Zcl = __importStar(require("../zspec/zcl"));
 const zclTransactionSequenceNumber_1 = __importDefault(require("./helpers/zclTransactionSequenceNumber"));
 const model_1 = require("./model");
 const NS = 'zh:controller:greenpower';
-const zigBeeLinkKey = Buffer.from([0x5a, 0x69, 0x67, 0x42, 0x65, 0x65, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x30, 0x39]);
-class GreenPower extends node_events_1.default.EventEmitter {
+class GreenPower extends node_events_1.EventEmitter {
     adapter;
     constructor(adapter) {
         super();
         this.adapter = adapter;
     }
     encryptSecurityKey(sourceID, securityKey) {
-        const sourceIDInBytes = Buffer.from([
-            sourceID & 0x000000ff,
-            (sourceID & 0x0000ff00) >> 8,
-            (sourceID & 0x00ff0000) >> 16,
-            (sourceID & 0xff000000) >> 24,
-        ]);
         const nonce = Buffer.alloc(13);
-        for (let i = 0; i < 3; i++) {
-            for (let j = 0; j < 4; j++) {
-                nonce[4 * i + j] = sourceIDInBytes[j];
-            }
-        }
-        nonce[12] = 0x05;
-        const cipher = node_crypto_1.default.createCipheriv('aes-128-ccm', zigBeeLinkKey, nonce, { authTagLength: 16 });
+        nonce.writeUInt32LE(sourceID, 0);
+        nonce.writeUInt32LE(sourceID, 4);
+        nonce.writeUInt32LE(sourceID, 8);
+        nonce.writeUInt8(0x05, 12);
+        const cipher = (0, node_crypto_1.createCipheriv)('aes-128-ccm', Buffer.from(consts_1.INTEROPERABILITY_LINK_KEY), nonce, { authTagLength: 16 });
         const encrypted = cipher.update(securityKey);
         return Buffer.concat([encrypted, cipher.final()]);
     }
-    /* eslint-disable-next-line @typescript-eslint/no-explicit-any*/
-    async sendPairingCommand(payload, dataPayload, frame) {
-        logger_1.logger.debug(`Payload.Options: ${payload.options} wasBroadcast: ${dataPayload.wasBroadcast}`, NS);
+    decryptPayload(sourceID, frameCounter, securityKey, payload) {
+        const nonce = Buffer.alloc(13);
+        nonce.writeUInt32LE(sourceID, 0);
+        nonce.writeUInt32LE(sourceID, 4);
+        nonce.writeUInt32LE(frameCounter, 8);
+        nonce.writeUInt8(0x05, 12);
+        const [, decryptedPayload] = (0, zigbee_1.aes128CcmStar)(4, securityKey, nonce, payload);
+        return decryptedPayload;
+    }
+    async sendPairingCommand(payload, wasBroadcast, gppNwkAddr) {
+        const appId = payload.options & 0x7;
+        // const addSink = Boolean(payload.options & 0x8);
+        // const removeGpd = Boolean(payload.options & 0x10);
+        const communicationMode = (payload.options >> 5) & 0x3;
+        // const gpdFixed = Boolean(payload.options & 0x80);
+        // const gpdMacSeqNumCapabilities = Boolean(payload.options & 0x100);
+        // const securityLevel = (payload.options >> 9) & 0x2;
+        // const securityKeyType = (payload.options >> 11) & 0x3;
+        // const gpdSecurityFrameCounterPresent = Boolean(payload.options & 0x4000);
+        // const gpdSecurityKeyPresent = Boolean(payload.options & 0x8000);
+        // const assignedAliasPresent = Boolean(payload.options & 0x10000);
+        // const groupcastRadiusPresent = Boolean(payload.options & 0x20000);
+        // payload.options bits 18..23 reserved
+        logger_1.logger.debug(`[PAIRING] options=${payload.options} (appId=${appId} communicationMode=${communicationMode}) wasBroadcast=${wasBroadcast} gppNwkAddr=${gppNwkAddr}`, NS);
         // Set sink address based on communication mode
-        switch ((payload.options >> 5) & 3) {
-            case 0b10: // Groupcast to pre-commissioned GroupID
-            case 0b01: // Groupcast to DGroupID
+        switch (communicationMode) {
+            // Groupcast forwarding to pre-commissioned GroupID
+            // Groupcast forwarding to DGroupID
+            case 0b10:
+            case 0b01: {
                 payload.sinkGroupID = consts_1.GP_GROUP_ID;
                 break;
+            }
+            // Full unicast forwarding
+            // Lightweight unicast forwarding
             /* v8 ignore next */
-            case 0b00: // Full unicast forwarding
+            case 0b00:
             case 0b11: {
-                // Lightweight unicast forwarding
-                const coordinatorIEEE = await this.adapter.getCoordinatorIEEE();
-                payload.sinkIEEEAddr = coordinatorIEEE;
+                payload.sinkIEEEAddr = await this.adapter.getCoordinatorIEEE();
                 payload.sinkNwkAddr = consts_1.COORDINATOR_ADDRESS;
                 break;
             }
-            /* v8 ignore start */
-            default:
-                logger_1.logger.error(`Unhandled applicationID: ${payload.options & 7}`, NS);
-                return;
-            /* v8 ignore stop */
         }
         const replyFrame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, undefined, zclTransactionSequenceNumber_1.default.next(), 'pairing', Zcl.Clusters.greenPower.ID, payload, {});
         // Not sure how correct this is - according to GP spec Pairing command is
         // to be sent as broadcast unless communication mode is 0b11 - in which case
         // the proxy MAY send it as unicast to selected proxy.
         // This attempts to mirror logic from commit 92f77cc5.
-        if (dataPayload.wasBroadcast) {
+        if (wasBroadcast) {
             return await this.adapter.sendZclFrameToAll(consts_1.GP_ENDPOINT, replyFrame, consts_1.GP_ENDPOINT, enums_1.BroadcastAddress.RX_ON_WHEN_IDLE);
         }
         else {
-            const device = model_1.Device.byNetworkAddress(frame.payload.gppNwkAddr);
+            const device = model_1.Device.byNetworkAddress(gppNwkAddr ?? /* v8 ignore next */ consts_1.COORDINATOR_ADDRESS);
             (0, node_assert_1.default)(device, 'Failed to find green power proxy device');
-            return await this.adapter.sendZclFrameToEndpoint(device.ieeeAddr, frame.payload.gppNwkAddr, consts_1.GP_ENDPOINT, replyFrame, 10000, false, false, consts_1.GP_ENDPOINT);
+            return await this.adapter.sendZclFrameToEndpoint(device.ieeeAddr, device.networkAddress, consts_1.GP_ENDPOINT, replyFrame, 10000, false, false, consts_1.GP_ENDPOINT);
         }
     }
-    async onZclGreenPowerData(dataPayload, frame) {
+    async onZclGreenPowerData(dataPayload, frame, securityKey) {
         try {
+            const fullEncr = ((frame.payload.options >> 6) & 0x3) === 0x3;
+            if (fullEncr) {
+                if (!securityKey) {
+                    logger_1.logger.error(`[FULLENCR] from=${dataPayload.address} commandIdentifier=${frame.header.commandIdentifier} Unknown security key`, NS);
+                    return frame;
+                }
+                if (frame.header.commandIdentifier === Zcl.Clusters.greenPower.commands.notification.ID) {
+                    /* v8 ignore start */
+                    if (frame.payload.srcID === undefined) {
+                        // ApplicationID = 0b010 indicates the GPD ID field has the length of 8B and contains the GPD IEEE address; the Endpoint field is present.
+                        // Note: no device are currently known to use this (too expensive)
+                        logger_1.logger.error(`[FULLENCR] from=${dataPayload.address} GPD ID containing IEEE address is not supported`, NS);
+                        return frame;
+                    }
+                    /* v8 ignore stop */
+                    const hashedKey = this.encryptSecurityKey(frame.payload.srcID, securityKey);
+                    const oldHeader = dataPayload.data.subarray(0, 15);
+                    // 4 bytes appended for MIC placeholder (just needs the bytes present for decrypt)
+                    const payload = Buffer.from([frame.payload.commandID, ...dataPayload.data.subarray(15), 0, 0, 0, 0]);
+                    // if the device has a registered security key, we assume it uses encrypted payloads
+                    const decrypted = this.decryptPayload(frame.payload.srcID, frame.payload.frameCounter, hashedKey, payload);
+                    const newHeader = Buffer.alloc(15);
+                    newHeader.set(oldHeader, 0);
+                    newHeader.writeUInt8(decrypted[0], oldHeader.byteLength - 2); // commandID
+                    newHeader.writeUInt8(decrypted.byteLength - 1, oldHeader.byteLength - 1); // payloadSize
+                    // re-parse with decrypted data
+                    frame = Zcl.Frame.fromBuffer(dataPayload.clusterID, dataPayload.header, Buffer.concat([newHeader, decrypted.subarray(1)]), {});
+                    /* v8 ignore start */
+                }
+                else {
+                    logger_1.logger.error(`[FULLENCR] from=${dataPayload.address} commandIdentifier=${frame.header.commandIdentifier} Not supported`, NS);
+                    return frame;
+                }
+                /* v8 ignore stop */
+            }
             const commandID = frame.payload.commandID ?? frame.header.commandIdentifier;
             switch (commandID) {
-                /* v8 ignore start */
-                case undefined:
-                    logger_1.logger.error(`Received undefined command from '${dataPayload.address}'`, NS);
-                    break;
-                /* v8 ignore stop */
                 case 0xe0: {
                     // GP Commissioning
-                    logger_1.logger.info(`Received commissioning from '${dataPayload.address}'`, NS);
+                    logger_1.logger.info(`[COMMISSIONING] from=${dataPayload.address}`, NS);
                     /* v8 ignore start */
-                    if (typeof dataPayload.address !== 'number') {
-                        logger_1.logger.error(`Commissioning request with string type address unsupported for '${dataPayload.address}'`, NS);
+                    if (frame.payload.srcID === undefined) {
+                        // ApplicationID = 0b010 indicates the GPD ID field has the length of 8B and contains the GPD IEEE address; the Endpoint field is present.
+                        // Note: no device are currently known to use this (too expensive)
+                        logger_1.logger.error(`[COMMISSIONING] from=${dataPayload.address} GPD ID containing IEEE address is not supported`, NS);
                         break;
                     }
                     /* v8 ignore stop */
-                    const rxOnCap = frame.payload.commandFrame.options & 0b10;
-                    const key = this.encryptSecurityKey(frame.payload.srcID, frame.payload.commandFrame.securityKey);
-                    // RX capable GPD needs GP Commissioning Reply
+                    /* v8 ignore start */
+                    if (frame.payload.gppGpdLink !== undefined) {
+                        const rssi = frame.payload.gppGpdLink & 0x3f;
+                        const linkQuality = (frame.payload.gppGpdLink >> 6) & 0x3;
+                        let linkQualityStr;
+                        switch (linkQuality) {
+                            case 0b00:
+                                linkQualityStr = 'Poor';
+                                break;
+                            case 0b01:
+                                linkQualityStr = 'Moderate';
+                                break;
+                            case 0b10:
+                                linkQualityStr = 'High';
+                                break;
+                            case 0b11:
+                                linkQualityStr = 'Excellent';
+                                break;
+                        }
+                        logger_1.logger.info(`[COMMISSIONING] from=${dataPayload.address} rssi=${rssi} linkQuality=${linkQualityStr}`, NS);
+                    }
+                    /* v8 ignore stop */
+                    /* v8 ignore start */
+                    if (frame.payload.options & 0x200) {
+                        logger_1.logger.warning(`[COMMISSIONING] from=${dataPayload.address} Security processing marked as failed`, NS);
+                    }
+                    /* v8 ignore stop */
+                    const rxOnCap = frame.payload.commandFrame.options & 0x2;
                     if (rxOnCap) {
-                        logger_1.logger.debug('RxOnCap set -> supports bidirectional communication', NS);
+                        // RX capable GPD needs GP Commissioning Reply
+                        logger_1.logger.debug(`[COMMISSIONING] from=${dataPayload.address} GPD has receiving capabilities in operational mode (RxOnCapability)`, NS);
                         // NOTE: currently encryption is disabled for RX capable GPDs
                         const networkParameters = await this.adapter.getNetworkParameters();
                         // Commissioning reply
-                        const payloadReply = {
+                        const payloadResponse = {
                             options: 0,
-                            tempMaster: frame.payload.gppNwkAddr,
+                            tempMaster: frame.payload.gppNwkAddr ?? /* v8 ignore next */ consts_1.COORDINATOR_ADDRESS,
                             tempMasterTx: networkParameters.channel - 11,
                             srcID: frame.payload.srcID,
                             gpdCmd: 0xf0,
                             gpdPayload: {
                                 commandID: 0xf0,
                                 options: 0b00000000, // Disable encryption
-                                // securityKey: [...frame.payload.commandFrame.securityKey],
+                                // panID: number,
+                                // securityKey: frame.payload.commandFrame.securityKey,
                                 // keyMic: frame.payload.commandFrame.keyMic,
+                                // frameCounter: number,
                             },
                         };
-                        const replyFrame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, undefined, zclTransactionSequenceNumber_1.default.next(), 'response', Zcl.Clusters.greenPower.ID, payloadReply, {});
+                        const replyFrame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, undefined, zclTransactionSequenceNumber_1.default.next(), 'response', Zcl.Clusters.greenPower.ID, payloadResponse, {});
                         await this.adapter.sendZclFrameToAll(consts_1.GP_ENDPOINT, replyFrame, consts_1.GP_ENDPOINT, enums_1.BroadcastAddress.RX_ON_WHEN_IDLE);
-                        const payloadPairing = {
-                            options: 0b0000000110101000, // Disable encryption
+                        await this.sendPairingCommand({
+                            options: 0b000000000110101000, // Disable encryption
                             srcID: frame.payload.srcID,
                             deviceID: frame.payload.commandFrame.deviceID,
-                        };
-                        await this.sendPairingCommand(payloadPairing, dataPayload, frame);
+                        }, dataPayload.wasBroadcast, frame.payload.gppNwkAddr);
                     }
                     else {
-                        // Communication mode:
-                        //  Broadcast: Groupcast to precommissioned ID (0b10)
-                        // !Broadcast: Lightweight unicast (0b11)
-                        let opt = 0b1110010101101000;
-                        if (dataPayload.wasBroadcast) {
-                            opt = 0b1110010101001000;
-                        }
-                        const payload = {
-                            options: opt,
+                        const gpdKey = this.encryptSecurityKey(frame.payload.srcID, frame.payload.commandFrame.securityKey);
+                        await this.sendPairingCommand({
+                            // Communication mode:
+                            //  Broadcast: Groupcast to precommissioned ID (0b10)
+                            // !Broadcast: Lightweight unicast (0b11)
+                            options: dataPayload.wasBroadcast ? 0b001110010101001000 : 0b001110010101101000,
                             srcID: frame.payload.srcID,
                             deviceID: frame.payload.commandFrame.deviceID,
                             frameCounter: frame.payload.commandFrame.outgoingCounter,
-                            gpdKey: [...key],
-                        };
-                        await this.sendPairingCommand(payload, dataPayload, frame);
+                            gpdKey,
+                        }, dataPayload.wasBroadcast, frame.payload.gppNwkAddr);
                     }
                     this.emit('deviceJoined', {
                         sourceID: frame.payload.srcID,
                         deviceID: frame.payload.commandFrame.deviceID,
                         networkAddress: frame.payload.srcID & 0xffff,
+                        securityKey: frame.payload.commandFrame.securityKey,
                     });
                     break;
                 }
                 /* v8 ignore start */
-                case 0xe2: // GP Success
-                    logger_1.logger.debug(`Received success from '${dataPayload.address}'`, NS);
+                case 0xe1:
+                    // GP Success
+                    logger_1.logger.debug(`[DECOMMISSIONING] from=${dataPayload.address}`, NS);
+                    this.emit('deviceLeave', frame.payload.srcID);
+                    break;
+                case 0xe2:
+                    // GP Success
+                    logger_1.logger.debug(`[SUCCESS] from=${dataPayload.address}`, NS);
                     break;
                 /* v8 ignore stop */
                 case 0xe3: {
                     // GP Channel Request
-                    logger_1.logger.debug(`Received channel request from '${dataPayload.address}'`, NS);
+                    logger_1.logger.debug(`[CHANNEL_REQUEST] from=${dataPayload.address}`, NS);
                     const networkParameters = await this.adapter.getNetworkParameters();
                     // Channel notification
                     const payload = {
                         options: 0,
-                        tempMaster: frame.payload.gppNwkAddr,
+                        tempMaster: frame.payload.gppNwkAddr ?? /* v8 ignore next */ consts_1.COORDINATOR_ADDRESS,
                         tempMasterTx: frame.payload.commandFrame.nextChannel,
                         srcID: frame.payload.srcID,
                         gpdCmd: 0xf3,
                         gpdPayload: {
                             commandID: 0xf3,
-                            options: networkParameters.channel - 11,
+                            operationalChannel: networkParameters.channel - 11,
+                            /** This bit SHALL be set to 0b1 in GPD Channel Configuration commands sent by Basic Combo product. */
+                            basic: true,
                         },
                     };
                     const replyFrame = Zcl.Frame.create(Zcl.FrameType.SPECIFIC, Zcl.Direction.SERVER_TO_CLIENT, true, undefined, zclTransactionSequenceNumber_1.default.next(), 'response', Zcl.Clusters.greenPower.ID, payload, {});
@@ -208,19 +283,26 @@ class GreenPower extends node_events_1.default.EventEmitter {
                     break;
                 }
                 /* v8 ignore start */
-                case 0xa1: // GP Manufacturer-specific Attribute Reporting
+                case 0xe4:
+                    // GP Success
+                    logger_1.logger.debug(`[APP_DESCRIPTION] from=${dataPayload.address}`, NS);
+                    break;
+                case 0xa1:
+                    // GP Manufacturer-specific Attribute Reporting
                     break;
                 /* v8 ignore stop */
                 default:
                     // NOTE: this is spammy because it logs everything that is handed back to Controller without special processing here
-                    logger_1.logger.debug(`Received unhandled command '0x${commandID.toString(16)}' from '${dataPayload.address}'`, NS);
+                    logger_1.logger.debug(`[UNHANDLED_CMD/PASSTHROUGH] command=0x${commandID.toString(16)} from=${dataPayload.address}`, NS);
             }
             /* v8 ignore start */
         }
         catch (error) {
             logger_1.logger.error(error.stack, NS);
+            return frame;
         }
         /* v8 ignore stop */
+        return frame;
     }
     async permitJoin(time, networkAddress) {
         const payload = {

package/dist/controller/greenPower.js.map

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

package/dist/controller/model/device.d.ts

@@ -48,6 +48,7 @@ export declare class Device extends Entity<ControllerEventMap> {
     private _checkinInterval?;
     private _pendingRequestTimeout;
     private _customClusters;
+    private _gpSecurityKey?;
     get ieeeAddr(): string;
     set ieeeAddr(ieeeAddr: string);
     get applicationVersion(): number | undefined;
@@ -89,6 +90,7 @@ export declare class Device extends Entity<ControllerEventMap> {
     get pendingRequestTimeout(): number;
     set pendingRequestTimeout(pendingRequestTimeout: number);
     get customClusters(): CustomClusters;
+    get gpSecurityKey(): number[] | undefined;
     meta: KeyValue;
     private static readonly devices;
     private static loadedFromDatabase;
@@ -128,7 +130,7 @@ export declare class Device extends Entity<ControllerEventMap> {
     static all(): Device[];
     static allIterator(predicate?: (value: Device) => boolean): Generator<Device>;
     undelete(interviewCompleted?: boolean): void;
-    static create(type: DeviceType, ieeeAddr: string, networkAddress: number, manufacturerID: number | undefined, manufacturerName: string | undefined, powerSource: string | undefined, modelID: string | undefined, interviewCompleted: boolean): Device;
+    static create(type: DeviceType, ieeeAddr: string, networkAddress: number, manufacturerID: number | undefined, manufacturerName: string | undefined, powerSource: string | undefined, modelID: string | undefined, interviewCompleted: boolean, gpSecurityKey: number[] | undefined): Device;
     interview(ignoreCache?: boolean): Promise<void>;
     private interviewQuirks;
     private interviewInternal;

package/dist/controller/model/device.d.ts.map

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

package/dist/controller/model/device.js

@@ -79,6 +79,7 @@ class Device extends entity_1.default {
     _checkinInterval;
     _pendingRequestTimeout;
     _customClusters = {};
+    _gpSecurityKey;
     // Getters/setters
     get ieeeAddr() {
         return this._ieeeAddr;
@@ -209,6 +210,9 @@ class Device extends entity_1.default {
     get customClusters() {
         return this._customClusters;
     }
+    get gpSecurityKey() {
+        return this._gpSecurityKey;
+    }
     meta;
     // This lookup contains all devices that are queried from the database, this is to ensure that always
     // the same instance is returned.
@@ -272,7 +276,7 @@ class Device extends entity_1.default {
             },
         },
     };
-    constructor(ID, type, ieeeAddr, networkAddress, manufacturerID, endpoints, manufacturerName, powerSource, modelID, applicationVersion, stackVersion, zclVersion, hardwareVersion, dateCode, softwareBuildID, interviewCompleted, meta, lastSeen, checkinInterval, pendingRequestTimeout) {
+    constructor(ID, type, ieeeAddr, networkAddress, manufacturerID, endpoints, manufacturerName, powerSource, modelID, applicationVersion, stackVersion, zclVersion, hardwareVersion, dateCode, softwareBuildID, interviewCompleted, meta, lastSeen, checkinInterval, pendingRequestTimeout, gpSecurityKey) {
         super();
         this.ID = ID;
         this._type = type;
@@ -296,6 +300,7 @@ class Device extends entity_1.default {
         this._lastSeen = lastSeen;
         this._checkinInterval = checkinInterval;
         this._pendingRequestTimeout = pendingRequestTimeout;
+        this._gpSecurityKey = gpSecurityKey;
     }
     createEndpoint(ID) {
         if (this.getEndpoint(ID)) {
@@ -493,7 +498,7 @@ class Device extends entity_1.default {
             pendingRequestTimeout = entry.checkinInterval * 1000; // milliseconds
         }
         logger_1.logger.debug(`Request Queue (${ieeeAddr}): default expiration timeout set to ${pendingRequestTimeout}`, NS);
-        return new Device(entry.id, entry.type, ieeeAddr, networkAddress, entry.manufId, endpoints, entry.manufName, entry.powerSource, entry.modelId, entry.appVersion, entry.stackVersion, entry.zclVersion, entry.hwVersion, entry.dateCode, entry.swBuildId, entry.interviewCompleted, meta, entry.lastSeen, entry.checkinInterval, pendingRequestTimeout);
+        return new Device(entry.id, entry.type, ieeeAddr, networkAddress, entry.manufId, endpoints, entry.manufName, entry.powerSource, entry.modelId, entry.appVersion, entry.stackVersion, entry.zclVersion, entry.hwVersion, entry.dateCode, entry.swBuildId, entry.interviewCompleted, meta, entry.lastSeen, entry.checkinInterval, pendingRequestTimeout, entry.gpSecurityKey);
     }
     toDatabaseEntry() {
         const epList = this.endpoints.map((e) => e.ID);
@@ -522,6 +527,7 @@ class Device extends entity_1.default {
             meta: this.meta,
             lastSeen: this.lastSeen,
             checkinInterval: this.checkinInterval,
+            gpSecurityKey: this.gpSecurityKey,
         };
     }
     save(writeDatabase = true) {
@@ -583,13 +589,13 @@ class Device extends entity_1.default {
             throw new Error(`Device '${this.ieeeAddr}' is not deleted`);
         }
     }
-    static create(type, ieeeAddr, networkAddress, manufacturerID, manufacturerName, powerSource, modelID, interviewCompleted) {
+    static create(type, ieeeAddr, networkAddress, manufacturerID, manufacturerName, powerSource, modelID, interviewCompleted, gpSecurityKey) {
         Device.loadFromDatabaseIfNecessary();
         if (Device.devices.has(ieeeAddr)) {
             throw new Error(`Device with IEEE address '${ieeeAddr}' already exists`);
         }
         const ID = entity_1.default.database.newID();
-        const device = new Device(ID, type, ieeeAddr, networkAddress, manufacturerID, [], manufacturerName, powerSource, modelID, undefined, undefined, undefined, undefined, undefined, undefined, interviewCompleted, {}, undefined, undefined, 0);
+        const device = new Device(ID, type, ieeeAddr, networkAddress, manufacturerID, [], manufacturerName, powerSource, modelID, undefined, undefined, undefined, undefined, undefined, undefined, interviewCompleted, {}, undefined, undefined, 0, gpSecurityKey);
         entity_1.default.database.insert(device.toDatabaseEntry());
         Device.devices.set(device.ieeeAddr, device);
         Device.nwkToIeeeCache.set(device.networkAddress, device.ieeeAddr);