@zwave-js/nvmedit 14.1.0 → 14.2.0

package/build/cjs/convert.js

@@ -39,10 +39,14 @@ __export(convert_exports, {
   nvmToJSON: () => nvmToJSON
 });
 module.exports = __toCommonJS(convert_exports);
+var import_error = require("@zwave-js/core/error");
 var import_safe = require("@zwave-js/core/safe");
 var import_safe2 = require("@zwave-js/shared/safe");
 var import_typeguards = require("alcalzone-shared/typeguards");
-var import_semver = __toESM(require("semver"), 1);
+var import_gte = __toESM(require("semver/functions/gte.js"), 1);
+var import_lt = __toESM(require("semver/functions/lt.js"), 1);
+var import_lte = __toESM(require("semver/functions/lte.js"), 1);
+var import_parse = __toESM(require("semver/functions/parse.js"), 1);
 var import_consts = require("./consts.js");
 var import_NVM3 = require("./lib/NVM3.js");
 var import_NVM500 = require("./lib/NVM500.js");
@@ -125,7 +129,7 @@ function nvmObjectsToJSON(objects) {
     const ret2 = getObject(id);
     if (ret2)
       return ret2;
-    throw new import_safe.ZWaveError(`Object${typeof id === "number" ? ` ${(0, import_safe2.num2hex)(id)} (${id})` : ""} not found!`, import_safe.ZWaveErrorCodes.NVM_ObjectNotFound);
+    throw new import_error.ZWaveError(`Object${typeof id === "number" ? ` ${(0, import_safe2.num2hex)(id)} (${id})` : ""} not found!`, import_error.ZWaveErrorCodes.NVM_ObjectNotFound);
   };
   const getFileOrThrow = (id, fileVersion) => {
     const obj = getObjectOrThrow(id);
@@ -141,7 +145,7 @@ function nvmObjectsToJSON(objects) {
   const protocolFileFormat = protocolVersionFile.format;
   const protocolVersion = `${protocolVersionFile.major}.${protocolVersionFile.minor}.${protocolVersionFile.patch}`;
   if (protocolFileFormat > import_consts.MAX_PROTOCOL_FILE_FORMAT) {
-    throw new import_safe.ZWaveError(`Unsupported protocol file format: ${protocolFileFormat}`, import_safe.ZWaveErrorCodes.NVM_NotSupported, { protocolFileFormat });
+    throw new import_error.ZWaveError(`Unsupported protocol file format: ${protocolFileFormat}`, import_error.ZWaveErrorCodes.NVM_NotSupported, { protocolFileFormat });
   }
   const nodeIds = getFileOrThrow(import_files.ProtocolNodeListFileID, protocolVersion).nodeIds;
   const appRouteLock = new Set(getFileOrThrow(import_files.ProtocolAppRouteLockNodeMaskFileID, protocolVersion).nodeIds);
@@ -226,7 +230,7 @@ function nvmObjectsToJSON(objects) {
   const applicationVersionFile800 = getFile(import_files.ApplicationVersionFile800ID, "7.0.0");
   const applicationVersionFile = applicationVersionFile700 ?? applicationVersionFile800;
   if (!applicationVersionFile) {
-    throw new import_safe.ZWaveError("ApplicationVersionFile not found!", import_safe.ZWaveErrorCodes.NVM_ObjectNotFound);
+    throw new import_error.ZWaveError("ApplicationVersionFile not found!", import_error.ZWaveErrorCodes.NVM_ObjectNotFound);
   }
   const applicationVersion = `${applicationVersionFile.major}.${applicationVersionFile.minor}.${applicationVersionFile.patch}`;
   const rfConfigFile = getFile(import_files.ApplicationRFConfigFileID, applicationVersion);
@@ -406,7 +410,7 @@ async function nvmToJSON(buffer, debugLogs = false) {
     type: "protocolFileFormat"
   }, true);
   if (protocolFileFormat > import_consts.MAX_PROTOCOL_FILE_FORMAT) {
-    throw new import_safe.ZWaveError(`Unsupported protocol file format: ${protocolFileFormat}`, import_safe.ZWaveErrorCodes.NVM_NotSupported, { protocolFileFormat });
+    throw new import_error.ZWaveError(`Unsupported protocol file format: ${protocolFileFormat}`, import_error.ZWaveErrorCodes.NVM_NotSupported, { protocolFileFormat });
   }
   const protocolVersion = await adapter.get({
     domain: "controller",
@@ -761,9 +765,9 @@ async function nvm500ToJSON(buffer) {
   };
 }
 async function jsonToNVM(json, targetSDKVersion) {
-  const parsedVersion = import_semver.default.parse(targetSDKVersion);
+  const parsedVersion = (0, import_parse.default)(targetSDKVersion);
   if (!parsedVersion) {
-    throw new import_safe.ZWaveError(`Invalid SDK version: ${targetSDKVersion}`, import_safe.ZWaveErrorCodes.Argument_Invalid);
+    throw new import_error.ZWaveError(`Invalid SDK version: ${targetSDKVersion}`, import_error.ZWaveErrorCodes.Argument_Invalid);
   }
   const sharedFileSystem = json.meta?.sharedFileSystem;
   const nvmSize = sharedFileSystem ? import_consts2.ZWAVE_SHARED_NVM_SIZE : import_consts2.ZWAVE_APPLICATION_NVM_SIZE + import_consts2.ZWAVE_PROTOCOL_NVM_SIZE;
@@ -779,28 +783,28 @@ async function jsonToNVM(json, targetSDKVersion) {
   let targetProtocolVersion;
   let targetProtocolFormat;
   const HIGHEST_SUPPORTED_SDK_VERSION = "7.21.0";
-  if (import_semver.default.lte(targetSDKVersion, HIGHEST_SUPPORTED_SDK_VERSION)) {
-    targetApplicationVersion = import_semver.default.parse(targetSDKVersion);
+  if ((0, import_lte.default)(targetSDKVersion, HIGHEST_SUPPORTED_SDK_VERSION)) {
+    targetApplicationVersion = (0, import_parse.default)(targetSDKVersion);
   } else {
-    targetApplicationVersion = import_semver.default.parse(HIGHEST_SUPPORTED_SDK_VERSION);
+    targetApplicationVersion = (0, import_parse.default)(HIGHEST_SUPPORTED_SDK_VERSION);
   }
-  if (import_semver.default.gte(targetSDKVersion, "7.19.0")) {
-    targetProtocolVersion = import_semver.default.parse("7.19.0");
+  if ((0, import_gte.default)(targetSDKVersion, "7.19.0")) {
+    targetProtocolVersion = (0, import_parse.default)("7.19.0");
     targetProtocolFormat = 5;
-  } else if (import_semver.default.gte(targetSDKVersion, "7.17.0")) {
-    targetProtocolVersion = import_semver.default.parse("7.17.0");
+  } else if ((0, import_gte.default)(targetSDKVersion, "7.17.0")) {
+    targetProtocolVersion = (0, import_parse.default)("7.17.0");
     targetProtocolFormat = 4;
-  } else if (import_semver.default.gte(targetSDKVersion, "7.15.3")) {
-    targetProtocolVersion = import_semver.default.parse("7.15.3");
+  } else if ((0, import_gte.default)(targetSDKVersion, "7.15.3")) {
+    targetProtocolVersion = (0, import_parse.default)("7.15.3");
     targetProtocolFormat = 3;
-  } else if (import_semver.default.gte(targetSDKVersion, "7.12.0")) {
-    targetProtocolVersion = import_semver.default.parse("7.12.0");
+  } else if ((0, import_gte.default)(targetSDKVersion, "7.12.0")) {
+    targetProtocolVersion = (0, import_parse.default)("7.12.0");
     targetProtocolFormat = 2;
-  } else if (import_semver.default.gte(targetSDKVersion, "7.11.0")) {
-    targetProtocolVersion = import_semver.default.parse("7.11.0");
+  } else if ((0, import_gte.default)(targetSDKVersion, "7.11.0")) {
+    targetProtocolVersion = (0, import_parse.default)("7.11.0");
     targetProtocolFormat = 1;
   } else {
-    targetProtocolVersion = import_semver.default.parse("7.0.0");
+    targetProtocolVersion = (0, import_parse.default)("7.0.0");
     targetProtocolFormat = 0;
   }
   const target = (0, import_safe2.cloneDeep)(json);
@@ -858,11 +862,11 @@ async function jsonToNVM(json, targetSDKVersion) {
     maxTXPower: null,
     nodeIdType: null
   };
-  if (import_semver.default.gte(targetSDKVersion, "7.15.3")) {
+  if ((0, import_gte.default)(targetSDKVersion, "7.15.3")) {
     target.controller.rfConfig.enablePTI ??= 0;
     target.controller.rfConfig.maxTXPower ??= 14;
   }
-  if (import_semver.default.gte(targetSDKVersion, "7.21.0")) {
+  if ((0, import_gte.default)(targetSDKVersion, "7.21.0")) {
     target.controller.rfConfig.nodeIdType ??= import_safe.NodeIDType.Short;
   }
   const applRFConfigFile = new import_files.ApplicationRFConfigFile({
@@ -953,7 +957,7 @@ async function jsonToNVM(json, targetSDKVersion) {
 async function jsonToNVM500(json, protocolVersion) {
   const impl = import_impls.nvm500Impls.find((p) => p.protocolVersions.includes(protocolVersion) && p.name.toLowerCase().startsWith(json.meta.library));
   if (!impl) {
-    throw new import_safe.ZWaveError(`Did not find a matching implementation for protocol version ${protocolVersion} and library ${json.meta.library}. To convert 500-series NVMs, both the source and the target controller must be using Z-Wave SDK 6.61 or higher.`, import_safe.ZWaveErrorCodes.NVM_NotSupported);
+    throw new import_error.ZWaveError(`Did not find a matching implementation for protocol version ${protocolVersion} and library ${json.meta.library}. To convert 500-series NVMs, both the source and the target controller must be using Z-Wave SDK 6.61 or higher.`, import_error.ZWaveErrorCodes.NVM_NotSupported);
   }
   const { layout, nvmSize } = (0, import_shared.resolveLayout)(impl.layout);
   const ret = new Uint8Array(nvmSize);
@@ -1064,7 +1068,7 @@ function json500To700(json, truncateApplicationData) {
     raw = raw.subarray(start, end + 1);
     if (raw.length > 512) {
       if (!truncateApplicationData) {
-        throw new import_safe.ZWaveError("Invalid NVM JSON: Application data would be truncated! Set truncateApplicationData to true to allow this.", import_safe.ZWaveErrorCodes.NVM_InvalidJSON);
+        throw new import_error.ZWaveError("Invalid NVM JSON: Application data would be truncated! Set truncateApplicationData to true to allow this.", import_error.ZWaveErrorCodes.NVM_InvalidJSON);
       }
       raw = raw.subarray(0, 512);
     }
@@ -1191,12 +1195,12 @@ async function migrateNVM(sourceNVM, targetNVM) {
     };
     sourceProtocolFileFormat = source.json.format;
   } catch (e) {
-    if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.NVM_InvalidFormat) {
+    if ((0, import_error.isZWaveError)(e) && e.code === import_error.ZWaveErrorCodes.NVM_InvalidFormat) {
       source = {
         type: 500,
         json: await nvm500ToJSON(sourceNVM)
       };
-    } else if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.NVM_NotSupported && (0, import_typeguards.isObject)(e.context) && typeof e.context.protocolFileFormat === "number") {
+    } else if ((0, import_error.isZWaveError)(e) && e.code === import_error.ZWaveErrorCodes.NVM_NotSupported && (0, import_typeguards.isObject)(e.context) && typeof e.context.protocolFileFormat === "number") {
       source = { type: "unknown" };
       sourceProtocolFileFormat = e.context.protocolFileFormat;
     } else {
@@ -1210,12 +1214,12 @@ async function migrateNVM(sourceNVM, targetNVM) {
     };
     targetProtocolFileFormat = target.json.format;
   } catch (e) {
-    if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.NVM_InvalidFormat) {
+    if ((0, import_error.isZWaveError)(e) && e.code === import_error.ZWaveErrorCodes.NVM_InvalidFormat) {
       target = {
         type: 500,
         json: await nvm500ToJSON(targetNVM)
       };
-    } else if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.NVM_NotSupported && source.type === 700 && (0, import_typeguards.isObject)(e.context) && typeof e.context.protocolFileFormat === "number") {
+    } else if ((0, import_error.isZWaveError)(e) && e.code === import_error.ZWaveErrorCodes.NVM_NotSupported && source.type === 700 && (0, import_typeguards.isObject)(e.context) && typeof e.context.protocolFileFormat === "number") {
       target = { type: "unknown" };
       targetProtocolFileFormat = e.context.protocolFileFormat;
     } else {
@@ -1229,19 +1233,19 @@ async function migrateNVM(sourceNVM, targetNVM) {
     const targetProtocolVersion = target.json.controller.protocolVersion;
     const sourceApplicationVersion = source.json.controller.applicationVersion;
     const targetApplicationVersion = target.json.controller.applicationVersion;
-    if (import_semver.default.gte(targetProtocolVersion, "7.16.0") && import_semver.default.gte(targetProtocolVersion, sourceProtocolVersion) && import_semver.default.gte(targetApplicationVersion, targetProtocolVersion) && import_semver.default.gte(sourceApplicationVersion, sourceProtocolVersion) && import_semver.default.lt(sourceApplicationVersion, "255.0.0") && import_semver.default.lt(targetApplicationVersion, "255.0.0") && !hasShiftedAppVersion800File(source.json)) {
+    if ((0, import_gte.default)(targetProtocolVersion, "7.16.0") && (0, import_gte.default)(targetProtocolVersion, sourceProtocolVersion) && (0, import_gte.default)(targetApplicationVersion, targetProtocolVersion) && (0, import_gte.default)(sourceApplicationVersion, sourceProtocolVersion) && (0, import_lt.default)(sourceApplicationVersion, "255.0.0") && (0, import_lt.default)(targetApplicationVersion, "255.0.0") && !hasShiftedAppVersion800File(source.json)) {
       return sourceNVM;
     }
   } else if (source.type === "unknown" && target.type !== "unknown") {
-    throw new import_safe.ZWaveError(`The source NVM has an unsupported format, which cannot be restored on a ${target.type}-series NVM!`, import_safe.ZWaveErrorCodes.NVM_NotSupported);
+    throw new import_error.ZWaveError(`The source NVM has an unsupported format, which cannot be restored on a ${target.type}-series NVM!`, import_error.ZWaveErrorCodes.NVM_NotSupported);
   } else if (source.type !== "unknown" && target.type === "unknown") {
-    throw new import_safe.ZWaveError(`The target NVM has an unsupported format, cannot restore ${source.type}-series NVM onto it!`, import_safe.ZWaveErrorCodes.NVM_NotSupported);
+    throw new import_error.ZWaveError(`The target NVM has an unsupported format, cannot restore ${source.type}-series NVM onto it!`, import_error.ZWaveErrorCodes.NVM_NotSupported);
   } else if (source.type === "unknown" && target.type === "unknown") {
     return sourceNVM;
   }
   source = source;
   target = target;
-  if (target.type === 700 && import_semver.default.gte(target.json.controller.applicationVersion, "255.0.0")) {
+  if (target.type === 700 && (0, import_gte.default)(target.json.controller.applicationVersion, "255.0.0")) {
     target.json.controller.applicationVersion = target.json.controller.protocolVersion;
   }
   source.json.controller.applicationVersion = target.json.controller.applicationVersion;
@@ -1278,10 +1282,10 @@ async function migrateNVM(sourceNVM, targetNVM) {
 function hasShiftedAppVersion800File(json) {
   if (!json.meta.sharedFileSystem)
     return false;
-  const protocolVersion = import_semver.default.parse(json.controller.protocolVersion);
+  const protocolVersion = (0, import_parse.default)(json.controller.protocolVersion);
   if (!protocolVersion)
     return false;
-  const applicationVersion = import_semver.default.parse(json.controller.applicationVersion);
+  const applicationVersion = (0, import_parse.default)(json.controller.applicationVersion);
   if (!applicationVersion)
     return false;
   if (json.applicationFileFormat !== protocolVersion.major)