zwave-js 15.4.1 → 15.4.2

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

@@ -1,3 +1,3 @@
-export declare const PACKAGE_VERSION = "15.4.1";
+export declare const PACKAGE_VERSION = "15.4.2";
 export declare const PACKAGE_NAME = "zwave-js";
 //# sourceMappingURL=_version.d.ts.map

package/build/cjs/lib/_version.js

@@ -22,7 +22,7 @@ __export(version_exports, {
   PACKAGE_VERSION: () => PACKAGE_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const PACKAGE_VERSION = "15.4.1";
+const PACKAGE_VERSION = "15.4.2";
 const PACKAGE_NAME = "zwave-js";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../src/lib/_version.ts"],
-  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.4.1\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
+  "sourcesContent": ["// This file is auto-generated by the codegen maintenance script\nexport const PACKAGE_VERSION = \"15.4.2\";\nexport const PACKAGE_NAME = \"zwave-js\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;;;;;;AACO,MAAM,kBAAkB;AACxB,MAAM,eAAe;",
   "names": []
 }

package/build/cjs/lib/driver/Driver.js

@@ -83,7 +83,8 @@ const libNameString = `
 `;
 const defaultOptions = {
   timeouts: {
-    ack: 1e3,
+    ack: 1600,
+    // A sending interface MUST wait for 1600ms or more for an ACK Frame after transmitting a Data Frame.
     byte: 150,
     // Ideally we'd want to have this as low as possible, but some
     // 500 series controllers can take several seconds to respond sometimes.
@@ -92,7 +93,7 @@ const defaultOptions = {
     // ReportTime timeout SHOULD be set to CommandTime + 1 second
     nonce: 5e3,
     sendDataAbort: 2e4,
-    // If a controller takes over 15s to reach a node, it's probably not going to happen
+    // If a controller takes over 20 seconds to reach a node, it's probably not going to happen
     sendDataCallback: 3e4,
     // INS13954 defines this to be 65000 ms, but waiting that long causes issues with reporting devices
     sendToSleep: 250,
@@ -3579,12 +3580,14 @@ ${handlers.length} left`);
     while (msg = await transaction.generateNextMessage(prevResult)) {
       let jammedAttempts = 0;
       let queueAttempts = 0;
+      let commandAttempts = 0;
       attemptMessage: for (let attemptNumber = 1; ; attemptNumber++) {
         try {
           prevResult = await this.queueSerialAPICommand(msg, transaction.stack);
           if ((0, import_serialapi.isTransmitReport)(prevResult)) {
             if (prevResult.transmitStatus === import_core.TransmitStatus.Fail && "txReport" in prevResult && prevResult.txReport?.txTicks === 0) {
               jammedAttempts++;
+              attemptNumber--;
               if (jammedAttempts < maxJammedAttempts) {
                 this.controller.setStatus(import_core.ControllerStatus.Jammed);
                 await (0, import_async.wait)(this.options.timeouts.retryJammed, true);
@@ -3603,35 +3606,33 @@ ${handlers.length} left`);
           break attemptMessage;
         } catch (e) {
           let zwError;
-          let waitDurationMs = 0;
           if (!(0, import_core.isZWaveError)(e)) {
             zwError = (0, import_StateMachineShared.createMessageDroppedUnexpectedError)(e);
           } else {
             if ((0, import_serialapi.isSendData)(msg) && (0, import_core.isMissingControllerCallback)(e)) {
               throw e;
             } else if ((0, import_core.isMissingControllerACK)(e)) {
-              throw e;
+              commandAttempts++;
+              attemptNumber--;
+              if (commandAttempts < this.options.attempts.controller) {
+                continue attemptMessage;
+              } else {
+                throw e;
+              }
             } else if ((0, import_core.wasControllerReset)(e)) {
               throw e;
             } else if ((0, import_serialapi.isAnySendDataResponse)(e.context) && !e.context.wasSent) {
               queueAttempts++;
+              attemptNumber--;
               if (queueAttempts < 3) {
-                waitDurationMs = 500;
-              } else {
-                throw e;
+                await (0, import_async.wait)(500, true);
+                continue attemptMessage;
               }
+              throw e;
             } else if (e.code === import_core.ZWaveErrorCodes.Controller_MessageDropped) {
               throw e;
             }
-            if (this.mayRetrySerialAPICommand(
-              msg,
-              // Ignore the number of attempts while jammed or where queuing failed
-              attemptNumber - jammedAttempts - queueAttempts,
-              e
-            )) {
-              if (waitDurationMs) {
-                await (0, import_async.wait)(waitDurationMs, true);
-              }
+            if (this.mayRetrySerialAPICommand(msg, attemptNumber, e)) {
               continue attemptMessage;
             }
             zwError = e;
@@ -3669,6 +3670,10 @@ ${handlers.length} left`);
     }
   }
   triggerQueues() {
+    for (const queue of this.queues) {
+      if (!queue)
+        return;
+    }
     for (const queue of this.queues) {
       queue.trigger();
     }