incyclist-devices 2.1.32 → 2.1.35

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

@@ -1,9 +1,11 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { IChannel, ISensor, Profile } from 'incyclist-ant-plus';
 import AntInterface from './interface';
 import IncyclistDevice from '../../base/adpater';
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile, BaseDeviceData, AdapterStartStatus } from '../types';
 import { IAdapter, IncyclistAdapterData, IncyclistBikeData, IncyclistCapability } from '../../types';
+import EventEmitter from 'events';
 export default class AntAdapter<TDeviceData extends BaseDeviceData> extends IncyclistDevice<AntDeviceProperties> {
     sensor: ISensor;
     data: IncyclistAdapterData;
@@ -26,6 +28,7 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData> extends Incy
     protected sensorConnected: boolean;
     protected startStatus: AdapterStartStatus;
     protected startupRetryPause: number;
+    protected internalEmitter: EventEmitter;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getProfileName(): Profile;
     getLegacyProfileName(): LegacyProfile;

package/lib/antv2/base/adapter.js

@@ -21,12 +21,14 @@ const utils_2 = require("../utils");
 const consts_1 = require("../consts");
 const sensor_factory_1 = __importDefault(require("../factories/sensor-factory"));
 const gd_eventlog_1 = require("gd-eventlog");
+const events_1 = __importDefault(require("events"));
 const INTERFACE_NAME = 'ant';
 const MAX_RETRIES = 3;
 class AntAdapter extends adpater_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.startupRetryPause = 1000;
+        this.internalEmitter = new events_1.default();
         const profile = this.getProfileName();
         if (settings.protocol && settings.profile !== this.getLegacyProfileName())
             throw new Error('Incorrect Profile');
@@ -126,7 +128,7 @@ class AntAdapter extends adpater_1.default {
             if (!ManId && deviceData.ManId) {
                 this.emit('device-info', this.getSettings(), { manufacturer: (0, utils_2.getBrand)(deviceData.ManId) });
             }
-            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData', '_RawData']);
             this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused, started: this.started, canEmit: this.canEmitData() });
             if (this.isStopped() || !this.canEmitData())
                 return;
@@ -331,6 +333,7 @@ class AntAdapter extends adpater_1.default {
         });
     }
     initSensor(props) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.startStatus.sensorStarted = this.sensorConnected;
             if (this.startStatus.sensorStarted || this.startStatus.sensorStarted)
@@ -339,7 +342,7 @@ class AntAdapter extends adpater_1.default {
             try {
                 this.sensorConnected = yield this.startSensor();
                 if (this.sensorConnected) {
-                    this.logEvent({ message: 'sensor started', device: this.getName(), props });
+                    this.logEvent({ message: 'sensor started', device: this.getName(), channel: (_b = (_a = this.sensor) === null || _a === void 0 ? void 0 : _a.getChannel()) === null || _b === void 0 ? void 0 : _b.getChannelNo(), props });
                     this.startStatus.sensorStarted = true;
                 }
                 else {
@@ -390,8 +393,15 @@ class AntAdapter extends adpater_1.default {
                 this.reportStartStatus();
                 return this.started;
             });
+            const checkInterrupt = () => new Promise(done => {
+                this.internalEmitter.on('stop', () => {
+                    this.started = false;
+                    this.startStatus.interrupted = true;
+                    done(false);
+                });
+            });
             try {
-                yield (0, utils_1.runWithTimeout)(doStart(), totalTimeout);
+                yield (0, utils_1.runWithTimeout)(Promise.race([doStart(), checkInterrupt()]), totalTimeout);
             }
             catch (err) {
                 if (err.message === 'Timeout') {
@@ -409,6 +419,7 @@ class AntAdapter extends adpater_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let stopped;
             this.logger.logEvent({ message: 'stopping device', device: this.getName() });
+            this.internalEmitter.emit('stop');
             this.promiseWaitForData = null;
             if (this.startStatus) {
                 this.startStatus.interrupted = true;
@@ -431,7 +442,7 @@ class AntAdapter extends adpater_1.default {
     }
     startSensor() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
+            return yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
         });
     }
     stopSensor() {

package/lib/base/adpater.js

@@ -67,9 +67,12 @@ class IncyclistDevice extends events_1.default {
     }
     restart(pause) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'restarting device', device: this.getName() });
             const stopped = yield this.stop();
-            if (!stopped)
+            if (!stopped && !this.isStopped()) {
+                this.logger.logEvent({ message: 'restarting device - stop failed', device: this.getName() });
                 return false;
+            }
             if (pause)
                 yield (0, utils_1.sleep)(pause);
             return yield this.start();

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

@@ -24,6 +24,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     updateBusy: boolean;
     startPromise: Promise<boolean>;
     checkPromise: Promise<boolean>;
+    internalEmitter: EventEmitter;
     constructor(settings: S, props?: P);
     getPort(): string;
     getSerialInterface(): SerialInterface;

package/lib/serial/daum/DaumAdapter.js

@@ -26,6 +26,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         this.adapterTime = 0;
         this.requestBusy = false;
         this.updateBusy = false;
+        this.internalEmitter = new events_1.default();
         this.iv = undefined;
         this.deviceData = {
             isPedalling: false,
@@ -216,7 +217,9 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                     this.started = true;
                     return true;
                 }));
+                this.internalEmitter.emit('start');
                 const started = yield this.startPromise;
+                this.internalEmitter.emit('started', started);
                 this.startPromise = undefined;
                 return started;
             }
@@ -340,8 +343,11 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.stopped)
+            console.log('~~~ STOP', this.stopped);
+            if (this.stopped) {
                 return true;
+            }
+            this.internalEmitter.emit('stop');
             this.logEvent({ message: 'stop request', port: this.getPort() });
             if (this.paused)
                 this.resume();
@@ -355,6 +361,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                 this.logEvent({ message: 'stop request failed', port: this.getPort(), reason: err.message });
                 throw (err);
             }
+            this.internalEmitter.emit('stopped', this.stopped);
             return this.stopped;
         });
     }

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

@@ -99,9 +99,14 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         const user = this.getUser();
         const { gear = consts_1.DEFAULT_GEAR } = props;
         this.initData();
+        let stopped = false;
         let startState = {};
-        return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+        const start = () => __awaiter(this, void 0, void 0, function* () {
             try {
+                if (stopped) {
+                    this.started = false;
+                    return false;
+                }
                 this.logEvent({ message: 'start attempt', isRelaunch, isConnected: this.getComms().isConnected() });
                 if (!isRelaunch && !this.getComms().isConnected()) {
                     yield this.verifyConnection();
@@ -136,13 +141,15 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 startState.checkRunData = true;
                 const data = yield this.getComms().runData();
                 if (startRequest.targetPower && startRequest.targetPower !== 25 && data.power === 25) {
-                    throw new Error('invalid device response: runData');
+                    throw (new Error('invalid device response: runData'));
                 }
                 this.started = true;
                 this.startUpdatePull();
-                return true;
+                return (true);
             }
             catch (err) {
+                if (stopped)
+                    return false;
                 this.logEvent({ message: 'start attempt failed', error: err.message });
                 this.started = false;
                 if (startState.checkRunData) {
@@ -150,7 +157,15 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 }
                 throw (new Error(`could not start device, reason:${err.message}`));
             }
-        }), 5, 1000);
+        });
+        const checkInterrupt = () => new Promise(done => {
+            this.internalEmitter.on('stop', () => {
+                stopped = true;
+                this.started = false;
+                done(false);
+            });
+        });
+        return (0, utils_1.runWithRetries)(() => Promise.race([start(), checkInterrupt()]), 5, 1000);
     }
     getCurrentBikeData() {
         return __awaiter(this, void 0, void 0, function* () {

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

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

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

@@ -139,8 +139,12 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
             if (!wasPaused)
                 yield this.stop();
             var info = {};
-            yield (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+            let stopped = false;
+            this.stopped = false;
+            const start = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (stopped)
+                        return false;
                     if (wasPaused) {
                         info.deviceType = 'Resumed';
                         info.version = "Resumed";
@@ -156,7 +160,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     }
                     const user = this.getUser();
                     const { route, onStatusUpdate, gear } = props;
-                    if (this.requiresProgramUpload()) {
+                    if (route && this.requiresProgramUpload()) {
                         const bikeType = this.getCyclingMode().getSetting('bikeType');
                         if (!info.upload) {
                             info.upload = yield this.getComms().programUpload(bikeType, route, onStatusUpdate);
@@ -177,21 +181,33 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
                     if (!this.getCyclingMode().getModeProperty('eppSupport')) {
                         info.gear = yield this.getComms().setGear(this.deviceData.gear || gear || DEFAULT_GEAR);
                     }
-                    return;
+                    return true;
                 }
                 catch (err) {
+                    if (stopped)
+                        return false;
                     if (info.connected && !info.deviceType) {
                         yield (0, utils_1.sleep)(500);
                         yield this.reconnect();
                     }
                     throw (err);
                 }
-            }), this.getStartRetries(), this.getStartRetryTimeout());
-            this.stopped = false;
-            this.paused = false;
-            this.started = true;
-            this.startUpdatePull();
-            return true;
+            });
+            const checkInterrupt = () => new Promise(done => {
+                this.internalEmitter.on('stop', () => {
+                    stopped = true;
+                    this.started = false;
+                    done(false);
+                });
+            });
+            const started = yield (0, utils_1.runWithRetries)(() => Promise.race([start(), checkInterrupt()]), this.getStartRetries(), this.getStartRetryTimeout());
+            if (started) {
+                this.stopped = false;
+                this.paused = false;
+                this.started = true;
+                this.startUpdatePull();
+            }
+            return started;
         });
     }
     requiresProgramUpload() {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-devices",
-  "version": "2.1.32",
+  "version": "2.1.35",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@serialport/parser-readline": "^10.5.0",
     "@serialport/stream": "^10.5.0",
-    "incyclist-ant-plus": "^0.2.0",
+    "incyclist-ant-plus": "^0.3.0",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {

package/lib/adapters.d.ts

@@ -1,7 +0,0 @@
-import { IncyclistDeviceAdapter } from "./base/adpater";
-import { DeviceProperties, DeviceSettings } from "./types/device";
-export default class AdapterFactory {
-    static adapters: IncyclistDeviceAdapter[];
-    static reset(): void;
-    static create(settings: DeviceSettings, props?: DeviceProperties): any;
-}

package/lib/adapters.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const antv2_1 = require("./antv2");
-const ble_1 = require("./ble");
-const serial_1 = require("./serial");
-const Simulator_1 = require("./simulator/Simulator");
-const device_1 = require("./types/device");
-class AdapterFactory {
-    static reset() {
-        AdapterFactory.adapters = [];
-        ble_1.BleAdapterFactory.getInstance().instances = [];
-    }
-    static create(settings, props) {
-        const adapters = AdapterFactory.adapters;
-        if (!settings.interface && settings.protocol === 'Simulator') {
-            const adapter = new Simulator_1.Simulator(settings);
-            if (adapter) {
-                adapters.push(adapter);
-            }
-            return adapter;
-        }
-        const existing = adapters.find(a => a.isEqual(settings));
-        if (existing)
-            return existing;
-        const ifaceName = typeof settings.interface === 'string' ? settings.interface : settings.interface.getName();
-        let adapter;
-        switch (ifaceName) {
-            case device_1.INTERFACE.SERIAL:
-            case device_1.INTERFACE.TCPIP:
-                adapter = serial_1.SerialAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.ANT:
-                adapter = antv2_1.AntAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.BLE:
-                adapter = ble_1.BleAdapterFactory.getInstance().createInstance(settings, props);
-                break;
-            case device_1.INTERFACE.SIMULATOR:
-                adapter = new Simulator_1.Simulator(settings, props);
-                break;
-        }
-        if (adapter) {
-            adapters.push(adapter);
-        }
-        return adapter;
-    }
-}
-AdapterFactory.adapters = [];
-exports.default = AdapterFactory;

package/lib/antv2/adapter-factory.d.ts

@@ -1,14 +0,0 @@
-import { Profile } from "incyclist-ant-plus";
-import AntAdapter from "./base/adapter";
-import { AntDeviceProperties, AntDeviceSettings, LegacyProfile, BaseDeviceData } from "./types";
-import { AntAdapterInfo, AdapterQuery } from "./types";
-export default class AntAdapterFactory {
-    static _instance: AntAdapterFactory;
-    adapters: AntAdapterInfo[];
-    static getInstance(): AntAdapterFactory;
-    constructor();
-    register<TDeviceData extends BaseDeviceData>(antProfile: Profile, incyclistProfile: LegacyProfile, Adapter: typeof AntAdapter<TDeviceData>): void;
-    getAdapter(query?: AdapterQuery): any;
-    createInstance(settings: AntDeviceSettings, props?: AntDeviceProperties): any;
-    createFromDetected(profile: Profile, deviceID: number, props?: AntDeviceProperties): any;
-}

package/lib/antv2/adapter-factory.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class AntAdapterFactory {
-    static getInstance() {
-        if (!AntAdapterFactory._instance)
-            AntAdapterFactory._instance = new AntAdapterFactory();
-        return AntAdapterFactory._instance;
-    }
-    constructor() {
-        this.adapters = [];
-    }
-    register(antProfile, incyclistProfile, Adapter) {
-        const info = Object.assign({}, { antProfile, incyclistProfile, Adapter });
-        const existing = this.adapters.findIndex(a => a.antProfile === antProfile);
-        if (existing !== -1)
-            this.adapters[existing] = info;
-        else
-            this.adapters.push(info);
-    }
-    getAdapter(query) {
-        const { antProfile, incyclistProfile } = query;
-        if (!antProfile && !incyclistProfile)
-            throw new Error('Illegal arguments: either "antProfile" or "incyclistProfile" must be set');
-        let found;
-        if (antProfile)
-            found = this.adapters.find(a => a.antProfile === antProfile);
-        if (incyclistProfile)
-            found = this.adapters.find(a => a.incyclistProfile === incyclistProfile);
-        return found;
-    }
-    createInstance(settings, props) {
-        let info;
-        const { profile, protocol } = settings;
-        let isLegacy = false;
-        if (protocol) {
-            try {
-                const incyclistProfile = profile;
-                info = this.getAdapter({ incyclistProfile });
-                isLegacy = true;
-            }
-            catch (_a) {
-                isLegacy = false;
-            }
-        }
-        if (!isLegacy) {
-            const antProfile = profile;
-            info = this.getAdapter({ antProfile });
-        }
-        if (info && info.Adapter)
-            return new info.Adapter(settings, props);
-    }
-    createFromDetected(profile, deviceID, props) {
-        const info = this.getAdapter({ antProfile: profile });
-        if (!info || !info.Adapter)
-            return;
-        const settings = Object.assign({}, {
-            profile: info.incyclistProfile,
-            deviceID: deviceID.toString(),
-            interface: 'ant',
-            protocol: 'Ant'
-        });
-        return new info.Adapter(settings, props);
-    }
-}
-exports.default = AntAdapterFactory;

package/lib/antv2/adapter.d.ts

@@ -1,54 +0,0 @@
-/// <reference types="node" />
-import { IChannel, ISensor, Profile } from 'incyclist-ant-plus';
-import AntInterface from './ant-interface';
-import IncyclistDevice from '../base/adpater';
-import { AntDeviceProperties, AntDeviceSettings, BaseDeviceData } from './types';
-import { IAdapter, IncyclistAdapterData, IncyclistBikeData } from '../types';
-export default class AntAdapter<TDeviceData extends BaseDeviceData> extends IncyclistDevice<AntDeviceProperties> {
-    sensor: ISensor;
-    data: IncyclistAdapterData;
-    deviceData: TDeviceData;
-    updateFrequency: number;
-    channel: IChannel;
-    ant: AntInterface;
-    userSettings: {
-        weight?: number;
-    };
-    bikeSettings: {
-        weight?: number;
-    };
-    onDataFn: (data: IncyclistAdapterData) => void;
-    startupRetryPause: number;
-    protected ivDataTimeout: NodeJS.Timeout;
-    protected lastDataTS: number;
-    protected dataMsgCount: number;
-    protected ivWaitForData: NodeJS.Timeout;
-    constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
-    createSensor(settings: AntDeviceSettings): ISensor;
-    isEqual(settings: AntDeviceSettings): boolean;
-    connect(): Promise<boolean>;
-    close(): Promise<boolean>;
-    resetData(): void;
-    isSame(device: IAdapter): boolean;
-    hasData(): boolean;
-    mapData(deviceData: TDeviceData): IncyclistBikeData;
-    transformData(data: IncyclistBikeData): void;
-    mapToAdapterData(deviceData: any): void;
-    onDeviceData(deviceData: TDeviceData): void;
-    isWaitingForData(): boolean;
-    waitForData(timeout: number): Promise<boolean>;
-    getID(): string;
-    getName(): string;
-    getInterface(): string;
-    getProfile(): Profile;
-    getLogData(data: any, excludeList: any): any;
-    triggerTimeoutCheck(): void;
-    startDataTimeoutCheck(): void;
-    stopDataTimeoutCheck(): void;
-    check(): Promise<boolean>;
-    checkCapabilities(): Promise<void>;
-    initControl(): Promise<void>;
-    sendUpdate(request: any): void;
-    start(props?: AntDeviceProperties): Promise<boolean>;
-    stop(): Promise<boolean>;
-}