incyclist-devices 2.0.4 → 2.0.6

package/lib/antv2/adapter.d.ts

@@ -65,5 +65,6 @@ export declare class ControllableAntAdapter<TDeviceData extends BaseDeviceData,
     getSupportedCyclingModes(): any[];
     getDefaultCyclingMode(): CyclingMode;
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
     getCyclingMode(): CyclingMode;
 }

package/lib/antv2/adapter.js

@@ -306,6 +306,11 @@ class ControllableAntAdapter extends AntAdapter {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     getCyclingMode() {
         if (!this.cyclingMode)
             this.setCyclingMode(this.getDefaultCyclingMode());

package/lib/antv2/ant-interface.js

@@ -57,6 +57,7 @@ class AntInterface extends events_1.default {
     logEvent(event) {
         if (this.logger)
             this.logger.logEvent(event);
+        console.log('~~~ ANT', event);
     }
     isConnected() {
         return this.connectState.connected;

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

@@ -17,6 +17,7 @@ export default class AntFEAdapter extends ControllableAntAdapter<FitnessEquipmen
     protected distanceInternal?: number;
     protected startProps: AntDeviceProperties;
     protected isReconnecting: boolean;
+    protected sensorConnected: boolean;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     createSensor(settings: AntDeviceSettings): ISensor;
     getName(): string;
@@ -32,7 +33,8 @@ export default class AntFEAdapter extends ControllableAntAdapter<FitnessEquipmen
     transformData(bikeData: IncyclistBikeData): FitnessEquipmentSensorData;
     start(props?: any): Promise<any>;
     setFEDefaultTimeout(): void;
+    stop(): Promise<boolean>;
     reconnect(): Promise<boolean>;
-    setCyclingMode(mode: string | CyclingMode, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
 }
 export {};

package/lib/antv2/fe/adapter.js

@@ -38,6 +38,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         this.logger = new gd_eventlog_1.EventLogger('Ant+FE');
         this.isReconnecting = false;
         this.startProps = {};
+        this.sensorConnected = false;
         this.capabilities = [
             capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Speed, capabilities_1.IncyclistCapability.Cadence,
             capabilities_1.IncyclistCapability.Control
@@ -193,8 +194,8 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             const opts = props || {};
             const { args = {}, user = {} } = opts;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const { timeout = 20000 } = props || {};
-                const totalTimeout = timeout + 10000;
+                const { startupTimeout = 20000, reconnectTimeout = 2000 } = props || {};
+                const totalTimeout = Math.min(startupTimeout + 10000, startupTimeout * 2);
                 let to;
                 const stopTimeoutCheck = () => {
                     if (to) {
@@ -203,44 +204,43 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                     }
                 };
                 to = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                    yield this.stop();
                     reject(new Error(`could not start device, reason:timeout`));
+                    this.started = false;
                     to = null;
                 }), totalTimeout);
                 this.setFEDefaultTimeout();
                 let success = false;
                 let status = { userSent: false, slopeSent: false };
                 let retry = 0;
-                let startSuccess = 0;
+                let hasData = false;
                 while (!success && retry < MAX_RETRIES) {
                     retry++;
-                    if (!this.started) {
+                    if (!this.sensorConnected) {
                         this.logEvent({ message: 'start sensor', props });
-                        this.started = yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
-                        if (this.started) {
+                        this.sensorConnected = yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
+                        if (this.sensorConnected) {
                             this.logEvent({ message: 'sensor started', props });
-                            startSuccess++;
                         }
-                        if (this.started && startSuccess === 1) {
+                    }
+                    if (this.sensorConnected && !hasData) {
+                        try {
+                            yield this.waitForData(startupTimeout);
+                            hasData = true;
+                        }
+                        catch (err) {
+                            stopTimeoutCheck();
                             try {
-                                console.log('~~~ Device: waiting for data', 'timeout=', timeout || 'unknown');
-                                yield this.waitForData(timeout);
-                                console.log('~~~ Device: data received');
-                            }
-                            catch (err) {
-                                stopTimeoutCheck();
-                                try {
-                                    yield yield this.ant.stopSensor(this.sensor);
-                                }
-                                catch (_a) { }
-                                this.started = false;
-                                return reject(new Error('could not start device, reason:timeout'));
+                                yield yield this.ant.stopSensor(this.sensor);
+                                this.sensorConnected = false;
                             }
+                            catch (_a) { }
+                            this.started = false;
+                            return reject(new Error('could not start device, reason:no data received'));
                         }
-                        status = { userSent: false, slopeSent: false };
                     }
-                    if (!this.started) {
-                        yield (0, utils_2.sleep)(2000);
+                    status = { userSent: false, slopeSent: false };
+                    if (!hasData) {
+                        yield (0, utils_2.sleep)(reconnectTimeout);
                         continue;
                     }
                     if (!this.isReconnecting) {
@@ -272,10 +272,6 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                         }
                         catch (err) {
                             this.logger.logEvent({ message: 'sending FE message error', error: err.message });
-                            try {
-                                yield this.ant.stopSensor(this.sensor);
-                            }
-                            catch (_b) { }
                             this.started = false;
                         }
                         success = status.userSent && status.slopeSent;
@@ -284,22 +280,24 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                         success = true;
                     }
                 }
-                while (success && this.dataMsgCount === 0) {
-                    yield (0, utils_2.sleep)(500);
-                }
                 if (success) {
                     this.logEvent({ message: 'start success' });
+                    this.started = true;
                     stopTimeoutCheck();
                     resolve(true);
                 }
                 else {
                     this.logEvent({ message: 'start failed' });
                     stopTimeoutCheck();
-                    if (this.started) {
+                    if (!hasData) {
+                        reject(new Error('could not start device, reason: no data received'));
+                    }
+                    else if (this.sensorConnected) {
                         reject(new Error('could not start device, reason: could not send FE commands'));
                     }
-                    else
+                    else {
                         reject(new Error('could not start device, reason: could not connect'));
+                    }
                     this.started = false;
                 }
             }));
@@ -309,6 +307,11 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         const fe = this.sensor;
         fe.setSendTimeout(5000);
     }
+    stop() {
+        const stopped = super.stop();
+        this.sensorConnected = false;
+        return stopped;
+    }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'reconnect to device' });
@@ -328,16 +331,25 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             }
         });
     }
-    setCyclingMode(mode, settings) {
-        const modeChange = this.cyclingMode.getName() !== mode;
-        super.setCyclingMode(mode, settings);
-        if (modeChange && this.started && !this.stopped) {
-            if (this.getCyclingMode() instanceof ant_fe_erg_mode_1.default) {
-                const power = this.data.power;
-                const request = power ? { targetPower: power } : this.getCyclingMode().getBikeInitRequest();
-                this.sendUpdate(request, true);
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.started && !this.stopped) {
+                try {
+                    if (this.getCyclingMode() instanceof ant_fe_erg_mode_1.default) {
+                        const power = this.data.power;
+                        const request = power ? { targetPower: power } : this.getCyclingMode().getBikeInitRequest();
+                        yield this.sendUpdate(request, true);
+                        return true;
+                    }
+                }
+                catch (_a) {
+                    return false;
+                }
             }
-        }
+            else {
+                return false;
+            }
+        });
     }
 }
 exports.default = AntFEAdapter;

package/lib/base/adpater.d.ts

@@ -64,5 +64,6 @@ export declare class ControllableDevice extends IncyclistDevice implements Bike
     getSupportedCyclingModes(): any[];
     getDefaultCyclingMode(): CyclingMode;
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
     getCyclingMode(): CyclingMode;
 }

package/lib/base/adpater.js

@@ -65,6 +65,10 @@ class IncyclistDevice extends events_1.default {
         if (!this.logger || this.paused)
             return;
         this.logger.logEvent(event);
+        if (process.env.BLE_DEBUG || process.env.ANT_DEBUG) {
+            const logText = '~~~' + this.getInterface().toUpperCase();
+            console.log(logText, event);
+        }
     }
     getMaxUpdateFrequency() {
         return this.updateFrequency;
@@ -174,6 +178,11 @@ class ControllableDevice extends IncyclistDevice {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     getCyclingMode() {
         if (!this.cyclingMode)
             this.setCyclingMode(this.getDefaultCyclingMode());

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

@@ -49,5 +49,6 @@ export declare class BleControllableAdapter extends BleAdapter implements Bike {
     getSupportedCyclingModes(): any[];
     getDefaultCyclingMode(): CyclingMode;
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
     getCyclingMode(): CyclingMode;
 }

package/lib/ble/base/adapter.js

@@ -281,6 +281,11 @@ class BleControllableAdapter extends BleAdapter {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     getCyclingMode() {
         if (!this.cyclingMode)
             this.setCyclingMode(this.getDefaultCyclingMode());

package/lib/ble/fm/adapter.d.ts

@@ -17,6 +17,6 @@ export default class BleFmAdapter extends BleControllableAdapter {
     mapData(deviceData: IndoorBikeData): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: BleStartProperties): Promise<any>;
-    sendUpdate(request: any): Promise<void>;
-    setCyclingMode(mode: string | CyclingMode, settings?: any): void;
+    sendUpdate(request: any, enforced?: boolean): Promise<void>;
+    sendInitCommands(): Promise<boolean>;
 }

package/lib/ble/fm/adapter.js

@@ -113,10 +113,11 @@ class BleFmAdapter extends adapter_1.BleControllableAdapter {
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const wasPaused = this.paused;
-            this.resume();
+            if (wasPaused)
+                this.resume();
             if (this.started && !wasPaused)
                 return true;
-            this.logEvent(Object.assign(Object.assign({ message: 'start requested' }, this.getSettings()), { protocol: this.getProtocolName(), props }));
+            this.logEvent(Object.assign(Object.assign({ message: 'starting device' }, this.getSettings()), { protocol: this.getProtocolName(), props, isStarted: this.started }));
             const { restart = wasPaused } = props;
             if (!restart && this.ble.isScanning() && !this.getComms().isConnected()) {
             }
@@ -172,7 +173,7 @@ class BleFmAdapter extends adapter_1.BleControllableAdapter {
                         if (!hasControl)
                             throw new Error('could not establish control');
                         const startRequest = this.getCyclingMode().getBikeInitRequest();
-                        yield this.sendUpdate(startRequest);
+                        yield this.sendUpdate(startRequest, true);
                     }
                     if (!this.started && !wasPaused) {
                         comms.on('data', (data) => {
@@ -207,9 +208,9 @@ class BleFmAdapter extends adapter_1.BleControllableAdapter {
             }
         });
     }
-    sendUpdate(request) {
+    sendUpdate(request, enforced = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused || !this.device)
+            if (!enforced && (this.paused || !this.device))
                 return;
             try {
                 const update = this.getCyclingMode().sendBikeUpdate(request);
@@ -227,23 +228,25 @@ class BleFmAdapter extends adapter_1.BleControllableAdapter {
             }
         });
     }
-    setCyclingMode(mode, settings) {
-        const modeChange = this.cyclingMode.getName() !== mode;
-        const prevMode = this.getCyclingMode();
-        super.setCyclingMode(mode, settings);
-        const isPaused = this.isPaused();
-        if (modeChange && this.started && !this.stopped) {
-            if (prevMode instanceof ble_st_mode_1.default) {
-                const power = this.data.power;
-                const request = power ? { targetPower: power } : this.getCyclingMode().getBikeInitRequest();
-                if (isPaused)
-                    this.resume();
-                this.sendUpdate(request).then().catch().finally(() => {
-                    if (isPaused)
-                        this.pause();
-                });
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.started && !this.stopped) {
+                try {
+                    if (this.getCyclingMode() instanceof ble_erg_mode_1.default) {
+                        const power = this.data.power;
+                        const request = power ? { targetPower: power } : this.getCyclingMode().getBikeInitRequest();
+                        yield this.sendUpdate(request, true);
+                        return true;
+                    }
+                }
+                catch (_a) {
+                    return false;
+                }
             }
-        }
+            else {
+                return false;
+            }
+        });
     }
 }
 exports.default = BleFmAdapter;

package/lib/serial/bindings/tcp.js

@@ -228,9 +228,14 @@ class TCPPortBinding {
         }
         this.writeOperation = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             yield resolveNextTick();
-            this.socket.write(buffer, () => {
-                resolve();
-            });
+            try {
+                this.socket.write(buffer, () => {
+                    resolve();
+                });
+            }
+            catch (err) {
+                this.onError(err);
+            }
         }));
         return this.writeOperation;
     }

package/lib/serial/daum/DaumAdapter.d.ts

@@ -27,6 +27,7 @@ export default class DaumAdapterBase extends SerialIncyclistDevice implements Da
     updateBusy: boolean;
     constructor(settings: SerialDeviceSettings, props?: DeviceProperties);
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
     getSupportedCyclingModes(): Array<any>;
     getCyclingMode(): CyclingMode;
     getDefaultCyclingMode(): CyclingMode;

package/lib/serial/daum/DaumAdapter.js

@@ -61,6 +61,26 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.started && !this.stopped) {
+                try {
+                    if (this.getCyclingMode() instanceof ERGCyclingMode_1.default) {
+                        const power = this.deviceData.power;
+                        const request = power ? { targetPower: power } : this.getCyclingMode().getBikeInitRequest();
+                        yield this.sendUpdate(request);
+                        return true;
+                    }
+                }
+                catch (_a) {
+                    return false;
+                }
+            }
+            else {
+                return false;
+            }
+        });
+    }
     getSupportedCyclingModes() {
         return [ERGCyclingMode_1.default, SmartTrainerCyclingMode_1.default, DaumPowerMeterCyclingMode_1.default];
     }
@@ -215,7 +235,6 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
-                console.log('~~~ bike data', bikeData);
                 this.updateData(this.cyclingData, bikeData);
                 const data = this.transformData();
                 this.updateBusy = false;

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

@@ -25,7 +25,6 @@ const DAUM_PREMIUM_DEFAULT_PORT = 51955;
 const START_RETRY_TIMEOUT = 1500;
 const DEFAULT_GEAR = 10;
 const getBikeProps = (props) => {
-    console.log('~~~getBikeProps', props);
     const { host, port = DAUM_PREMIUM_DEFAULT_PORT, interface: ifaceName } = props;
     let serial;
     if (ifaceName && typeof ifaceName === 'string') {
@@ -47,7 +46,6 @@ const getBikeProps = (props) => {
 };
 class DaumPremiumAdapter extends DaumAdapter_1.default {
     constructor(settings, props) {
-        console.log('~~~ new premium adapter');
         const logger = new gd_eventlog_1.EventLogger('DaumPremium');
         const commProps = Object.assign(Object.assign({}, getBikeProps(settings)), { logger });
         const bike = new comms_1.default(commProps);
@@ -187,7 +185,6 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     if (!info.version) {
                         info.version = yield this.bike.getProtocolVersion();
                     }
-                    console.log('~~~~ starting Daum8i', this.getCyclingMode().getName(), this.getCyclingMode().getModeProperty('eppSupport'));
                     if (this.getCyclingMode().getModeProperty('eppSupport')) {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload) {

package/lib/serial/serial-interface.js

@@ -42,7 +42,6 @@ class SinglePathScanner {
     }
     scan() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ start SERIAL Scan', this.isScanning);
             if (this.isScanning)
                 return;
             this.isScanning = true;
@@ -53,7 +52,6 @@ class SinglePathScanner {
                 let found = false;
                 while (!found && this.isScanning) {
                     try {
-                        console.log('~~~ adapter check attempt');
                         const { protocol } = this.props;
                         let host, port;
                         if (this.serial.getName() === exports.SerialInterfaceType.TCPIP) {
@@ -72,7 +70,6 @@ class SinglePathScanner {
                         yield (0, utils_1.sleep)(100);
                     }
                     catch (err) {
-                        console.log('~~~ERROR', err);
                         this.logger.logEvent({ message: 'error', fn: 'scan()', error: err.message || err, stack: err.stack });
                         yield (0, utils_1.sleep)(100);
                     }
@@ -85,13 +82,11 @@ exports.SinglePathScanner = SinglePathScanner;
 class SerialInterface extends events_1.default {
     static getInstance(props) {
         const { ifaceName, binding, logger } = props;
-        console.log('~~~ new instance #1', ifaceName, serialport_1.default.getInstance().getBinding(ifaceName));
         let instance = SerialInterface._instances.find(i => i.ifaceName === ifaceName);
         if (!instance) {
             if (binding)
                 instance = new SerialInterface(props);
             else {
-                console.log('~~~ new instance', ifaceName, serialport_1.default.getInstance().getBinding(ifaceName));
                 instance = new SerialInterface({ ifaceName, binding: serialport_1.default.getInstance().getBinding(ifaceName), logger });
                 if (instance)
                     SerialInterface._instances.push(instance);
@@ -115,6 +110,7 @@ class SerialInterface extends events_1.default {
         this.isScanning = false;
         this.isStopScanRequested = false;
         this.scanEvents = new events_1.default();
+        this.scanEvents.setMaxListeners(100);
         this.logger = props.logger || new gd_eventlog_1.EventLogger(`Serial:${ifaceName}`);
         this.connected = false;
         this.logger.logEvent({ message: 'new serial interface', ifaceName });
@@ -160,7 +156,6 @@ class SerialInterface extends events_1.default {
     }
     openPort(path) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ SerialPort.openPort', this.ifaceName, path);
             this.logger.logEvent({ message: 'opening port', path });
             const port = serialport_1.default.getInstance().getSerialPort(this.ifaceName, { path });
             if (!port) {
@@ -193,7 +188,6 @@ class SerialInterface extends events_1.default {
     }
     closePort(path) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~~ SerialPort.closePort', this.ifaceName, path);
             const existing = this.ports.findIndex(p => p.path === path);
             if (existing === -1)
                 return true;
@@ -217,7 +211,6 @@ class SerialInterface extends events_1.default {
     }
     scan(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log('~~serial scan', this.isScanning, this.isConnected());
             if (this.isScanning)
                 return [];
             if (!this.isConnected())

package/lib/simulator/Simulator.d.ts

@@ -41,6 +41,7 @@ export declare class Simulator extends ControllableDevice {
     getDefaultCyclingMode(): CyclingMode;
     getCyclingMode(): CyclingMode;
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    sendInitCommands(): Promise<boolean>;
     start(props?: SimulatorProperties): Promise<boolean>;
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;

package/lib/simulator/Simulator.js

@@ -88,6 +88,11 @@ class Simulator extends adpater_1.ControllableDevice {
         this.cyclingMode = selectedMode;
         this.cyclingMode.setSettings(settings);
     }
+    sendInitCommands() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return true;
+        });
+    }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.startProps = props;

package/lib/types/adapter.d.ts

@@ -30,7 +30,7 @@ export interface IncyclistDeviceAdapter extends EventEmitter {
     onData(callback: OnDeviceDataCallback): any;
 }
 export interface Bike {
-    setCyclingMode(mode: CyclingMode | string, settings?: any): void;
+    setCyclingMode(mode: CyclingMode | string, settings?: any, sendInitCommands?: boolean): void;
     getSupportedCyclingModes(): Array<any>;
     getCyclingMode(): CyclingMode;
     getDefaultCyclingMode(): CyclingMode;

package/package.json

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