incyclist-devices 1.4.18 → 1.4.19

package/lib/kettler/comms.js

@@ -16,7 +16,7 @@ const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const events_1 = __importDefault(require("events"));
 const DEFAULT_RCV_TIMEOUT = 1500;
-const DEFAULT_OPEN_TIMEOUT = 1500;
+const DEFAULT_OPEN_TIMEOUT = 3000;
 const DEBUG_LOGGER = {
     log: (e, ...args) => console.log(e, ...args),
     logEvent: (event) => console.log(JSON.stringify(event))
@@ -200,6 +200,7 @@ class KettlerSerialComms extends events_1.default {
                 cmd.onError(err);
             this.sendState = SendState.Idle;
             this.currentCmd = undefined;
+            this.stopCurrentTimeoutCheck();
         };
         try {
             this.logger.logEvent({ message: "sendCommand:sending:", cmd: logStr, msg, port: this.getPort() });
@@ -208,16 +209,17 @@ class KettlerSerialComms extends events_1.default {
             this.sp.write(msg + CRLF, (err) => {
                 this.sendState = SendState.Receiving;
                 this.currentCmd = cmd;
-                if (timeout) {
-                    this.currentTimeout = setTimeout(() => {
-                        if (this.sendState === SendState.Receiving) {
-                            onError(new Error("response timeout"));
-                        }
-                    }, timeout);
-                }
                 if (err)
                     onError(err);
             });
+            this.currentTimeout = setTimeout(() => {
+                if (this.sendState === SendState.Sending) {
+                    onError(new Error("send timeout"));
+                }
+                if (this.sendState === SendState.Receiving) {
+                    onError(new Error("response timeout"));
+                }
+            }, timeout);
         }
         catch (err) {
             onError(err);
@@ -232,7 +234,7 @@ class KettlerSerialComms extends events_1.default {
             this.write(cmd);
     }
     send(cmd) {
-        this.logger.logEvent({ message: 'send()', cmd: cmd.logStr, port: this.getPort(), queueSize: this.queue.size() });
+        this.logger.logEvent({ message: 'add command to queue', cmd: cmd.logStr, msg: cmd.message, port: this.getPort(), queueSize: this.queue.size() });
         this.queue.enqueue(cmd);
     }
 }

package/lib/kettler/ergo-racer/adapter.js

@@ -312,7 +312,6 @@ class KettlerRacerAdapter extends Device_1.default {
                 return info.data;
             }
             catch (err) {
-                console.log('~~~ Error', err);
                 try {
                     yield this.reset();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.18",
+  "version": "1.4.19",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",