incyclist-devices 2.1.29 → 2.1.31

package/lib/antv2/base/adapter.js

@@ -415,7 +415,7 @@ class AntAdapter extends adpater_1.default {
                 yield (0, utils_1.sleep)(20);
             }
             try {
-                stopped = yield this.ant.stopSensor(this.sensor);
+                stopped = yield (0, utils_1.runWithTimeout)(this.ant.stopSensor(this.sensor), 5000);
             }
             catch (err) {
                 this.logEvent({ message: 'stop sensor failed', reason: err.message });

package/lib/antv2/base/interface.js

@@ -116,12 +116,14 @@ class AntInterface extends events_1.default {
                         else
                             promises.push(c.channel.stopAllSensors());
                     });
-                    yield Promise.allSettled(promises);
+                    yield (0, utils_1.waitWithTimeout)(Promise.allSettled(promises), 2000, () => {
+                        this.logEvent({ message: 'ANT+ disconnect timeout' });
+                    });
                     yield (0, utils_1.sleep)(200);
                 }
                 if (this.device) {
                     try {
-                        closed = yield this.device.close();
+                        closed = yield (0, utils_1.runWithTimeout)(this.device.close(), 1000);
                     }
                     catch (_a) {
                         closed = false;
@@ -133,6 +135,7 @@ class AntInterface extends events_1.default {
             }
             catch (err) {
                 this.logEvent({ message: 'Error', fn: '', error: err.message, stack: err.stack });
+                closed = false;
             }
             this.logEvent({ message: 'ANT+ disconnected' });
             this.connectPromise = null;

package/lib/antv2/fe/adapter.d.ts

@@ -16,6 +16,7 @@ export default class AntFEAdapter extends AntAdapter<FitnessEquipmentSensorState
     protected startProps: AntDeviceProperties;
     protected promiseReconnect: Promise<boolean>;
     protected promiseSendUpdate: Promise<boolean>;
+    protected promiseStop: Promise<boolean>;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getDisplayName(): string;
     isReconnecting(): boolean;

package/lib/antv2/fe/adapter.js

@@ -40,6 +40,8 @@ class AntFEAdapter extends adapter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if ((this.paused || this.isReconnecting()) && !forced)
                 return;
+            if (this.promiseStop)
+                return;
             if (this.promiseSendUpdate) {
                 this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy' });
                 return;
@@ -221,9 +223,18 @@ class AntFEAdapter extends adapter_1.default {
         fe.setSendTimeout(5000);
     }
     stop() {
-        const stopped = super.stop();
-        this.sensorConnected = false;
-        return stopped;
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.promiseStop)
+                return yield this.promiseStop;
+            this.promiseStop = _super.stop.call(this);
+            this.sensorConnected = false;
+            const stopped = yield this.promiseStop;
+            delete this.promiseStop;
+            return stopped;
+        });
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/factories/interfaces.js

@@ -12,7 +12,7 @@ class InterfaceFactory {
         switch (ifaceName) {
             case device_1.INTERFACE.SERIAL:
             case device_1.INTERFACE.TCPIP:
-                const serialProps = props;
+                const serialProps = (props || {});
                 serialProps.ifaceName = ifaceName;
                 return serial_1.SerialInterface.getInstance(serialProps);
             case device_1.INTERFACE.ANT:

package/lib/serial/daum/premium/adapter.d.ts

@@ -20,6 +20,7 @@ export default class DaumPremiumAdapter extends DaumAdapter<SerialDeviceSettings
     performCheck(): Promise<boolean>;
     getStartRetries(): number;
     getStartRetryTimeout(): number;
+    restart(pause?: number): Promise<boolean>;
     performStart(props?: DaumPremiumDeviceProperties, _isRelaunch?: boolean, wasPaused?: boolean): Promise<boolean>;
     requiresProgramUpload(): boolean;
     getCurrentBikeData(): Promise<IncyclistBikeData>;

package/lib/serial/daum/premium/adapter.js

@@ -122,6 +122,16 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
     getStartRetryTimeout() {
         return START_RETRY_TIMEOUT;
     }
+    restart(pause) {
+        const _super = Object.create(null, {
+            restart: { get: () => super.restart }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.requiresProgramUpload())
+                return false;
+            return yield _super.restart.call(this, pause);
+        });
+    }
     performStart(props = {}, _isRelaunch = false, wasPaused = false) {
         return __awaiter(this, void 0, void 0, function* () {
             this.setBikeProps(props);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.1.29",
+  "version": "2.1.31",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",