zwave-js 14.2.0 → 14.3.0

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

@@ -507,10 +507,10 @@ class Driver extends import_shared.TypedEventEmitter {
     if (this._learnModeAuthenticatedKeyPair == void 0) {
       const privateKey = this.cacheGet(import_NetworkCache.cacheKeys.controller.privateKey);
       if (privateKey) {
-        this._learnModeAuthenticatedKeyPair = (0, import_core.keyPairFromRawECDHPrivateKey)(privateKey);
+        this._learnModeAuthenticatedKeyPair = (0, import_core.keyPairFromRawECDHPrivateKeySync)(privateKey);
       } else {
-        this._learnModeAuthenticatedKeyPair = (0, import_core.generateECDHKeyPair)();
-        this.cacheSet(import_NetworkCache.cacheKeys.controller.privateKey, (0, import_core.extractRawECDHPrivateKey)(this._learnModeAuthenticatedKeyPair.privateKey));
+        this._learnModeAuthenticatedKeyPair = (0, import_core.generateECDHKeyPairSync)();
+        this.cacheSet(import_NetworkCache.cacheKeys.controller.privateKey, (0, import_core.extractRawECDHPrivateKeySync)(this._learnModeAuthenticatedKeyPair.privateKey));
       }
     }
     return this._learnModeAuthenticatedKeyPair;
@@ -962,7 +962,7 @@ class Driver extends import_shared.TypedEventEmitter {
       }
       if (this._options.securityKeys && Object.keys(this._options.securityKeys).some((key) => key.startsWith("S2_") && key in import_core.SecurityClass && (0, import_core.securityClassIsS2)(import_core.SecurityClass[key]))) {
         this.driverLog.print("At least one network key for S2 configured, enabling S2 security manager...");
-        this._securityManager2 = new import_core.SecurityManager2();
+        this._securityManager2 = await import_core.SecurityManager2.create();
         for (const secClass of [
           "S2_Unauthenticated",
           "S2_Authenticated",
@@ -971,7 +971,7 @@ class Driver extends import_shared.TypedEventEmitter {
         ]) {
           const key = this._options.securityKeys[secClass];
           if (key) {
-            this._securityManager2.setKey(import_core.SecurityClass[secClass], key);
+            await this._securityManager2.setKeyAsync(import_core.SecurityClass[secClass], key);
           }
         }
       } else {
@@ -979,12 +979,12 @@ class Driver extends import_shared.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 import_core.SecurityManager2();
+        this._securityManagerLR = await import_core.SecurityManager2.create();
         if (this._options.securityKeysLongRange?.S2_AccessControl) {
-          this._securityManagerLR.setKey(import_core.SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
+          await this._securityManagerLR.setKeyAsync(import_core.SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
         }
         if (this._options.securityKeysLongRange?.S2_Authenticated) {
-          this._securityManagerLR.setKey(import_core.SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
+          await this._securityManagerLR.setKeyAsync(import_core.SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
         }
       } else {
         this.driverLog.print("No network key for Z-Wave Long Range configured, communication won't work!", "warn");
@@ -1000,18 +1000,18 @@ class Driver extends import_shared.TypedEventEmitter {
         ]).filter((v) => v[1] != void 0);
         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 import_core.SecurityManager2();
+          this._securityManagerLR = await import_core.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 import_core.SecurityManager2();
+          this._securityManagerLR = await import_core.SecurityManager2.create();
           if (this._options.securityKeysLongRange?.S2_AccessControl) {
-            this._securityManagerLR.setKey(import_core.SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
+            await this._securityManagerLR.setKeyAsync(import_core.SecurityClass.S2_AccessControl, this._options.securityKeysLongRange.S2_AccessControl);
           }
           if (this._options.securityKeysLongRange?.S2_Authenticated) {
-            this._securityManagerLR.setKey(import_core.SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
+            await this._securityManagerLR.setKeyAsync(import_core.SecurityClass.S2_Authenticated, this._options.securityKeysLongRange.S2_Authenticated);
           }
         } else {
           this.driverLog.print("No network key for Z-Wave Long Range configured, communication won't work!", "warn");
@@ -1041,13 +1041,13 @@ class Driver extends import_shared.TypedEventEmitter {
         ]).filter((v) => v[1] != void 0);
         if (securityKeys.length) {
           this.driverLog.print("At least one network key for S2 found in cache, enabling S2 security manager...");
-          this._securityManager2 = new import_core.SecurityManager2();
+          this._securityManager2 = await import_core.SecurityManager2.create();
           for (const [sc, key] of securityKeys) {
-            this._securityManager2.setKey(sc, key);
+            await this._securityManager2.setKeyAsync(sc, key);
           }
         } else if (this._options.securityKeys && Object.keys(this._options.securityKeys).some((key) => key.startsWith("S2_") && key in import_core.SecurityClass && (0, import_core.securityClassIsS2)(import_core.SecurityClass[key]))) {
           this.driverLog.print("Fallback to configured network keys for S2, enabling S2 security manager...");
-          this._securityManager2 = new import_core.SecurityManager2();
+          this._securityManager2 = await import_core.SecurityManager2.create();
           for (const secClass of [
             "S2_Unauthenticated",
             "S2_Authenticated",
@@ -1056,7 +1056,7 @@ class Driver extends import_shared.TypedEventEmitter {
           ]) {
             const key = this._options.securityKeys[secClass];
             if (key) {
-              this._securityManager2.setKey(import_core.SecurityClass[secClass], key);
+              await this._securityManager2.setKeyAsync(import_core.SecurityClass[secClass], key);
             }
           }
         } else {