zwave-js 9.2.1 → 9.3.0

package/build/lib/driver/Driver.js

@@ -59,12 +59,7 @@ const _Types_1 = require("../commandclass/_Types");
 const Controller_1 = require("../controller/Controller");
 const Inclusion_1 = require("../controller/Inclusion");
 const _Types_2 = require("../controller/_Types");
-const Controller_2 = require("../log/Controller");
 const Driver_1 = require("../log/Driver");
-const Constants_1 = require("../message/Constants");
-const Message_1 = require("../message/Message");
-const SuccessIndicator_1 = require("../message/SuccessIndicator");
-const INodeQuery_1 = require("../node/INodeQuery");
 const _Types_3 = require("../node/_Types");
 const ApplicationCommandRequest_1 = require("../serialapi/application/ApplicationCommandRequest");
 const ApplicationUpdateRequest_1 = require("../serialapi/application/ApplicationUpdateRequest");
@@ -232,10 +227,9 @@ class Driver extends shared_1.TypedEventEmitter {
         // Initialize logging
         this._logContainer = new core_1.ZWaveLogContainer(this.options.logConfig);
         this._driverLog = new Driver_1.DriverLogger(this._logContainer);
-        this._controllerLog = new Controller_2.ControllerLogger(this._logContainer);
+        this._controllerLog = new core_1.ControllerLogger(this._logContainer);
         // Initialize the cache
         this.cacheDir = this.options.storage.cacheDir;
-        // TODO: Load provisioning list
         // Initialize config manager
         this.configManager = new config_1.ConfigManager({
             logContainer: this._logContainer,
@@ -412,6 +406,27 @@ class Driver extends shared_1.TypedEventEmitter {
     get securityManager2() {
         return this._securityManager2;
     }
+    /** @internal This is needed for the ZWaveHost interface */
+    get homeId() {
+        return this.controller.homeId;
+    }
+    /** @internal This is needed for the ZWaveHost interface */
+    get ownNodeId() {
+        return this.controller.ownNodeId;
+    }
+    /** @internal This is needed for the ZWaveHost interface */
+    get nodes() {
+        return this.controller.nodes;
+    }
+    getNodeUnsafe(msg) {
+        const nodeId = msg.getNodeId();
+        if (nodeId != undefined)
+            return this.controller.nodes.get(nodeId);
+    }
+    getValueDB(nodeId) {
+        const node = this.controller.nodes.getOrThrow(nodeId);
+        return node.valueDB;
+    }
     /** Updates the logging configuration without having to restart the driver. */
     updateLogConfig(config) {
         this._logContainer.updateConfiguration(config);
@@ -431,6 +446,7 @@ class Driver extends shared_1.TypedEventEmitter {
     }
     /** Start the driver */
     async start() {
+        var _a;
         // avoid starting twice
         if (this.wasDestroyed) {
             throw new core_1.ZWaveError("The driver was destroyed. Create a new instance and start that one.", core_1.ZWaveErrorCodes.Driver_Destroyed);
@@ -438,8 +454,9 @@ class Driver extends shared_1.TypedEventEmitter {
         if (this._wasStarted)
             return Promise.resolve();
         this._wasStarted = true;
-        // Enforce that an error handler is attached
-        if (this.listenerCount("error") === 0) {
+        // Enforce that an error handler is attached, except for testing with a mocked serialport
+        if (!this.options.testingHooks &&
+            this.listenerCount("error") === 0) {
             throw new core_1.ZWaveError(`Before starting the driver, a handler for the "error" event must be attached.`, core_1.ZWaveErrorCodes.Driver_NoErrorHandler);
         }
         const spOpenPromise = (0, deferred_promise_1.createDeferredPromise)();
@@ -460,7 +477,7 @@ class Driver extends shared_1.TypedEventEmitter {
         }
         else {
             this.driverLog.print(`opening serial port ${this.port}`);
-            this.serial = new serial_1.ZWaveSerialPort(this.port, this._logContainer);
+            this.serial = new serial_1.ZWaveSerialPort(this.port, this._logContainer, (_a = this.options.testingHooks) === null || _a === void 0 ? void 0 : _a.serialPortBinding);
         }
         this.serial
             .on("data", this.serialport_onData.bind(this))
@@ -487,6 +504,7 @@ class Driver extends shared_1.TypedEventEmitter {
         // Everything async (inluding opening the serial port) must happen in the setImmediate callback
         // asynchronously open the serial port
         setImmediate(async () => {
+            var _a;
             try {
                 await this.openSerialport();
             }
@@ -498,6 +516,10 @@ class Driver extends shared_1.TypedEventEmitter {
             this.driverLog.print("serial port opened");
             this._isOpen = true;
             spOpenPromise.resolve();
+            if (typeof ((_a = this.options.testingHooks) === null || _a === void 0 ? void 0 : _a.onSerialPortOpen) ===
+                "function") {
+                await this.options.testingHooks.onSerialPortOpen(this.serial);
+            }
             // Perform initialization sequence
             await this.writeHeader(serial_1.MessageHeaders.NAK);
             // Per the specs, this should be followed by a soft-reset but we need to be able
@@ -827,7 +849,7 @@ class Driver extends shared_1.TypedEventEmitter {
         }
         // Drop all pending messages that come from a previous interview attempt
         this.rejectTransactions((t) => t.message.getNodeId() === node.id &&
-            (t.priority === Constants_1.MessagePriority.NodeQuery ||
+            (t.priority === serial_1.MessagePriority.NodeQuery ||
                 t.tag === "interview"), "The interview was restarted", core_1.ZWaveErrorCodes.Controller_InterviewRestarted);
         const maxInterviewAttempts = this.options.attempts.nodeInterview;
         try {
@@ -1339,7 +1361,7 @@ class Driver extends shared_1.TypedEventEmitter {
         // Z-Wave 700 sticks are relatively fast, so we also wait for the Serial API started command
         // to bail early
         this.controllerLog.print("Waiting for the controller to reconnect...");
-        let waitResult = await this.waitForMessage((msg) => msg.functionType === Constants_1.FunctionType.SerialAPIStarted, 1500).catch(() => false);
+        let waitResult = await this.waitForMessage((msg) => msg.functionType === serial_1.FunctionType.SerialAPIStarted, 1500).catch(() => false);
         if (waitResult) {
             // Serial API did start, maybe do something with the information?
             this.controllerLog.print("reconnected and restarted");
@@ -1357,7 +1379,7 @@ class Driver extends shared_1.TypedEventEmitter {
         }
         // Wait the configured amount of time for the Serial API started command to be received
         this.controllerLog.print("Waiting for the Serial API to start...");
-        waitResult = await this.waitForMessage((msg) => msg.functionType === Constants_1.FunctionType.SerialAPIStarted, this.options.timeouts.serialAPIStarted).catch(() => false);
+        waitResult = await this.waitForMessage((msg) => msg.functionType === serial_1.FunctionType.SerialAPIStarted, this.options.timeouts.serialAPIStarted).catch(() => false);
         if (waitResult) {
             // Serial API did start, maybe do something with the information?
             this.controllerLog.print("Serial API started");
@@ -1401,7 +1423,8 @@ class Driver extends shared_1.TypedEventEmitter {
      */
     async hardReset() {
         this.ensureReady(true);
-        // Calling ensureReady with true ensures that _controller is defined
+        // Update the controller NIF prior to hard resetting
+        await this._controller.setControllerNIF();
         await this._controller.hardReset();
         // Clean up
         this.rejectTransactions(() => true, `The controller was hard-reset`);
@@ -1526,14 +1549,14 @@ class Driver extends shared_1.TypedEventEmitter {
         try {
             // Parse the message while remembering potential decoding errors in embedded CCs
             // This way we can log the invalid CC contents
-            msg = Message_1.Message.from(this, data);
+            msg = serial_1.Message.from(this, data);
             // Then ensure there are no errors
             if ((0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
                 (0, CommandClass_1.assertValidCCs)(msg);
             }
             if (!!this._controller) {
                 if ((0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
-                    (_c = msg.getNodeUnsafe()) === null || _c === void 0 ? void 0 : _c.incrementStatistics("commandsRX");
+                    (_c = this.getNodeUnsafe(msg)) === null || _c === void 0 ? void 0 : _c.incrementStatistics("commandsRX");
                 }
                 else {
                     this._controller.incrementStatistics("messagesRX");
@@ -1553,14 +1576,13 @@ class Driver extends shared_1.TypedEventEmitter {
                         await this.writeHeader(response);
                     if (!!this._controller) {
                         if ((0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
-                            (_d = msg.getNodeUnsafe()) === null || _d === void 0 ? void 0 : _d.incrementStatistics("commandsDroppedRX");
+                            (_d = this.getNodeUnsafe(msg)) === null || _d === void 0 ? void 0 : _d.incrementStatistics("commandsDroppedRX");
                             // Figure out if the command was received with supervision encapsulation
                             const supervisionSessionId = SupervisionCC_1.SupervisionCC.getSessionId(msg.command);
                             if (supervisionSessionId !== undefined &&
                                 msg.command instanceof CommandClass_1.InvalidCC) {
                                 // If it was, we need to notify the sender that we couldn't decode the command
-                                await ((_e = msg
-                                    .getNodeUnsafe()) === null || _e === void 0 ? void 0 : _e.createAPI(core_1.CommandClasses.Supervision, false).sendReport({
+                                await ((_e = this.getNodeUnsafe(msg)) === null || _e === void 0 ? void 0 : _e.createAPI(core_1.CommandClasses.Supervision, false).sendReport({
                                     sessionId: supervisionSessionId,
                                     moreUpdatesFollow: false,
                                     status: _Types_1.SupervisionStatus.NoSupport,
@@ -1598,7 +1620,7 @@ class Driver extends shared_1.TypedEventEmitter {
                 // and handle the encapsulation part normally
                 if (msg.command instanceof
                     SecurityCC_1.SecurityCCCommandEncapsulationNonceGet) {
-                    void ((_g = msg.getNodeUnsafe()) === null || _g === void 0 ? void 0 : _g.handleSecurityNonceGet());
+                    void ((_g = this.getNodeUnsafe(msg)) === null || _g === void 0 ? void 0 : _g.handleSecurityNonceGet());
                 }
                 // Transport Service commands must be handled before assembling partial CCs
                 if ((0, TransportServiceCC_1.isTransportServiceEncapsulation)(msg.command)) {
@@ -1808,7 +1830,7 @@ class Driver extends shared_1.TypedEventEmitter {
      * Returns `true` if the transaction failure was handled, `false` if it needs to be rejected.
      */
     handleMissingNodeACK(transaction) {
-        const node = transaction.message.getNodeUnsafe();
+        const node = this.getNodeUnsafe(transaction.message);
         if (!node)
             return false; // This should never happen, but whatever
         const messagePart1 = (0, SendDataShared_1.isSendData)(transaction.message)
@@ -1955,7 +1977,7 @@ class Driver extends shared_1.TypedEventEmitter {
                     });
                     await this.sendCommand(cc, {
                         maxSendAttempts: 1,
-                        priority: Constants_1.MessagePriority.Nonce,
+                        priority: serial_1.MessagePriority.Nonce,
                     });
                 },
                 sendSegmentsComplete: async () => {
@@ -1970,7 +1992,7 @@ class Driver extends shared_1.TypedEventEmitter {
                     });
                     await this.sendCommand(cc, {
                         maxSendAttempts: 1,
-                        priority: Constants_1.MessagePriority.Nonce,
+                        priority: serial_1.MessagePriority.Nonce,
                     });
                 },
             }, {
@@ -2012,7 +2034,7 @@ class Driver extends shared_1.TypedEventEmitter {
                 });
                 await this.sendCommand(cc, {
                     maxSendAttempts: 1,
-                    priority: Constants_1.MessagePriority.Nonce,
+                    priority: serial_1.MessagePriority.Nonce,
                 });
             }
         }
@@ -2022,7 +2044,7 @@ class Driver extends shared_1.TypedEventEmitter {
      * @param msg The decoded message
      */
     async handleUnsolicitedMessage(msg) {
-        if (msg.type === Constants_1.MessageType.Request) {
+        if (msg.type === serial_1.MessageType.Request) {
             // This is a request we might have registered handlers for
             try {
                 await this.handleRequest(msg);
@@ -2057,7 +2079,7 @@ class Driver extends shared_1.TypedEventEmitter {
             : [];
         const entry = { invoke: handler, oneTime };
         handlers.push(entry);
-        this.driverLog.print(`added${oneTime ? " one-time" : ""} request handler for ${Constants_1.FunctionType[fnType]} (${(0, shared_1.num2hex)(fnType)})...
+        this.driverLog.print(`added${oneTime ? " one-time" : ""} request handler for ${serial_1.FunctionType[fnType]} (${(0, shared_1.num2hex)(fnType)})...
 ${handlers.length} registered`);
         this.requestHandlers.set(fnType, handlers);
     }
@@ -2077,7 +2099,7 @@ ${handlers.length} registered`);
                 break;
             }
         }
-        this.driverLog.print(`removed request handler for ${Constants_1.FunctionType[fnType]} (${fnType})...
+        this.driverLog.print(`removed request handler for ${serial_1.FunctionType[fnType]} (${fnType})...
 ${handlers.length} left`);
         this.requestHandlers.set(fnType, handlers);
     }
@@ -2114,8 +2136,8 @@ ${handlers.length} left`);
      */
     async handleRequest(msg) {
         let handlers;
-        if ((0, INodeQuery_1.isNodeQuery)(msg) || (0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
-            const node = msg.getNodeUnsafe();
+        if ((0, serial_1.isNodeQuery)(msg) || (0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
+            const node = this.getNodeUnsafe(msg);
             if (node) {
                 // We have received an unsolicited message from a dead node, bring it back to life
                 if (node.status === _Types_3.NodeStatus.Dead) {
@@ -2134,7 +2156,7 @@ ${handlers.length} left`);
         if ((0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
             // For further actions, we are only interested in the innermost CC
             this.unwrapCommands(msg);
-            const node = msg.getNodeUnsafe();
+            const node = this.getNodeUnsafe(msg);
             // If we receive an encrypted message but assume the node is insecure, change our assumption
             if ((node === null || node === void 0 ? void 0 : node.isSecure) === false &&
                 (msg.command.ccId === core_1.CommandClasses.Security ||
@@ -2255,7 +2277,7 @@ ${handlers.length} left`);
         }
         else if (msg instanceof ApplicationUpdateRequest_1.ApplicationUpdateRequest) {
             if (msg instanceof ApplicationUpdateRequest_1.ApplicationUpdateRequestNodeInfoReceived) {
-                const node = msg.getNodeUnsafe();
+                const node = this.getNodeUnsafe(msg);
                 if (node) {
                     this.controllerLog.logNode(node.id, {
                         message: "Received updated node info",
@@ -2305,7 +2327,7 @@ ${handlers.length} left`);
         }
         else {
             // TODO: This deserves a nicer formatting
-            this.driverLog.print(`handling request ${Constants_1.FunctionType[msg.functionType]} (${msg.functionType})`);
+            this.driverLog.print(`handling request ${serial_1.FunctionType[msg.functionType]} (${msg.functionType})`);
             handlers = this.requestHandlers.get(msg.functionType);
         }
         if (handlers != undefined && handlers.length > 0) {
@@ -2369,7 +2391,7 @@ ${handlers.length} left`);
         // 5.
         // When a node supports S2 and has a valid security class, the command
         // must be S2-encapsulated
-        const node = msg.command.getNode();
+        const node = msg.command.getNode(this);
         if (node === null || node === void 0 ? void 0 : node.supportsCC(core_1.CommandClasses["Security 2"])) {
             const securityClass = node.getHighestSecurityClass();
             if (((securityClass != undefined &&
@@ -2402,9 +2424,9 @@ ${handlers.length} left`);
     handleSerialAPICommandResult(msg, options, result) {
         var _a, _b;
         // Update statistics
-        const node = msg.getNodeUnsafe();
+        const node = this.getNodeUnsafe(msg);
         let success = true;
-        if ((0, SendDataShared_1.isSendData)(msg) || (0, INodeQuery_1.isNodeQuery)(msg)) {
+        if ((0, SendDataShared_1.isSendData)(msg) || (0, serial_1.isNodeQuery)(msg)) {
             // This shouldn't happen, but just in case
             if (!node)
                 return;
@@ -2428,8 +2450,8 @@ ${handlers.length} left`);
             if (success) {
                 if (node.canSleep) {
                     // Do not update the node status when we only responded to a nonce request
-                    if (options.priority !== Constants_1.MessagePriority.Nonce &&
-                        options.priority !== Constants_1.MessagePriority.Supervision) {
+                    if (options.priority !== serial_1.MessagePriority.Nonce &&
+                        options.priority !== serial_1.MessagePriority.Supervision) {
                         // If the node is not meant to be kept awake, try to send it back to sleep
                         if (!node.keepAwake) {
                             setImmediate(() => this.debounceSendNodeToSleep(node));
@@ -2458,8 +2480,8 @@ ${handlers.length} left`);
         this.ensureReady();
         let node;
         // Don't send messages to dead nodes
-        if ((0, INodeQuery_1.isNodeQuery)(msg) || (0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
-            node = msg.getNodeUnsafe();
+        if ((0, serial_1.isNodeQuery)(msg) || (0, ICommandClassContainer_1.isCommandClassContainer)(msg)) {
+            node = this.getNodeUnsafe(msg);
             if (!(0, NoOperationCC_1.messageIsPing)(msg) && (node === null || node === void 0 ? void 0 : node.status) === _Types_3.NodeStatus.Dead) {
                 // Instead of throwing immediately, try to ping the node first - if it responds, continue
                 if (!(await node.ping())) {
@@ -2468,10 +2490,10 @@ ${handlers.length} left`);
             }
         }
         if (options.priority == undefined)
-            options.priority = (0, Message_1.getDefaultPriority)(msg);
+            options.priority = (0, serial_1.getDefaultPriority)(msg);
         if (options.priority == undefined) {
             const className = msg.constructor.name;
-            const msgTypeName = Constants_1.FunctionType[msg.functionType];
+            const msgTypeName = serial_1.FunctionType[msg.functionType];
             throw new core_1.ZWaveError(`No default priority has been defined for ${className} (${msgTypeName}), so you have to provide one for your message`, core_1.ZWaveErrorCodes.Driver_NoPriority);
         }
         if (options.supportCheck == undefined)
@@ -2479,7 +2501,7 @@ ${handlers.length} left`);
         if (options.supportCheck &&
             this._controller != undefined &&
             !this._controller.isFunctionSupported(msg.functionType)) {
-            throw new core_1.ZWaveError(`Your hardware does not support the ${Constants_1.FunctionType[msg.functionType]} function`, core_1.ZWaveErrorCodes.Driver_NotSupported);
+            throw new core_1.ZWaveError(`Your hardware does not support the ${serial_1.FunctionType[msg.functionType]} function`, core_1.ZWaveErrorCodes.Driver_NotSupported);
         }
         // When sending a message to a node that is known to be sleeping,
         // the priority must be WakeUp, so the message gets deprioritized
@@ -2499,13 +2521,13 @@ ${handlers.length} left`);
             !(msg instanceof SendDataMessages_1.SendDataMulticastRequest) &&
             !(msg instanceof SendDataBridgeMessages_1.SendDataMulticastBridgeRequest) &&
             // Nonces and responses to Supervision Get have to be sent immediately
-            options.priority !== Constants_1.MessagePriority.Nonce &&
-            options.priority !== Constants_1.MessagePriority.Supervision) {
-            if (options.priority === Constants_1.MessagePriority.NodeQuery) {
+            options.priority !== serial_1.MessagePriority.Nonce &&
+            options.priority !== serial_1.MessagePriority.Supervision) {
+            if (options.priority === serial_1.MessagePriority.NodeQuery) {
                 // Remember that this transaction was part of an interview
                 options.tag = "interview";
             }
-            options.priority = Constants_1.MessagePriority.WakeUp;
+            options.priority = serial_1.MessagePriority.WakeUp;
         }
         // Create the transaction
         const { generator, resultPromise } = (0, MessageGenerators_1.createMessageGenerator)(this, msg, (msg, _result) => {
@@ -2554,24 +2576,24 @@ ${handlers.length} left`);
             if ((0, SendDataShared_1.isSendData)(msg)) {
                 // For SendData messages, make sure the message is not a nonce
                 maybeSendToSleep =
-                    options.priority !== Constants_1.MessagePriority.Nonce &&
-                        options.priority !== Constants_1.MessagePriority.Supervision &&
+                    options.priority !== serial_1.MessagePriority.Nonce &&
+                        options.priority !== serial_1.MessagePriority.Supervision &&
                         // And that the result is either a response from the node
                         // or a transmit report indicating success
                         result &&
                         (result.functionType ===
-                            Constants_1.FunctionType.BridgeApplicationCommand ||
+                            serial_1.FunctionType.BridgeApplicationCommand ||
                             result.functionType ===
-                                Constants_1.FunctionType.ApplicationCommand ||
+                                serial_1.FunctionType.ApplicationCommand ||
                             ((0, SendDataShared_1.isSendDataTransmitReport)(result) && result.isOK()));
             }
             else {
                 // For other messages to the node, just check for successful completion. If the callback is not OK,
                 // we might not be able to communicate with the node. Sending another message is not a good idea.
                 maybeSendToSleep =
-                    (0, INodeQuery_1.isNodeQuery)(msg) &&
+                    (0, serial_1.isNodeQuery)(msg) &&
                         result &&
-                        (0, SuccessIndicator_1.isSuccessIndicator)(result) &&
+                        (0, serial_1.isSuccessIndicator)(result) &&
                         result.isOK();
             }
             if (maybeSendToSleep && node && node.canSleep && !node.keepAwake) {
@@ -2585,13 +2607,13 @@ ${handlers.length} left`);
                 // If a controller command failed (that is not SendData), pass the response/callback through
                 (e.code === core_1.ZWaveErrorCodes.Controller_ResponseNOK ||
                     e.code === core_1.ZWaveErrorCodes.Controller_CallbackNOK) &&
-                    e.context instanceof Message_1.Message &&
+                    e.context instanceof serial_1.Message &&
                     // We need to check the function type here because context can be the transmit reports
-                    e.context.functionType !== Constants_1.FunctionType.SendData &&
-                    e.context.functionType !== Constants_1.FunctionType.SendDataMulticast &&
-                    e.context.functionType !== Constants_1.FunctionType.SendDataBridge &&
+                    e.context.functionType !== serial_1.FunctionType.SendData &&
+                    e.context.functionType !== serial_1.FunctionType.SendDataMulticast &&
+                    e.context.functionType !== serial_1.FunctionType.SendDataBridge &&
                     e.context.functionType !==
-                        Constants_1.FunctionType.SendDataMulticastBridge) {
+                        serial_1.FunctionType.SendDataMulticastBridge) {
                     (_a = this._controller) === null || _a === void 0 ? void 0 : _a.incrementStatistics("messagesDroppedTX");
                     return e.context;
                 }
@@ -2616,7 +2638,7 @@ ${handlers.length} left`);
     createSendDataMessage(command, options = {}) {
         let msg;
         if (command.isSinglecast()) {
-            if (this.controller.isFunctionSupported(Constants_1.FunctionType.SendDataBridge)) {
+            if (this.controller.isFunctionSupported(serial_1.FunctionType.SendDataBridge)) {
                 // Prioritize Bridge commands when they are supported
                 msg = new SendDataBridgeMessages_1.SendDataBridgeRequest(this, { command });
             }
@@ -2625,7 +2647,7 @@ ${handlers.length} left`);
             }
         }
         else if (command.isMulticast()) {
-            if (this.controller.isFunctionSupported(Constants_1.FunctionType.SendDataMulticastBridge)) {
+            if (this.controller.isFunctionSupported(serial_1.FunctionType.SendDataMulticastBridge)) {
                 // Prioritize Bridge commands when they are supported
                 msg = new SendDataBridgeMessages_1.SendDataMulticastBridgeRequest(this, { command });
             }
@@ -2697,7 +2719,7 @@ ${handlers.length} left`);
             throw new core_1.ZWaveError(`Sending a supervised command is only supported with singlecast!`, core_1.ZWaveErrorCodes.CC_NotSupported);
         }
         // Check if the target supports this command
-        if (!((_a = command.getNode()) === null || _a === void 0 ? void 0 : _a.supportsCC(core_1.CommandClasses.Supervision))) {
+        if (!((_a = command.getNode(this)) === null || _a === void 0 ? void 0 : _a.supportsCC(core_1.CommandClasses.Supervision))) {
             throw new core_1.ZWaveError(`Node ${nodeId} does not support the Supervision CC!`, core_1.ZWaveErrorCodes.CC_NotSupported);
         }
         // Create the encapsulating CC so we have a session ID
@@ -2724,7 +2746,7 @@ ${handlers.length} left`);
      */
     async trySendCommandSupervised(command, options) {
         var _a;
-        if ((_a = command.getNode()) === null || _a === void 0 ? void 0 : _a.supportsCC(core_1.CommandClasses.Supervision)) {
+        if ((_a = command.getNode(this)) === null || _a === void 0 ? void 0 : _a.supportsCC(core_1.CommandClasses.Supervision)) {
             return this.sendSupervisedCommand(command, options);
         }
         else {
@@ -2816,8 +2838,8 @@ ${handlers.length} left`);
         switch (true) {
             // Pings, nonces and Supervision Reports will block the send queue until wakeup, so they must be dropped
             case (0, NoOperationCC_1.messageIsPing)(msg):
-            case transaction.priority === Constants_1.MessagePriority.Nonce:
-            case transaction.priority === Constants_1.MessagePriority.Supervision:
+            case transaction.priority === serial_1.MessagePriority.Nonce:
+            case transaction.priority === serial_1.MessagePriority.Supervision:
             // We also don't want to immediately send the node to sleep when it wakes up
             case (0, ICommandClassContainer_1.isCommandClassContainer)(msg) &&
                 msg.command instanceof WakeUpCC_1.WakeUpCCNoMoreInformation:
@@ -2836,7 +2858,7 @@ ${handlers.length} left`);
         };
         const requeue = {
             type: "requeue",
-            priority: Constants_1.MessagePriority.WakeUp,
+            priority: serial_1.MessagePriority.WakeUp,
         };
         const requeueAndTagAsInterview = {
             ...requeue,
@@ -2849,7 +2871,7 @@ ${handlers.length} left`);
             // Drop all messages that are not allowed in the wakeup queue
             // For all other messages, change the priority to wakeup
             return this.mayMoveToWakeupQueue(transaction)
-                ? transaction.priority === Constants_1.MessagePriority.NodeQuery
+                ? transaction.priority === serial_1.MessagePriority.NodeQuery
                     ? requeueAndTagAsInterview
                     : requeue
                 : reject;
@@ -3012,14 +3034,14 @@ ${handlers.length} left`);
     /** Returns the preferred constructor to use for singlecast SendData commands */
     getSendDataSinglecastConstructor() {
         var _a;
-        return ((_a = this._controller) === null || _a === void 0 ? void 0 : _a.isFunctionSupported(Constants_1.FunctionType.SendDataBridge))
+        return ((_a = this._controller) === null || _a === void 0 ? void 0 : _a.isFunctionSupported(serial_1.FunctionType.SendDataBridge))
             ? SendDataBridgeMessages_1.SendDataBridgeRequest
             : SendDataMessages_1.SendDataRequest;
     }
     /** Returns the preferred constructor to use for multicast SendData commands */
     getSendDataMulticastConstructor() {
         var _a;
-        return ((_a = this._controller) === null || _a === void 0 ? void 0 : _a.isFunctionSupported(Constants_1.FunctionType.SendDataMulticastBridge))
+        return ((_a = this._controller) === null || _a === void 0 ? void 0 : _a.isFunctionSupported(serial_1.FunctionType.SendDataMulticastBridge))
             ? SendDataBridgeMessages_1.SendDataMulticastBridgeRequest
             : SendDataMessages_1.SendDataMulticastRequest;
     }