incyclist-devices 1.5.18 → 1.5.20

package/lib/antv2/ant-device.js

@@ -97,7 +97,6 @@ class AntAdapter extends device_1.default {
         if (this.ivDataTimeout)
             return;
         this.ivDataTimeout = setInterval(() => {
-            console.log('~~~ check', this.lastDataTS);
             if (!this.lastDataTS)
                 return;
             if (this.lastDataTS + NO_DATA_TIMEOUT < Date.now()) {

package/lib/antv2/ant-interface.js

@@ -64,7 +64,7 @@ class AntInterface extends events_1.default {
                     const device = new this.Binding(Object.assign(Object.assign({}, this.props), { logger: this.logger }));
                     const opened = yield device.open();
                     if (!opened) {
-                        this.logEvent({ message: 'could not connect' });
+                        this.logEvent({ message: 'ANT+ not connected' });
                         this.isConnecting = false;
                         return false;
                     }

package/lib/antv2/fe.d.ts

@@ -25,5 +25,6 @@ export default class AntFEAdapter extends AntAdapter {
     mapData(deviceData: any): IncyclistBikeData;
     transformData(bikeData: any): any;
     start(props?: any): Promise<any>;
+    initTimeoutHandler(): void;
     stop(): Promise<boolean>;
 }

package/lib/antv2/fe.js

@@ -104,6 +104,9 @@ class AntFEAdapter extends ant_device_1.default {
                 }
             }
             catch (err) {
+                if (err.message && err.message.toLowerCase() === 'timeout') {
+                    this.emit('timeout');
+                }
                 this.logger.logEvent({ message: 'sendBikeUpdate() error', error: err.message });
             }
         });
@@ -220,6 +223,7 @@ class AntFEAdapter extends ant_device_1.default {
                     this.stop();
                     return reject(new Error(`could not start device`));
                 }
+                this.initTimeoutHandler();
                 try {
                     const fe = this.sensor;
                     const mode = this.getCyclingMode();
@@ -251,6 +255,10 @@ class AntFEAdapter extends ant_device_1.default {
             }));
         });
     }
+    initTimeoutHandler() {
+        const fe = this.sensor;
+        fe.setSendTimeout(5000);
+    }
     stop() {
         const _super = Object.create(null, {
             stop: { get: () => super.stop }

package/lib/daum/classic/DaumClassicAdapter.js

@@ -83,9 +83,9 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             try {
                 if (!this.bike.isConnected())
                     yield this.bike.saveConnect();
-                const address = yield this.bike.getAddress();
+                const address = (yield this.bike.getAddress()) || {};
                 info.bikeNo = address.bike;
-                const version = yield this.bike.getVersion();
+                const version = (yield this.bike.getVersion()) || {};
                 info.serialNo = version.serialNo;
                 info.cockpit = version.cockpit;
                 this.setName('Daum ' + info.cockpit);
@@ -117,7 +117,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 if (isRelaunch) {
                     yield this.stop();
                 }
-                yield this.performStart(props);
+                yield this.performStart(props, isRelaunch);
                 if (!isRelaunch) {
                     try {
                         const version = yield this.bike.getVersion();

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.18",
+  "version": "1.5.20",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@types/serialport": "^8.0.1",
     "gd-ant-plus": "^0.0.33",
-    "incyclist-ant-plus": "^0.1.7",
+    "incyclist-ant-plus": "^0.1.12",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {