zwave-js 8.7.8 → 8.8.2

package/build/lib/driver/MessageGenerators.js

@@ -0,0 +1,246 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMessageGenerator = exports.secureMessageGeneratorS2 = exports.secureMessageGeneratorS0 = exports.simpleMessageGenerator = exports.waitForNodeUpdate = void 0;
+const core_1 = require("@zwave-js/core");
+const deferred_promise_1 = require("alcalzone-shared/deferred-promise");
+const commandclass_1 = require("../commandclass");
+const ICommandClassContainer_1 = require("../commandclass/ICommandClassContainer");
+const SecurityCC_1 = require("../commandclass/SecurityCC");
+const SendDataShared_1 = require("../controller/SendDataShared");
+const StateMachineShared_1 = require("./StateMachineShared");
+async function waitForNodeUpdate(driver, msg) {
+    try {
+        return await driver.waitForMessage((received) => {
+            return msg.isExpectedNodeUpdate(received);
+        }, driver.options.timeouts.report);
+    }
+    catch (e) {
+        throw new core_1.ZWaveError(`Timed out while waiting for a response from the node`, core_1.ZWaveErrorCodes.Controller_NodeTimeout);
+    }
+}
+exports.waitForNodeUpdate = waitForNodeUpdate;
+/** A simple message generator that simply sends a message, waits for the ACK (and the response if one is expected) */
+const simpleMessageGenerator = async function* (driver, msg, onMessageSent) {
+    // Pass this message to the send thread and wait for it to be sent
+    let result;
+    try {
+        // The yield can throw and must be handled here
+        result = yield msg;
+        onMessageSent(msg, result);
+    }
+    catch (e) {
+        throw e;
+    }
+    // If the sent message was a SendData message that had a NOK callback,
+    // we now need to throw because the callback was passed through so we could inspect it.
+    if ((0, SendDataShared_1.isSendData)(msg) &&
+        (0, SendDataShared_1.isSendDataTransmitReport)(result) &&
+        !result.isOK()) {
+        // Throw the message in order to short-circuit all possible generators
+        throw result;
+    }
+    // If the sent message expects an update from the node, wait for it
+    if (msg.expectsNodeUpdate()) {
+        return waitForNodeUpdate(driver, msg);
+    }
+    return result;
+};
+exports.simpleMessageGenerator = simpleMessageGenerator;
+/** A simple (internal) generator that simply sends a command, and optionally returns the response command */
+async function* sendCommandGenerator(driver, command, onMessageSent, options) {
+    const msg = driver.createSendDataMessage(command, options);
+    const resp = yield* (0, exports.simpleMessageGenerator)(driver, msg, onMessageSent);
+    if (resp && (0, ICommandClassContainer_1.isCommandClassContainer)(resp)) {
+        driver.unwrapCommands(resp);
+        return resp.command;
+    }
+}
+/** A message generator for security encapsulated messages (S0) */
+const secureMessageGeneratorS0 = async function* (driver, msg, onMessageSent) {
+    if (!(0, SendDataShared_1.isSendData)(msg)) {
+        throw new core_1.ZWaveError("Cannot use the S0 message generator for a command that's not a SendData message!", core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    else if (typeof msg.command.nodeId !== "number") {
+        throw new core_1.ZWaveError("Cannot use the S0 message generator for multicast commands!", core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    else if (!(msg.command instanceof SecurityCC_1.SecurityCCCommandEncapsulation)) {
+        throw new core_1.ZWaveError("The S0 message generator can only be used for Security S0 command encapsulation!", core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    // Step 1: Acquire a nonce
+    const secMan = driver.securityManager;
+    const nodeId = msg.command.nodeId;
+    let nonceId;
+    // Try to get a free nonce before requesting a new one
+    const freeNonce = secMan.getFreeNonce(nodeId);
+    if (freeNonce) {
+        nonceId = secMan.getNonceId(freeNonce);
+    }
+    else {
+        // No free nonce, request a new one
+        const cc = new SecurityCC_1.SecurityCCNonceGet(driver, {
+            nodeId: nodeId,
+            endpoint: msg.command.endpointIndex,
+        });
+        const nonceResp = yield* sendCommandGenerator(driver, cc, onMessageSent, {
+            // Only try getting a nonce once
+            maxSendAttempts: 1,
+        });
+        if (!nonceResp) {
+            throw new core_1.ZWaveError("No nonce received from the node, cannot send secure command!", core_1.ZWaveErrorCodes.SecurityCC_NoNonce);
+        }
+        const nonce = nonceResp.nonce;
+        // and store it
+        nonceId = secMan.getNonceId(nonce);
+        secMan.setNonce({
+            issuer: nodeId,
+            nonceId: nonceId,
+        }, { nonce, receiver: driver.controller.ownNodeId }, 
+        // The nonce is reserved for this command
+        { free: false });
+    }
+    // Now send the actual secure command
+    msg.command.nonceId = nonceId;
+    return yield* (0, exports.simpleMessageGenerator)(driver, msg, onMessageSent);
+};
+exports.secureMessageGeneratorS0 = secureMessageGeneratorS0;
+/** A message generator for security encapsulated messages (S2) */
+const secureMessageGeneratorS2 = async function* (driver, msg, onMessageSent) {
+    if (!(0, SendDataShared_1.isSendData)(msg)) {
+        throw new core_1.ZWaveError("Cannot use the S2 message generator for a command that's not a SendData message!", core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    else if (typeof msg.command.nodeId !== "number") {
+        throw new core_1.ZWaveError("Cannot use the S2 message generator for multicast commands!", // (yet)
+        core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    else if (!(msg.command instanceof commandclass_1.Security2CCMessageEncapsulation)) {
+        throw new core_1.ZWaveError("The S2 message generator can only be used for Security S2 command encapsulation!", core_1.ZWaveErrorCodes.Argument_Invalid);
+    }
+    const secMan = driver.securityManager2;
+    const nodeId = msg.command.nodeId;
+    const spanState = secMan.getSPANState(nodeId);
+    if (spanState.type === core_1.SPANState.None ||
+        spanState.type === core_1.SPANState.LocalEI) {
+        // Request a new nonce
+        // No free nonce, request a new one
+        const cc = new commandclass_1.Security2CCNonceGet(driver, {
+            nodeId: nodeId,
+            endpoint: msg.command.endpointIndex,
+        });
+        const nonceResp = yield* sendCommandGenerator(driver, cc, onMessageSent, {
+            // Only try getting a nonce once
+            maxSendAttempts: 1,
+        });
+        if (!nonceResp) {
+            throw new core_1.ZWaveError("No nonce received from the node, cannot send secure command!", core_1.ZWaveErrorCodes.Security2CC_NoSPAN);
+        }
+        // Storing the nonce is not necessary, this will be done automatically when the nonce is received
+    }
+    // Now send the actual secure command
+    let response = yield* (0, exports.simpleMessageGenerator)(driver, msg, onMessageSent);
+    if ((0, ICommandClassContainer_1.isCommandClassContainer)(response) &&
+        response.command instanceof commandclass_1.Security2CCNonceReport) {
+        const command = response.command;
+        if (command.SOS && command.receiverEI) {
+            // The node couldn't decrypt the last command we sent it. Invalidate
+            // the shared SPAN, since it did the same
+            secMan.storeRemoteEI(nodeId, command.receiverEI);
+        }
+        driver.controllerLog.logNode(nodeId, {
+            message: `failed to decode the message, retrying with SPAN extension...`,
+            direction: "none",
+        });
+        // Prepare the messsage for re-transmission
+        msg.callbackId = undefined;
+        msg.command.unsetSequenceNumber();
+        // Send the message again
+        response = yield* (0, exports.simpleMessageGenerator)(driver, msg, onMessageSent);
+        if ((0, ICommandClassContainer_1.isCommandClassContainer)(response) &&
+            response.command instanceof commandclass_1.Security2CCNonceReport) {
+            // No dice
+            driver.controllerLog.logNode(nodeId, {
+                message: `failed to decode the message after re-transmission with SPAN extension, dropping the message.`,
+                direction: "none",
+                level: "warn",
+            });
+            throw new core_1.ZWaveError("The node failed to decode the message.", core_1.ZWaveErrorCodes.Security2CC_CannotDecode);
+        }
+    }
+    return response;
+};
+exports.secureMessageGeneratorS2 = secureMessageGeneratorS2;
+function createMessageGenerator(driver, msg, onMessageSent) {
+    const resultPromise = (0, deferred_promise_1.createDeferredPromise)();
+    const generator = {
+        parent: undefined,
+        current: undefined,
+        self: undefined,
+        start: () => {
+            const resetGenerator = () => {
+                generator.current = undefined;
+                generator.self = undefined;
+            };
+            async function* gen() {
+                // Determine which message generator implemenation should be used
+                let implementation = exports.simpleMessageGenerator;
+                if ((0, SendDataShared_1.isSendData)(msg)) {
+                    if (msg.command instanceof commandclass_1.Security2CCMessageEncapsulation) {
+                        implementation = exports.secureMessageGeneratorS2;
+                    }
+                    else if (msg.command instanceof SecurityCC_1.SecurityCCCommandEncapsulation) {
+                        implementation = exports.secureMessageGeneratorS0;
+                    }
+                }
+                // Step through the generator so we can easily cancel it and don't
+                // accidentally forget to unset this.current at the end
+                const gen = implementation(driver, msg, onMessageSent);
+                let sendResult;
+                let result;
+                while (true) {
+                    // This call passes the previous send result (if it exists already) to the generator and saves the
+                    // generated or returned message in `value`. When `done` is true, `value` contains the returned result of the message generator
+                    try {
+                        const { value, done } = await gen.next(sendResult);
+                        if (done) {
+                            result = value;
+                            break;
+                        }
+                        // Pass the generated message to the transaction machine and remember the result for the next iteration
+                        generator.current = value;
+                        sendResult = yield generator.current;
+                    }
+                    catch (e) {
+                        if (e instanceof Error) {
+                            // There was an actual error, reject the transaction
+                            resultPromise.reject(e);
+                        }
+                        else if ((0, SendDataShared_1.isSendDataTransmitReport)(e) && !e.isOK()) {
+                            // The generator was prematurely ended by throwing a NOK transmit report.
+                            // If this cannot be handled (e.g. by moving the messages to the wakeup queue), we need
+                            // to treat this as an error
+                            if (driver.handleMissingNodeACK(generator.parent)) {
+                                resetGenerator();
+                                return;
+                            }
+                            else {
+                                resultPromise.reject((0, StateMachineShared_1.sendDataErrorToZWaveError)("callback NOK", generator.parent, e));
+                            }
+                        }
+                        else {
+                            // The generator was prematurely ended by throwing a Message
+                            resultPromise.resolve(e);
+                        }
+                        break;
+                    }
+                }
+                resultPromise.resolve(result);
+                resetGenerator();
+                return;
+            }
+            generator.self = gen();
+            return generator.self;
+        },
+    };
+    return { resultPromise, generator };
+}
+exports.createMessageGenerator = createMessageGenerator;
+//# sourceMappingURL=MessageGenerators.js.map

package/build/lib/driver/MessageGenerators.js.map

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

package/build/lib/driver/SendThreadMachine.d.ts

@@ -1,36 +1,14 @@
 import { ZWaveErrorCodes } from "@zwave-js/core";
 import { SortedList } from "alcalzone-shared/sorted-list";
-import { Interpreter, StateMachine } from "xstate";
-import { ApplicationCommandRequest } from "../controller/ApplicationCommandRequest";
-import { BridgeApplicationCommandRequest } from "../controller/BridgeApplicationCommandRequest";
+import { ActorRef, ActorRefFrom, Interpreter, StateMachine } from "xstate";
 import { MessagePriority } from "../message/Constants";
 import type { Message } from "../message/Message";
-import { CommandQueueEvent, CommandQueueInterpreter } from "./CommandQueueMachine";
+import { CommandQueueEvent } from "./CommandQueueMachine";
 import type { SerialAPICommandDoneData, SerialAPICommandMachineParams } from "./SerialAPICommandMachine";
-import { ServiceImplementations } from "./StateMachineShared";
+import type { ServiceImplementations } from "./StateMachineShared";
 import type { Transaction } from "./Transaction";
+import { TransactionMachine } from "./TransactionMachine";
 import type { ZWaveOptions } from "./ZWaveOptions";
-export interface SendThreadStateSchema {
-    states: {
-        init: {};
-        idle: {};
-        sending: {
-            states: {
-                beforeSend: {};
-                handshake: {
-                    states: {
-                        waitForCommandResult: {};
-                        waitForHandshakeResponse: {};
-                    };
-                };
-                execute: {};
-                waitForUpdate: {};
-                retryWait: {};
-                done: {};
-            };
-        };
-    };
-}
 export declare type SendDataErrorData = (SerialAPICommandDoneData & {
     type: "failure";
 }) | {
@@ -38,12 +16,15 @@ export declare type SendDataErrorData = (SerialAPICommandDoneData & {
     reason: "node timeout";
     result?: undefined;
 };
+export interface ActiveTransaction {
+    transaction: Transaction;
+    machine: ActorRefFrom<TransactionMachine>;
+}
 export interface SendThreadContext {
-    commandQueue: CommandQueueInterpreter;
     queue: SortedList<Transaction>;
-    currentTransaction?: Transaction;
-    handshakeTransaction?: Transaction;
-    sendDataAttempts: number;
+    commandQueue: ActorRef<any, any>;
+    activeTransactions: Map<string, ActiveTransaction>;
+    counter: number;
     paused: boolean;
 }
 export declare type SendThreadEvent = {
@@ -51,12 +32,6 @@ export declare type SendThreadEvent = {
     transaction: Transaction;
 } | {
     type: "trigger";
-} | {
-    type: "nodeUpdate";
-    result: ApplicationCommandRequest | BridgeApplicationCommandRequest;
-} | {
-    type: "handshakeResponse";
-    result: ApplicationCommandRequest | BridgeApplicationCommandRequest;
 } | {
     type: "unsolicited";
     message: Message;
@@ -85,23 +60,19 @@ export declare type SendThreadEvent = {
     type: "command_failure";
 } | {
     type: "command_error";
-})) | ({
-    type: "active_command_success";
-} & Omit<CommandQueueEvent & {
-    type: "command_success";
-}, "type">) | ({
-    type: "active_command_failure";
-} & Omit<CommandQueueEvent & {
-    type: "command_failure";
-}, "type">) | ({
-    type: "active_command_error";
-} & Omit<CommandQueueEvent & {
-    type: "command_error";
-}, "type">) | {
+})) | {
     type: "pause" | "unpause";
+} | {
+    type: "forward";
+    from: string;
+    to: string;
+    payload: any;
+} | {
+    type: "transaction_done";
+    id: string;
 };
-export declare type SendThreadMachine = StateMachine<SendThreadContext, SendThreadStateSchema, SendThreadEvent>;
-export declare type SendThreadInterpreter = Interpreter<SendThreadContext, SendThreadStateSchema, SendThreadEvent>;
+export declare type SendThreadMachine = StateMachine<SendThreadContext, any, SendThreadEvent>;
+export declare type SendThreadInterpreter = Interpreter<SendThreadContext, any, SendThreadEvent>;
 export declare type TransactionReducerResult = {
     type: "drop";
 } | {
@@ -118,10 +89,10 @@ export declare type TransactionReducerResult = {
     priority?: MessagePriority;
     tag?: any;
 };
-export declare type TransactionReducer = (transaction: Transaction, source: "queue" | "current") => TransactionReducerResult;
+export declare type TransactionReducer = (transaction: Transaction, source: "queue" | "active") => TransactionReducerResult;
 export declare type SendThreadMachineParams = {
     timeouts: SerialAPICommandMachineParams["timeouts"] & Pick<ZWaveOptions["timeouts"], "report">;
-    attempts: SerialAPICommandMachineParams["attempts"] & Pick<ZWaveOptions["attempts"], "retryAfterTransmitReport">;
+    attempts: SerialAPICommandMachineParams["attempts"];
 };
 export declare function createSendThreadMachine(implementations: ServiceImplementations, params: SendThreadMachineParams): SendThreadMachine;
 //# sourceMappingURL=SendThreadMachine.d.ts.map

package/build/lib/driver/SendThreadMachine.d.ts.map

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