@zwave-js/cc 14.3.10 → 15.0.0-beta.1

package/build/cjs/lib/CCValueUtils.js

@@ -0,0 +1,93 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var CCValueUtils_exports = {};
+__export(CCValueUtils_exports, {
+  irrigationValveIdToMetadataPrefix: () => irrigationValveIdToMetadataPrefix,
+  meterTypesToPropertyKey: () => meterTypesToPropertyKey,
+  multilevelSwitchTypeProperties: () => multilevelSwitchTypeProperties,
+  multilevelSwitchTypeToActions: () => multilevelSwitchTypeToActions,
+  windowCoveringParameterToLevelChangeLabel: () => windowCoveringParameterToLevelChangeLabel,
+  windowCoveringParameterToMetadataStates: () => windowCoveringParameterToMetadataStates
+});
+module.exports = __toCommonJS(CCValueUtils_exports);
+var import_Types = require("./_Types.js");
+function multilevelSwitchTypeToActions(switchType) {
+  if (!switchType.includes("/"))
+    switchType = import_Types.SwitchType[2];
+  return switchType.split("/", 2);
+}
+__name(multilevelSwitchTypeToActions, "multilevelSwitchTypeToActions");
+const multilevelSwitchTypeProperties = Object.keys(import_Types.SwitchType).filter((key) => key.includes("/")).map((key) => multilevelSwitchTypeToActions(key)).reduce((acc, cur) => acc.concat(...cur), []);
+function windowCoveringParameterToMetadataStates(parameter) {
+  switch (parameter) {
+    case import_Types.WindowCoveringParameter["Vertical Slats Angle (no position)"]:
+    case import_Types.WindowCoveringParameter["Vertical Slats Angle"]:
+      return {
+        0: "Closed (right inside)",
+        50: "Open",
+        99: "Closed (left inside)"
+      };
+    case import_Types.WindowCoveringParameter["Horizontal Slats Angle (no position)"]:
+    case import_Types.WindowCoveringParameter["Horizontal Slats Angle"]:
+      return {
+        0: "Closed (up inside)",
+        50: "Open",
+        99: "Closed (down inside)"
+      };
+  }
+  return {
+    0: "Closed",
+    99: "Open"
+  };
+}
+__name(windowCoveringParameterToMetadataStates, "windowCoveringParameterToMetadataStates");
+function windowCoveringParameterToLevelChangeLabel(parameter, direction) {
+  switch (parameter) {
+    // For angle control, both directions are closed, so we specify it explicitly
+    case import_Types.WindowCoveringParameter["Vertical Slats Angle (no position)"]:
+    case import_Types.WindowCoveringParameter["Vertical Slats Angle"]:
+      return `Change tilt (${direction === "up" ? "left inside" : "right inside"})`;
+    case import_Types.WindowCoveringParameter["Horizontal Slats Angle (no position)"]:
+    case import_Types.WindowCoveringParameter["Horizontal Slats Angle"]:
+      return `Change tilt (${direction === "up" ? "down inside" : "up inside"})`;
+  }
+  return direction === "up" ? "Open" : "Close";
+}
+__name(windowCoveringParameterToLevelChangeLabel, "windowCoveringParameterToLevelChangeLabel");
+function meterTypesToPropertyKey(meterType, rateType, scale) {
+  return meterType << 16 | scale << 8 | rateType;
+}
+__name(meterTypesToPropertyKey, "meterTypesToPropertyKey");
+function irrigationValveIdToMetadataPrefix(valveId) {
+  if (valveId === "master")
+    return "Master valve";
+  return `Valve ${valveId.toString().padStart(3, "0")}`;
+}
+__name(irrigationValveIdToMetadataPrefix, "irrigationValveIdToMetadataPrefix");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  irrigationValveIdToMetadataPrefix,
+  meterTypesToPropertyKey,
+  multilevelSwitchTypeProperties,
+  multilevelSwitchTypeToActions,
+  windowCoveringParameterToLevelChangeLabel,
+  windowCoveringParameterToMetadataStates
+});
+//# sourceMappingURL=CCValueUtils.js.map

package/build/cjs/lib/CCValueUtils.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/lib/CCValueUtils.ts"],
+  "sourcesContent": ["import {\n\ttype RateType,\n\tSwitchType,\n\ttype ValveId,\n\tWindowCoveringParameter,\n} from \"./_Types.js\";\n\n/**\n * Translates a switch type into two actions that may be performed. Unknown types default to Down/Up\n */\n\nexport function multilevelSwitchTypeToActions(\n\tswitchType: string,\n): [down: string, up: string] {\n\tif (!switchType.includes(\"/\")) switchType = SwitchType[0x02]; // Down/Up\n\treturn switchType.split(\"/\", 2) as any;\n}\n/**\n * The property names are organized so that positive motions are at odd indices and negative motions at even indices\n */\n\nexport const multilevelSwitchTypeProperties = Object.keys(SwitchType)\n\t.filter((key) => key.includes(\"/\"))\n\t.map((key) => multilevelSwitchTypeToActions(key))\n\t.reduce<string[]>((acc, cur) => acc.concat(...cur), []);\n\nexport function windowCoveringParameterToMetadataStates(\n\tparameter: WindowCoveringParameter,\n): Record<number, string> {\n\tswitch (parameter) {\n\t\tcase WindowCoveringParameter[\"Vertical Slats Angle (no position)\"]:\n\t\tcase WindowCoveringParameter[\"Vertical Slats Angle\"]:\n\t\t\treturn {\n\t\t\t\t0: \"Closed (right inside)\",\n\t\t\t\t50: \"Open\",\n\t\t\t\t99: \"Closed (left inside)\",\n\t\t\t};\n\n\t\tcase WindowCoveringParameter[\"Horizontal Slats Angle (no position)\"]:\n\t\tcase WindowCoveringParameter[\"Horizontal Slats Angle\"]:\n\t\t\treturn {\n\t\t\t\t0: \"Closed (up inside)\",\n\t\t\t\t50: \"Open\",\n\t\t\t\t99: \"Closed (down inside)\",\n\t\t\t};\n\t}\n\n\treturn {\n\t\t0: \"Closed\",\n\t\t99: \"Open\",\n\t};\n}\n\nexport function windowCoveringParameterToLevelChangeLabel(\n\tparameter: WindowCoveringParameter,\n\tdirection: \"up\" | \"down\",\n): string {\n\tswitch (parameter) {\n\t\t// For angle control, both directions are closed, so we specify it explicitly\n\t\tcase WindowCoveringParameter[\"Vertical Slats Angle (no position)\"]:\n\t\tcase WindowCoveringParameter[\"Vertical Slats Angle\"]:\n\t\t\treturn `Change tilt (${\n\t\t\t\tdirection === \"up\" ? \"left inside\" : \"right inside\"\n\t\t\t})`;\n\n\t\tcase WindowCoveringParameter[\"Horizontal Slats Angle (no position)\"]:\n\t\tcase WindowCoveringParameter[\"Horizontal Slats Angle\"]:\n\t\t\t// Horizontal slats refer to the position of the inner side of the slats\n\t\t\t// where a high level (99) actually means they face down\n\t\t\treturn `Change tilt (${\n\t\t\t\tdirection === \"up\" ? \"down inside\" : \"up inside\"\n\t\t\t})`;\n\t}\n\t// For all other parameters, refer to the amount of light that is let in\n\treturn direction === \"up\" ? \"Open\" : \"Close\";\n}\n\nexport function meterTypesToPropertyKey(\n\tmeterType: number,\n\trateType: RateType,\n\tscale: number,\n): number {\n\treturn (meterType << 16) | (scale << 8) | rateType;\n}\n\nexport function irrigationValveIdToMetadataPrefix(valveId: ValveId): string {\n\tif (valveId === \"master\") return \"Master valve\";\n\treturn `Valve ${valveId.toString().padStart(3, \"0\")}`;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;AAAA,mBAKO;AAMD,SAAU,8BACf,YAAkB;AAElB,MAAI,CAAC,WAAW,SAAS,GAAG;AAAG,iBAAa,wBAAW,CAAI;AAC3D,SAAO,WAAW,MAAM,KAAK,CAAC;AAC/B;AALgB;AAUT,MAAM,iCAAiC,OAAO,KAAK,uBAAU,EAClE,OAAO,CAAC,QAAQ,IAAI,SAAS,GAAG,CAAC,EACjC,IAAI,CAAC,QAAQ,8BAA8B,GAAG,CAAC,EAC/C,OAAiB,CAAC,KAAK,QAAQ,IAAI,OAAO,GAAG,GAAG,GAAG,CAAA,CAAE;AAEjD,SAAU,wCACf,WAAkC;AAElC,UAAQ,WAAW;IAClB,KAAK,qCAAwB,oCAAoC;IACjE,KAAK,qCAAwB,sBAAsB;AAClD,aAAO;QACN,GAAG;QACH,IAAI;QACJ,IAAI;;IAGN,KAAK,qCAAwB,sCAAsC;IACnE,KAAK,qCAAwB,wBAAwB;AACpD,aAAO;QACN,GAAG;QACH,IAAI;QACJ,IAAI;;EAEP;AAEA,SAAO;IACN,GAAG;IACH,IAAI;;AAEN;AAzBgB;AA2BV,SAAU,0CACf,WACA,WAAwB;AAExB,UAAQ,WAAW;;IAElB,KAAK,qCAAwB,oCAAoC;IACjE,KAAK,qCAAwB,sBAAsB;AAClD,aAAO,gBACN,cAAc,OAAO,gBAAgB,cACtC;IAED,KAAK,qCAAwB,sCAAsC;IACnE,KAAK,qCAAwB,wBAAwB;AAGpD,aAAO,gBACN,cAAc,OAAO,gBAAgB,WACtC;EACF;AAEA,SAAO,cAAc,OAAO,SAAS;AACtC;AAtBgB;AAwBV,SAAU,wBACf,WACA,UACA,OAAa;AAEb,SAAQ,aAAa,KAAO,SAAS,IAAK;AAC3C;AANgB;AAQV,SAAU,kCAAkC,SAAgB;AACjE,MAAI,YAAY;AAAU,WAAO;AACjC,SAAO,SAAS,QAAQ,SAAQ,EAAG,SAAS,GAAG,GAAG,CAAC;AACpD;AAHgB;",
+  "names": []
+}

package/build/cjs/lib/CommandClass.d.ts

@@ -1,9 +1,12 @@
-import { type BroadcastCC, type CCAddress, type CCId, CommandClasses, type ControlsCC, EncapsulationFlags, type EndpointId, type FrameType, type GetAllEndpoints, type GetCCs, type GetEndpoint, type ListenBehavior, type MessageOrCCLogEntry, type ModifyCCs, type MulticastCC, type MulticastDestination, type NodeId, type QueryNodeStatus, type QuerySecurityClasses, type SetSecurityClass, type SinglecastCC, type SupportsCC, type ValueDB, type ValueID, type ValueMetadata, ZWaveErrorCodes } from "@zwave-js/core";
-import type { CCEncodingContext, CCParsingContext, GetDeviceConfig, GetInterviewOptions, GetNode, GetSupportedCCVersion, GetValueDB, HostIDs, LogNode, LookupManufacturer } from "@zwave-js/host";
-import { Bytes, type JSONObject } from "@zwave-js/shared";
+import { type CCEncodingContext, type CCParsingContext } from "@zwave-js/cc";
+import { type GetDeviceConfig, type LookupManufacturer } from "@zwave-js/config";
+import { type LogNode } from "@zwave-js/core";
+import { type BroadcastCC, type CCAddress, type CCId, CommandClasses, type ControlsCC, EncapsulationFlags, type EndpointId, type FrameType, type GetAllEndpoints, type GetCCs, type GetEndpoint, type GetNode, type GetSupportedCCVersion, type GetValueDB, type HostIDs, type ListenBehavior, type MessageOrCCLogEntry, type ModifyCCs, type MulticastCC, type MulticastDestination, type NodeId, type QueryNodeStatus, type QuerySecurityClasses, type SetSecurityClass, type SinglecastCC, type SupportsCC, type ValueDB, type ValueID, type ValueMetadata, ZWaveErrorCodes } from "@zwave-js/core/safe";
+import { Bytes, type JSONObject } from "@zwave-js/shared/safe";
 import type { CCAPIHost, CCAPINode, ValueIDProperties } from "./API.js";
 import { type EncapsulatingCommandClass } from "./EncapsulatingCommandClass.js";
 import { type CCValue, type DynamicCCValue, type StaticCCValue } from "./Values.js";
+import { type GetInterviewOptions } from "./traits.js";
 export interface CommandClassOptions extends CCAddress {
     ccId?: number;
     ccCommand?: number;
@@ -25,12 +28,8 @@ export declare class CCRaw {
 }
 export declare class CommandClass implements CCId {
     constructor(options: CommandClassOptions);
-    /** @deprecated Use {@link parseAsync} instead */
-    static parse(data: Uint8Array, ctx: CCParsingContext): CommandClass;
-    static parseAsync(data: Uint8Array, ctx: CCParsingContext): Promise<CommandClass>;
-    /** @deprecated Use {@link fromAsync} instead */
-    static from(raw: CCRaw, ctx: CCParsingContext): CommandClass;
-    static fromAsync(raw: CCRaw, ctx: CCParsingContext): Promise<CommandClass>;
+    static parse(data: Uint8Array, ctx: CCParsingContext): Promise<CommandClass>;
+    static from(raw: CCRaw, ctx: CCParsingContext): CommandClass | Promise<CommandClass>;
     /** This CC's identifier */
     ccId: CommandClasses;
     ccCommand?: number;
@@ -60,13 +59,8 @@ export declare class CommandClass implements CCId {
     setInterviewComplete(host: GetValueDB, complete: boolean): void;
     /**
      * Serializes this CommandClass to be embedded in a message payload or another CC
-     * @deprecated Use {@link serializeAsync} instead
      */
-    serialize(ctx: CCEncodingContext): Bytes;
-    /**
-     * Serializes this CommandClass to be embedded in a message payload or another CC
-     */
-    serializeAsync(ctx: CCEncodingContext): Promise<Bytes>;
+    serialize(ctx: CCEncodingContext): Promise<Bytes>;
     prepareRetransmission(): void;
     /**
      * Create an instance of the given CC without checking whether it is supported.
@@ -186,13 +180,8 @@ export declare class CommandClass implements CCId {
      * @param _session The previously received set of messages received in this partial CC session
      */
     expectMoreMessages(_session: CommandClass[]): boolean;
-    /**
-     * Include previously received partial responses into a final CC
-     * @deprecated Use {@link mergePartialCCsAsync} instead
-     */
-    mergePartialCCs(_partials: CommandClass[], _ctx: CCParsingContext): void;
     /** Include previously received partial responses into a final CC */
-    mergePartialCCsAsync(_partials: CommandClass[], _ctx: CCParsingContext): Promise<void>;
+    mergePartialCCs(_partials: CommandClass[], _ctx: CCParsingContext): Promise<void>;
     /** Tests whether this CC expects at least one command in return */
     expectsCCResponse(): boolean;
     isExpectedCCResponse(received: CommandClass): boolean;

package/build/cjs/lib/CommandClass.js

@@ -25,14 +25,14 @@ __export(CommandClass_exports, {
   getEffectiveCCVersion: () => getEffectiveCCVersion
 });
 module.exports = __toCommonJS(CommandClass_exports);
-var import_core = require("@zwave-js/core");
-var import_shared = require("@zwave-js/shared");
+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_CommandClassDecorators = require("./CommandClassDecorators.js");
 var import_EncapsulatingCommandClass = require("./EncapsulatingCommandClass.js");
 var import_Values = require("./Values.js");
 function getEffectiveCCVersion(ctx, cc, defaultVersion) {
-  if (typeof cc.nodeId !== "number" || cc.nodeId === import_core.NODE_ID_BROADCAST || cc.nodeId === import_core.NODE_ID_BROADCAST_LR) {
+  if (typeof cc.nodeId !== "number" || cc.nodeId === import_safe.NODE_ID_BROADCAST || cc.nodeId === import_safe.NODE_ID_BROADCAST_LR) {
     return (0, import_CommandClassDecorators.getImplementedVersion)(cc.ccId);
   }
   return ctx.getSupportedCCVersion(cc.ccId, cc.nodeId, cc.endpointIndex) || (defaultVersion ?? (0, import_CommandClassDecorators.getImplementedVersion)(cc.ccId));
@@ -51,21 +51,21 @@ class CCRaw {
     this.payload = payload;
   }
   static parse(data) {
-    const { ccId, bytesRead: ccIdLength } = (0, import_core.parseCCId)(data);
-    if (ccId === import_core.CommandClasses["No Operation"]) {
-      return new CCRaw(ccId, void 0, new import_shared.Bytes());
+    const { ccId, bytesRead: ccIdLength } = (0, import_safe.parseCCId)(data);
+    if (ccId === import_safe.CommandClasses["No Operation"]) {
+      return new CCRaw(ccId, void 0, new import_safe2.Bytes());
     }
     let ccCommand = data[ccIdLength];
-    let payload = import_shared.Bytes.view(data.subarray(ccIdLength + 1));
-    if (ccId === import_core.CommandClasses["Transport Service"]) {
-      payload = import_shared.Bytes.concat([
-        import_shared.Bytes.from([ccCommand & 7]),
+    let payload = import_safe2.Bytes.view(data.subarray(ccIdLength + 1));
+    if (ccId === import_safe.CommandClasses["Transport Service"]) {
+      payload = import_safe2.Bytes.concat([
+        import_safe2.Bytes.from([ccCommand & 7]),
         payload
       ]);
       ccCommand = ccCommand & 248;
-    } else if (ccId === import_core.CommandClasses["Manufacturer Proprietary"]) {
-      payload = import_shared.Bytes.concat([
-        import_shared.Bytes.from([ccCommand]),
+    } else if (ccId === import_safe.CommandClasses["Manufacturer Proprietary"]) {
+      payload = import_safe2.Bytes.concat([
+        import_safe2.Bytes.from([ccCommand]),
         payload
       ]);
       ccCommand = void 0;
@@ -87,26 +87,25 @@ class CommandClass {
     this.endpointIndex = endpointIndex;
     this.ccId = ccId;
     this.ccCommand = ccCommand;
-    this.payload = import_shared.Bytes.view(payload);
+    this.payload = import_safe2.Bytes.view(payload);
   }
-  /** @deprecated Use {@link parseAsync} instead */
-  static parse(data, ctx) {
+  static async parse(data, ctx) {
     const raw = CCRaw.parse(data);
     const CCConstructor = (0, import_CommandClassDecorators.getCCConstructor)(raw.ccId);
     if (!CCConstructor) {
-      return CommandClass.from(raw, ctx);
+      return await CommandClass.from(raw, ctx);
     }
     let CommandConstructor;
     if (raw.ccCommand != void 0) {
       CommandConstructor = (0, import_CommandClassDecorators.getCCCommandConstructor)(raw.ccId, raw.ccCommand);
     }
     try {
-      return (CommandConstructor ?? CCConstructor).from(raw, ctx);
+      return await (CommandConstructor ?? CCConstructor).from(raw, ctx);
     } catch (e) {
-      if ((0, import_core.isZWaveError)(e) && e.code === import_core.ZWaveErrorCodes.PacketFormat_InvalidPayload) {
-        const ccName = CommandConstructor?.name ?? `${(0, import_core.getCCName)(raw.ccId)} CC`;
+      if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.PacketFormat_InvalidPayload) {
+        const ccName = CommandConstructor?.name ?? `${(0, import_safe.getCCName)(raw.ccId)} CC`;
         let reason;
-        if (typeof e.context === "string" || typeof e.context === "number" && import_core.ZWaveErrorCodes[e.context] != void 0) {
+        if (typeof e.context === "string" || typeof e.context === "number" && import_safe.ZWaveErrorCodes[e.context] != void 0) {
           reason = e.context;
         }
         const ret = new InvalidCC({
@@ -121,38 +120,6 @@ class CommandClass {
       throw e;
     }
   }
-  static async parseAsync(data, ctx) {
-    const raw = CCRaw.parse(data);
-    const CCConstructor = (0, import_CommandClassDecorators.getCCConstructor)(raw.ccId);
-    if (!CCConstructor) {
-      return CommandClass.fromAsync(raw, ctx);
-    }
-    let CommandConstructor;
-    if (raw.ccCommand != void 0) {
-      CommandConstructor = (0, import_CommandClassDecorators.getCCCommandConstructor)(raw.ccId, raw.ccCommand);
-    }
-    try {
-      return await (CommandConstructor ?? CCConstructor).fromAsync(raw, ctx);
-    } catch (e) {
-      if ((0, import_core.isZWaveError)(e) && e.code === import_core.ZWaveErrorCodes.PacketFormat_InvalidPayload) {
-        const ccName = CommandConstructor?.name ?? `${(0, import_core.getCCName)(raw.ccId)} CC`;
-        let reason;
-        if (typeof e.context === "string" || typeof e.context === "number" && import_core.ZWaveErrorCodes[e.context] != void 0) {
-          reason = e.context;
-        }
-        const ret = new InvalidCC({
-          nodeId: ctx.sourceNodeId,
-          ccId: raw.ccId,
-          ccCommand: raw.ccCommand,
-          ccName,
-          reason
-        });
-        return ret;
-      }
-      throw e;
-    }
-  }
-  /** @deprecated Use {@link fromAsync} instead */
   static from(raw, ctx) {
     return new this({
       nodeId: ctx.sourceNodeId,
@@ -161,15 +128,11 @@ class CommandClass {
       payload: raw.payload
     });
   }
-  // eslint-disable-next-line @typescript-eslint/require-await
-  static async fromAsync(raw, ctx) {
-    return this.from(raw, ctx);
-  }
   /** This CC's identifier */
   ccId;
   ccCommand;
   get ccName() {
-    return (0, import_core.getCCName)(this.ccId);
+    return (0, import_safe.getCCName)(this.ccId);
   }
   /** The ID of the target node(s) */
   nodeId;
@@ -181,7 +144,7 @@ class CommandClass {
    *
    * Don't use this directly, this is used internally.
    */
-  encapsulationFlags = import_core.EncapsulationFlags.None;
+  encapsulationFlags = import_safe.EncapsulationFlags.None;
   /** Activates or deactivates the given encapsulation flag(s) */
   toggleEncapsulationFlag(flag, active) {
     if (active) {
@@ -216,18 +179,17 @@ class CommandClass {
   }
   /**
    * Serializes this CommandClass to be embedded in a message payload or another CC
-   * @deprecated Use {@link serializeAsync} instead
    */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  serialize(ctx) {
-    if (this.ccId === import_core.CommandClasses["No Operation"]) {
-      return import_shared.Bytes.from([this.ccId]);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/require-await
+  async serialize(ctx) {
+    if (this.ccId === import_safe.CommandClasses["No Operation"]) {
+      return import_safe2.Bytes.from([this.ccId]);
     } else if (this.ccCommand == void 0) {
-      throw new import_core.ZWaveError("Cannot serialize a Command Class without a command", import_core.ZWaveErrorCodes.CC_Invalid);
+      throw new import_safe.ZWaveError("Cannot serialize a Command Class without a command", import_safe.ZWaveErrorCodes.CC_Invalid);
     }
     const payloadLength = this.payload.length;
     const ccIdLength = this.isExtended() ? 2 : 1;
-    const data = new import_shared.Bytes(ccIdLength + 1 + payloadLength);
+    const data = new import_safe2.Bytes(ccIdLength + 1 + payloadLength);
     data.writeUIntBE(this.ccId, 0, ccIdLength);
     data[ccIdLength] = this.ccCommand;
     if (payloadLength > 0) {
@@ -235,17 +197,6 @@ class CommandClass {
     }
     return data;
   }
-  /**
-   * Serializes this CommandClass to be embedded in a message payload or another CC
-   */
-  // eslint-disable-next-line @typescript-eslint/require-await
-  async serializeAsync(ctx) {
-    if (this.serializeAsync !== CommandClass.prototype.serializeAsync) {
-      return CommandClass.prototype.serialize.call(this, ctx);
-    } else {
-      return this.serialize(ctx);
-    }
-  }
   prepareRetransmission() {
   }
   /**
@@ -268,13 +219,13 @@ class CommandClass {
     let tag = this.constructor.name;
     const message = {};
     if (this.constructor === CommandClass) {
-      tag = `${(0, import_shared.getEnumMemberName)(import_core.CommandClasses, this.ccId)} CC (not implemented)`;
+      tag = `${(0, import_safe2.getEnumMemberName)(import_safe.CommandClasses, this.ccId)} CC (not implemented)`;
       if (this.ccCommand != void 0) {
-        message.command = (0, import_shared.num2hex)(this.ccCommand);
+        message.command = (0, import_safe2.num2hex)(this.ccCommand);
       }
     }
     if (this.payload.length > 0) {
-      message.payload = (0, import_shared.buffer2hex)(this.payload);
+      message.payload = (0, import_safe2.buffer2hex)(this.payload);
     }
     return {
       tags: [tag],
@@ -288,18 +239,18 @@ class CommandClass {
   toJSONInternal() {
     const ret = {
       nodeId: this.nodeId,
-      ccId: import_core.CommandClasses[this.ccId] || (0, import_shared.num2hex)(this.ccId)
+      ccId: import_safe.CommandClasses[this.ccId] || (0, import_safe2.num2hex)(this.ccId)
     };
     if (this.ccCommand != void 0) {
-      ret.ccCommand = (0, import_shared.num2hex)(this.ccCommand);
+      ret.ccCommand = (0, import_safe2.num2hex)(this.ccCommand);
     }
     if (this.payload.length > 0) {
-      ret.payload = (0, import_shared.buffer2hex)(this.payload);
+      ret.payload = (0, import_safe2.buffer2hex)(this.payload);
     }
     return ret;
   }
   throwMissingCriticalInterviewResponse() {
-    throw new import_core.ZWaveError(`The node did not respond to a critical interview query in time.`, import_core.ZWaveErrorCodes.Controller_NodeTimeout);
+    throw new import_safe.ZWaveError(`The node did not respond to a critical interview query in time.`, import_safe.ZWaveErrorCodes.Controller_NodeTimeout);
   }
   /**
    * Performs the interview procedure for this CC according to SDS14223
@@ -320,7 +271,7 @@ class CommandClass {
   }
   /** Determines which CC interviews must be performed before this CC can be interviewed */
   determineRequiredCCInterviews() {
-    return [import_core.CommandClasses.Version];
+    return [import_safe.CommandClasses.Version];
   }
   /**
    * Whether the endpoint interview may be skipped by a CC. Can be overwritten by a subclass.
@@ -338,7 +289,7 @@ class CommandClass {
   isSinglecast() {
     return (
       // received
-      this.frameType === "singlecast" || this.frameType == void 0 && typeof this.nodeId === "number" && this.nodeId !== import_core.NODE_ID_BROADCAST && this.nodeId !== import_core.NODE_ID_BROADCAST_LR
+      this.frameType === "singlecast" || this.frameType == void 0 && typeof this.nodeId === "number" && this.nodeId !== import_safe.NODE_ID_BROADCAST && this.nodeId !== import_safe.NODE_ID_BROADCAST_LR
     );
   }
   isMulticast() {
@@ -350,7 +301,7 @@ class CommandClass {
   isBroadcast() {
     return (
       // received
-      this.frameType === "broadcast" || this.frameType == void 0 && (this.nodeId === import_core.NODE_ID_BROADCAST || this.nodeId === import_core.NODE_ID_BROADCAST_LR)
+      this.frameType === "broadcast" || this.frameType == void 0 && (this.nodeId === import_safe.NODE_ID_BROADCAST || this.nodeId === import_safe.NODE_ID_BROADCAST_LR)
     );
   }
   /**
@@ -369,7 +320,7 @@ class CommandClass {
     try {
       return this.getNode(ctx);
     } catch (e) {
-      if ((0, import_core.isZWaveError)(e) && e.code === import_core.ZWaveErrorCodes.Driver_NotReady) {
+      if ((0, import_safe.isZWaveError)(e) && e.code === import_safe.ZWaveErrorCodes.Driver_NotReady) {
         return void 0;
       }
       throw e;
@@ -384,10 +335,10 @@ class CommandClass {
       try {
         return ctx.getValueDB(this.nodeId);
       } catch {
-        throw new import_core.ZWaveError("The node for this CC does not exist or the driver is not ready yet", import_core.ZWaveErrorCodes.Driver_NotReady);
+        throw new import_safe.ZWaveError("The node for this CC does not exist or the driver is not ready yet", import_safe.ZWaveErrorCodes.Driver_NotReady);
       }
     }
-    throw new import_core.ZWaveError("Cannot retrieve the value DB for non-singlecast CCs", import_core.ZWaveErrorCodes.CC_NoNodeID);
+    throw new import_safe.ZWaveError("Cannot retrieve the value DB for non-singlecast CCs", import_safe.ZWaveErrorCodes.CC_NoNodeID);
   }
   /**
    * Ensures that the metadata for the given CC value exists in the Value DB or creates it if it does not.
@@ -502,7 +453,7 @@ class CommandClass {
         property,
         propertyKey
       };
-      const dbKey = (0, import_core.valueIdToString)(valueId);
+      const dbKey = (0, import_safe.valueIdToString)(valueId);
       if (!ret.has(dbKey))
         ret.set(dbKey, valueId);
     }, "addValueId");
@@ -511,7 +462,7 @@ class CommandClass {
       ...valueDB.getValues(this.ccId),
       ...valueDB.getAllMetadata(this.ccId)
     ];
-    const supportedVersion = typeof this.nodeId === "number" && this.nodeId !== import_core.NODE_ID_BROADCAST && this.nodeId !== import_core.NODE_ID_BROADCAST_LR ? ctx.getSupportedCCVersion(this.ccId, this.nodeId, this.endpointIndex) : (0, import_CommandClassDecorators.getImplementedVersion)(this.ccId);
+    const supportedVersion = typeof this.nodeId === "number" && this.nodeId !== import_safe.NODE_ID_BROADCAST && this.nodeId !== import_safe.NODE_ID_BROADCAST_LR ? ctx.getSupportedCCVersion(this.ccId, this.nodeId, this.endpointIndex) : (0, import_CommandClassDecorators.getImplementedVersion)(this.ccId);
     for (const value of Object.values((0, import_CommandClassDecorators.getCCValues)(this) ?? {})) {
       if (!value || typeof value === "function")
         continue;
@@ -605,43 +556,37 @@ class CommandClass {
   expectMoreMessages(_session) {
     return false;
   }
-  /**
-   * Include previously received partial responses into a final CC
-   * @deprecated Use {@link mergePartialCCsAsync} instead
-   */
-  mergePartialCCs(_partials, _ctx) {
-  }
   /** Include previously received partial responses into a final CC */
-  async mergePartialCCsAsync(_partials, _ctx) {
+  async mergePartialCCs(_partials, _ctx) {
   }
   /** Tests whether this CC expects at least one command in return */
   expectsCCResponse() {
     let expected = (0, import_CommandClassDecorators.getExpectedCCResponse)(this);
-    if (typeof expected === "function" && !(0, import_shared.staticExtends)(expected, CommandClass)) {
+    if (typeof expected === "function" && !(0, import_safe2.staticExtends)(expected, CommandClass)) {
       expected = expected(this);
     }
     if (expected === void 0)
       return false;
     if ((0, import_typeguards.isArray)(expected)) {
-      return expected.every((cc) => (0, import_shared.staticExtends)(cc, CommandClass));
+      return expected.every((cc) => (0, import_safe2.staticExtends)(cc, CommandClass));
     } else {
-      return (0, import_shared.staticExtends)(expected, CommandClass);
+      return (0, import_safe2.staticExtends)(expected, CommandClass);
     }
   }
   isExpectedCCResponse(received) {
     if (received.nodeId !== this.nodeId)
       return false;
     let expected = (0, import_CommandClassDecorators.getExpectedCCResponse)(this);
-    if (typeof expected === "function" && !(0, import_shared.staticExtends)(expected, CommandClass)) {
+    if (typeof expected === "function" && !(0, import_safe2.staticExtends)(expected, CommandClass)) {
       expected = expected(this);
     }
     if (expected == void 0) {
       return false;
-    } else if ((0, import_typeguards.isArray)(expected) && expected.every((cc) => (0, import_shared.staticExtends)(cc, CommandClass))) {
+    } else if ((0, import_typeguards.isArray)(expected) && expected.every((cc) => (0, import_safe2.staticExtends)(cc, CommandClass))) {
       if (expected.every((base) => !(received instanceof base))) {
         return false;
       }
-    } else if ((0, import_shared.staticExtends)(expected, CommandClass)) {
+    } else if ((0, import_safe2.staticExtends)(expected, CommandClass)) {
       if (!(received instanceof expected))
         return false;
     }
@@ -743,7 +688,7 @@ class InvalidCC extends CommandClass {
     return {
       tags: [this.ccName, "INVALID"],
       message: this.reason != void 0 ? {
-        error: typeof this.reason === "string" ? this.reason : (0, import_shared.getEnumMemberName)(import_core.ZWaveErrorCodes, this.reason)
+        error: typeof this.reason === "string" ? this.reason : (0, import_safe2.getEnumMemberName)(import_safe.ZWaveErrorCodes, this.reason)
       } : void 0
     };
   }