@zwave-js/nvmedit 15.1.1 → 15.1.2

package/build/cjs/convert.d.ts

@@ -1,9 +1,9 @@
-import { type CommandClasses, NodeIDType, type NodeProtocolInfo, RFRegion } from "@zwave-js/core/safe";
+import { type CommandClasses, NodeIDType, type NodeProtocolInfo, RFRegion } from "@zwave-js/core";
 import { type NVM3Meta } from "./lib/NVM3.js";
 import { type Route } from "./lib/common/routeCache.js";
-import { type SUCUpdateEntry } from "./lib/common/sucUpdateEntry.js";
+import type { SUCUpdateEntry } from "./lib/common/sucUpdateEntry.js";
 import type { NVM3Object } from "./lib/nvm3/object.js";
-import { type NVM500JSON } from "./nvm500/NVMParser.js";
+import type { NVM500JSON } from "./nvm500/NVMParser.js";
 export interface NVMJSON {
     format: number;
     applicationFileFormat?: number;

package/build/cjs/convert.js

@@ -40,9 +40,9 @@ __export(convert_exports, {
   nvmToJSON: () => nvmToJSON
 });
 module.exports = __toCommonJS(convert_exports);
+var import_core = require("@zwave-js/core");
 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_shared = require("@zwave-js/shared");
 var import_typeguards = require("alcalzone-shared/typeguards");
 var import_gte = __toESM(require("semver/functions/gte.js"), 1);
 var import_lt = __toESM(require("semver/functions/lt.js"), 1);
@@ -60,7 +60,7 @@ var import_files = require("./lib/nvm3/files/index.js");
 var import_utils = require("./lib/nvm3/utils.js");
 var import_adapter2 = require("./lib/nvm500/adapter.js");
 var import_impls = require("./lib/nvm500/impls/index.js");
-var import_shared = require("./lib/nvm500/shared.js");
+var import_shared2 = require("./lib/nvm500/shared.js");
 function nodeHasInfo(node) {
   return !node.isVirtual || Object.keys(node).length > 1;
 }
@@ -74,7 +74,7 @@ function createEmptyPhysicalNode() {
     supportedDataRates: [],
     protocolVersion: 0,
     optionalFunctionality: false,
-    nodeType: import_safe.NodeType["End Node"],
+    nodeType: import_core.NodeType["End Node"],
     supportsSecurity: false,
     supportsBeaming: false,
     genericDeviceClass: 0,
@@ -98,7 +98,7 @@ function createEmptyLRNode() {
     supportedDataRates: [],
     protocolVersion: 3,
     optionalFunctionality: false,
-    nodeType: import_safe.NodeType["End Node"],
+    nodeType: import_core.NodeType["End Node"],
     supportsSecurity: true,
     supportsBeaming: false,
     genericDeviceClass: 0,
@@ -133,7 +133,7 @@ function nvmObjectsToJSON(objects) {
     const ret2 = getObject(id);
     if (ret2)
       return ret2;
-    throw new import_error.ZWaveError(`Object${typeof id === "number" ? ` ${(0, import_safe2.num2hex)(id)} (${id})` : ""} not found!`, import_error.ZWaveErrorCodes.NVM_ObjectNotFound);
+    throw new import_error.ZWaveError(`Object${typeof id === "number" ? ` ${(0, import_shared.num2hex)(id)} (${id})` : ""} not found!`, import_error.ZWaveErrorCodes.NVM_ObjectNotFound);
   }, "getObjectOrThrow");
   const getFileOrThrow = /* @__PURE__ */ __name((id, fileVersion) => {
     const obj = getObjectOrThrow(id);
@@ -262,15 +262,15 @@ function nvmObjectsToJSON(objects) {
   const controller = {
     protocolVersion,
     applicationVersion,
-    homeId: (0, import_safe2.buffer2hex)(controllerInfoFile.homeId),
-    ...(0, import_safe2.pick)(controllerInfoFile, controllerProps),
-    ...(0, import_safe2.pick)(applicationTypeFile, [
+    homeId: (0, import_shared.buffer2hex)(controllerInfoFile.homeId),
+    ...(0, import_shared.pick)(controllerInfoFile, controllerProps),
+    ...(0, import_shared.pick)(applicationTypeFile, [
       "isListening",
       "optionalFunctionality",
       "genericDeviceClass",
       "specificDeviceClass"
     ]),
-    commandClasses: (0, import_safe2.pick)(applicationCCsFile, [
+    commandClasses: (0, import_shared.pick)(applicationCCsFile, [
       "includedInsecurely",
       "includedSecurelyInsecureCCs",
       "includedSecurelySecureCCs"
@@ -319,7 +319,7 @@ __name(nvmObjectsToJSON, "nvmObjectsToJSON");
 function nvmJSONNodeToNodeInfo(nodeId, node) {
   return {
     nodeId,
-    ...(0, import_safe2.pick)(node, [
+    ...(0, import_shared.pick)(node, [
       "isListening",
       "isFrequentListening",
       "isRouting",
@@ -340,7 +340,7 @@ __name(nvmJSONNodeToNodeInfo, "nvmJSONNodeToNodeInfo");
 function nvmJSONLRNodeToLRNodeInfo(nodeId, node) {
   return {
     nodeId,
-    ...(0, import_safe2.pick)(node, [
+    ...(0, import_shared.pick)(node, [
       "isListening",
       "isFrequentListening",
       "isRouting",
@@ -358,7 +358,7 @@ function nvmJSONLRNodeToLRNodeInfo(nodeId, node) {
 __name(nvmJSONLRNodeToLRNodeInfo, "nvmJSONLRNodeToLRNodeInfo");
 function nvmJSONControllerToFileOptions(ctrlr) {
   const ret = {
-    homeId: import_safe2.Bytes.from(ctrlr.homeId.replace(/^0x/, ""), "hex"),
+    homeId: import_shared.Bytes.from(ctrlr.homeId.replace(/^0x/, ""), "hex"),
     nodeId: ctrlr.nodeId,
     lastNodeId: ctrlr.lastNodeId,
     staticControllerNodeId: ctrlr.staticControllerNodeId,
@@ -371,7 +371,7 @@ function nvmJSONControllerToFileOptions(ctrlr) {
   if (ctrlr.sucAwarenessPushNeeded != void 0) {
     ret.sucAwarenessPushNeeded = ctrlr.sucAwarenessPushNeeded;
   } else {
-    Object.assign(ret, (0, import_safe.stripUndefined)((0, import_safe2.pick)(ctrlr, [
+    Object.assign(ret, (0, import_core.stripUndefined)((0, import_shared.pick)(ctrlr, [
       "sucAwarenessPushNeeded",
       "lastNodeIdLR",
       "maxNodeIdLR",
@@ -394,7 +394,7 @@ async function nvmToJSON(buffer, debugLogs = false) {
   const firstPageHeader = info.isSharedFileSystem ? info.sections.all.pages[0] : info.sections.protocol.pages[0];
   const meta = {
     sharedFileSystem: info.isSharedFileSystem,
-    ...(0, import_safe2.pick)(firstPageHeader, [
+    ...(0, import_shared.pick)(firstPageHeader, [
       "pageSize",
       "writeSize",
       "memoryMapped",
@@ -518,8 +518,8 @@ async function nvmToJSON(buffer, debugLogs = false) {
   const controller = {
     protocolVersion,
     applicationVersion,
-    homeId: (0, import_safe2.buffer2hex)(controllerInfoFile.homeId),
-    ...(0, import_safe2.pick)(controllerInfoFile, [
+    homeId: (0, import_shared.buffer2hex)(controllerInfoFile.homeId),
+    ...(0, import_shared.pick)(controllerInfoFile, [
       "nodeId",
       "lastNodeId",
       "staticControllerNodeId",
@@ -535,13 +535,13 @@ async function nvmToJSON(buffer, debugLogs = false) {
       "primaryLongRangeChannelId",
       "dcdcConfig"
     ]),
-    ...(0, import_safe2.pick)(applicationTypeFile, [
+    ...(0, import_shared.pick)(applicationTypeFile, [
       "isListening",
       "optionalFunctionality",
       "genericDeviceClass",
       "specificDeviceClass"
     ]),
-    commandClasses: (0, import_safe2.pick)(applicationCCsFile, [
+    commandClasses: (0, import_shared.pick)(applicationCCsFile, [
       "includedInsecurely",
       "includedSecurelyInsecureCCs",
       "includedSecurelySecureCCs"
@@ -558,7 +558,7 @@ async function nvmToJSON(buffer, debugLogs = false) {
       }
     } : {},
     sucUpdateEntries,
-    applicationData: (applicationData && import_safe2.Bytes.view(applicationData).toString("hex")) ?? null,
+    applicationData: (applicationData && import_shared.Bytes.view(applicationData).toString("hex")) ?? null,
     applicationName: applicationName ?? null
   };
   const optionalControllerProps = [
@@ -597,7 +597,7 @@ async function nvm500ToJSON(buffer) {
   const info = await nvm.init();
   const meta = {
     library: info.library,
-    ...(0, import_safe2.pick)(info.nvmDescriptor, [
+    ...(0, import_shared.pick)(info.nvmDescriptor, [
       "manufacturerID",
       "firmwareID",
       "productType",
@@ -626,7 +626,7 @@ async function nvm500ToJSON(buffer) {
     type: "pendingDiscovery"
   }, true));
   const nodes = {};
-  for (let nodeId = 1; nodeId <= import_safe.MAX_NODES; nodeId++) {
+  for (let nodeId = 1; nodeId <= import_core.MAX_NODES; nodeId++) {
     const nodeInfo = await adapter.get({
       domain: "node",
       nodeId,
@@ -743,8 +743,8 @@ async function nvm500ToJSON(buffer) {
   const controller = {
     protocolVersion: info.nvmDescriptor.protocolVersion,
     applicationVersion: info.nvmDescriptor.firmwareVersion,
-    ownHomeId: (0, import_safe2.buffer2hex)(ownHomeId),
-    learnedHomeId: learnedHomeId ? (0, import_safe2.buffer2hex)(learnedHomeId) : null,
+    ownHomeId: (0, import_shared.buffer2hex)(ownHomeId),
+    learnedHomeId: learnedHomeId ? (0, import_shared.buffer2hex)(learnedHomeId) : null,
     nodeId: ownNodeId,
     lastNodeId,
     staticControllerNodeId,
@@ -764,7 +764,7 @@ async function nvm500ToJSON(buffer) {
     },
     preferredRepeaters,
     commandClasses,
-    applicationData: (applicationData && import_safe2.Bytes.view(applicationData).toString("hex")) ?? null
+    applicationData: (applicationData && import_shared.Bytes.view(applicationData).toString("hex")) ?? null
   };
   return {
     format: 500,
@@ -817,7 +817,7 @@ async function jsonToNVM(json, targetSDKVersion) {
     targetProtocolVersion = (0, import_parse.default)("7.0.0");
     targetProtocolFormat = 0;
   }
-  const target = (0, import_safe2.cloneDeep)(json);
+  const target = (0, import_shared.cloneDeep)(json);
   target.controller.protocolVersion = targetProtocolVersion.format();
   target.format = targetProtocolFormat;
   target.controller.applicationVersion = parsedVersion.format();
@@ -846,7 +846,7 @@ async function jsonToNVM(json, targetSDKVersion) {
   }
   const adapter = new import_adapter.NVM3Adapter(nvm3);
   const applTypeFile = new import_files.ApplicationTypeFile({
-    ...(0, import_safe2.pick)(target.controller, [
+    ...(0, import_shared.pick)(target.controller, [
       "isListening",
       "optionalFunctionality",
       "genericDeviceClass",
@@ -856,7 +856,7 @@ async function jsonToNVM(json, targetSDKVersion) {
   });
   adapter.setFile(applTypeFile);
   const applCCsFile = new import_files.ApplicationCCsFile({
-    ...(0, import_safe2.pick)(target.controller.commandClasses, [
+    ...(0, import_shared.pick)(target.controller.commandClasses, [
       "includedInsecurely",
       "includedSecurelyInsecureCCs",
       "includedSecurelySecureCCs"
@@ -865,7 +865,7 @@ async function jsonToNVM(json, targetSDKVersion) {
   });
   adapter.setFile(applCCsFile);
   target.controller.rfConfig ??= {
-    rfRegion: import_safe.RFRegion["Default (EU)"],
+    rfRegion: import_core.RFRegion["Default (EU)"],
     txPower: 0,
     measured0dBm: 3.3,
     enablePTI: null,
@@ -877,10 +877,10 @@ async function jsonToNVM(json, targetSDKVersion) {
     target.controller.rfConfig.maxTXPower ??= 14;
   }
   if ((0, import_gte.default)(targetSDKVersion, "7.21.0")) {
-    target.controller.rfConfig.nodeIdType ??= import_safe.NodeIDType.Short;
+    target.controller.rfConfig.nodeIdType ??= import_core.NodeIDType.Short;
   }
   const applRFConfigFile = new import_files.ApplicationRFConfigFile({
-    ...(0, import_safe2.pick)(target.controller.rfConfig, [
+    ...(0, import_shared.pick)(target.controller.rfConfig, [
       "rfRegion",
       "txPower",
       "measured0dBm"
@@ -892,7 +892,7 @@ async function jsonToNVM(json, targetSDKVersion) {
   });
   adapter.setFile(applRFConfigFile);
   if (target.controller.applicationData) {
-    await adapter.set({ domain: "controller", type: "applicationData" }, import_safe2.Bytes.from(target.controller.applicationData, "hex"));
+    await adapter.set({ domain: "controller", type: "applicationData" }, import_shared.Bytes.from(target.controller.applicationData, "hex"));
   }
   if (target.controller.applicationName && target.meta?.sharedFileSystem) {
     await adapter.set({ domain: "controller", type: "applicationName" }, target.controller.applicationName);
@@ -970,7 +970,7 @@ async function jsonToNVM500(json, protocolVersion) {
   if (!impl) {
     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 { layout, nvmSize } = (0, import_shared2.resolveLayout)(impl.layout);
   const ret = new Uint8Array(nvmSize);
   const io = new import_NVMMemoryIO.NVMMemoryIO(ret);
   const nvm = new import_NVM500.NVM500(io);
@@ -979,7 +979,7 @@ async function jsonToNVM500(json, protocolVersion) {
     nvmSize,
     library: impl.library,
     nvmDescriptor: {
-      ...(0, import_safe2.pick)(json.meta, [
+      ...(0, import_shared.pick)(json.meta, [
         "manufacturerID",
         "productType",
         "productID",
@@ -992,8 +992,8 @@ async function jsonToNVM500(json, protocolVersion) {
   });
   const adapter = new import_adapter2.NVM500Adapter(nvm);
   const c = json.controller;
-  await adapter.set({ domain: "controller", type: "homeId" }, import_safe2.Bytes.from(c.ownHomeId.replace(/^0x/, ""), "hex"));
-  await adapter.set({ domain: "controller", type: "learnedHomeId" }, c.learnedHomeId ? import_safe2.Bytes.from(c.learnedHomeId.replace(/^0x/, ""), "hex") : void 0);
+  await adapter.set({ domain: "controller", type: "homeId" }, import_shared.Bytes.from(c.ownHomeId.replace(/^0x/, ""), "hex"));
+  await adapter.set({ domain: "controller", type: "learnedHomeId" }, c.learnedHomeId ? import_shared.Bytes.from(c.learnedHomeId.replace(/^0x/, ""), "hex") : void 0);
   await adapter.set({ domain: "controller", type: "nodeId" }, c.nodeId);
   await adapter.set({ domain: "controller", type: "lastNodeId" }, c.lastNodeId);
   await adapter.set({ domain: "controller", type: "maxNodeId" }, c.maxNodeId);
@@ -1024,7 +1024,7 @@ async function jsonToNVM500(json, protocolVersion) {
   await adapter.set({ domain: "controller", type: "preferredRepeaters" }, c.preferredRepeaters);
   await adapter.set({ domain: "controller", type: "commandClasses" }, c.commandClasses);
   if (c.applicationData) {
-    await adapter.set({ domain: "controller", type: "applicationData" }, import_safe2.Bytes.from(c.applicationData, "hex"));
+    await adapter.set({ domain: "controller", type: "applicationData" }, import_shared.Bytes.from(c.applicationData, "hex"));
   }
   const appRouteLock = [];
   const routeSlaveSUC = [];
@@ -1067,7 +1067,7 @@ async function jsonToNVM500(json, protocolVersion) {
 }
 __name(jsonToNVM500, "jsonToNVM500");
 function json500To700(json, truncateApplicationData) {
-  const source = (0, import_safe2.cloneDeep)(json);
+  const source = (0, import_shared.cloneDeep)(json);
   let controllerNode = source.nodes[source.controller.nodeId || 1];
   if (!nodeHasInfo(controllerNode)) {
     controllerNode = {
@@ -1080,7 +1080,7 @@ function json500To700(json, truncateApplicationData) {
   }
   let applicationData = null;
   if (source.controller.applicationData) {
-    let raw = import_safe2.Bytes.from(source.controller.applicationData, "hex");
+    let raw = import_shared.Bytes.from(source.controller.applicationData, "hex");
     let start = 0;
     while (start < raw.length && raw[start] === 0) {
       start++;
@@ -1100,15 +1100,15 @@ function json500To700(json, truncateApplicationData) {
   }
   let controllerConfiguration = source.controller.controllerConfiguration;
   if (source.controller.controllerConfiguration === 255) {
-    controllerConfiguration = import_safe.ControllerCapabilityFlags.SISPresent | import_safe.ControllerCapabilityFlags.WasRealPrimary | import_safe.ControllerCapabilityFlags.SUC;
+    controllerConfiguration = import_core.ControllerCapabilityFlags.SISPresent | import_core.ControllerCapabilityFlags.WasRealPrimary | import_core.ControllerCapabilityFlags.SUC;
   }
   let homeId;
-  if (!!(controllerConfiguration & import_safe.ControllerCapabilityFlags.OnOtherNetwork) && source.controller.learnedHomeId && source.controller.nodeId) {
+  if (!!(controllerConfiguration & import_core.ControllerCapabilityFlags.OnOtherNetwork) && source.controller.learnedHomeId && source.controller.nodeId) {
     homeId = source.controller.learnedHomeId;
   } else {
     homeId = source.controller.ownHomeId;
-    controllerConfiguration &= ~import_safe.ControllerCapabilityFlags.OnOtherNetwork;
-    if (controllerConfiguration & import_safe.ControllerCapabilityFlags.SUC) {
+    controllerConfiguration &= ~import_core.ControllerCapabilityFlags.OnOtherNetwork;
+    if (controllerConfiguration & import_core.ControllerCapabilityFlags.SUC) {
       source.controller.nodeId = source.controller.staticControllerNodeId || 1;
     } else {
       source.controller.nodeId = 1;
@@ -1158,11 +1158,11 @@ function json500To700(json, truncateApplicationData) {
 }
 __name(json500To700, "json500To700");
 function json700To500(json) {
-  const source = (0, import_safe2.cloneDeep)(json);
+  const source = (0, import_shared.cloneDeep)(json);
   let ownHomeId;
   let learnedHomeId = null;
   let nodeId;
-  if (source.controller.controllerConfiguration & import_safe.ControllerCapabilityFlags.OnOtherNetwork) {
+  if (source.controller.controllerConfiguration & import_core.ControllerCapabilityFlags.OnOtherNetwork) {
     ownHomeId = learnedHomeId = source.controller.homeId;
     nodeId = source.controller.nodeId;
   } else {