zwave-js 9.2.1 → 9.3.0

package/build/lib/node/utils.js

@@ -0,0 +1,187 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefinedValueIDs = exports.filterRootApplicationCCValueIDs = exports.translateValueID = exports.shouldHideRootApplicationCCValues = exports.getAllEndpoints = exports.setMultiChannelInterviewComplete = exports.isMultiChannelInterviewComplete = exports.setEndpointIndizes = exports.getEndpointIndizes = exports.setAggregatedEndpointCount = exports.setIndividualEndpointCount = exports.getEndpointCount = exports.getAggregatedEndpointCount = exports.getIndividualEndpointCount = exports.endpointsHaveIdenticalCapabilities = exports.endpointCountIsDynamic = void 0;
+const core_1 = require("@zwave-js/core");
+const CommandClass_1 = require("../commandclass/CommandClass");
+const MultiChannelCC_1 = require("../commandclass/MultiChannelCC");
+function getValue(host, node, valueId) {
+    return host.getValueDB(node.id).getValue(valueId);
+}
+function setValue(host, node, valueId, value, options) {
+    return host.getValueDB(node.id).setValue(valueId, value, options);
+}
+function endpointCountIsDynamic(host, node) {
+    return getValue(host, node, (0, MultiChannelCC_1.getCountIsDynamicValueId)());
+}
+exports.endpointCountIsDynamic = endpointCountIsDynamic;
+function endpointsHaveIdenticalCapabilities(host, node) {
+    return getValue(host, node, (0, MultiChannelCC_1.getIdenticalCapabilitiesValueId)());
+}
+exports.endpointsHaveIdenticalCapabilities = endpointsHaveIdenticalCapabilities;
+function getIndividualEndpointCount(host, node) {
+    return getValue(host, node, (0, MultiChannelCC_1.getIndividualCountValueId)());
+}
+exports.getIndividualEndpointCount = getIndividualEndpointCount;
+function getAggregatedEndpointCount(host, node) {
+    return getValue(host, node, (0, MultiChannelCC_1.getAggregatedCountValueId)());
+}
+exports.getAggregatedEndpointCount = getAggregatedEndpointCount;
+function getEndpointCount(host, node) {
+    return ((getIndividualEndpointCount(host, node) || 0) +
+        (getAggregatedEndpointCount(host, node) || 0));
+}
+exports.getEndpointCount = getEndpointCount;
+function setIndividualEndpointCount(host, node, count) {
+    setValue(host, node, (0, MultiChannelCC_1.getIndividualCountValueId)(), count);
+}
+exports.setIndividualEndpointCount = setIndividualEndpointCount;
+function setAggregatedEndpointCount(host, node, count) {
+    setValue(host, node, (0, MultiChannelCC_1.getAggregatedCountValueId)(), count);
+}
+exports.setAggregatedEndpointCount = setAggregatedEndpointCount;
+function getEndpointIndizes(host, node) {
+    let ret = getValue(host, node, (0, MultiChannelCC_1.getEndpointIndizesValueId)());
+    if (!ret) {
+        // Endpoint indizes not stored, assume sequential endpoints
+        ret = [];
+        for (let i = 1; i <= getEndpointCount(host, node); i++) {
+            ret.push(i);
+        }
+    }
+    return ret;
+}
+exports.getEndpointIndizes = getEndpointIndizes;
+function setEndpointIndizes(host, node, indizes) {
+    setValue(host, node, (0, MultiChannelCC_1.getEndpointIndizesValueId)(), indizes);
+}
+exports.setEndpointIndizes = setEndpointIndizes;
+function isMultiChannelInterviewComplete(host, node) {
+    return !!getValue(host, node, {
+        commandClass: core_1.CommandClasses["Multi Channel"],
+        endpoint: 0,
+        property: "interviewComplete",
+    });
+}
+exports.isMultiChannelInterviewComplete = isMultiChannelInterviewComplete;
+function setMultiChannelInterviewComplete(host, node, complete) {
+    setValue(host, node, {
+        commandClass: core_1.CommandClasses["Multi Channel"],
+        endpoint: 0,
+        property: "interviewComplete",
+    }, complete);
+}
+exports.setMultiChannelInterviewComplete = setMultiChannelInterviewComplete;
+function getAllEndpoints(host, node) {
+    const ret = [node];
+    // Check if the Multi Channel CC interview for this node is completed,
+    // because we don't have all the endpoint information before that
+    if (isMultiChannelInterviewComplete(host, node)) {
+        for (const i of getEndpointIndizes(host, node)) {
+            const endpoint = node.getEndpoint(i);
+            if (endpoint)
+                ret.push(endpoint);
+        }
+    }
+    return ret;
+}
+exports.getAllEndpoints = getAllEndpoints;
+/** Determines whether the root application CC values should be hidden in favor of endpoint values */
+function shouldHideRootApplicationCCValues(host, node) {
+    var _a, _b, _c, _d;
+    // This is not the case when the root values should explicitly be preserved
+    if ((_b = (_a = node.deviceConfig) === null || _a === void 0 ? void 0 : _a.compat) === null || _b === void 0 ? void 0 : _b.preserveRootApplicationCCValueIDs)
+        return false;
+    // This is not the case when there are no endpoints
+    const endpointIndizes = getEndpointIndizes(host, node);
+    if (endpointIndizes.length === 0)
+        return false;
+    // This is not the case when only individual endpoints should be preserved in addition to the root
+    const preserveEndpoints = (_d = (_c = node.deviceConfig) === null || _c === void 0 ? void 0 : _c.compat) === null || _d === void 0 ? void 0 : _d.preserveEndpoints;
+    if (preserveEndpoints != undefined &&
+        preserveEndpoints !== "*" &&
+        preserveEndpoints.length !== endpointIndizes.length) {
+        return false;
+    }
+    // Otherwise they should be hidden
+    return true;
+}
+exports.shouldHideRootApplicationCCValues = shouldHideRootApplicationCCValues;
+/**
+ * Enhances a value id so it can be consumed better by applications
+ */
+function translateValueID(host, node, valueId) {
+    // Try to retrieve the speaking CC name
+    const commandClassName = (0, core_1.getCCName)(valueId.commandClass);
+    const ret = {
+        commandClassName,
+        ...valueId,
+    };
+    const ccInstance = CommandClass_1.CommandClass.createInstanceUnchecked(host, node, valueId.commandClass);
+    if (!ccInstance) {
+        throw new core_1.ZWaveError(`Cannot translate a value ID for the non-implemented CC ${(0, core_1.getCCName)(valueId.commandClass)}`, core_1.ZWaveErrorCodes.CC_NotImplemented);
+    }
+    // Retrieve the speaking property name
+    ret.propertyName = ccInstance.translateProperty(valueId.property, valueId.propertyKey);
+    // Try to retrieve the speaking property key
+    if (valueId.propertyKey != undefined) {
+        const propertyKey = ccInstance.translatePropertyKey(valueId.property, valueId.propertyKey);
+        ret.propertyKeyName = propertyKey;
+    }
+    return ret;
+}
+exports.translateValueID = translateValueID;
+/**
+ * Removes all Value IDs from an array that belong to a root endpoint and have a corresponding
+ * Value ID on a non-root endpoint
+ */
+function filterRootApplicationCCValueIDs(allValueIds) {
+    const shouldHideRootValueID = (valueId, allValueIds) => {
+        // Non-root endpoint values don't need to be filtered
+        if (!!valueId.endpoint)
+            return false;
+        // Non-application CCs don't need to be filtered
+        if (!core_1.applicationCCs.includes(valueId.commandClass))
+            return false;
+        // Filter out root values if an identical value ID exists for another endpoint
+        const valueExistsOnAnotherEndpoint = allValueIds.some((other) => 
+        // same CC
+        other.commandClass === valueId.commandClass &&
+            // non-root endpoint
+            !!other.endpoint &&
+            // same property and key
+            other.property === valueId.property &&
+            other.propertyKey === valueId.propertyKey);
+        return valueExistsOnAnotherEndpoint;
+    };
+    return allValueIds.filter((vid) => !shouldHideRootValueID(vid, allValueIds));
+}
+exports.filterRootApplicationCCValueIDs = filterRootApplicationCCValueIDs;
+/** Returns a list of all value names that are defined on all endpoints of this node */
+function getDefinedValueIDs(host, node) {
+    let ret = [];
+    const allowControlled = [
+        core_1.CommandClasses["Scene Activation"],
+    ];
+    for (const endpoint of getAllEndpoints(host, node)) {
+        for (const cc of core_1.allCCs) {
+            if (endpoint.supportsCC(cc) ||
+                (endpoint.controlsCC(cc) && allowControlled.includes(cc))) {
+                const ccInstance = CommandClass_1.CommandClass.createInstanceUnchecked(host, endpoint, cc);
+                if (ccInstance) {
+                    ret.push(...ccInstance.getDefinedValueIDs());
+                }
+            }
+        }
+    }
+    // Application command classes of the Root Device capabilities that are also advertised by at
+    // least one End Point SHOULD be filtered out by controlling nodes before presenting the functionalities
+    // via service discovery mechanisms like mDNS or to users in a GUI.
+    // We do this when there are endpoints that were explicitly preserved
+    if (shouldHideRootApplicationCCValues(host, node)) {
+        ret = filterRootApplicationCCValueIDs(ret);
+    }
+    // Translate the remaining value IDs before exposing them to applications
+    return ret.map((id) => translateValueID(host, node, id));
+}
+exports.getDefinedValueIDs = getDefinedValueIDs;
+//# sourceMappingURL=utils.js.map

package/build/lib/node/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/node/utils.ts"],"names":[],"mappings":"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"}

package/build/lib/serialapi/_Types.d.ts

@@ -1,17 +1,4 @@
-export declare enum ZWaveLibraryTypes {
-    "Unknown" = 0,
-    "Static Controller" = 1,
-    "Controller" = 2,
-    "Enhanced Slave" = 3,
-    "Slave" = 4,
-    "Installer" = 5,
-    "Routing Slave" = 6,
-    "Bridge Controller" = 7,
-    "Device under Test" = 8,
-    "N/A" = 9,
-    "AV Remote" = 10,
-    "AV Device" = 11
-}
+export { ZWaveApiVersion, ZWaveLibraryTypes } from "@zwave-js/core/safe";
 export declare enum NodeIDType {
     Short = 1,
     Long = 2

package/build/lib/serialapi/_Types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_Types.d.ts","sourceRoot":"","sources":["../../../src/lib/serialapi/_Types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB;IAC5B,SAAS,IAAA;IACT,mBAAmB,IAAA;IACnB,YAAY,IAAA;IACZ,gBAAgB,IAAA;IAChB,OAAO,IAAA;IACP,WAAW,IAAA;IACX,eAAe,IAAA;IACf,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;IACnB,KAAK,IAAA;IACL,WAAW,KAAA;IACX,WAAW,KAAA;CACX;AAED,oBAAY,UAAU;IACrB,KAAK,IAAO;IACZ,IAAI,IAAO;CACX"}
+{"version":3,"file":"_Types.d.ts","sourceRoot":"","sources":["../../../src/lib/serialapi/_Types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,oBAAY,UAAU;IACrB,KAAK,IAAO;IACZ,IAAI,IAAO;CACX"}

package/build/lib/serialapi/_Types.js

@@ -1,21 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeIDType = exports.ZWaveLibraryTypes = void 0;
-var ZWaveLibraryTypes;
-(function (ZWaveLibraryTypes) {
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Unknown"] = 0] = "Unknown";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Static Controller"] = 1] = "Static Controller";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Controller"] = 2] = "Controller";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Enhanced Slave"] = 3] = "Enhanced Slave";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Slave"] = 4] = "Slave";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Installer"] = 5] = "Installer";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Routing Slave"] = 6] = "Routing Slave";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Bridge Controller"] = 7] = "Bridge Controller";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["Device under Test"] = 8] = "Device under Test";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["N/A"] = 9] = "N/A";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["AV Remote"] = 10] = "AV Remote";
-    ZWaveLibraryTypes[ZWaveLibraryTypes["AV Device"] = 11] = "AV Device";
-})(ZWaveLibraryTypes = exports.ZWaveLibraryTypes || (exports.ZWaveLibraryTypes = {}));
+var safe_1 = require("@zwave-js/core/safe");
+Object.defineProperty(exports, "ZWaveLibraryTypes", { enumerable: true, get: function () { return safe_1.ZWaveLibraryTypes; } });
 var NodeIDType;
 (function (NodeIDType) {
     NodeIDType[NodeIDType["Short"] = 1] = "Short";

package/build/lib/serialapi/_Types.js.map

@@ -1 +1 @@
-{"version":3,"file":"_Types.js","sourceRoot":"","sources":["../../../src/lib/serialapi/_Types.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAaX;AAbD,WAAY,iBAAiB;IAC5B,+DAAS,CAAA;IACT,mFAAmB,CAAA;IACnB,qEAAY,CAAA;IACZ,6EAAgB,CAAA;IAChB,2DAAO,CAAA;IACP,mEAAW,CAAA;IACX,2EAAe,CAAA;IACf,mFAAmB,CAAA;IACnB,mFAAmB,CAAA;IACnB,uDAAK,CAAA;IACL,oEAAW,CAAA;IACX,oEAAW,CAAA;AACZ,CAAC,EAbW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAa5B;AAED,IAAY,UAGX;AAHD,WAAY,UAAU;IACrB,6CAAY,CAAA;IACZ,2CAAW,CAAA;AACZ,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}
+{"version":3,"file":"_Types.js","sourceRoot":"","sources":["../../../src/lib/serialapi/_Types.ts"],"names":[],"mappings":";;;AAAA,4CAAyE;AAA/C,yGAAA,iBAAiB,OAAA;AAE3C,IAAY,UAGX;AAHD,WAAY,UAAU;IACrB,6CAAY,CAAA;IACZ,2CAAW,CAAA;AACZ,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB"}

package/build/lib/serialapi/application/ApplicationCommandRequest.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { MessageOrCCLogEntry } from "@zwave-js/core";
+import type { ZWaveHost } from "@zwave-js/host";
+import { Message, MessageBaseOptions, MessageDeserializationOptions } from "@zwave-js/serial";
 import { CommandClass, SinglecastCC } from "../../commandclass/CommandClass";
 import type { ICommandClassContainer } from "../../commandclass/ICommandClassContainer";
-import type { Driver } from "../../driver/Driver";
-import { Message, MessageBaseOptions, MessageDeserializationOptions } from "../../message/Message";
 export declare enum ApplicationCommandStatusFlags {
     RoutedBusy = 1,
     LowPower = 2,
@@ -21,13 +21,14 @@ interface ApplicationCommandRequestOptions extends MessageBaseOptions {
     routedBusy?: boolean;
 }
 export declare class ApplicationCommandRequest extends Message implements ICommandClassContainer {
-    constructor(driver: Driver, options: MessageDeserializationOptions | ApplicationCommandRequestOptions);
+    constructor(host: ZWaveHost, options: MessageDeserializationOptions | ApplicationCommandRequestOptions);
     readonly routedBusy: boolean;
     readonly frameType: "singlecast" | "broadcast" | "multicast";
     readonly isExploreFrame: boolean;
     readonly isForeignFrame: boolean;
     readonly fromForeignHomeId: boolean;
     command: SinglecastCC;
+    getNodeId(): number | undefined;
     serialize(): Buffer;
     toLogEntry(): MessageOrCCLogEntry;
 }

package/build/lib/serialapi/application/ApplicationCommandRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationCommandRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationCommandRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,mBAAmB,EAInB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAMlD,OAAO,EAEN,OAAO,EACP,kBAAkB,EAClB,6BAA6B,EAG7B,MAAM,uBAAuB,CAAC;AAE/B,oBAAY,6BAA6B;IACxC,UAAU,IAAM;IAChB,QAAQ,IAAO;IAEf,UAAU,IAAS;IACnB,SAAS,IAAS;IAClB,SAAS,IAAS;IAClB,QAAQ,KAAqC;IAE7C,OAAO,KAAU;IAEjB,YAAY,KAAc;IAC1B,aAAa,MAAc;CAC3B;AAED,UAAU,gCAAiC,SAAQ,kBAAkB;IACpE,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,yBAAyB,CAAC,WAAW,CAAC,CAAC;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAGa,yBACZ,SAAQ,OACR,YAAW,sBAAsB;gBAGhC,MAAM,EAAE,MAAM,EACd,OAAO,EACJ,6BAA6B,GAC7B,gCAAgC;IAuDpC,SAAgB,UAAU,EAAE,OAAO,CAAC;IACpC,SAAgB,SAAS,EAAE,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;IACpE,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,iBAAiB,EAAE,OAAO,CAAC;IAGpC,OAAO,EAAE,YAAY,CAAC;IAEtB,SAAS,IAAI,MAAM;IAsBnB,UAAU,IAAI,mBAAmB;CAUxC"}
+{"version":3,"file":"ApplicationCommandRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationCommandRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,mBAAmB,EAInB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAGN,OAAO,EACP,kBAAkB,EAClB,6BAA6B,EAK7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAExF,oBAAY,6BAA6B;IACxC,UAAU,IAAM;IAChB,QAAQ,IAAO;IAEf,UAAU,IAAS;IACnB,SAAS,IAAS;IAClB,SAAS,IAAS;IAClB,QAAQ,KAAqC;IAE7C,OAAO,KAAU;IAEjB,YAAY,KAAc;IAC1B,aAAa,MAAc;CAC3B;AAED,UAAU,gCAAiC,SAAQ,kBAAkB;IACpE,OAAO,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,yBAAyB,CAAC,WAAW,CAAC,CAAC;IACnD,UAAU,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,qBAGa,yBACZ,SAAQ,OACR,YAAW,sBAAsB;gBAGhC,IAAI,EAAE,SAAS,EACf,OAAO,EACJ,6BAA6B,GAC7B,gCAAgC;IAuDpC,SAAgB,UAAU,EAAE,OAAO,CAAC;IACpC,SAAgB,SAAS,EAAE,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;IACpE,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,iBAAiB,EAAE,OAAO,CAAC;IAGpC,OAAO,EAAE,YAAY,CAAC;IAEb,SAAS,IAAI,MAAM,GAAG,SAAS;IAOxC,SAAS,IAAI,MAAM;IAkBnB,UAAU,IAAI,mBAAmB;CAUxC"}

package/build/lib/serialapi/application/ApplicationCommandRequest.js

@@ -8,9 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationCommandRequest = exports.ApplicationCommandStatusFlags = void 0;
 const core_1 = require("@zwave-js/core");
+const serial_1 = require("@zwave-js/serial");
 const CommandClass_1 = require("../../commandclass/CommandClass");
-const Constants_1 = require("../../message/Constants");
-const Message_1 = require("../../message/Message");
 var ApplicationCommandStatusFlags;
 (function (ApplicationCommandStatusFlags) {
     ApplicationCommandStatusFlags[ApplicationCommandStatusFlags["RoutedBusy"] = 1] = "RoutedBusy";
@@ -23,11 +22,11 @@ var ApplicationCommandStatusFlags;
     ApplicationCommandStatusFlags[ApplicationCommandStatusFlags["ForeignFrame"] = 64] = "ForeignFrame";
     ApplicationCommandStatusFlags[ApplicationCommandStatusFlags["ForeignHomeId"] = 128] = "ForeignHomeId";
 })(ApplicationCommandStatusFlags = exports.ApplicationCommandStatusFlags || (exports.ApplicationCommandStatusFlags = {}));
-let ApplicationCommandRequest = class ApplicationCommandRequest extends Message_1.Message {
-    constructor(driver, options) {
+let ApplicationCommandRequest = class ApplicationCommandRequest extends serial_1.Message {
+    constructor(host, options) {
         var _a;
-        super(driver, options);
-        if ((0, Message_1.gotDeserializationOptions)(options)) {
+        super(host, options);
+        if ((0, serial_1.gotDeserializationOptions)(options)) {
             // first byte is a status flag
             const status = this.payload[0];
             this.routedBusy = !!(status & ApplicationCommandStatusFlags.RoutedBusy);
@@ -50,7 +49,7 @@ let ApplicationCommandRequest = class ApplicationCommandRequest extends Message_
             const nodeId = this.payload[1];
             // and a command class
             const commandLength = this.payload[2];
-            this.command = CommandClass_1.CommandClass.from(this.driver, {
+            this.command = CommandClass_1.CommandClass.from(this.host, {
                 data: this.payload.slice(3, 3 + commandLength),
                 nodeId,
             });
@@ -68,6 +67,12 @@ let ApplicationCommandRequest = class ApplicationCommandRequest extends Message_
             this.fromForeignHomeId = false;
         }
     }
+    getNodeId() {
+        if (this.command.isSinglecast()) {
+            return this.command.nodeId;
+        }
+        return super.getNodeId();
+    }
     serialize() {
         const statusByte = (this.frameType === "broadcast"
             ? ApplicationCommandStatusFlags.TypeBroad
@@ -77,11 +82,7 @@ let ApplicationCommandRequest = class ApplicationCommandRequest extends Message_
             (this.routedBusy ? ApplicationCommandStatusFlags.RoutedBusy : 0);
         const serializedCC = this.command.serialize();
         this.payload = Buffer.concat([
-            Buffer.from([
-                statusByte,
-                this.driver.controller.ownNodeId,
-                serializedCC.length,
-            ]),
+            Buffer.from([statusByte, this.host.ownNodeId, serializedCC.length]),
             serializedCC,
         ]);
         return super.serialize();
@@ -98,10 +99,10 @@ let ApplicationCommandRequest = class ApplicationCommandRequest extends Message_
     }
 };
 ApplicationCommandRequest = __decorate([
-    (0, Message_1.messageTypes)(Constants_1.MessageType.Request, Constants_1.FunctionType.ApplicationCommand)
+    (0, serial_1.messageTypes)(serial_1.MessageType.Request, serial_1.FunctionType.ApplicationCommand)
     // This does not expect a response. The controller sends us this when a node sends a command
     ,
-    (0, Message_1.priority)(Constants_1.MessagePriority.Normal)
+    (0, serial_1.priority)(serial_1.MessagePriority.Normal)
 ], ApplicationCommandRequest);
 exports.ApplicationCommandRequest = ApplicationCommandRequest;
 //# sourceMappingURL=ApplicationCommandRequest.js.map

package/build/lib/serialapi/application/ApplicationCommandRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationCommandRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationCommandRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApplicationCommandRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationCommandRequest.ts"],"names":[],"mappings":";;;;;;;;;AAAA,yCAKwB;AAExB,6CAU0B;AAC1B,kEAA6E;AAG7E,IAAY,6BAaX;AAbD,WAAY,6BAA6B;IACxC,6FAAgB,CAAA;IAChB,yFAAe,CAAA;IAEf,6FAAmB,CAAA;IACnB,2FAAkB,CAAA;IAClB,2FAAkB,CAAA;IAClB,0FAA6C,CAAA;IAE7C,wFAAiB,CAAA;IAEjB,kGAA0B,CAAA;IAC1B,qGAA2B,CAAA;AAC5B,CAAC,EAbW,6BAA6B,GAA7B,qCAA6B,KAA7B,qCAA6B,QAaxC;AAWD,IAAa,yBAAyB,GAAtC,MAAa,yBACZ,SAAQ,gBAAO;IAGf,YACC,IAAe,EACf,OAEmC;;QAEnC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrB,IAAI,IAAA,kCAAyB,EAAC,OAAO,CAAC,EAAE;YACvC,8BAA8B;YAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,CACnB,MAAM,GAAG,6BAA6B,CAAC,UAAU,CACjD,CAAC;YACF,QAAQ,MAAM,GAAG,6BAA6B,CAAC,QAAQ,EAAE;gBACxD,KAAK,6BAA6B,CAAC,SAAS;oBAC3C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;oBAC7B,MAAM;gBACP,KAAK,6BAA6B,CAAC,SAAS;oBAC3C,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;oBAC7B,MAAM;gBACP;oBACC,IAAI,CAAC,SAAS,GAAG,YAAY,CAAC;aAC/B;YACD,IAAI,CAAC,cAAc;gBAClB,IAAI,CAAC,SAAS,KAAK,WAAW;oBAC9B,CAAC,CAAC,CAAC,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,CACvB,MAAM,GAAG,6BAA6B,CAAC,YAAY,CACnD,CAAC;YACF,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAC1B,MAAM,GAAG,6BAA6B,CAAC,aAAa,CACpD,CAAC;YAEF,wBAAwB;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/B,sBAAsB;YACtB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACtC,IAAI,CAAC,OAAO,GAAG,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBAC3C,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC;gBAC9C,MAAM;aACN,CAAiB,CAAC;SACnB;aAAM;YACN,8BAA8B;YAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE;gBACpC,MAAM,IAAI,iBAAU,CACnB,+DAA+D,EAC/D,sBAAe,CAAC,gBAAgB,CAChC,CAAC;aACF;YAED,IAAI,CAAC,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,YAAY,CAAC;YACnD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAC/B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;SAC/B;IACF,CAAC;IAWe,SAAS;QACxB,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE;YAChC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEM,SAAS;QACf,MAAM,UAAU,GACf,CAAC,IAAI,CAAC,SAAS,KAAK,WAAW;YAC9B,CAAC,CAAC,6BAA6B,CAAC,SAAS;YACzC,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,WAAW;gBAChC,CAAC,CAAC,6BAA6B,CAAC,SAAS;gBACzC,CAAC,CAAC,CAAC,CAAC;YACL,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAC9C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;YACnE,YAAY;SACZ,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAEM,UAAU;QAChB,MAAM,OAAO,GAAkB,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,SAAS,KAAK,YAAY,EAAE;YACpC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;SAC9B;QACD,OAAO;YACN,GAAG,KAAK,CAAC,UAAU,EAAE;YACrB,OAAO;SACP,CAAC;IACH,CAAC;CACD,CAAA;AA3GY,yBAAyB;IAHrC,IAAA,qBAAY,EAAC,oBAAW,CAAC,OAAO,EAAE,qBAAY,CAAC,kBAAkB,CAAC;IACnE,4FAA4F;;IAC3F,IAAA,iBAAQ,EAAC,wBAAe,CAAC,MAAM,CAAC;GACpB,yBAAyB,CA2GrC;AA3GY,8DAAyB"}

package/build/lib/serialapi/application/ApplicationUpdateRequest.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import { CommandClasses, MessageOrCCLogEntry, NodeUpdatePayload } from "@zwave-js/core";
+import type { ZWaveHost } from "@zwave-js/host";
+import type { SuccessIndicator } from "@zwave-js/serial";
+import { Message, MessageDeserializationOptions } from "@zwave-js/serial";
 import { JSONObject } from "@zwave-js/shared";
-import type { Driver } from "../../driver/Driver";
-import { Message, MessageDeserializationOptions } from "../../message/Message";
-import type { SuccessIndicator } from "../../message/SuccessIndicator";
 export declare enum ApplicationUpdateTypes {
     SmartStart_NodeInfo_Received = 134,
     SmartStart_HomeId_Received = 133,
@@ -16,11 +16,11 @@ export declare enum ApplicationUpdateTypes {
     SUC_IdChanged = 16
 }
 export declare class ApplicationUpdateRequest extends Message {
-    constructor(driver: Driver, options: MessageDeserializationOptions);
+    constructor(host: ZWaveHost, options: MessageDeserializationOptions);
     readonly updateType: ApplicationUpdateTypes;
 }
 export declare class ApplicationUpdateRequestNodeInfoReceived extends ApplicationUpdateRequest {
-    constructor(driver: Driver, options: MessageDeserializationOptions);
+    constructor(host: ZWaveHost, options: MessageDeserializationOptions);
     private _nodeId;
     get nodeId(): number;
     private _nodeInformation;
@@ -31,7 +31,7 @@ export declare class ApplicationUpdateRequestNodeInfoRequestFailed extends Appli
     isOK(): boolean;
 }
 export declare class ApplicationUpdateRequestSmartStartHomeIDReceived extends ApplicationUpdateRequest {
-    constructor(driver: Driver, options: MessageDeserializationOptions);
+    constructor(host: ZWaveHost, options: MessageDeserializationOptions);
     readonly remoteNodeId: number;
     readonly nwiHomeId: Buffer;
     readonly basicDeviceClass: number;

package/build/lib/serialapi/application/ApplicationUpdateRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationUpdateRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationUpdateRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,cAAc,EAEd,mBAAmB,EAEnB,iBAAiB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAiC,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EACN,OAAO,EACP,6BAA6B,EAE7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,oBAAY,sBAAsB;IACjC,4BAA4B,MAAO;IACnC,0BAA0B,MAAO;IACjC,iBAAiB,MAAO;IACxB,oBAAoB,MAAO;IAC3B,sBAAsB,MAAO;IAC7B,cAAc,MAAO;IACrB,aAAa,KAAO;IACpB,UAAU,KAAO;IACjB,aAAa,KAAO;CACpB;AAED,qBAEa,wBAAyB,SAAQ,OAAO;gBACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,6BAA6B;IAyBzE,SAAgB,UAAU,EAAE,sBAAsB,CAAC;CACnD;AAED,qBAAa,wCAAyC,SAAQ,wBAAwB;gBAClE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,6BAA6B;IAMzE,OAAO,CAAC,OAAO,CAAS;IACxB,IAAW,MAAM,IAAI,MAAM,CAE1B;IAED,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,IAAW,eAAe,IAAI,iBAAiB,CAE9C;IAEM,MAAM,IAAI,UAAU;CAO3B;AAED,qBAAa,6CACZ,SAAQ,wBACR,YAAW,gBAAgB;IAE3B,IAAI,IAAI,OAAO;CAGf;AAED,qBAAa,gDAAiD,SAAQ,wBAAwB;gBAC1E,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,6BAA6B;IAezE,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IACzC,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAC3C,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAC5C,SAAgB,YAAY,EAAE,SAAS,cAAc,EAAE,CAAC;IAEjD,UAAU,IAAI,mBAAmB;CAiBxC"}
+{"version":3,"file":"ApplicationUpdateRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationUpdateRequest.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,cAAc,EAEd,mBAAmB,EAEnB,iBAAiB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAEN,OAAO,EACP,6BAA6B,EAG7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAiC,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE7E,oBAAY,sBAAsB;IACjC,4BAA4B,MAAO;IACnC,0BAA0B,MAAO;IACjC,iBAAiB,MAAO;IACxB,oBAAoB,MAAO;IAC3B,sBAAsB,MAAO;IAC7B,cAAc,MAAO;IACrB,aAAa,KAAO;IACpB,UAAU,KAAO;IACjB,aAAa,KAAO;CACpB;AAED,qBAEa,wBAAyB,SAAQ,OAAO;gBAEnD,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,6BAA6B;IA0BvC,SAAgB,UAAU,EAAE,sBAAsB,CAAC;CACnD;AAED,qBAAa,wCAAyC,SAAQ,wBAAwB;gBAEpF,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,6BAA6B;IAOvC,OAAO,CAAC,OAAO,CAAS;IACxB,IAAW,MAAM,IAAI,MAAM,CAE1B;IAED,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,IAAW,eAAe,IAAI,iBAAiB,CAE9C;IAEM,MAAM,IAAI,UAAU;CAO3B;AAED,qBAAa,6CACZ,SAAQ,wBACR,YAAW,gBAAgB;IAE3B,IAAI,IAAI,OAAO;CAGf;AAED,qBAAa,gDAAiD,SAAQ,wBAAwB;gBAE5F,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,6BAA6B;IAgBvC,SAAgB,YAAY,EAAE,MAAM,CAAC;IACrC,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,SAAgB,gBAAgB,EAAE,MAAM,CAAC;IACzC,SAAgB,kBAAkB,EAAE,MAAM,CAAC;IAC3C,SAAgB,mBAAmB,EAAE,MAAM,CAAC;IAC5C,SAAgB,YAAY,EAAE,SAAS,cAAc,EAAE,CAAC;IAEjD,UAAU,IAAI,mBAAmB;CAiBxC"}

package/build/lib/serialapi/application/ApplicationUpdateRequest.js

@@ -9,9 +9,8 @@ var ApplicationUpdateRequest_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationUpdateRequestSmartStartHomeIDReceived = exports.ApplicationUpdateRequestNodeInfoRequestFailed = exports.ApplicationUpdateRequestNodeInfoReceived = exports.ApplicationUpdateRequest = exports.ApplicationUpdateTypes = void 0;
 const core_1 = require("@zwave-js/core");
+const serial_1 = require("@zwave-js/serial");
 const shared_1 = require("@zwave-js/shared");
-const Constants_1 = require("../../message/Constants");
-const Message_1 = require("../../message/Message");
 var ApplicationUpdateTypes;
 (function (ApplicationUpdateTypes) {
     ApplicationUpdateTypes[ApplicationUpdateTypes["SmartStart_NodeInfo_Received"] = 134] = "SmartStart_NodeInfo_Received";
@@ -26,9 +25,9 @@ var ApplicationUpdateTypes;
 })(ApplicationUpdateTypes = exports.ApplicationUpdateTypes || (exports.ApplicationUpdateTypes = {}));
 let ApplicationUpdateRequest = ApplicationUpdateRequest_1 = 
 // this is only received, not sent!
-class ApplicationUpdateRequest extends Message_1.Message {
-    constructor(driver, options) {
-        super(driver, options);
+class ApplicationUpdateRequest extends serial_1.Message {
+    constructor(host, options) {
+        super(host, options);
         this.updateType = this.payload[0];
         this.payload = this.payload.slice(1);
         let CommandConstructor;
@@ -46,18 +45,18 @@ class ApplicationUpdateRequest extends Message_1.Message {
                 break;
         }
         if (CommandConstructor && new.target !== CommandConstructor) {
-            return new CommandConstructor(driver, options);
+            return new CommandConstructor(host, options);
         }
     }
 };
 ApplicationUpdateRequest = ApplicationUpdateRequest_1 = __decorate([
-    (0, Message_1.messageTypes)(Constants_1.MessageType.Request, Constants_1.FunctionType.ApplicationUpdateRequest)
+    (0, serial_1.messageTypes)(serial_1.MessageType.Request, serial_1.FunctionType.ApplicationUpdateRequest)
     // this is only received, not sent!
 ], ApplicationUpdateRequest);
 exports.ApplicationUpdateRequest = ApplicationUpdateRequest;
 class ApplicationUpdateRequestNodeInfoReceived extends ApplicationUpdateRequest {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         this._nodeInformation = (0, core_1.parseNodeUpdatePayload)(this.payload);
         this._nodeId = this._nodeInformation.nodeId;
     }
@@ -83,8 +82,8 @@ class ApplicationUpdateRequestNodeInfoRequestFailed extends ApplicationUpdateReq
 }
 exports.ApplicationUpdateRequestNodeInfoRequestFailed = ApplicationUpdateRequestNodeInfoRequestFailed;
 class ApplicationUpdateRequestSmartStartHomeIDReceived extends ApplicationUpdateRequest {
-    constructor(driver, options) {
-        super(driver, options);
+    constructor(host, options) {
+        super(host, options);
         this.remoteNodeId = this.payload[0];
         // payload[1] is rxStatus
         this.nwiHomeId = this.payload.slice(2, 6);

package/build/lib/serialapi/application/ApplicationUpdateRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationUpdateRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationUpdateRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApplicationUpdateRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/ApplicationUpdateRequest.ts"],"names":[],"mappings":"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"}

package/build/lib/serialapi/application/BridgeApplicationCommandRequest.d.ts

@@ -1,11 +1,11 @@
 import { MessageOrCCLogEntry } from "@zwave-js/core";
+import type { ZWaveHost } from "@zwave-js/host";
+import { Message, MessageDeserializationOptions } from "@zwave-js/serial";
 import { SinglecastCC } from "../../commandclass/CommandClass";
 import type { ICommandClassContainer } from "../../commandclass/ICommandClassContainer";
 import { RSSI } from "../../controller/_Types";
-import type { Driver } from "../../driver/Driver";
-import { Message, MessageDeserializationOptions } from "../../message/Message";
 export declare class BridgeApplicationCommandRequest extends Message implements ICommandClassContainer {
-    constructor(driver: Driver, options: MessageDeserializationOptions);
+    constructor(host: ZWaveHost, options: MessageDeserializationOptions);
     readonly routedBusy: boolean;
     readonly frameType: "singlecast" | "broadcast" | "multicast";
     readonly targetNodeId: number | number[];
@@ -14,6 +14,7 @@ export declare class BridgeApplicationCommandRequest extends Message implements
     readonly fromForeignHomeId: boolean;
     readonly rssi?: RSSI;
     command: SinglecastCC;
+    getNodeId(): number | undefined;
     toLogEntry(): MessageOrCCLogEntry;
 }
 //# sourceMappingURL=BridgeApplicationCommandRequest.d.ts.map

package/build/lib/serialapi/application/BridgeApplicationCommandRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BridgeApplicationCommandRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/BridgeApplicationCommandRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EAGnB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAgB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,EAAE,IAAI,EAAa,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAMlD,OAAO,EACN,OAAO,EACP,6BAA6B,EAG7B,MAAM,uBAAuB,CAAC;AAI/B,qBAGa,+BACZ,SAAQ,OACR,YAAW,sBAAsB;gBAEd,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,6BAA6B;IAqDzE,SAAgB,UAAU,EAAE,OAAO,CAAC;IACpC,SAAgB,SAAS,EAAE,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;IACpE,SAAgB,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChD,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,iBAAiB,EAAE,OAAO,CAAC;IAC3C,SAAgB,IAAI,CAAC,EAAE,IAAI,CAAC;IAGrB,OAAO,EAAE,YAAY,CAAC;IAEtB,UAAU,IAAI,mBAAmB;CA4BxC"}
+{"version":3,"file":"BridgeApplicationCommandRequest.d.ts","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/BridgeApplicationCommandRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EAGnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAEN,OAAO,EACP,6BAA6B,EAK7B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAgB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,EAAE,IAAI,EAAa,MAAM,yBAAyB,CAAC;AAI1D,qBAGa,+BACZ,SAAQ,OACR,YAAW,sBAAsB;gBAGhC,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,6BAA6B;IAsDvC,SAAgB,UAAU,EAAE,OAAO,CAAC;IACpC,SAAgB,SAAS,EAAE,YAAY,GAAG,WAAW,GAAG,WAAW,CAAC;IACpE,SAAgB,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChD,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC,SAAgB,iBAAiB,EAAE,OAAO,CAAC;IAC3C,SAAgB,IAAI,CAAC,EAAE,IAAI,CAAC;IAGrB,OAAO,EAAE,YAAY,CAAC;IAEb,SAAS,IAAI,MAAM,GAAG,SAAS;IAOxC,UAAU,IAAI,mBAAmB;CA4BxC"}

package/build/lib/serialapi/application/BridgeApplicationCommandRequest.js

@@ -8,16 +8,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BridgeApplicationCommandRequest = void 0;
 const core_1 = require("@zwave-js/core");
+const serial_1 = require("@zwave-js/serial");
 const shared_1 = require("@zwave-js/shared");
 const CommandClass_1 = require("../../commandclass/CommandClass");
 const _Types_1 = require("../../controller/_Types");
-const Constants_1 = require("../../message/Constants");
-const Message_1 = require("../../message/Message");
 const SendDataShared_1 = require("../transport/SendDataShared");
 const ApplicationCommandRequest_1 = require("./ApplicationCommandRequest");
-let BridgeApplicationCommandRequest = class BridgeApplicationCommandRequest extends Message_1.Message {
-    constructor(driver, options) {
-        super(driver, options);
+let BridgeApplicationCommandRequest = class BridgeApplicationCommandRequest extends serial_1.Message {
+    constructor(host, options) {
+        super(host, options);
         // if (gotDeserializationOptions(options)) {
         // first byte is a status flag
         const status = this.payload[0];
@@ -41,7 +40,7 @@ let BridgeApplicationCommandRequest = class BridgeApplicationCommandRequest exte
         // Parse the CC
         const commandLength = this.payload[3];
         let offset = 4;
-        this.command = CommandClass_1.CommandClass.from(this.driver, {
+        this.command = CommandClass_1.CommandClass.from(this.host, {
             data: this.payload.slice(offset, offset + commandLength),
             nodeId: sourceNodeId,
         });
@@ -63,12 +62,18 @@ let BridgeApplicationCommandRequest = class BridgeApplicationCommandRequest exte
         offset += multicastNodesLength;
         this.rssi = (0, SendDataShared_1.tryParseRSSI)(this.payload, offset);
     }
+    getNodeId() {
+        if (this.command.isSinglecast()) {
+            return this.command.nodeId;
+        }
+        return super.getNodeId();
+    }
     toLogEntry() {
         const message = {};
         if (this.frameType !== "singlecast") {
             message.type = this.frameType;
         }
-        if (this.targetNodeId !== this.driver.controller.ownNodeId) {
+        if (this.targetNodeId !== this.host.ownNodeId) {
             message["target node"] =
                 typeof this.targetNodeId === "number"
                     ? this.targetNodeId
@@ -93,10 +98,10 @@ let BridgeApplicationCommandRequest = class BridgeApplicationCommandRequest exte
     }
 };
 BridgeApplicationCommandRequest = __decorate([
-    (0, Message_1.messageTypes)(Constants_1.MessageType.Request, Constants_1.FunctionType.BridgeApplicationCommand)
+    (0, serial_1.messageTypes)(serial_1.MessageType.Request, serial_1.FunctionType.BridgeApplicationCommand)
     // This does not expect a response. The controller sends us this when a node sends a command
     ,
-    (0, Message_1.priority)(Constants_1.MessagePriority.Normal)
+    (0, serial_1.priority)(serial_1.MessagePriority.Normal)
 ], BridgeApplicationCommandRequest);
 exports.BridgeApplicationCommandRequest = BridgeApplicationCommandRequest;
 //# sourceMappingURL=BridgeApplicationCommandRequest.js.map

package/build/lib/serialapi/application/BridgeApplicationCommandRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"BridgeApplicationCommandRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/BridgeApplicationCommandRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BridgeApplicationCommandRequest.js","sourceRoot":"","sources":["../../../../src/lib/serialapi/application/BridgeApplicationCommandRequest.ts"],"names":[],"mappings":"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"}