@zwave-js/cc 15.1.1 → 15.2.0

package/build/cjs/cc/ManufacturerSpecificCC.js

@@ -39,9 +39,8 @@ __export(ManufacturerSpecificCC_exports, {
 });
 module.exports = __toCommonJS(ManufacturerSpecificCC_exports);
 var __validateArgs = __toESM(require("./ManufacturerSpecificCC._validateArgs.js"), 1);
-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_core = require("@zwave-js/core");
+var import_shared = require("@zwave-js/shared");
 var import_API = require("../lib/API.js");
 var import_CommandClass = require("../lib/CommandClass.js");
 var import_CommandClassDecorators = require("../lib/CommandClassDecorators.js");
@@ -90,7 +89,7 @@ var __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializ
 };
 const { validateArgs_ManufacturerSpecificCCAPI_deviceSpecificGet, validateArgs_ManufacturerSpecificCCAPI_sendReport } = __validateArgs;
 let ManufacturerSpecificCCAPI = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_safe.CommandClasses["Manufacturer Specific"])];
+  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_core.CommandClasses["Manufacturer Specific"])];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -137,7 +136,7 @@ let ManufacturerSpecificCCAPI = (() => {
       });
       const response = await this.host.sendCommand(cc, this.commandOptions);
       if (response) {
-        return (0, import_safe3.pick)(response, [
+        return (0, import_shared.pick)(response, [
           "manufacturerId",
           "productType",
           "productId"
@@ -171,7 +170,7 @@ let ManufacturerSpecificCCAPI = (() => {
   return ManufacturerSpecificCCAPI2 = _classThis;
 })();
 let ManufacturerSpecificCC = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses["Manufacturer Specific"]), (0, import_CommandClassDecorators.implementedVersion)(2), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.ManufacturerSpecificCCValues)];
+  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_core.CommandClasses["Manufacturer Specific"]), (0, import_CommandClassDecorators.implementedVersion)(2), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.ManufacturerSpecificCCValues)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -196,7 +195,7 @@ let ManufacturerSpecificCC = (() => {
     async interview(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
-      const api = import_API.CCAPI.create(import_safe.CommandClasses["Manufacturer Specific"], ctx, endpoint).withOptions({ priority: import_safe.MessagePriority.NodeQuery });
+      const api = import_API.CCAPI.create(import_core.CommandClasses["Manufacturer Specific"], ctx, endpoint).withOptions({ priority: import_core.MessagePriority.NodeQuery });
       if (node.id !== ctx.ownNodeId) {
         ctx.logNode(node.id, {
           endpoint: this.endpointIndex,
@@ -211,9 +210,9 @@ let ManufacturerSpecificCC = (() => {
         const mfResp = await api.get();
         if (mfResp) {
           const logMessage = `received response for manufacturer information:
-  manufacturer: ${ctx.lookupManufacturer(mfResp.manufacturerId) || "unknown"} (${(0, import_safe3.num2hex)(mfResp.manufacturerId)})
-  product type: ${(0, import_safe3.num2hex)(mfResp.productType)}
-  product id:   ${(0, import_safe3.num2hex)(mfResp.productId)}`;
+  manufacturer: ${ctx.lookupManufacturer(mfResp.manufacturerId) || "unknown"} (${(0, import_shared.num2hex)(mfResp.manufacturerId)})
+  product type: ${(0, import_shared.num2hex)(mfResp.productType)}
+  product id:   ${(0, import_shared.num2hex)(mfResp.productId)}`;
           ctx.logNode(node.id, {
             endpoint: this.endpointIndex,
             message: logMessage,
@@ -253,7 +252,7 @@ let ManufacturerSpecificCCReport = (() => {
       this.productId = options.productId;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 6);
+      (0, import_core.validatePayload)(raw.payload.length >= 6);
       const manufacturerId = raw.payload.readUInt16BE(0);
       const productType = raw.payload.readUInt16BE(2);
       const productId = raw.payload.readUInt16BE(4);
@@ -268,7 +267,7 @@ let ManufacturerSpecificCCReport = (() => {
     productType;
     productId;
     serialize(ctx) {
-      this.payload = new import_safe2.Bytes(6);
+      this.payload = new import_shared.Bytes(6);
       this.payload.writeUInt16BE(this.manufacturerId, 0);
       this.payload.writeUInt16BE(this.productType, 2);
       this.payload.writeUInt16BE(this.productId, 4);
@@ -278,9 +277,9 @@ let ManufacturerSpecificCCReport = (() => {
       return {
         ...super.toLogEntry(ctx),
         message: {
-          "manufacturer id": (0, import_safe3.num2hex)(this.manufacturerId),
-          "product type": (0, import_safe3.num2hex)(this.productType),
-          "product id": (0, import_safe3.num2hex)(this.productId)
+          "manufacturer id": (0, import_shared.num2hex)(this.manufacturerId),
+          "product type": (0, import_shared.num2hex)(this.productType),
+          "product id": (0, import_shared.num2hex)(this.productId)
         }
       };
     }
@@ -336,11 +335,11 @@ let ManufacturerSpecificCCDeviceSpecificReport = (() => {
       this.deviceId = options.deviceId;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 2);
+      (0, import_core.validatePayload)(raw.payload.length >= 2);
       const type = raw.payload[0] & 7;
       const dataFormat = raw.payload[1] >>> 5;
       const dataLength = raw.payload[1] & 31;
-      (0, import_safe.validatePayload)(dataLength > 0, raw.payload.length >= 2 + dataLength);
+      (0, import_core.validatePayload)(dataLength > 0, raw.payload.length >= 2 + dataLength);
       const deviceIdData = raw.payload.subarray(2, 2 + dataLength);
       const deviceId = dataFormat === 0 ? deviceIdData.toString("utf8") : "0x" + deviceIdData.toString("hex");
       return new this({
@@ -355,7 +354,7 @@ let ManufacturerSpecificCCDeviceSpecificReport = (() => {
       return {
         ...super.toLogEntry(ctx),
         message: {
-          "device id type": (0, import_safe3.getEnumMemberName)(import_Types.DeviceIdType, this.type),
+          "device id type": (0, import_shared.getEnumMemberName)(import_Types.DeviceIdType, this.type),
           "device id": this.deviceId
         }
       };
@@ -388,18 +387,18 @@ let ManufacturerSpecificCCDeviceSpecificGet = (() => {
       this.deviceIdType = options.deviceIdType;
     }
     static from(_raw, _ctx) {
-      throw new import_safe.ZWaveError(`${this.name}: deserialization not implemented`, import_safe.ZWaveErrorCodes.Deserialization_NotImplemented);
+      throw new import_core.ZWaveError(`${this.name}: deserialization not implemented`, import_core.ZWaveErrorCodes.Deserialization_NotImplemented);
     }
     deviceIdType;
     serialize(ctx) {
-      this.payload = import_safe2.Bytes.from([(this.deviceIdType || 0) & 7]);
+      this.payload = import_shared.Bytes.from([(this.deviceIdType || 0) & 7]);
       return super.serialize(ctx);
     }
     toLogEntry(ctx) {
       return {
         ...super.toLogEntry(ctx),
         message: {
-          "device id type": (0, import_safe3.getEnumMemberName)(import_Types.DeviceIdType, this.deviceIdType)
+          "device id type": (0, import_shared.getEnumMemberName)(import_Types.DeviceIdType, this.deviceIdType)
         }
       };
     }

package/build/cjs/cc/ManufacturerSpecificCC.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/cc/ManufacturerSpecificCC.ts"],
-  "sourcesContent": ["import { type CCEncodingContext, type CCParsingContext } from \"@zwave-js/cc\";\nimport type {\n\tGetValueDB,\n\tMessageOrCCLogEntry,\n\tWithAddress,\n} from \"@zwave-js/core/safe\";\nimport {\n\tCommandClasses,\n\ttype MaybeNotKnown,\n\tMessagePriority,\n\tValueMetadata,\n\tZWaveError,\n\tZWaveErrorCodes,\n\tvalidatePayload,\n} from \"@zwave-js/core/safe\";\nimport { Bytes } from \"@zwave-js/shared/safe\";\nimport { getEnumMemberName, num2hex, pick } from \"@zwave-js/shared/safe\";\nimport { validateArgs } from \"@zwave-js/transformers\";\nimport { CCAPI, PhysicalCCAPI } from \"../lib/API.js\";\nimport {\n\ttype CCRaw,\n\tCommandClass,\n\ttype InterviewContext,\n} from \"../lib/CommandClass.js\";\nimport {\n\tAPI,\n\tCCCommand,\n\tccValueProperty,\n\tccValues,\n\tcommandClass,\n\texpectedCCResponse,\n\timplementedVersion,\n} from \"../lib/CommandClassDecorators.js\";\nimport { V } from \"../lib/Values.js\";\nimport { DeviceIdType, ManufacturerSpecificCommand } from \"../lib/_Types.js\";\n\nexport const ManufacturerSpecificCCValues = V.defineCCValues(\n\tCommandClasses[\"Manufacturer Specific\"],\n\t{\n\t\t...V.staticProperty(\n\t\t\t\"manufacturerId\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Manufacturer ID\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.staticProperty(\n\t\t\t\"productType\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Product type\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.staticProperty(\n\t\t\t\"productId\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Product ID\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.dynamicPropertyAndKeyWithName(\n\t\t\t\"deviceId\",\n\t\t\t\"deviceId\",\n\t\t\t(type: DeviceIdType) => getEnumMemberName(DeviceIdType, type),\n\t\t\t({ property, propertyKey }) =>\n\t\t\t\tproperty === \"deviceId\"\n\t\t\t\t&& typeof propertyKey === \"string\"\n\t\t\t\t&& propertyKey in DeviceIdType,\n\t\t\t(type: DeviceIdType) => ({\n\t\t\t\t...ValueMetadata.ReadOnlyString,\n\t\t\t\tlabel: `Device ID (${getEnumMemberName(DeviceIdType, type)})`,\n\t\t\t}),\n\t\t\t{ minVersion: 2 } as const,\n\t\t),\n\t},\n);\n\n// @noSetValueAPI This CC is read-only\n\n@API(CommandClasses[\"Manufacturer Specific\"])\nexport class ManufacturerSpecificCCAPI extends PhysicalCCAPI {\n\tpublic supportsCommand(\n\t\tcmd: ManufacturerSpecificCommand,\n\t): MaybeNotKnown<boolean> {\n\t\tswitch (cmd) {\n\t\t\tcase ManufacturerSpecificCommand.Get:\n\t\t\tcase ManufacturerSpecificCommand.Report:\n\t\t\t\treturn true; // This is mandatory\n\t\t\tcase ManufacturerSpecificCommand.DeviceSpecificGet:\n\t\t\tcase ManufacturerSpecificCommand.DeviceSpecificReport:\n\t\t\t\treturn this.version >= 2;\n\t\t}\n\t\treturn super.supportsCommand(cmd);\n\t}\n\n\t// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types\n\tpublic async get() {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.Get,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCGet({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t});\n\t\tconst response = await this.host.sendCommand<\n\t\t\tManufacturerSpecificCCReport\n\t\t>(\n\t\t\tcc,\n\t\t\tthis.commandOptions,\n\t\t);\n\t\tif (response) {\n\t\t\treturn pick(response, [\n\t\t\t\t\"manufacturerId\",\n\t\t\t\t\"productType\",\n\t\t\t\t\"productId\",\n\t\t\t]);\n\t\t}\n\t}\n\n\t@validateArgs()\n\tpublic async deviceSpecificGet(\n\t\tdeviceIdType: DeviceIdType,\n\t): Promise<MaybeNotKnown<string>> {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.DeviceSpecificGet,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCDeviceSpecificGet({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t\tdeviceIdType,\n\t\t});\n\t\tconst response = await this.host.sendCommand<\n\t\t\tManufacturerSpecificCCDeviceSpecificReport\n\t\t>(\n\t\t\tcc,\n\t\t\tthis.commandOptions,\n\t\t);\n\t\treturn response?.deviceId;\n\t}\n\n\t@validateArgs()\n\tpublic async sendReport(\n\t\toptions: ManufacturerSpecificCCReportOptions,\n\t): Promise<void> {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.Report,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCReport({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t\t...options,\n\t\t});\n\t\tawait this.host.sendCommand(cc, this.commandOptions);\n\t}\n}\n\n@commandClass(CommandClasses[\"Manufacturer Specific\"])\n@implementedVersion(2)\n@ccValues(ManufacturerSpecificCCValues)\nexport class ManufacturerSpecificCC extends CommandClass {\n\tdeclare ccCommand: ManufacturerSpecificCommand;\n\n\tpublic determineRequiredCCInterviews(): readonly CommandClasses[] {\n\t\t// The Manufacturer Specific CC MUST be interviewed first\n\t\treturn [];\n\t}\n\n\tpublic async interview(\n\t\tctx: InterviewContext,\n\t): Promise<void> {\n\t\tconst node = this.getNode(ctx)!;\n\t\tconst endpoint = this.getEndpoint(ctx)!;\n\t\tconst api = CCAPI.create(\n\t\t\tCommandClasses[\"Manufacturer Specific\"],\n\t\t\tctx,\n\t\t\tendpoint,\n\t\t).withOptions({ priority: MessagePriority.NodeQuery });\n\n\t\tif (node.id !== ctx.ownNodeId) {\n\t\t\tctx.logNode(node.id, {\n\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\tmessage: `Interviewing ${this.ccName}...`,\n\t\t\t\tdirection: \"none\",\n\t\t\t});\n\n\t\t\tctx.logNode(node.id, {\n\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\tmessage: \"querying manufacturer information...\",\n\t\t\t\tdirection: \"outbound\",\n\t\t\t});\n\t\t\tconst mfResp = await api.get();\n\t\t\tif (mfResp) {\n\t\t\t\tconst logMessage =\n\t\t\t\t\t`received response for manufacturer information:\n  manufacturer: ${\n\t\t\t\t\t\tctx.lookupManufacturer(\n\t\t\t\t\t\t\tmfResp.manufacturerId,\n\t\t\t\t\t\t)\n\t\t\t\t\t\t|| \"unknown\"\n\t\t\t\t\t} (${num2hex(mfResp.manufacturerId)})\n  product type: ${num2hex(mfResp.productType)}\n  product id:   ${num2hex(mfResp.productId)}`;\n\t\t\t\tctx.logNode(node.id, {\n\t\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\t\tmessage: logMessage,\n\t\t\t\t\tdirection: \"inbound\",\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\n\t\t// Remember that the interview is complete\n\t\tthis.setInterviewComplete(ctx, true);\n\t}\n}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCReportOptions {\n\tmanufacturerId: number;\n\tproductType: number;\n\tproductId: number;\n}\n\n@CCCommand(ManufacturerSpecificCommand.Report)\n@ccValueProperty(\"manufacturerId\", ManufacturerSpecificCCValues.manufacturerId)\n@ccValueProperty(\"productType\", ManufacturerSpecificCCValues.productType)\n@ccValueProperty(\"productId\", ManufacturerSpecificCCValues.productId)\nexport class ManufacturerSpecificCCReport extends ManufacturerSpecificCC {\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCReportOptions>,\n\t) {\n\t\tsuper(options);\n\n\t\tthis.manufacturerId = options.manufacturerId;\n\t\tthis.productType = options.productType;\n\t\tthis.productId = options.productId;\n\t}\n\n\tpublic static from(\n\t\traw: CCRaw,\n\t\tctx: CCParsingContext,\n\t): ManufacturerSpecificCCReport {\n\t\tvalidatePayload(raw.payload.length >= 6);\n\t\tconst manufacturerId = raw.payload.readUInt16BE(0);\n\t\tconst productType = raw.payload.readUInt16BE(2);\n\t\tconst productId = raw.payload.readUInt16BE(4);\n\n\t\treturn new this({\n\t\t\tnodeId: ctx.sourceNodeId,\n\t\t\tmanufacturerId,\n\t\t\tproductType,\n\t\t\tproductId,\n\t\t});\n\t}\n\n\tpublic readonly manufacturerId: number;\n\n\tpublic readonly productType: number;\n\n\tpublic readonly productId: number;\n\n\tpublic serialize(ctx: CCEncodingContext): Promise<Bytes> {\n\t\tthis.payload = new Bytes(6);\n\t\tthis.payload.writeUInt16BE(this.manufacturerId, 0);\n\t\tthis.payload.writeUInt16BE(this.productType, 2);\n\t\tthis.payload.writeUInt16BE(this.productId, 4);\n\t\treturn super.serialize(ctx);\n\t}\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"manufacturer id\": num2hex(this.manufacturerId),\n\t\t\t\t\"product type\": num2hex(this.productType),\n\t\t\t\t\"product id\": num2hex(this.productId),\n\t\t\t},\n\t\t};\n\t}\n}\n\n@CCCommand(ManufacturerSpecificCommand.Get)\n@expectedCCResponse(ManufacturerSpecificCCReport)\nexport class ManufacturerSpecificCCGet extends ManufacturerSpecificCC {}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCDeviceSpecificReportOptions {\n\ttype: DeviceIdType;\n\tdeviceId: string;\n}\n\n@CCCommand(ManufacturerSpecificCommand.DeviceSpecificReport)\n@ccValueProperty(\n\t\"deviceId\",\n\tManufacturerSpecificCCValues.deviceId,\n\t(self) => [self.type],\n)\nexport class ManufacturerSpecificCCDeviceSpecificReport\n\textends ManufacturerSpecificCC\n{\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCDeviceSpecificReportOptions>,\n\t) {\n\t\tsuper(options);\n\n\t\t// TODO: Check implementation:\n\t\tthis.type = options.type;\n\t\tthis.deviceId = options.deviceId;\n\t}\n\n\tpublic static from(\n\t\traw: CCRaw,\n\t\tctx: CCParsingContext,\n\t): ManufacturerSpecificCCDeviceSpecificReport {\n\t\tvalidatePayload(raw.payload.length >= 2);\n\t\tconst type: DeviceIdType = raw.payload[0] & 0b111;\n\t\tconst dataFormat = raw.payload[1] >>> 5;\n\t\tconst dataLength = raw.payload[1] & 0b11111;\n\t\tvalidatePayload(dataLength > 0, raw.payload.length >= 2 + dataLength);\n\t\tconst deviceIdData = raw.payload.subarray(2, 2 + dataLength);\n\t\tconst deviceId: string = dataFormat === 0\n\t\t\t? deviceIdData.toString(\"utf8\")\n\t\t\t: \"0x\" + deviceIdData.toString(\"hex\");\n\n\t\treturn new this({\n\t\t\tnodeId: ctx.sourceNodeId,\n\t\t\ttype,\n\t\t\tdeviceId,\n\t\t});\n\t}\n\n\tpublic readonly type: DeviceIdType;\n\n\tpublic readonly deviceId: string;\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"device id type\": getEnumMemberName(DeviceIdType, this.type),\n\t\t\t\t\"device id\": this.deviceId,\n\t\t\t},\n\t\t};\n\t}\n}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCDeviceSpecificGetOptions {\n\tdeviceIdType: DeviceIdType;\n}\n\n@CCCommand(ManufacturerSpecificCommand.DeviceSpecificGet)\n@expectedCCResponse(ManufacturerSpecificCCDeviceSpecificReport)\nexport class ManufacturerSpecificCCDeviceSpecificGet\n\textends ManufacturerSpecificCC\n{\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCDeviceSpecificGetOptions>,\n\t) {\n\t\tsuper(options);\n\t\tthis.deviceIdType = options.deviceIdType;\n\t}\n\n\tpublic static from(\n\t\t_raw: CCRaw,\n\t\t_ctx: CCParsingContext,\n\t): ManufacturerSpecificCCDeviceSpecificGet {\n\t\tthrow new ZWaveError(\n\t\t\t`${this.name}: deserialization not implemented`,\n\t\t\tZWaveErrorCodes.Deserialization_NotImplemented,\n\t\t);\n\n\t\t// return new ManufacturerSpecificCCDeviceSpecificGet({\n\t\t// \tnodeId: ctx.sourceNodeId,\n\t\t// });\n\t}\n\n\tpublic deviceIdType: DeviceIdType;\n\n\tpublic serialize(ctx: CCEncodingContext): Promise<Bytes> {\n\t\tthis.payload = Bytes.from([(this.deviceIdType || 0) & 0b111]);\n\t\treturn super.serialize(ctx);\n\t}\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"device id type\": getEnumMemberName(\n\t\t\t\t\tDeviceIdType,\n\t\t\t\t\tthis.deviceIdType,\n\t\t\t\t),\n\t\t\t},\n\t\t};\n\t}\n}\n"],
-  "mappings": "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",
-  "names": ["import_safe"]
+  "sourcesContent": ["import type { CCEncodingContext, CCParsingContext } from \"@zwave-js/cc\";\nimport {\n\tCommandClasses,\n\ttype GetValueDB,\n\ttype MaybeNotKnown,\n\ttype MessageOrCCLogEntry,\n\tMessagePriority,\n\tValueMetadata,\n\ttype WithAddress,\n\tZWaveError,\n\tZWaveErrorCodes,\n\tvalidatePayload,\n} from \"@zwave-js/core\";\nimport { Bytes, getEnumMemberName, num2hex, pick } from \"@zwave-js/shared\";\nimport { validateArgs } from \"@zwave-js/transformers\";\nimport { CCAPI, PhysicalCCAPI } from \"../lib/API.js\";\nimport {\n\ttype CCRaw,\n\tCommandClass,\n\ttype InterviewContext,\n} from \"../lib/CommandClass.js\";\nimport {\n\tAPI,\n\tCCCommand,\n\tccValueProperty,\n\tccValues,\n\tcommandClass,\n\texpectedCCResponse,\n\timplementedVersion,\n} from \"../lib/CommandClassDecorators.js\";\nimport { V } from \"../lib/Values.js\";\nimport { DeviceIdType, ManufacturerSpecificCommand } from \"../lib/_Types.js\";\n\nexport const ManufacturerSpecificCCValues = V.defineCCValues(\n\tCommandClasses[\"Manufacturer Specific\"],\n\t{\n\t\t...V.staticProperty(\n\t\t\t\"manufacturerId\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Manufacturer ID\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.staticProperty(\n\t\t\t\"productType\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Product type\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.staticProperty(\n\t\t\t\"productId\",\n\t\t\t{\n\t\t\t\t...ValueMetadata.ReadOnlyUInt16,\n\t\t\t\tlabel: \"Product ID\",\n\t\t\t} as const,\n\t\t\t{ supportsEndpoints: false },\n\t\t),\n\t\t...V.dynamicPropertyAndKeyWithName(\n\t\t\t\"deviceId\",\n\t\t\t\"deviceId\",\n\t\t\t(type: DeviceIdType) => getEnumMemberName(DeviceIdType, type),\n\t\t\t({ property, propertyKey }) =>\n\t\t\t\tproperty === \"deviceId\"\n\t\t\t\t&& typeof propertyKey === \"string\"\n\t\t\t\t&& propertyKey in DeviceIdType,\n\t\t\t(type: DeviceIdType) => ({\n\t\t\t\t...ValueMetadata.ReadOnlyString,\n\t\t\t\tlabel: `Device ID (${getEnumMemberName(DeviceIdType, type)})`,\n\t\t\t}),\n\t\t\t{ minVersion: 2 } as const,\n\t\t),\n\t},\n);\n\n// @noSetValueAPI This CC is read-only\n\n@API(CommandClasses[\"Manufacturer Specific\"])\nexport class ManufacturerSpecificCCAPI extends PhysicalCCAPI {\n\tpublic supportsCommand(\n\t\tcmd: ManufacturerSpecificCommand,\n\t): MaybeNotKnown<boolean> {\n\t\tswitch (cmd) {\n\t\t\tcase ManufacturerSpecificCommand.Get:\n\t\t\tcase ManufacturerSpecificCommand.Report:\n\t\t\t\treturn true; // This is mandatory\n\t\t\tcase ManufacturerSpecificCommand.DeviceSpecificGet:\n\t\t\tcase ManufacturerSpecificCommand.DeviceSpecificReport:\n\t\t\t\treturn this.version >= 2;\n\t\t}\n\t\treturn super.supportsCommand(cmd);\n\t}\n\n\t// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types\n\tpublic async get() {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.Get,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCGet({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t});\n\t\tconst response = await this.host.sendCommand<\n\t\t\tManufacturerSpecificCCReport\n\t\t>(\n\t\t\tcc,\n\t\t\tthis.commandOptions,\n\t\t);\n\t\tif (response) {\n\t\t\treturn pick(response, [\n\t\t\t\t\"manufacturerId\",\n\t\t\t\t\"productType\",\n\t\t\t\t\"productId\",\n\t\t\t]);\n\t\t}\n\t}\n\n\t@validateArgs()\n\tpublic async deviceSpecificGet(\n\t\tdeviceIdType: DeviceIdType,\n\t): Promise<MaybeNotKnown<string>> {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.DeviceSpecificGet,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCDeviceSpecificGet({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t\tdeviceIdType,\n\t\t});\n\t\tconst response = await this.host.sendCommand<\n\t\t\tManufacturerSpecificCCDeviceSpecificReport\n\t\t>(\n\t\t\tcc,\n\t\t\tthis.commandOptions,\n\t\t);\n\t\treturn response?.deviceId;\n\t}\n\n\t@validateArgs()\n\tpublic async sendReport(\n\t\toptions: ManufacturerSpecificCCReportOptions,\n\t): Promise<void> {\n\t\tthis.assertSupportsCommand(\n\t\t\tManufacturerSpecificCommand,\n\t\t\tManufacturerSpecificCommand.Report,\n\t\t);\n\n\t\tconst cc = new ManufacturerSpecificCCReport({\n\t\t\tnodeId: this.endpoint.nodeId,\n\t\t\tendpointIndex: this.endpoint.index,\n\t\t\t...options,\n\t\t});\n\t\tawait this.host.sendCommand(cc, this.commandOptions);\n\t}\n}\n\n@commandClass(CommandClasses[\"Manufacturer Specific\"])\n@implementedVersion(2)\n@ccValues(ManufacturerSpecificCCValues)\nexport class ManufacturerSpecificCC extends CommandClass {\n\tdeclare ccCommand: ManufacturerSpecificCommand;\n\n\tpublic determineRequiredCCInterviews(): readonly CommandClasses[] {\n\t\t// The Manufacturer Specific CC MUST be interviewed first\n\t\treturn [];\n\t}\n\n\tpublic async interview(\n\t\tctx: InterviewContext,\n\t): Promise<void> {\n\t\tconst node = this.getNode(ctx)!;\n\t\tconst endpoint = this.getEndpoint(ctx)!;\n\t\tconst api = CCAPI.create(\n\t\t\tCommandClasses[\"Manufacturer Specific\"],\n\t\t\tctx,\n\t\t\tendpoint,\n\t\t).withOptions({ priority: MessagePriority.NodeQuery });\n\n\t\tif (node.id !== ctx.ownNodeId) {\n\t\t\tctx.logNode(node.id, {\n\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\tmessage: `Interviewing ${this.ccName}...`,\n\t\t\t\tdirection: \"none\",\n\t\t\t});\n\n\t\t\tctx.logNode(node.id, {\n\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\tmessage: \"querying manufacturer information...\",\n\t\t\t\tdirection: \"outbound\",\n\t\t\t});\n\t\t\tconst mfResp = await api.get();\n\t\t\tif (mfResp) {\n\t\t\t\tconst logMessage =\n\t\t\t\t\t`received response for manufacturer information:\n  manufacturer: ${\n\t\t\t\t\t\tctx.lookupManufacturer(\n\t\t\t\t\t\t\tmfResp.manufacturerId,\n\t\t\t\t\t\t)\n\t\t\t\t\t\t|| \"unknown\"\n\t\t\t\t\t} (${num2hex(mfResp.manufacturerId)})\n  product type: ${num2hex(mfResp.productType)}\n  product id:   ${num2hex(mfResp.productId)}`;\n\t\t\t\tctx.logNode(node.id, {\n\t\t\t\t\tendpoint: this.endpointIndex,\n\t\t\t\t\tmessage: logMessage,\n\t\t\t\t\tdirection: \"inbound\",\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\n\t\t// Remember that the interview is complete\n\t\tthis.setInterviewComplete(ctx, true);\n\t}\n}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCReportOptions {\n\tmanufacturerId: number;\n\tproductType: number;\n\tproductId: number;\n}\n\n@CCCommand(ManufacturerSpecificCommand.Report)\n@ccValueProperty(\"manufacturerId\", ManufacturerSpecificCCValues.manufacturerId)\n@ccValueProperty(\"productType\", ManufacturerSpecificCCValues.productType)\n@ccValueProperty(\"productId\", ManufacturerSpecificCCValues.productId)\nexport class ManufacturerSpecificCCReport extends ManufacturerSpecificCC {\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCReportOptions>,\n\t) {\n\t\tsuper(options);\n\n\t\tthis.manufacturerId = options.manufacturerId;\n\t\tthis.productType = options.productType;\n\t\tthis.productId = options.productId;\n\t}\n\n\tpublic static from(\n\t\traw: CCRaw,\n\t\tctx: CCParsingContext,\n\t): ManufacturerSpecificCCReport {\n\t\tvalidatePayload(raw.payload.length >= 6);\n\t\tconst manufacturerId = raw.payload.readUInt16BE(0);\n\t\tconst productType = raw.payload.readUInt16BE(2);\n\t\tconst productId = raw.payload.readUInt16BE(4);\n\n\t\treturn new this({\n\t\t\tnodeId: ctx.sourceNodeId,\n\t\t\tmanufacturerId,\n\t\t\tproductType,\n\t\t\tproductId,\n\t\t});\n\t}\n\n\tpublic readonly manufacturerId: number;\n\n\tpublic readonly productType: number;\n\n\tpublic readonly productId: number;\n\n\tpublic serialize(ctx: CCEncodingContext): Promise<Bytes> {\n\t\tthis.payload = new Bytes(6);\n\t\tthis.payload.writeUInt16BE(this.manufacturerId, 0);\n\t\tthis.payload.writeUInt16BE(this.productType, 2);\n\t\tthis.payload.writeUInt16BE(this.productId, 4);\n\t\treturn super.serialize(ctx);\n\t}\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"manufacturer id\": num2hex(this.manufacturerId),\n\t\t\t\t\"product type\": num2hex(this.productType),\n\t\t\t\t\"product id\": num2hex(this.productId),\n\t\t\t},\n\t\t};\n\t}\n}\n\n@CCCommand(ManufacturerSpecificCommand.Get)\n@expectedCCResponse(ManufacturerSpecificCCReport)\nexport class ManufacturerSpecificCCGet extends ManufacturerSpecificCC {}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCDeviceSpecificReportOptions {\n\ttype: DeviceIdType;\n\tdeviceId: string;\n}\n\n@CCCommand(ManufacturerSpecificCommand.DeviceSpecificReport)\n@ccValueProperty(\n\t\"deviceId\",\n\tManufacturerSpecificCCValues.deviceId,\n\t(self) => [self.type],\n)\nexport class ManufacturerSpecificCCDeviceSpecificReport\n\textends ManufacturerSpecificCC\n{\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCDeviceSpecificReportOptions>,\n\t) {\n\t\tsuper(options);\n\n\t\t// TODO: Check implementation:\n\t\tthis.type = options.type;\n\t\tthis.deviceId = options.deviceId;\n\t}\n\n\tpublic static from(\n\t\traw: CCRaw,\n\t\tctx: CCParsingContext,\n\t): ManufacturerSpecificCCDeviceSpecificReport {\n\t\tvalidatePayload(raw.payload.length >= 2);\n\t\tconst type: DeviceIdType = raw.payload[0] & 0b111;\n\t\tconst dataFormat = raw.payload[1] >>> 5;\n\t\tconst dataLength = raw.payload[1] & 0b11111;\n\t\tvalidatePayload(dataLength > 0, raw.payload.length >= 2 + dataLength);\n\t\tconst deviceIdData = raw.payload.subarray(2, 2 + dataLength);\n\t\tconst deviceId: string = dataFormat === 0\n\t\t\t? deviceIdData.toString(\"utf8\")\n\t\t\t: \"0x\" + deviceIdData.toString(\"hex\");\n\n\t\treturn new this({\n\t\t\tnodeId: ctx.sourceNodeId,\n\t\t\ttype,\n\t\t\tdeviceId,\n\t\t});\n\t}\n\n\tpublic readonly type: DeviceIdType;\n\n\tpublic readonly deviceId: string;\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"device id type\": getEnumMemberName(DeviceIdType, this.type),\n\t\t\t\t\"device id\": this.deviceId,\n\t\t\t},\n\t\t};\n\t}\n}\n\n// @publicAPI\nexport interface ManufacturerSpecificCCDeviceSpecificGetOptions {\n\tdeviceIdType: DeviceIdType;\n}\n\n@CCCommand(ManufacturerSpecificCommand.DeviceSpecificGet)\n@expectedCCResponse(ManufacturerSpecificCCDeviceSpecificReport)\nexport class ManufacturerSpecificCCDeviceSpecificGet\n\textends ManufacturerSpecificCC\n{\n\tpublic constructor(\n\t\toptions: WithAddress<ManufacturerSpecificCCDeviceSpecificGetOptions>,\n\t) {\n\t\tsuper(options);\n\t\tthis.deviceIdType = options.deviceIdType;\n\t}\n\n\tpublic static from(\n\t\t_raw: CCRaw,\n\t\t_ctx: CCParsingContext,\n\t): ManufacturerSpecificCCDeviceSpecificGet {\n\t\tthrow new ZWaveError(\n\t\t\t`${this.name}: deserialization not implemented`,\n\t\t\tZWaveErrorCodes.Deserialization_NotImplemented,\n\t\t);\n\n\t\t// return new ManufacturerSpecificCCDeviceSpecificGet({\n\t\t// \tnodeId: ctx.sourceNodeId,\n\t\t// });\n\t}\n\n\tpublic deviceIdType: DeviceIdType;\n\n\tpublic serialize(ctx: CCEncodingContext): Promise<Bytes> {\n\t\tthis.payload = Bytes.from([(this.deviceIdType || 0) & 0b111]);\n\t\treturn super.serialize(ctx);\n\t}\n\n\tpublic toLogEntry(ctx?: GetValueDB): MessageOrCCLogEntry {\n\t\treturn {\n\t\t\t...super.toLogEntry(ctx),\n\t\t\tmessage: {\n\t\t\t\t\"device id type\": getEnumMemberName(\n\t\t\t\t\tDeviceIdType,\n\t\t\t\t\tthis.deviceIdType,\n\t\t\t\t),\n\t\t\t},\n\t\t};\n\t}\n}\n"],
+  "mappings": "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",
+  "names": []
 }

package/build/cjs/cc/MeterCC.d.ts

@@ -1,9 +1,7 @@
-import { type CCEncodingContext, type CCParsingContext } from "@zwave-js/cc";
-import { type GetDeviceConfig } from "@zwave-js/config";
-import { type GetNode, type GetSupportedCCVersion, type GetValueDB, type MaybeUnknown, type WithAddress } from "@zwave-js/core";
-import { CommandClasses, type ControlsCC, type EndpointId, type GetEndpoint, type MaybeNotKnown, type MessageOrCCLogEntry, type NodeId, type SinglecastCC, type SupervisionResult, type SupportsCC } from "@zwave-js/core/safe";
-import { Bytes } from "@zwave-js/shared/safe";
-import { type AllOrNone } from "@zwave-js/shared/safe";
+import type { CCEncodingContext, CCParsingContext } from "@zwave-js/cc";
+import type { GetDeviceConfig } from "@zwave-js/config";
+import { CommandClasses, type ControlsCC, type EndpointId, type GetEndpoint, type GetNode, type GetSupportedCCVersion, type GetValueDB, type MaybeNotKnown, type MaybeUnknown, type MessageOrCCLogEntry, type NodeId, type SinglecastCC, type SupervisionResult, type SupportsCC, type WithAddress } from "@zwave-js/core";
+import { type AllOrNone, Bytes } from "@zwave-js/shared";
 import { POLL_VALUE, PhysicalCCAPI, type PollValueImplementation, SET_VALUE, SET_VALUE_HOOKS, type SetValueImplementation, type SetValueImplementationHooksFactory } from "../lib/API.js";
 import { type CCRaw, CommandClass, type InterviewContext, type PersistValuesContext, type RefreshValuesContext } from "../lib/CommandClass.js";
 import { MeterCommand, type MeterReading, RateType } from "../lib/_Types.js";

package/build/cjs/cc/MeterCC.js

@@ -42,9 +42,7 @@ __export(MeterCC_exports, {
 module.exports = __toCommonJS(MeterCC_exports);
 var __validateArgs = __toESM(require("./MeterCC._validateArgs.js"), 1);
 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_API = require("../lib/API.js");
 var import_CCValueUtils = require("../lib/CCValueUtils.js");
 var import_CommandClass = require("../lib/CommandClass.js");
@@ -121,11 +119,11 @@ function getValueLabel(meterType, scale, rateType, suffix) {
 }
 __name(getValueLabel, "getValueLabel");
 function parseMeterValueAndInfo(data, offset) {
-  (0, import_safe.validatePayload)(data.length >= offset + 1);
+  (0, import_core.validatePayload)(data.length >= offset + 1);
   const type = data[offset] & 31;
   const rateType = (data[offset] & 96) >>> 5;
   const scale1Bit2 = (data[offset] & 128) >>> 7;
-  const { scale: scale1Bits10, value, bytesRead } = (0, import_safe.parseFloatWithScale)(data.subarray(offset + 1));
+  const { scale: scale1Bits10, value, bytesRead } = (0, import_core.parseFloatWithScale)(data.subarray(offset + 1));
   return {
     type,
     rateType,
@@ -146,15 +144,15 @@ function encodeMeterValueAndInfo(type, rateType, scale, value) {
   const floatParams = (0, import_core.getFloatParameters)(value);
   const valueBytes = (0, import_core.encodeFloatWithScale)(value, scale1Bits10, floatParams);
   return {
-    data: import_safe2.Bytes.concat([import_safe2.Bytes.from([typeByte]), valueBytes]),
-    floatParams: (0, import_safe3.pick)(floatParams, ["precision", "size"]),
+    data: import_shared.Bytes.concat([import_shared.Bytes.from([typeByte]), valueBytes]),
+    floatParams: (0, import_shared.pick)(floatParams, ["precision", "size"]),
     scale2
   };
 }
 __name(encodeMeterValueAndInfo, "encodeMeterValueAndInfo");
 function parseScale(scale1, data, scale2Offset) {
   if (scale1 === 7) {
-    (0, import_safe.validatePayload)(data.length >= scale2Offset + 1);
+    (0, import_core.validatePayload)(data.length >= scale2Offset + 1);
     const scale2 = data[scale2Offset];
     return scale1 + scale2;
   } else {
@@ -192,7 +190,7 @@ function isAccumulatedValue(meterType, scale) {
 }
 __name(isAccumulatedValue, "isAccumulatedValue");
 let MeterCCAPI = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_safe.CommandClasses.Meter)];
+  let _classDecorators = [(0, import_CommandClassDecorators.API)(import_core.CommandClasses.Meter)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -276,7 +274,7 @@ let MeterCCAPI = (() => {
         return {
           type: response.type,
           scale: (0, import_core.getMeterScale)(response.type, response.scale) ?? (0, import_core.getUnknownMeterScale)(response.scale),
-          ...(0, import_safe3.pick)(response, [
+          ...(0, import_shared.pick)(response, [
             "value",
             "previousValue",
             "rateType",
@@ -330,7 +328,7 @@ let MeterCCAPI = (() => {
       });
       const response = await this.host.sendCommand(cc, this.commandOptions);
       if (response) {
-        return (0, import_safe3.pick)(response, [
+        return (0, import_shared.pick)(response, [
           "type",
           "supportsReset",
           "supportedScales",
@@ -435,7 +433,7 @@ let MeterCCAPI = (() => {
   return MeterCCAPI2 = _classThis;
 })();
 let MeterCC = (() => {
-  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_safe.CommandClasses.Meter), (0, import_CommandClassDecorators.implementedVersion)(6), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.MeterCCValues)];
+  let _classDecorators = [(0, import_CommandClassDecorators.commandClass)(import_core.CommandClasses.Meter), (0, import_CommandClassDecorators.implementedVersion)(6), (0, import_CommandClassDecorators.ccValues)(import_CCValues_generated.MeterCCValues)];
   let _classDescriptor;
   let _classExtraInitializers = [];
   let _classThis;
@@ -457,8 +455,8 @@ let MeterCC = (() => {
     async interview(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
-      const api = import_API.CCAPI.create(import_safe.CommandClasses.Meter, ctx, endpoint).withOptions({
-        priority: import_safe.MessagePriority.NodeQuery
+      const api = import_API.CCAPI.create(import_core.CommandClasses.Meter, ctx, endpoint).withOptions({
+        priority: import_core.MessagePriority.NodeQuery
       });
       ctx.logNode(node.id, {
         endpoint: this.endpointIndex,
@@ -477,7 +475,7 @@ let MeterCC = (() => {
 type:                 ${(0, import_core.getMeterName)(suppResp.type)}
 supported scales:     ${suppResp.supportedScales.map((s) => ((0, import_core.getMeterScale)(suppResp.type, s) ?? (0, import_core.getUnknownMeterScale)(s)).label).map((label) => `
 \xB7 ${label}`).join("")}
-supported rate types: ${suppResp.supportedRateTypes.map((rt) => (0, import_safe3.getEnumMemberName)(import_Types.RateType, rt)).map((label) => `
+supported rate types: ${suppResp.supportedRateTypes.map((rt) => (0, import_shared.getEnumMemberName)(import_Types.RateType, rt)).map((label) => `
 \xB7 ${label}`).join("")}
 supports reset:       ${suppResp.supportsReset}`;
           ctx.logNode(node.id, {
@@ -500,8 +498,8 @@ supports reset:       ${suppResp.supportsReset}`;
     async refreshValues(ctx) {
       const node = this.getNode(ctx);
       const endpoint = this.getEndpoint(ctx);
-      const api = import_API.CCAPI.create(import_safe.CommandClasses.Meter, ctx, endpoint).withOptions({
-        priority: import_safe.MessagePriority.NodeQuery
+      const api = import_API.CCAPI.create(import_core.CommandClasses.Meter, ctx, endpoint).withOptions({
+        priority: import_core.MessagePriority.NodeQuery
       });
       if (api.version === 1) {
         ctx.logNode(node.id, {
@@ -519,7 +517,7 @@ supports reset:       ${suppResp.supportsReset}`;
           for (const scale of supportedScales) {
             ctx.logNode(node.id, {
               endpoint: this.endpointIndex,
-              message: `querying meter value (type = ${(0, import_core.getMeterName)(type)}, scale = ${((0, import_core.getMeterScale)(type, scale) ?? (0, import_core.getUnknownMeterScale)(scale)).label}${rateType != void 0 ? `, rate type = ${(0, import_safe3.getEnumMemberName)(import_Types.RateType, rateType)}` : ""})...`,
+              message: `querying meter value (type = ${(0, import_core.getMeterName)(type)}, scale = ${((0, import_core.getMeterScale)(type, scale) ?? (0, import_core.getUnknownMeterScale)(scale)).label}${rateType != void 0 ? `, rate type = ${(0, import_shared.getEnumMemberName)(import_Types.RateType, rateType)}` : ""})...`,
               direction: "outbound"
             });
             await api.get({ scale, rateType });
@@ -575,7 +573,7 @@ supports reset:       ${suppResp.supportsReset}`;
           ret = "default";
         }
         if (rateType !== import_Types.RateType.Unspecified) {
-          ret += "_" + (0, import_safe3.getEnumMemberName)(import_Types.RateType, rateType);
+          ret += "_" + (0, import_shared.getEnumMemberName)(import_Types.RateType, rateType);
         }
         return ret;
       } else if (property === "reset" && typeof propertyKey === "number") {
@@ -613,7 +611,7 @@ let MeterCCReport = (() => {
       this.value = options.value;
       this.previousValue = options.previousValue;
       this.rateType = options.rateType ?? import_Types.RateType.Unspecified;
-      this.deltaTime = options.deltaTime ?? import_safe.UNKNOWN_STATE;
+      this.deltaTime = options.deltaTime ?? import_core.UNKNOWN_STATE;
     }
     static from(raw, ctx) {
       const { type, rateType, scale1, value, bytesRead } = parseMeterValueAndInfo(raw.payload, 0);
@@ -625,16 +623,16 @@ let MeterCCReport = (() => {
         deltaTime = raw.payload.readUInt16BE(offset);
         offset += 2;
         if (deltaTime === 65535) {
-          deltaTime = import_safe.UNKNOWN_STATE;
+          deltaTime = import_core.UNKNOWN_STATE;
         }
         if (
           // Previous value is included only if delta time is not 0
           deltaTime !== 0 && raw.payload.length >= offset + floatSize
         ) {
-          const { value: prevValue } = (0, import_safe.parseFloatWithScale)(
+          const { value: prevValue } = (0, import_core.parseFloatWithScale)(
             // This float is split in the payload
-            import_safe2.Bytes.concat([
-              import_safe2.Bytes.from([raw.payload[1]]),
+            import_shared.Bytes.concat([
+              import_shared.Bytes.from([raw.payload[1]]),
               raw.payload.subarray(offset)
             ])
           );
@@ -663,20 +661,20 @@ let MeterCCReport = (() => {
       const scale = (0, import_core.getMeterScale)(this.type, this.scale) ?? (0, import_core.getUnknownMeterScale)(this.scale);
       const measurementValidation = !ctx.getDeviceConfig?.(this.nodeId)?.compat?.disableStrictMeasurementValidation;
       if (measurementValidation) {
-        import_safe.validatePayload.withReason(`Unknown meter type ${(0, import_safe3.num2hex)(this.type)} or corrupted data`)(!!meter);
-        import_safe.validatePayload.withReason(`Unknown meter scale ${(0, import_safe3.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, import_core.getUnknownMeterScale)(this.scale).label);
+        import_core.validatePayload.withReason(`Unknown meter type ${(0, import_shared.num2hex)(this.type)} or corrupted data`)(!!meter);
+        import_core.validatePayload.withReason(`Unknown meter scale ${(0, import_shared.num2hex)(this.scale)} or corrupted data`)(scale.label !== (0, import_core.getUnknownMeterScale)(this.scale).label);
         if (ccVersion >= 2) {
           const expectedType = this.getValue(ctx, import_CCValues_generated.MeterCCValues.type);
           if (expectedType != void 0) {
-            import_safe.validatePayload.withReason("Unexpected meter type or corrupted data")(this.type === expectedType);
+            import_core.validatePayload.withReason("Unexpected meter type or corrupted data")(this.type === expectedType);
           }
           const supportedScales = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedScales);
           if (supportedScales?.length) {
-            import_safe.validatePayload.withReason(`Unsupported meter scale ${scale.label} or corrupted data`)(supportedScales.includes(this.scale));
+            import_core.validatePayload.withReason(`Unsupported meter scale ${scale.label} or corrupted data`)(supportedScales.includes(this.scale));
           }
           const supportedRateTypes = this.getValue(ctx, import_CCValues_generated.MeterCCValues.supportedRateTypes);
           if (supportedRateTypes?.length) {
-            import_safe.validatePayload.withReason(`Unsupported rate type ${(0, import_safe3.getEnumMemberName)(import_Types.RateType, this.rateType)} or corrupted data`)(supportedRateTypes.includes(this.rateType));
+            import_core.validatePayload.withReason(`Unsupported rate type ${(0, import_shared.getEnumMemberName)(import_Types.RateType, this.rateType)} or corrupted data`)(supportedRateTypes.includes(this.rateType));
           }
         }
       }
@@ -703,9 +701,9 @@ let MeterCCReport = (() => {
     serialize(ctx) {
       const { data: typeAndValue, floatParams, scale2 } = encodeMeterValueAndInfo(this.type, this.rateType, this.scale, this.value);
       const deltaTime = this.deltaTime ?? 65535;
-      const deltaTimeBytes = new import_safe2.Bytes(2);
+      const deltaTimeBytes = new import_shared.Bytes(2);
       deltaTimeBytes.writeUInt16BE(deltaTime, 0);
-      this.payload = import_safe2.Bytes.concat([
+      this.payload = import_shared.Bytes.concat([
         typeAndValue,
         deltaTimeBytes
       ]);
@@ -716,15 +714,15 @@ let MeterCCReport = (() => {
           // we discard the scale anyways
           floatParams
         ).subarray(1);
-        this.payload = import_safe2.Bytes.concat([
+        this.payload = import_shared.Bytes.concat([
           this.payload,
           prevValueBytes
         ]);
       }
       if (scale2 != void 0) {
-        this.payload = import_safe2.Bytes.concat([
+        this.payload = import_shared.Bytes.concat([
           this.payload,
-          import_safe2.Bytes.from([scale2])
+          import_shared.Bytes.from([scale2])
         ]);
       }
       return super.serialize(ctx);
@@ -734,10 +732,10 @@ let MeterCCReport = (() => {
       const message = {
         "meter type": (0, import_core.getMeterName)(this.type),
         scale: scale.label,
-        "rate type": (0, import_safe3.getEnumMemberName)(import_Types.RateType, this.rateType),
+        "rate type": (0, import_shared.getEnumMemberName)(import_Types.RateType, this.rateType),
         value: this.value
       };
-      if (this.deltaTime !== import_safe.UNKNOWN_STATE) {
+      if (this.deltaTime !== import_core.UNKNOWN_STATE) {
         message["time delta"] = `${this.deltaTime} seconds`;
       }
       if (this.previousValue != void 0) {
@@ -787,7 +785,7 @@ let MeterCCGet = (() => {
         rateType = (raw.payload[0] & 192) >>> 6;
         scale = (raw.payload[0] & 56) >>> 3;
         if (scale === 7) {
-          (0, import_safe.validatePayload)(raw.payload.length >= 2);
+          (0, import_core.validatePayload)(raw.payload.length >= 2);
           scale += raw.payload[1];
         }
       }
@@ -824,7 +822,7 @@ let MeterCCGet = (() => {
         rateTypeFlags = this.rateType & 3;
         bufferLength = Math.max(bufferLength, 1);
       }
-      this.payload = import_safe2.Bytes.alloc(bufferLength, 0);
+      this.payload = import_shared.Bytes.alloc(bufferLength, 0);
       this.payload[0] = rateTypeFlags << 6 | scale1 << 3;
       if (scale2)
         this.payload[1] = scale2;
@@ -833,7 +831,7 @@ let MeterCCGet = (() => {
     toLogEntry(ctx) {
       const message = {};
       if (this.rateType != void 0) {
-        message["rate type"] = (0, import_safe3.getEnumMemberName)(import_Types.RateType, this.rateType);
+        message["rate type"] = (0, import_shared.getEnumMemberName)(import_Types.RateType, this.rateType);
       }
       if (this.scale != void 0) {
         if (ctx) {
@@ -881,23 +879,23 @@ let MeterCCSupportedReport = (() => {
       this.supportedRateTypes = options.supportedRateTypes;
     }
     static from(raw, ctx) {
-      (0, import_safe.validatePayload)(raw.payload.length >= 2);
+      (0, import_core.validatePayload)(raw.payload.length >= 2);
       const type = raw.payload[0] & 31;
       const supportsReset = !!(raw.payload[0] & 128);
       const hasMoreScales = !!(raw.payload[1] & 128);
       let supportedScales;
       if (hasMoreScales) {
-        (0, import_safe.validatePayload)(raw.payload.length >= 3);
+        (0, import_core.validatePayload)(raw.payload.length >= 3);
         const extraBytes = raw.payload[2];
-        (0, import_safe.validatePayload)(raw.payload.length >= 3 + extraBytes);
-        supportedScales = (0, import_safe.parseBitMask)(import_safe2.Bytes.concat([
-          import_safe2.Bytes.from([raw.payload[1] & 127]),
+        (0, import_core.validatePayload)(raw.payload.length >= 3 + extraBytes);
+        supportedScales = (0, import_core.parseBitMask)(import_shared.Bytes.concat([
+          import_shared.Bytes.from([raw.payload[1] & 127]),
           raw.payload.subarray(3, 3 + extraBytes)
         ]), 0).map((scale) => scale >= 8 ? scale - 1 : scale);
       } else {
-        supportedScales = (0, import_safe.parseBitMask)(import_safe2.Bytes.from([raw.payload[1]]), 0);
+        supportedScales = (0, import_core.parseBitMask)(import_shared.Bytes.from([raw.payload[1]]), 0);
       }
-      const supportedRateTypes = (0, import_safe.parseBitMask)(import_safe2.Bytes.from([(raw.payload[0] & 96) >>> 5]), 1);
+      const supportedRateTypes = (0, import_core.parseBitMask)(import_shared.Bytes.from([(raw.payload[0] & 96) >>> 5]), 1);
       return new this({
         nodeId: ctx.sourceNodeId,
         type,
@@ -944,15 +942,15 @@ let MeterCCSupportedReport = (() => {
         -1
       );
       const scalesByte1 = supportedScales[0] >>> 1 | (supportedScales.length > 1 ? 128 : 0);
-      this.payload = import_safe2.Bytes.from([
+      this.payload = import_shared.Bytes.from([
         typeByte,
         scalesByte1
       ]);
       if (supportedScales.length > 1) {
-        this.payload = import_safe2.Bytes.concat([
+        this.payload = import_shared.Bytes.concat([
           this.payload,
-          import_safe2.Bytes.from([supportedScales.length - 1]),
-          import_safe2.Bytes.from(supportedScales.subarray(1))
+          import_shared.Bytes.from([supportedScales.length - 1]),
+          import_shared.Bytes.from(supportedScales.subarray(1))
         ]);
       }
       return super.serialize(ctx);
@@ -963,7 +961,7 @@ let MeterCCSupportedReport = (() => {
         "supports reset": this.supportsReset,
         "supported scales": `${this.supportedScales.map((scale) => `
 \xB7 ${((0, import_core.getMeterScale)(this.type, scale) ?? (0, import_core.getUnknownMeterScale)(scale)).label}`).join("")}`,
-        "supported rate types": this.supportedRateTypes.map((rt) => (0, import_safe3.getEnumMemberName)(import_Types.RateType, rt)).join(", ")
+        "supported rate types": this.supportedRateTypes.map((rt) => (0, import_shared.getEnumMemberName)(import_Types.RateType, rt)).join(", ")
       };
       return {
         ...super.toLogEntry(ctx),
@@ -1048,9 +1046,9 @@ let MeterCCReset = (() => {
         const { data: typeAndValue, scale2 } = encodeMeterValueAndInfo(this.type, this.rateType, this.scale, this.targetValue);
         this.payload = typeAndValue;
         if (scale2 != void 0) {
-          this.payload = import_safe2.Bytes.concat([
+          this.payload = import_shared.Bytes.concat([
             this.payload,
-            import_safe2.Bytes.from([scale2])
+            import_shared.Bytes.from([scale2])
           ]);
         }
       }
@@ -1062,7 +1060,7 @@ let MeterCCReset = (() => {
         message.type = (0, import_core.getMeterName)(this.type);
       }
       if (this.rateType != void 0) {
-        message["rate type"] = (0, import_safe3.getEnumMemberName)(import_Types.RateType, this.rateType);
+        message["rate type"] = (0, import_shared.getEnumMemberName)(import_Types.RateType, this.rateType);
       }
       if (this.type != void 0 && this.scale != void 0) {
         message.scale = ((0, import_core.getMeterScale)(this.type, this.scale) ?? (0, import_core.getUnknownMeterScale)(this.scale)).label;