incyclist-devices 1.4.0 → 1.4.1

package/lib/ant/AntScanner.js

@@ -575,8 +575,6 @@ class AntProtocol extends DeviceProtocol_1.default {
                             const channel = channelsUsed + idx;
                             const { sensor } = i;
                             i.device.setChannel(channel);
-                            if (process.env.DEBUG)
-                                console.log('~~~~Ant: attach', channel, i.device.getID());
                             sensor.attach(channel, i.device.getID());
                             this.sensors.attached.push(i);
                         });

package/lib/daum/classic/DaumClassicProtocol.js

@@ -156,7 +156,7 @@ class DaumClassicProtocol extends DeviceProtocol_1.default {
             return;
         scan.scanning = true;
         return device.check()
-            .then(() => {
+            .then(() => __awaiter(this, void 0, void 0, function* () {
             if (this.state.stopScanning)
                 return;
             const { onDeviceFound, onScanFinished, id } = opts;
@@ -166,10 +166,16 @@ class DaumClassicProtocol extends DeviceProtocol_1.default {
             if (onScanFinished) {
                 onScanFinished(id);
             }
+            try {
+                yield device.getBike().saveClose();
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'scanCommand warning: Could not close port', error: err.message });
+            }
             clearInterval(scan.iv);
             scan.iv = undefined;
             scan.scanning = false;
-        })
+        }))
             .catch(() => {
             scan.scanning = false;
         });

package/lib/daum/classic/utils.d.ts

@@ -1,4 +1,4 @@
-export declare function getCockpit(c: any): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "Unknown";
+export declare function getCockpit(c: any): "Cardio" | "Fitness" | "Vita De Luxe" | "8008" | "8008 TRS" | "8080" | "Therapie" | "8008 TRS Pro" | "8008 TRS3" | "Unknown";
 export declare function getBikeType(type: any): 1 | 0;
 export declare function getAge(birthday: any): number;
 export declare function getGender(sex: any): 1 | 2;

package/lib/daum/classic/utils.js

@@ -11,6 +11,8 @@ function getCockpit(c) {
             return "Vita De Luxe";
         case 40:
             return "8008";
+        case 0x2A:
+            return "8008 TRS";
         case 50:
             return "8080";
         case 60:

package/lib/daum/premium/DaumPremiumProtocol.js

@@ -177,7 +177,7 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             return;
         scan.scanning = true;
         device.check()
-            .then(() => {
+            .then(() => __awaiter(this, void 0, void 0, function* () {
             if (this.state.stopScanning)
                 return;
             const { onDeviceFound, onScanFinished, id } = opts;
@@ -187,10 +187,16 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             if (onScanFinished) {
                 onScanFinished(id);
             }
+            try {
+                yield device.getBike().saveClose();
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'scanCommand warning: Could not close port', error: err.message });
+            }
             clearInterval(scan.iv);
             scan.iv = undefined;
             scan.scanning = false;
-        })
+        }))
             .catch(() => {
             scan.scanning = false;
         });

package/lib/daum/premium/bike.js

@@ -166,21 +166,18 @@ class Daum8i {
             const tTimeout = Date.now() + TIMEOUT_START;
             const iv = setInterval(() => {
                 if (this.state.error !== undefined) {
-                    console.log('~~ -> error');
                     clearInterval(iv);
                     this.forceClose();
                     reject(this.state.error);
                     this.state = { opened: false, closed: true, busy: false };
                 }
                 else if (this.isConnected()) {
-                    console.log('~~ -> connected');
                     this.state.connecting = false;
                     resolve(true);
                     clearInterval(iv);
                 }
                 else {
                     if (Date.now() > tTimeout) {
-                        console.log('~~ -> timeout');
                         this.state.connecting = false;
                         this.forceClose();
                         clearInterval(iv);
@@ -281,7 +278,6 @@ class Daum8i {
         });
     }
     forceClose(updateState = false) {
-        console.log('~~~ forceClose', updateState);
         const sp = this.sp;
         if (!this.sp)
             return;

package/lib/daum/premium/tcpserial.js

@@ -38,18 +38,15 @@ class TcpSocketPort {
                 });
             }
             this.logger.logEvent({ message: 'opening', id: this.id, retry });
-            console.log('~~opening socket', this.id);
             this.socket.connect(this.port, this.host);
         }
         catch (err) {
             this.logger.logEvent({ message: 'opening error', id: this.id, error: err.message, stack: err.stack });
-            console.log('~~open socket error', this.id, err);
             this.emit('error', err);
         }
     }
     close() {
         this.logger.logEvent({ message: 'closing', id: this.id });
-        console.log('~~closing socket', this.id);
         this.isOpen = false;
         this.isClosed = true;
         try {
@@ -67,7 +64,6 @@ class TcpSocketPort {
         if (this.isOpen)
             return;
         this.logger.logEvent({ message: 'timeout', id: this.id });
-        console.log('~~socket timeout', this.id);
         try {
             this.socket.end();
         }
@@ -78,14 +74,12 @@ class TcpSocketPort {
     }
     onConnect() {
         this.logger.logEvent({ message: 'connected', id: this.id });
-        console.log('~~socket connected', this.id);
         this.isOpen = true;
         this.isClosed = false;
         this.emit('open');
     }
     onError(err) {
         this.logger.logEvent({ message: 'error', error: err.message });
-        console.log('~~socket error', this.id, err);
         if (this.callbacks['error'])
             this.callbacks['error'](err);
     }

package/package.json

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