incyclist-devices 1.5.17 → 1.5.19

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/DaumAdapter.js

@@ -204,6 +204,8 @@ class DaumAdapterBase extends device_1.default {
         this.logger.logEvent(event);
     }
     stop() {
+        if (this.stopped)
+            return Promise.resolve(true);
         this.logEvent({ message: 'stop request' });
         this.stopped = true;
         return new Promise((resolve, reject) => {
@@ -241,7 +243,7 @@ class DaumAdapterBase extends device_1.default {
     }
     sendUpdate(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused)
+            if (this.paused || this.stopped)
                 return;
             this.logEvent({ message: 'sendUpdate', request, waiting: this.requests.length });
             return yield this.processClientRequest(request);
@@ -253,6 +255,8 @@ class DaumAdapterBase extends device_1.default {
     }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                return;
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
@@ -271,6 +275,8 @@ class DaumAdapterBase extends device_1.default {
     }
     sendRequests() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.stopped)
+                return;
             if (this.requests.length > 0) {
                 const processing = [...this.requests];
                 const cnt = processing.length;
@@ -294,7 +300,7 @@ class DaumAdapterBase extends device_1.default {
     }
     bikeSync() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused) {
+            if (this.paused || this.stopped) {
                 return;
             }
             if (this.updateBusy || this.requestBusy) {

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

@@ -22,6 +22,6 @@ export default class DaumClassicAdapter extends DaumAdapter {
         user?: any;
         bikeSettings?: any;
         gear?: any;
-    }): Promise<unknown>;
+    }, isRelaunch?: boolean): Promise<unknown>;
     getCurrentBikeData(): any;
 }

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();
@@ -137,7 +137,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             }
         });
     }
-    performStart(props = {}) {
+    performStart(props = {}, isRelaunch = false) {
         this.stop();
         const { user, bikeSettings } = props;
         if (user && user.weight)
@@ -148,7 +148,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         let startState = {};
         return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
             try {
-                if (!this.bike.isConnected())
+                if (!isRelaunch && !this.bike.isConnected())
                     yield this.bike.saveConnect();
                 yield this.getBike().resetDevice();
                 if (!startState.setProg) {

package/lib/daum/classic/bike.js

@@ -76,10 +76,12 @@ class Daum8008 {
         return 10;
     }
     connect() {
-        this.logEvent({ message: "connect()", port: this.getPort(), sp: (this.sp !== undefined), });
+        this.logEvent({ message: "connect()", port: this.getPort(), isConnected: this.connected, sp: (this.sp !== undefined), });
         if (this.closing || this.opening) {
             return;
         }
+        if (this.connected)
+            return;
         try {
             if (this.sp === undefined) {
                 const settings = this.settings.port || {};

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.17",
+  "version": "1.5.19",
   "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.10",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {