@zwave-js/cc 15.1.0 → 15.1.2

package/build/cjs/cc/Security2CC.js

@@ -38,16 +38,14 @@ __export(Security2CC_exports, {
 });
 module.exports = __toCommonJS(Security2CC_exports);
 var import_core = require("@zwave-js/core");
-var import_safe = require("@zwave-js/core/safe");
-var import_safe2 = require("@zwave-js/shared/safe");
-var import_safe3 = require("@zwave-js/shared/safe");
+var import_shared = require("@zwave-js/shared");
 var import_async = require("alcalzone-shared/async");
 var import_typeguards = require("alcalzone-shared/typeguards");
 var import_API = require("../lib/API.js");
 var import_CommandClass = require("../lib/CommandClass.js");
 var import_CommandClassDecorators = require("../lib/CommandClassDecorators.js");
 var import_Extension = require("../lib/Security2/Extension.js");
-var import_shared = require("../lib/Security2/shared.js");
+var import_shared2 = require("../lib/Security2/shared.js");
 var import_Types = require("../lib/_Types.js");
 var import_CRC16CC = require("./CRC16CC.js");
 var import_MultiChannelCC = require("./MultiChannelCC.js");
@@ -106,7 +104,7 @@ __name(bitMaskToSecurityClass, "bitMaskToSecurityClass");
 const SECURITY_S2_AUTH_TAG_LENGTH = 8;
 function getAuthenticationData(sendingNodeId, destination, homeId, commandLength, unencryptedPayload) {
   const nodeIdSize = (0, import_core.isLongRangeNodeId)(sendingNodeId) || (0, import_core.isLongRangeNodeId)(destination) ? 2 : 1;
-  const ret = new import_safe2.Bytes(2 * nodeIdSize + 6 + unencryptedPayload.length);
+  const ret = new import_shared.Bytes(2 * nodeIdSize + 6 + unencryptedPayload.length);
   let offset = 0;
   ret.writeUIntBE(sendingNodeId, offset, nodeIdSize);
   offset += nodeIdSize;
@@ -491,7 +489,7 @@ let Security2CCAPI = (() => {
       });
       const response = await this.host.sendCommand(cc, this.commandOptions);
       if (response) {
-        return (0, import_safe3.pick)(response, [
+        return (0, import_shared.pick)(response, [
           "requestCSA",
           "echo",
           "supportedKEXSchemes",
@@ -671,14 +669,14 @@ let Security2CC = (() => {
         if (!securityManager?.hasKeysForSecurityClass(secClass2)) {
           ctx.logNode(node.id, {
             endpoint: endpoint.index,
-            message: `Cannot query securely supported commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}) - network key is not configured...`,
+            message: `Cannot query securely supported commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}) - network key is not configured...`,
             level: "warn"
           });
           continue;
         }
         ctx.logNode(node.id, {
           endpoint: endpoint.index,
-          message: `Querying securely supported commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)})...`,
+          message: `Querying securely supported commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)})...`,
           direction: "outbound"
         });
         let supportedCCs;
@@ -697,7 +695,7 @@ let Security2CC = (() => {
             if (attempts < MAX_ATTEMPTS) {
               ctx.logNode(node.id, {
                 endpoint: endpoint.index,
-                message: `Querying securely supported commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}), attempt ${attempts}/${MAX_ATTEMPTS} failed. Retrying in 500ms...`,
+                message: `Querying securely supported commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}), attempt ${attempts}/${MAX_ATTEMPTS} failed. Retrying in 500ms...`,
                 level: "warn"
               });
               await (0, import_async.wait)(500);
@@ -705,7 +703,7 @@ let Security2CC = (() => {
             } else if (endpoint.index > 0) {
               ctx.logNode(node.id, {
                 endpoint: endpoint.index,
-                message: `Querying securely supported commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}) failed. Assuming the endpoint supports all its mandatory CCs securely...`,
+                message: `Querying securely supported commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}) failed. Assuming the endpoint supports all its mandatory CCs securely...`,
                 level: "warn"
               });
               for (const [ccId] of endpoint.getCCs()) {
@@ -715,7 +713,7 @@ let Security2CC = (() => {
             } else {
               ctx.logNode(node.id, {
                 endpoint: endpoint.index,
-                message: `Querying securely supported commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}) failed. Let's hope for the best...`,
+                message: `Querying securely supported commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}) failed. Let's hope for the best...`,
                 level: "warn"
               });
               break;
@@ -728,7 +726,7 @@ let Security2CC = (() => {
           if (endpoint.index === 0 && possibleSecurityClasses.length > 1) {
             node.setSecurityClass(secClass2, false);
             ctx.logNode(node.id, {
-              message: `The node was NOT granted the security class ${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}`,
+              message: `The node was NOT granted the security class ${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}`,
               direction: "inbound"
             });
           }
@@ -737,14 +735,14 @@ let Security2CC = (() => {
         if (endpoint.index === 0 && possibleSecurityClasses.length > 1) {
           node.setSecurityClass(secClass2, true);
           ctx.logNode(node.id, {
-            message: `The node was granted the security class ${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)}`,
+            message: `The node was granted the security class ${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)}`,
             direction: "inbound"
           });
         }
         if (!hasReceivedSecureCommands && supportedCCs.length > 0) {
           hasReceivedSecureCommands = true;
           const logLines = [
-            `received secure commands (${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, secClass2)})`,
+            `received secure commands (${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, secClass2)})`,
             "supported CCs:"
           ];
           for (const cc of supportedCCs) {
@@ -771,7 +769,7 @@ let Security2CC = (() => {
     }
     /** Tests if a command should be sent secure and thus requires encapsulation */
     static requiresEncapsulation(cc) {
-      if (!(cc.encapsulationFlags & import_safe.EncapsulationFlags.Security)) {
+      if (!(cc.encapsulationFlags & import_core.EncapsulationFlags.Security)) {
         return false;
       }
       if (cc instanceof import_SecurityCC.SecurityCC || cc instanceof import_CRC16CC.CRC16CC || cc instanceof import_TransportServiceCC.TransportServiceCC) {
@@ -791,10 +789,10 @@ let Security2CC = (() => {
             return cc.echo;
           case import_Types.Security2Command.KEXFail: {
             switch (cc.failType) {
-              case import_shared.KEXFailType.Decrypt:
-              case import_shared.KEXFailType.WrongSecurityLevel:
-              case import_shared.KEXFailType.KeyNotGranted:
-              case import_shared.KEXFailType.NoVerify:
+              case import_shared2.KEXFailType.Decrypt:
+              case import_shared2.KEXFailType.WrongSecurityLevel:
+              case import_shared2.KEXFailType.KeyNotGranted:
+              case import_shared2.KEXFailType.NoVerify:
                 return true;
               default:
                 return false;
@@ -817,9 +815,9 @@ let Security2CC = (() => {
       let nodeId;
       if (cc.isMulticast()) {
         if (cc.nodeId.some((nodeId2) => (0, import_core.isLongRangeNodeId)(nodeId2))) {
-          nodeId = import_safe.NODE_ID_BROADCAST_LR;
+          nodeId = import_core.NODE_ID_BROADCAST_LR;
         } else {
-          nodeId = import_safe.NODE_ID_BROADCAST;
+          nodeId = import_core.NODE_ID_BROADCAST;
         }
       } else {
         nodeId = cc.nodeId;
@@ -831,7 +829,7 @@ let Security2CC = (() => {
         extensions,
         verifyDelivery: options?.verifyDelivery
       });
-      ret.encapsulationFlags = cc.encapsulationFlags & ~import_safe.EncapsulationFlags.Security;
+      ret.encapsulationFlags = cc.encapsulationFlags & ~import_core.EncapsulationFlags.Security;
       return ret;
     }
   };
@@ -1118,15 +1116,15 @@ let Security2CCMessageEncapsulation = (() => {
       await this.maybeAddSPANExtension(ctx, securityManager);
       const unencryptedExtensions = this.extensions.filter((e) => !e.isEncrypted());
       const encryptedExtensions = this.extensions.filter((e) => e.isEncrypted());
-      const unencryptedPayload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([
+      const unencryptedPayload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([
           this.sequenceNumber,
           (encryptedExtensions.length > 0 ? 2 : 0) | (unencryptedExtensions.length > 0 ? 1 : 0)
         ]),
         ...unencryptedExtensions.map((e, index) => e.serialize(index < unencryptedExtensions.length - 1))
       ]);
-      const serializedCC = await this.encapsulated?.serialize(ctx) ?? new import_safe2.Bytes();
-      const plaintextPayload = import_safe2.Bytes.concat([
+      const serializedCC = await this.encapsulated?.serialize(ctx) ?? new import_shared.Bytes();
+      const plaintextPayload = import_shared.Bytes.concat([
         ...encryptedExtensions.map((e, index) => e.serialize(index < encryptedExtensions.length - 1)),
         serializedCC
       ]);
@@ -1153,7 +1151,7 @@ let Security2CCMessageEncapsulation = (() => {
       this.authData = authData;
       this.authTag = authTag;
       this.ciphertext = ciphertextPayload;
-      this.payload = import_safe2.Bytes.concat([
+      this.payload = import_shared.Bytes.concat([
         unencryptedPayload,
         ciphertextPayload,
         authTag
@@ -1173,25 +1171,25 @@ let Security2CCMessageEncapsulation = (() => {
       }
       if (process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development") {
         if (this.key) {
-          message.key = (0, import_safe3.buffer2hex)(this.key);
+          message.key = (0, import_shared.buffer2hex)(this.key);
         }
         if (this.iv) {
-          message.IV = (0, import_safe3.buffer2hex)(this.iv);
+          message.IV = (0, import_shared.buffer2hex)(this.iv);
         }
         if (this.ciphertext) {
-          message.ciphertext = (0, import_safe3.buffer2hex)(this.ciphertext);
+          message.ciphertext = (0, import_shared.buffer2hex)(this.ciphertext);
         } else if (this.plaintext) {
-          message.plaintext = (0, import_safe3.buffer2hex)(this.plaintext);
+          message.plaintext = (0, import_shared.buffer2hex)(this.plaintext);
         }
         if (this.authData) {
-          message["auth data"] = (0, import_safe3.buffer2hex)(this.authData);
+          message["auth data"] = (0, import_shared.buffer2hex)(this.authData);
         }
         if (this.authTag) {
-          message["auth tag"] = (0, import_safe3.buffer2hex)(this.authTag);
+          message["auth tag"] = (0, import_shared.buffer2hex)(this.authTag);
         }
       }
       if (this.securityClass != void 0) {
-        message["security class"] = (0, import_safe3.getEnumMemberName)(import_core.SecurityClass, this.securityClass);
+        message["security class"] = (0, import_shared.getEnumMemberName)(import_core.SecurityClass, this.securityClass);
       }
       return {
         ...super.toLogEntry(ctx),
@@ -1270,12 +1268,12 @@ let Security2CCNonceReport = (() => {
     serialize(ctx) {
       const securityManager = assertSecurityTX(ctx, this.nodeId);
       this.ensureSequenceNumber(securityManager);
-      this.payload = import_safe2.Bytes.from([
+      this.payload = import_shared.Bytes.from([
         this.sequenceNumber,
         (this.MOS ? 2 : 0) + (this.SOS ? 1 : 0)
       ]);
       if (this.SOS) {
-        this.payload = import_safe2.Bytes.concat([this.payload, this.receiverEI]);
+        this.payload = import_shared.Bytes.concat([this.payload, this.receiverEI]);
       }
       return super.serialize(ctx);
     }
@@ -1286,7 +1284,7 @@ let Security2CCNonceReport = (() => {
         MOS: this.MOS
       };
       if (this.receiverEI) {
-        message["receiver entropy"] = (0, import_safe3.buffer2hex)(this.receiverEI);
+        message["receiver entropy"] = (0, import_shared.buffer2hex)(this.receiverEI);
       }
       return {
         ...super.toLogEntry(ctx),
@@ -1341,7 +1339,7 @@ let Security2CCNonceGet = (() => {
     serialize(ctx) {
       const securityManager = assertSecurityTX(ctx, this.nodeId);
       this.ensureSequenceNumber(securityManager);
-      this.payload = import_safe2.Bytes.from([this.sequenceNumber]);
+      this.payload = import_shared.Bytes.from([this.sequenceNumber]);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {
@@ -1390,7 +1388,7 @@ let Security2CCKEXReport = (() => {
       const echo = !!(raw.payload[0] & 1);
       const _reserved = raw.payload[0] & 252;
       const supportedKEXSchemes = (0, import_core.parseBitMask)(raw.payload.subarray(1, 2), 0).filter((s) => s !== 0);
-      const supportedECDHProfiles = (0, import_core.parseBitMask)(raw.payload.subarray(2, 3), import_shared.ECDHProfiles.Curve25519);
+      const supportedECDHProfiles = (0, import_core.parseBitMask)(raw.payload.subarray(2, 3), import_shared2.ECDHProfiles.Curve25519);
       const requestedKeys = (0, import_core.parseBitMask)(raw.payload.subarray(3, 4), import_core.SecurityClass.S2_Unauthenticated);
       return new this({
         nodeId: ctx.sourceNodeId,
@@ -1409,13 +1407,13 @@ let Security2CCKEXReport = (() => {
     supportedECDHProfiles;
     requestedKeys;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([
+      this.payload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([
           this._reserved + (this.requestCSA ? 2 : 0) + (this.echo ? 1 : 0)
         ]),
         // The bit mask starts at 0, but bit 0 is not used
         (0, import_core.encodeBitMask)(this.supportedKEXSchemes, 7, 0),
-        (0, import_core.encodeBitMask)(this.supportedECDHProfiles, 7, import_shared.ECDHProfiles.Curve25519),
+        (0, import_core.encodeBitMask)(this.supportedECDHProfiles, 7, import_shared2.ECDHProfiles.Curve25519),
         (0, import_core.encodeBitMask)(this.requestedKeys, import_core.SecurityClass.S0_Legacy, import_core.SecurityClass.S2_Unauthenticated)
       ]);
       return super.serialize(ctx);
@@ -1426,12 +1424,12 @@ let Security2CCKEXReport = (() => {
         message: {
           echo: this.echo,
           "supported schemes": this.supportedKEXSchemes.map((s) => `
-\xB7 ${(0, import_safe3.getEnumMemberName)(import_shared.KEXSchemes, s)}`).join(""),
+\xB7 ${(0, import_shared.getEnumMemberName)(import_shared2.KEXSchemes, s)}`).join(""),
           "supported ECDH profiles": this.supportedECDHProfiles.map((s) => `
-\xB7 ${(0, import_safe3.getEnumMemberName)(import_shared.ECDHProfiles, s)}`).join(""),
+\xB7 ${(0, import_shared.getEnumMemberName)(import_shared2.ECDHProfiles, s)}`).join(""),
           "CSA requested": this.requestCSA,
           "requested security classes": this.requestedKeys.map((s) => `
-\xB7 ${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, s)}`).join("")
+\xB7 ${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, s)}`).join("")
         }
       };
     }
@@ -1517,7 +1515,7 @@ let Security2CCKEXSet = (() => {
       const selectedKEXSchemes = (0, import_core.parseBitMask)(raw.payload.subarray(1, 2), 0).filter((s) => s !== 0);
       (0, import_core.validatePayload)(selectedKEXSchemes.length === 1);
       const selectedKEXScheme = selectedKEXSchemes[0];
-      const selectedECDHProfiles = (0, import_core.parseBitMask)(raw.payload.subarray(2, 3), import_shared.ECDHProfiles.Curve25519);
+      const selectedECDHProfiles = (0, import_core.parseBitMask)(raw.payload.subarray(2, 3), import_shared2.ECDHProfiles.Curve25519);
       (0, import_core.validatePayload)(selectedECDHProfiles.length === 1);
       const selectedECDHProfile = selectedECDHProfiles[0];
       const grantedKeys = (0, import_core.parseBitMask)(raw.payload.subarray(3, 4), import_core.SecurityClass.S2_Unauthenticated);
@@ -1538,13 +1536,13 @@ let Security2CCKEXSet = (() => {
     selectedECDHProfile;
     grantedKeys;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([
+      this.payload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([
           this._reserved + (this.permitCSA ? 2 : 0) + (this.echo ? 1 : 0)
         ]),
         // The bit mask starts at 0, but bit 0 is not used
         (0, import_core.encodeBitMask)([this.selectedKEXScheme], 7, 0),
-        (0, import_core.encodeBitMask)([this.selectedECDHProfile], 7, import_shared.ECDHProfiles.Curve25519),
+        (0, import_core.encodeBitMask)([this.selectedECDHProfile], 7, import_shared2.ECDHProfiles.Curve25519),
         (0, import_core.encodeBitMask)(this.grantedKeys, import_core.SecurityClass.S0_Legacy, import_core.SecurityClass.S2_Unauthenticated)
       ]);
       return super.serialize(ctx);
@@ -1554,11 +1552,11 @@ let Security2CCKEXSet = (() => {
         ...super.toLogEntry(ctx),
         message: {
           echo: this.echo,
-          "selected scheme": (0, import_safe3.getEnumMemberName)(import_shared.KEXSchemes, this.selectedKEXScheme),
-          "selected ECDH profile": (0, import_safe3.getEnumMemberName)(import_shared.ECDHProfiles, this.selectedECDHProfile),
+          "selected scheme": (0, import_shared.getEnumMemberName)(import_shared2.KEXSchemes, this.selectedKEXScheme),
+          "selected ECDH profile": (0, import_shared.getEnumMemberName)(import_shared2.ECDHProfiles, this.selectedECDHProfile),
           "CSA permitted": this.permitCSA,
           "granted security classes": this.grantedKeys.map((s) => `
-\xB7 ${(0, import_safe3.getEnumMemberName)(import_core.SecurityClass, s)}`).join("")
+\xB7 ${(0, import_shared.getEnumMemberName)(import_core.SecurityClass, s)}`).join("")
         }
       };
     }
@@ -1599,13 +1597,13 @@ let Security2CCKEXFail = (() => {
     }
     failType;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.from([this.failType]);
+      this.payload = import_shared.Bytes.from([this.failType]);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {
       return {
         ...super.toLogEntry(ctx),
-        message: { reason: (0, import_safe3.getEnumMemberName)(import_shared.KEXFailType, this.failType) }
+        message: { reason: (0, import_shared.getEnumMemberName)(import_shared2.KEXFailType, this.failType) }
       };
     }
   };
@@ -1649,8 +1647,8 @@ let Security2CCPublicKeyReport = (() => {
     includingNode;
     publicKey;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.concat([
-        import_safe2.Bytes.from([this.includingNode ? 1 : 0]),
+      this.payload = import_shared.Bytes.concat([
+        import_shared.Bytes.from([this.includingNode ? 1 : 0]),
         this.publicKey
       ]);
       return super.serialize(ctx);
@@ -1660,7 +1658,7 @@ let Security2CCPublicKeyReport = (() => {
         ...super.toLogEntry(ctx),
         message: {
           "is including node": this.includingNode,
-          "public key": (0, import_safe3.buffer2hex)(this.publicKey)
+          "public key": (0, import_shared.buffer2hex)(this.publicKey)
         }
       };
     }
@@ -1705,7 +1703,7 @@ let Security2CCNetworkKeyReport = (() => {
     grantedKey;
     networkKey;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.concat([
+      this.payload = import_shared.Bytes.concat([
         securityClassToBitMask(this.grantedKey),
         this.networkKey
       ]);
@@ -1715,7 +1713,7 @@ let Security2CCNetworkKeyReport = (() => {
       return {
         ...super.toLogEntry(ctx),
         message: {
-          "security class": (0, import_safe3.getEnumMemberName)(import_core.SecurityClass, this.grantedKey)
+          "security class": (0, import_shared.getEnumMemberName)(import_core.SecurityClass, this.grantedKey)
           // This shouldn't be logged, so users can safely post their logs online
           // "network key": buffer2hex(this.networkKey),
         }
@@ -1765,7 +1763,7 @@ let Security2CCNetworkKeyGet = (() => {
       return {
         ...super.toLogEntry(ctx),
         message: {
-          "security class": (0, import_safe3.getEnumMemberName)(import_core.SecurityClass, this.requestedKey)
+          "security class": (0, import_shared.getEnumMemberName)(import_core.SecurityClass, this.requestedKey)
         }
       };
     }
@@ -1833,7 +1831,7 @@ let Security2CCTransferEnd = (() => {
     keyVerified;
     keyRequestComplete;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.from([
+      this.payload = import_shared.Bytes.from([
         (this.keyVerified ? 2 : 0) + (this.keyRequestComplete ? 1 : 0)
       ]);
       return super.serialize(ctx);
@@ -1884,7 +1882,7 @@ let Security2CCCommandsSupportedReport = (() => {
     }
     supportedCCs;
     serialize(ctx) {
-      this.payload = (0, import_safe.encodeCCList)(this.supportedCCs, []);
+      this.payload = (0, import_core.encodeCCList)(this.supportedCCs, []);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {