incyclist-devices 2.2.4 → 2.2.7

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

@@ -63,6 +63,7 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData> extends Incy
     reportStartStatus(): boolean;
     protected waitForInitialData(startupTimeout: any): Promise<void>;
     protected initSensor(props: any): Promise<boolean>;
+    getLogProps(startProps?: AntDeviceProperties): AntDeviceProperties;
     start(startProps?: AntDeviceProperties): Promise<boolean>;
     stop(): Promise<boolean>;
     startSensor(): Promise<boolean>;

package/lib/antv2/base/adapter.js

@@ -354,15 +354,20 @@ class AntAdapter extends adpater_1.default {
             }
         });
     }
+    getLogProps(startProps) {
+        const { user, userWeight, bikeWeight, startupTimeout, automaticReconnect } = startProps !== null && startProps !== void 0 ? startProps : {};
+        return { user, userWeight, bikeWeight, startupTimeout, automaticReconnect };
+    }
     start(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const props = this.getStartProps(startProps);
+            const logProps = this.getLogProps(startProps);
             const preCheckResult = yield this.startPreChecks(props);
             if (preCheckResult === 'done')
                 return this.started;
             if (preCheckResult === 'connection-failed')
                 throw new Error(`could not start device, reason:could not connect`);
-            this.logEvent({ message: 'starting device', device: this.getName(), props, isStarted: this.started });
+            this.logEvent({ message: 'starting device', device: this.getName(), props: logProps, isStarted: this.started, isPaused: this.isPaused, isStopped: this.isStopped });
             this.resetStartStatus();
             this.resetData();
             const { startupTimeout = this.getDefaultStartupTimeout() } = props;

package/lib/modes/antble-smarttrainer.d.ts

@@ -4,6 +4,7 @@ import { IAdapter } from "../types";
 export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase implements ICyclingMode {
     protected static config: {
         name: string;
+        isSIM: boolean;
         description: string;
         properties: ({
             key: string;

package/lib/modes/antble-smarttrainer.js

@@ -64,6 +64,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
 }
 SmartTrainerCyclingMode.config = {
     name: "Smart Trainer",
+    isSIM: true,
     description: "Calculates speed based on power and slope. Slope is set to the device",
     properties: [
         { key: 'bikeType', name: 'Bike Type', description: '', type: types_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },

package/lib/modes/types.d.ts

@@ -49,6 +49,7 @@ export default interface ICyclingMode {
 }
 export type CyclingModeConfig = {
     isERG?: boolean;
+    isSIM?: boolean;
     name: string;
     description: string;
     properties: CyclingModeProperty[];
@@ -69,4 +70,7 @@ export declare class CyclingMode implements ICyclingMode {
     getSettings(): Settings;
     setModeProperty(_name: string, _value: any): void;
     getModeProperty(_name: string): void;
+    getConfig(): CyclingModeConfig;
+    isERG(): boolean;
+    isSIM(): boolean;
 }

package/lib/modes/types.js

@@ -52,5 +52,14 @@ class CyclingMode {
     getModeProperty(_name) {
         throw new Error("Method not implemented.");
     }
+    getConfig() {
+        throw new Error("Method not implemented.");
+    }
+    isERG() {
+        return this.getConfig().isERG;
+    }
+    isSIM() {
+        return this.getConfig().isSIM;
+    }
 }
 exports.CyclingMode = CyclingMode;

package/lib/serial/base/serial-scanner.js

@@ -67,6 +67,11 @@ class SinglePathScanner {
                         }
                         const adapterSettings = { interface: this.serial.getName(), host, port, protocol };
                         const adapter = adapter_factory_1.default.getInstance().createInstance(adapterSettings);
+                        if (!adapter) {
+                            this.isScanning = false;
+                            resolve(this.result);
+                            return;
+                        }
                         if (this.isScanning) {
                             found = yield (adapter === null || adapter === void 0 ? void 0 : adapter.check());
                             if (found) {

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

@@ -163,11 +163,13 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             }
         });
         const checkInterrupt = () => new Promise(done => {
-            this.internalEmitter.on('stop', () => {
+            const onStop = () => {
                 stopped = true;
                 this.started = false;
                 done(false);
-            });
+                this.internalEmitter.off('stop', onStop);
+            };
+            this.internalEmitter.on('stop', onStop);
         });
         return (0, utils_1.runWithRetries)(() => Promise.race([start(), checkInterrupt()]), 5, 1000);
     }

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

@@ -194,11 +194,13 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                 }
             });
             const checkInterrupt = () => new Promise(done => {
-                this.internalEmitter.on('stop', () => {
+                const onStop = () => {
                     stopped = true;
                     this.started = false;
                     done(false);
-                });
+                    this.internalEmitter.off('stop', onStop);
+                };
+                this.internalEmitter.on('stop', onStop);
             });
             const started = yield (0, utils_1.runWithRetries)(() => Promise.race([start(), checkInterrupt()]), this.getStartRetries(), this.getStartRetryTimeout());
             if (started) {

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

@@ -473,32 +473,51 @@ class Daum8i extends comms_1.default {
     }
     programUploadStart(bikeType, route) {
         return __awaiter(this, void 0, void 0, function* () {
-            const payload = Buffer.alloc(40);
-            const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
-            const eppLength = epp ? epp.length : 0;
-            const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
-            const wBits = route.lapMode ? consts_1.DS_BITS_ENDLESS_RACE : consts_1.DS_BITS_OFF;
-            payload.writeInt32LE(0, 0);
-            payload.writeInt8(bikeTypeVal, 4);
-            payload.writeInt8(0, 5);
-            payload.writeInt16LE(0, 6);
-            payload.writeInt32LE(0, 8);
-            payload.writeInt32LE(0, 12);
-            payload.writeFloatLE(0, 16);
-            payload.writeFloatLE(0, 20);
-            payload.writeInt16LE(0, 24);
-            payload.writeInt16LE(0, 26);
-            payload.writeInt16LE(0, 28);
-            payload.writeInt16LE(wBits, 30);
-            payload.writeInt32LE(7, 32);
-            payload.writeInt32LE(eppLength, 36);
-            const res = yield this.sendReservedDaum8iCommand('programUploadStart()', utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM, payload);
-            const buffer = Buffer.from(res);
-            if (buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM) {
-                this.logEvent({ message: 'programUploadStart() response', success: true });
-                return epp;
+            let payload, epp, eppLength, bikeTypeVal, wBits;
+            try {
+                payload = Buffer.alloc(40);
+                epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
+                eppLength = epp ? epp.length : 0;
+                bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
+                wBits = route.lapMode ? consts_1.DS_BITS_ENDLESS_RACE : consts_1.DS_BITS_OFF;
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'programUploadStart#prepare', epp, error: err.message, stack: err.stack });
+                throw err;
+            }
+            try {
+                payload.writeInt32LE(0, 0);
+                payload.writeInt8(bikeTypeVal, 4);
+                payload.writeInt8(0, 5);
+                payload.writeInt16LE(0, 6);
+                payload.writeInt32LE(0, 8);
+                payload.writeInt32LE(0, 12);
+                payload.writeFloatLE(0, 16);
+                payload.writeFloatLE(0, 20);
+                payload.writeInt16LE(0, 24);
+                payload.writeInt16LE(0, 26);
+                payload.writeInt16LE(0, 28);
+                payload.writeInt16LE(wBits, 30);
+                payload.writeInt32LE(7, 32);
+                payload.writeInt32LE(eppLength, 36);
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'programUploadStart#createPayload', bikeTypeVal, wBits, eppLength, error: err.message, stack: err.stack });
+                throw err;
+            }
+            try {
+                const res = yield this.sendReservedDaum8iCommand('programUploadStart()', utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM, payload);
+                const buffer = Buffer.from(res);
+                if (buffer.readInt16LE(0) === utils_1.ReservedCommands.PROGRAM_LIST_NEW_PROGRAM) {
+                    this.logEvent({ message: 'programUploadStart() response', success: true });
+                    return epp;
+                }
+                this.logEvent({ message: 'programUploadStart() response', success: false });
+            }
+            catch (err) {
+                this.logEvent({ message: 'error', fn: 'programUploadStart#send', payload: payload.toString('hex'), error: err.message, stack: err.stack });
+                throw err;
             }
-            this.logEvent({ message: 'programUploadStart() response', success: false });
             throw new Error('Illegal Response');
         });
     }

package/package.json

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