incyclist-devices 1.5.36 → 1.5.38

package/lib/daum/DaumAdapter.js

@@ -217,8 +217,7 @@ class DaumAdapterBase extends device_1.default {
                         clearInterval(this.iv.update);
                     this.iv = undefined;
                 }
-                if (this.bike.stopWorker && typeof (this.bike.stopWorker) === 'function')
-                    this.bike.stopWorker();
+                this.bike.stopWorker();
                 this.logEvent({ message: 'stop request completed' });
                 this.paused = undefined;
                 resolve(true);

package/lib/daum/classic/bike.js

@@ -220,6 +220,7 @@ class Daum8008 {
         }, 50);
     }
     stopWorker() {
+        this.logEvent({ message: "stop worker", port: this.getPort() });
         if (this.queue !== undefined)
             this.queue.clear();
         if (this.bikeCmdWorker !== undefined) {
@@ -230,7 +231,7 @@ class Daum8008 {
             this.queue.clear();
     }
     sendDaum8008CommandfromQueue() {
-        if (!this.connected || this.closing)
+        if (!this.connected || this.closing || !this.sp)
             return;
         if (this.cmdStart !== undefined && this.error !== undefined) {
             if (this.cmdStart !== undefined) {

package/lib/daum/premium/bike.d.ts

@@ -75,6 +75,7 @@ declare class Daum8i {
     sendACK(): void;
     sendNAK(): void;
     sendReservedDaum8iCommand(command: ReservedCommands, cmdType: any, data?: Buffer): Promise<any[]>;
+    stopWorker(): void;
     getProtocolVersion(): Promise<string>;
     getDashboardVersion(): Promise<unknown>;
     getDeviceType(): Promise<any>;

package/lib/daum/premium/bike.js

@@ -34,13 +34,19 @@ const DEBUG_LOGGER = {
     log: (e, ...args) => console.log(e, ...args),
     logEvent: (event) => console.log(JSON.stringify(event))
 };
+const validateHost = (host) => {
+    const ipParts = host.split('.');
+    if (ipParts.length > 1)
+        return ipParts.map(p => Number(p)).join('.');
+    return host;
+};
 class Daum8i {
     constructor(props) {
         this.props = props || {};
         this.logger = process.env.DEBUG ? DEBUG_LOGGER : new gd_eventlog_1.EventLogger('DaumPremium');
         if (this.props.interface === 'tcpip') {
             const port = this.props.port || DAUM_PREMIUM_DEFAULT_PORT;
-            const host = this.props.host || DAUM_PREMIUM_DEFAULT_HOST;
+            const host = validateHost(this.props.host || DAUM_PREMIUM_DEFAULT_HOST);
             this.portName = `${host}:51955`;
             this.tcpip = true;
             this.serial = false;
@@ -636,6 +642,9 @@ class Daum8i {
             return cmd;
         });
     }
+    stopWorker() {
+        this.logEvent({ message: "stop worker", port: this.getPort() });
+    }
     getProtocolVersion() {
         return this.sendDaum8iCommand('V00', 'AF', [])
             .then((data) => {

package/package.json

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