zwave-js 14.2.0 → 14.3.0

package/build/esm/lib/driver/Driver.js

@@ -1,7 +1,7 @@
 import { JsonlDB } from "@alcalzone/jsonl-db";
 import { CRC16CC, CRC16CCCommandEncapsulation, CommandClass, InvalidCC, KEXFailType, MultiChannelCC, NoOperationCC, Security2CC, Security2CCCommandsSupportedGet, Security2CCCommandsSupportedReport, Security2CCMessageEncapsulation, Security2CCNonceReport, Security2Command, SecurityCC, SecurityCCCommandEncapsulation, SecurityCCCommandEncapsulationNonceGet, SecurityCCCommandsSupportedGet, SecurityCCCommandsSupportedReport, SecurityCommand, SupervisionCC, SupervisionCCReport, TransportServiceCC, TransportServiceCCFirstSegment, TransportServiceCCSegmentComplete, TransportServiceCCSegmentRequest, TransportServiceCCSegmentWait, TransportServiceTimeouts, VersionCommand, WakeUpCCNoMoreInformation, WakeUpCCValues, getImplementedVersion, isEncapsulatingCommandClass, isMultiEncapsulatingCommandClass, isTransportServiceEncapsulation, } from "@zwave-js/cc";
 import { ConfigManager } from "@zwave-js/config";
-import { CommandClasses, ControllerLogger, ControllerRole, ControllerStatus, Duration, EncapsulationFlags, MAX_SUPERVISION_SESSION_ID, MAX_TRANSPORT_SERVICE_SESSION_ID, MPANState, MessagePriority, NUM_NODEMASK_BYTES, NodeIDType, RFRegion, SPANState, SecurityClass, SecurityManager, SecurityManager2, SupervisionStatus, TransactionState, TransmitOptions, TransmitStatus, ZWaveError, ZWaveErrorCodes, ZWaveLogContainer, deserializeCacheValue, extractRawECDHPrivateKey, generateECDHKeyPair, getCCName, highResTimestamp, isEncapsulationCC, isLongRangeNodeId, isMissingControllerACK, isMissingControllerCallback, isMissingControllerResponse, isZWaveError, keyPairFromRawECDHPrivateKey, messageRecordToLines, securityClassIsS2, securityClassOrder, serializeCacheValue, stripUndefined, timespan, wasControllerReset, } from "@zwave-js/core";
+import { CommandClasses, ControllerLogger, ControllerRole, ControllerStatus, Duration, EncapsulationFlags, MAX_SUPERVISION_SESSION_ID, MAX_TRANSPORT_SERVICE_SESSION_ID, MPANState, MessagePriority, NUM_NODEMASK_BYTES, NodeIDType, RFRegion, SPANState, SecurityClass, SecurityManager, SecurityManager2, SupervisionStatus, TransactionState, TransmitOptions, TransmitStatus, ZWaveError, ZWaveErrorCodes, ZWaveLogContainer, deserializeCacheValue, extractRawECDHPrivateKeySync, generateECDHKeyPairSync, getCCName, highResTimestamp, isEncapsulationCC, isLongRangeNodeId, isMissingControllerACK, isMissingControllerCallback, isMissingControllerResponse, isZWaveError, keyPairFromRawECDHPrivateKeySync, messageRecordToLines, securityClassIsS2, securityClassOrder, serializeCacheValue, stripUndefined, timespan, wasControllerReset, } from "@zwave-js/core";
 import { BootloaderChunkType, FunctionType, Message, MessageHeaders, MessageType, XModemMessageHeaders, ZWaveSerialMode, ZWaveSerialPort, ZWaveSerialPortBase, ZWaveSocket, getDefaultPriority, hasNodeId, isSuccessIndicator, isZWaveSerialPortImplementation, } from "@zwave-js/serial";
 import { ApplicationUpdateRequest } from "@zwave-js/serial/serialapi";
 import { SerialAPIStartedRequest, SerialAPIWakeUpReason, } from "@zwave-js/serial/serialapi";
@@ -517,12 +517,12 @@ export class Driver extends TypedEventEmitter {
             const privateKey = this.cacheGet(cacheKeys.controller.privateKey);
             if (privateKey) {
                 this._learnModeAuthenticatedKeyPair =
-                    keyPairFromRawECDHPrivateKey(privateKey);
+                    keyPairFromRawECDHPrivateKeySync(privateKey);
             }
             else {
                 // Not found in cache, create a new one and cache it
-                this._learnModeAuthenticatedKeyPair = generateECDHKeyPair();
-                this.cacheSet(cacheKeys.controller.privateKey, extractRawECDHPrivateKey(this._learnModeAuthenticatedKeyPair.privateKey));
+                this._learnModeAuthenticatedKeyPair = generateECDHKeyPairSync();
+                this.cacheSet(cacheKeys.controller.privateKey, extractRawECDHPrivateKeySync(this._learnModeAuthenticatedKeyPair.privateKey));
             }
         }
         return this._learnModeAuthenticatedKeyPair;
@@ -1085,7 +1085,7 @@ export class Driver extends TypedEventEmitter {
                     && key in SecurityClass
                     && securityClassIsS2(SecurityClass[key]))) {
                 this.driverLog.print("At least one network key for S2 configured, enabling S2 security manager...");
-                this._securityManager2 = new SecurityManager2();
+                this._securityManager2 = await SecurityManager2.create();
                 // Set up all keys
                 for (const secClass of [
                     "S2_Unauthenticated",
@@ -1095,7 +1095,7 @@ export class Driver extends TypedEventEmitter {
                 ]) {
                     const key = this._options.securityKeys[secClass];
                     if (key) {
-                        this._securityManager2.setKey(SecurityClass[secClass], key);
+                        await this._securityManager2.setKeyAsync(SecurityClass[secClass], key);
                     }
                 }
             }
@@ -1105,12 +1105,12 @@ export class Driver extends TypedEventEmitter {
             if (this._options.securityKeysLongRange?.S2_AccessControl
                 || this._options.securityKeysLongRange?.S2_Authenticated) {
                 this.driverLog.print("At least one network key for Z-Wave Long Range configured, enabling security manager...");
-                this._securityManagerLR = new SecurityManager2();
+                this._securityManagerLR = await SecurityManager2.create();
                 if (this._options.securityKeysLongRange?.S2_AccessControl) {
-                    this._securityManagerLR.setKey(SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
+                    await this._securityManagerLR.setKeyAsync(SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
                 }
                 if (this._options.securityKeysLongRange?.S2_Authenticated) {
-                    this._securityManagerLR.setKey(SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
+                    await this._securityManagerLR.setKeyAsync(SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
                 }
             }
             else {
@@ -1131,21 +1131,21 @@ export class Driver extends TypedEventEmitter {
                 ]).filter((v) => v[1] != undefined);
                 if (securityKeysLongRange.length) {
                     this.driverLog.print("At least one network key for Z-Wave Long Range found in cache, enabling security manager...");
-                    this._securityManagerLR = new SecurityManager2();
+                    this._securityManagerLR = await SecurityManager2.create();
                     for (const [sc, key] of securityKeysLongRange) {
-                        this._securityManagerLR.setKey(sc, key);
+                        await this._securityManagerLR.setKeyAsync(sc, key);
                     }
                 }
                 else if (this._options.securityKeysLongRange?.S2_AccessControl
                     || this._options.securityKeysLongRange?.S2_Authenticated) {
                     this.driverLog.print("Fallback to configured network keys for Z-Wave Long Range, enabling security manager...");
-                    this._securityManagerLR = new SecurityManager2();
+                    this._securityManagerLR = await SecurityManager2.create();
                     if (this._options.securityKeysLongRange?.S2_AccessControl) {
-                        this._securityManagerLR.setKey(SecurityClass.S2_AccessControl, this._options.securityKeysLongRange
+                        await this._securityManagerLR.setKeyAsync(SecurityClass.S2_AccessControl, this._options.securityKeysLongRange
                             .S2_AccessControl);
                     }
                     if (this._options.securityKeysLongRange?.S2_Authenticated) {
-                        this._securityManagerLR.setKey(SecurityClass.S2_Authenticated, this._options.securityKeysLongRange
+                        await this._securityManagerLR.setKeyAsync(SecurityClass.S2_Authenticated, this._options.securityKeysLongRange
                             .S2_Authenticated);
                     }
                 }
@@ -1180,9 +1180,9 @@ export class Driver extends TypedEventEmitter {
                 ]).filter((v) => v[1] != undefined);
                 if (securityKeys.length) {
                     this.driverLog.print("At least one network key for S2 found in cache, enabling S2 security manager...");
-                    this._securityManager2 = new SecurityManager2();
+                    this._securityManager2 = await SecurityManager2.create();
                     for (const [sc, key] of securityKeys) {
-                        this._securityManager2.setKey(sc, key);
+                        await this._securityManager2.setKeyAsync(sc, key);
                     }
                 }
                 else if (this._options.securityKeys
@@ -1190,7 +1190,7 @@ export class Driver extends TypedEventEmitter {
                         && key in SecurityClass
                         && securityClassIsS2(SecurityClass[key]))) {
                     this.driverLog.print("Fallback to configured network keys for S2, enabling S2 security manager...");
-                    this._securityManager2 = new SecurityManager2();
+                    this._securityManager2 = await SecurityManager2.create();
                     // Set up all keys
                     for (const secClass of [
                         "S2_Unauthenticated",
@@ -1200,7 +1200,7 @@ export class Driver extends TypedEventEmitter {
                     ]) {
                         const key = this._options.securityKeys[secClass];
                         if (key) {
-                            this._securityManager2.setKey(SecurityClass[secClass], key);
+                            await this._securityManager2.setKeyAsync(SecurityClass[secClass], key);
                         }
                     }
                 }