incyclist-devices 2.3.0-beta.7 → 2.3.0-beta.9

package/lib/base/adpater.d.ts

@@ -37,6 +37,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     resume(): Promise<boolean>;
     connect(): Promise<boolean>;
     close(): Promise<boolean>;
+    resetData(): void;
     getControllerInfo(): ControllerConfig | undefined;
     isControllable(): boolean;
     getCapabilities(): IncyclistCapability[];

package/lib/base/adpater.js

@@ -100,6 +100,9 @@ class IncyclistDevice extends events_1.default {
     }
     connect() { throw new Error('not implemented'); }
     close() { throw new Error('not implemented'); }
+    resetData() {
+        delete this.lastUpdate;
+    }
     getControllerInfo() {
         const a = this.constructor;
         const config = a.controllers;

package/lib/ble/base/adapter.js

@@ -87,6 +87,7 @@ class BleAdapter extends adpater_1.default {
         return (_a = this.device) === null || _a === void 0 ? void 0 : _a.isConnected();
     }
     resetData() {
+        super.resetData();
         this.dataMsgCount = 0;
         this.deviceData = {};
         this.data = {};
@@ -183,10 +184,7 @@ class BleAdapter extends adpater_1.default {
             this.stopped = false;
             if (wasPaused)
                 this.resume();
-            if (this.started && !wasPaused && !wasStopped) {
-                return 'done';
-            }
-            if (this.started && wasPaused) {
+            if (this.started && !wasStopped) {
                 return 'done';
             }
             const connected = yield this.connect();
@@ -261,6 +259,7 @@ class BleAdapter extends adpater_1.default {
             const preCheckResult = yield this.startPreChecks(props);
             if (preCheckResult === 'done') {
                 yield (0, utils_1.resolveNextTick)();
+                this.logEvent({ message: `start result: ${this.started ? 'success' : 'failed'}`, preCheckResult, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
                 return this.started;
             }
             if (preCheckResult === 'connection-failed') {
@@ -270,27 +269,37 @@ class BleAdapter extends adpater_1.default {
             }
             this.logEvent({ message: 'starting device', device: this.getName(), interface: this.getInterface(), props, isStarted: this.started });
             try {
+                this.resetData();
+                this.stopped = false;
                 const connected = yield this.startSensor();
                 if (connected) {
                     this.logEvent({ message: 'peripheral connected', device: this.getName(), interface: this.getInterface(), props });
                 }
                 else {
                     this.logEvent({ message: 'peripheral connection failed', device: this.getName(), interface: this.getInterface(), reason: 'unknown', props });
+                    this.stopped = true;
                     return false;
                 }
                 yield this.waitForInitialData(timeout);
                 this.checkCapabilities();
                 if (this.hasCapability(types_1.IncyclistCapability.Control))
                     yield this.initControl(startProps);
-                this.resetData();
                 this.stopped = false;
                 this.started = true;
                 if (wasPaused)
                     this.resume();
+                if (!this.isStarting()) {
+                    this.started = false;
+                    this.stopped = true;
+                    return false;
+                }
+                this.logEvent({ message: 'start result: success', device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
                 return true;
             }
             catch (err) {
                 this.logEvent({ message: 'start result: error', error: err.message, device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
+                this.started = false;
+                this.stopped = true;
                 return false;
             }
         });
@@ -319,6 +328,8 @@ class BleAdapter extends adpater_1.default {
             if (this.isStarting()) {
                 yield this.startTask.stop();
             }
+            this.started = false;
+            this.resetData();
             let reason = 'unknown';
             let stopped = false;
             if (!this.getComms()) {
@@ -338,8 +349,9 @@ class BleAdapter extends adpater_1.default {
             else {
                 this.logEvent({ message: 'stopping device failed', device: this.getName(), interface: this.getInterface(), reason });
             }
-            this.started = false;
+            this.resetData();
             this.stopped = true;
+            this.started = false;
             return stopped;
         });
     }

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

@@ -32,6 +32,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected onDiscovered: (peripheral: BlePeripheralInfo) => void;
     protected instanceId: number;
     protected connectedPeripherals: IBlePeripheral[];
+    protected connectAttemptCnt: number;
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
     getLogger(): EventLogger;
@@ -63,6 +64,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     pauseDiscovery(): Promise<void>;
     resumeDiscovery(): Promise<void>;
     protected onPeripheralFound(peripheral: BleRawPeripheral): void;
+    protected checkForWahooEnhancement(announcement: BlePeripheralAnnouncement): boolean;
+    protected processWahooAnnouncement(announcement: BlePeripheralAnnouncement): void;
     protected buildAnnouncement(peripheral: BleRawPeripheral): BlePeripheralAnnouncement;
     protected updateWithServices(announcement: BlePeripheralAnnouncement): Promise<BlePeripheralAnnouncement>;
     protected discoverServices(announcement: BlePeripheralAnnouncement): Promise<string[]>;
@@ -85,6 +88,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected waitForBleConnected(): Promise<boolean>;
     protected onBleStateChange(state: BleInterfaceState): void;
     protected getAdapterFactory(): BleAdapterFactory<TBleSensor>;
+    protected getConnectTimeout(): number;
+    protected getExpectedServices(): string[];
     logEvent(event: any): void;
     logError(err: Error, fn: string, args?: any): void;
 }

package/lib/ble/base/interface.js

@@ -49,6 +49,7 @@ class BleInterface extends events_1.default {
         this.expectedServices = ['180d', '1818', '1826', '6e40fec1'];
         this.matching = [];
         this.connectedPeripherals = [];
+        this.connectAttemptCnt = 0;
         this.instanceId = ++instanceCount;
         this.props = props;
         this.logEnabled = props.log || true;
@@ -90,28 +91,28 @@ class BleInterface extends events_1.default {
                 return false;
             }
             if (this.isConnecting()) {
-                this.logEvent({ message: 'connect - already connecting' });
+                this.logEvent({ message: 'BLE connect - already connecting' });
                 return this.connectTask.getPromise();
             }
             if (this.isConnected())
                 return true;
-            this.logEvent({ message: 'Ble connect request' });
+            this.logEvent({ message: 'BLE connect request' });
             this.connectTask = new task_1.InteruptableTask(this.connectBle(), {
-                timeout: BLE_DEFAULT_CONNECT_TIMEOUT,
-                name: 'connect',
+                timeout: this.getConnectTimeout(),
+                name: 'BLE connect',
                 errorOnTimeout: false,
                 log: this.logEvent.bind(this),
             });
-            const success = yield this.connectTask.run();
+            const success = yield this.connectTask.run().catch(() => false);
             if (success) {
                 this.startPeripheralScan();
             }
-            this.expectedServices = factories_1.BleAdapterFactory.getInstance('ble').getAllSupportedServices();
             return success;
         });
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!this.getBinding()) {
                 return false;
             }
@@ -122,14 +123,16 @@ class BleInterface extends events_1.default {
             const promises = this.connectedPeripherals.map(p => p.disconnect());
             yield Promise.allSettled(promises);
             this.connectedPeripherals = [];
-            yield this.connectTask.stop();
+            if (this.isConnecting())
+                yield ((_a = this.connectTask) === null || _a === void 0 ? void 0 : _a.stop());
             this.getBinding().removeAllListeners();
+            this.connectAttemptCnt = 0;
             return true;
         });
     }
     isConnected() {
         var _a;
-        return ((_a = this.getBinding()) === null || _a === void 0 ? void 0 : _a.state) === 'poweredOn';
+        return this.connectAttemptCnt > 0 && ((_a = this.getBinding()) === null || _a === void 0 ? void 0 : _a.state) === 'poweredOn';
     }
     registerConnected(peripheral) {
         this.connectedPeripherals.push(peripheral);
@@ -228,6 +231,7 @@ class BleInterface extends events_1.default {
     }
     startPeripheralScan() {
         return __awaiter(this, arguments, void 0, function* (retry = false) {
+            this.expectedServices = this.getExpectedServices();
             if (!retry)
                 this.logEvent({ message: 'starting peripheral discovery ...' });
             if (!this.isConnected() || this.isDiscovering()) {
@@ -254,9 +258,10 @@ class BleInterface extends events_1.default {
             return;
         this.logEvent({ message: 'stopping peripheral discovery ...' });
         this.discoverTask.stop();
-        this.getBinding().off('discover', this.onDiscovered);
+        const ble = this.getBinding();
+        ble.off('discover', this.onDiscovered);
         return new Promise(done => {
-            this.getBinding().stopScanning(() => {
+            ble.stopScanning(() => {
                 done();
             });
         });
@@ -313,24 +318,32 @@ class BleInterface extends events_1.default {
         }
         if (announcement.serviceUUIDs.length === 0) {
             return;
-            if (this.isCompleting(announcement)) {
-                return;
-            }
-            this.addCompleting(announcement);
-            setTimeout(() => {
-                if (this.find(announcement)) {
-                    this.removeCompleting(announcement);
-                    return;
-                }
-                this.updateWithServices(announcement)
-                    .then(() => {
-                    if (this.isSupportedPeripheral(announcement))
-                        this.addService(announcement);
-                });
-            }, 1000);
+        }
+        const isWahoo = this.checkForWahooEnhancement(announcement);
+        if (isWahoo) {
+            this.processWahooAnnouncement(announcement);
+            return;
         }
         this.addService(announcement);
     }
+    checkForWahooEnhancement(announcement) {
+        if (announcement.name.includes('KICKR')) {
+            const supported = announcement.serviceUUIDs.map(s => (0, utils_1.beautifyUUID)(s));
+            if (supported.length === 1 && supported[0] === '1818')
+                return true;
+        }
+        return false;
+    }
+    processWahooAnnouncement(announcement) {
+        if (this.isCompleting(announcement)) {
+            return;
+        }
+        this.updateWithServices(announcement)
+            .then(() => {
+            if (this.isSupportedPeripheral(announcement))
+                this.addService(announcement);
+        });
+    }
     buildAnnouncement(peripheral) {
         var _a;
         return {
@@ -379,11 +392,11 @@ class BleInterface extends events_1.default {
                     const res = yield peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
                     announcement.serviceUUIDs = res.services.map(s => s.uuid);
                 }
-                peripheral.removeAllListeners();
             }
             catch (err) {
                 this.logEvent({ message: 'discover services failed', reason: err.message, device });
             }
+            peripheral === null || peripheral === void 0 ? void 0 : peripheral.removeAllListeners();
             if (paused) {
                 yield this.resumeDiscovery();
             }
@@ -498,8 +511,10 @@ class BleInterface extends events_1.default {
     }
     connectBle() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.connectAttemptCnt++;
             const state = this.getBinding().state;
             if (state === 'poweredOn') {
+                this.logEvent({ message: 'BLE connected' });
                 return true;
             }
             const res = yield this.waitForBleConnected();
@@ -514,7 +529,7 @@ class BleInterface extends events_1.default {
             });
             this.getBinding().on('stateChange', (state) => {
                 if (state === 'poweredOn') {
-                    this.logEvent({ message: 'Ble connect result: success' });
+                    this.logEvent({ message: 'BLE connected' });
                     this.getBinding().removeAllListeners('stateChange');
                     this.getBinding().on('stateChange', this.onBleStateChange.bind(this));
                     this.getBinding().on('error', console.log);
@@ -531,6 +546,12 @@ class BleInterface extends events_1.default {
     getAdapterFactory() {
         return factories_1.BleAdapterFactory.getInstance('ble');
     }
+    getConnectTimeout() {
+        return BLE_DEFAULT_CONNECT_TIMEOUT;
+    }
+    getExpectedServices() {
+        return this.getAdapterFactory().getAllSupportedServices();
+    }
     logEvent(event) {
         if (this.logDisabled && event.message !== 'Error')
             return;

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

@@ -7,8 +7,9 @@ import { IAdapter, IncyclistAdapterData, IncyclistBikeData } from '../../types';
 import { LegacyProfile } from '../../antv2/types';
 export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessMachineDevice> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
-    distanceInternal: number;
-    connectPromise: Promise<boolean>;
+    protected distanceInternal: number;
+    protected connectPromise: Promise<boolean>;
+    protected requestControlRetryDelay: number;
     constructor(settings: BleDeviceSettings, props?: BleDeviceProperties);
     updateSensor(peripheral: IBlePeripheral): void;
     isSame(device: IAdapter): boolean;

package/lib/ble/fm/adapter.js

@@ -20,11 +20,12 @@ const sensor_1 = __importDefault(require("./sensor"));
 const adapter_1 = __importDefault(require("../base/adapter"));
 const consts_1 = require("./consts");
 const types_1 = require("../../types");
-const task_1 = require("../../utils/task");
+const utils_1 = require("../../utils/utils");
 class BleFmAdapter extends adapter_1.default {
     constructor(settings, props) {
         super(settings, props);
         this.distanceInternal = 0;
+        this.requestControlRetryDelay = 1000;
         this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
         this.device = new sensor_1.default(this.getPeripheral(), { logger: this.logger });
         this.capabilities = [
@@ -117,6 +118,8 @@ class BleFmAdapter extends adapter_1.default {
     }
     initControl(_startProps) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isStarting())
+                return;
             this.setConstants();
             yield this.establishControl();
             this.setConstants();
@@ -146,38 +149,30 @@ class BleFmAdapter extends adapter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isStarting())
                 return false;
-            let waitTask;
-            let iv;
+            let hasControl = false;
+            let tryCnt = 0;
             const sensor = this.getComms();
-            const wait = () => {
-                const res = new Promise((resolve) => {
-                    iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                        if (!this.isStarting() || !(waitTask === null || waitTask === void 0 ? void 0 : waitTask.isRunning)) {
-                            resolve(false);
-                            clearInterval(iv);
-                            return;
+            return new Promise((resolve) => {
+                this.startTask.notifyOnStop(() => {
+                    resolve(false);
+                });
+                const waitUntilControl = () => __awaiter(this, void 0, void 0, function* () {
+                    while (!hasControl && this.isStarting()) {
+                        if (tryCnt++ === 0) {
+                            this.logEvent({ message: 'requesting control', device: this.getName(), interface: this.getInterface() });
                         }
-                        const hasControl = yield sensor.requestControl();
+                        hasControl = yield sensor.requestControl();
                         if (hasControl) {
-                            clearInterval(iv);
-                            resolve(true);
+                            this.logEvent({ message: 'control granted', device: this.getName(), interface: this.getInterface() });
+                            resolve(this.isStarting());
                         }
-                        else if (!this.isStarting() || !(waitTask === null || waitTask === void 0 ? void 0 : waitTask.isRunning)) {
-                            resolve(false);
-                            clearInterval(iv);
+                        else {
+                            yield (0, utils_1.sleep)(this.requestControlRetryDelay);
                         }
-                    }), 1000);
+                    }
                 });
-                return res;
-            };
-            waitTask = new task_1.InteruptableTask(wait(), {
-                errorOnTimeout: false,
-                timeout: 10000
+                waitUntilControl();
             });
-            const hasControl = yield waitTask.run();
-            clearInterval(iv);
-            if (!hasControl && this.isStarting())
-                throw new Error('could not establish control');
         });
     }
     sendInitialRequest() {
@@ -212,7 +207,7 @@ class BleFmAdapter extends adapter_1.default {
             try {
                 const update = this.getCyclingMode().sendBikeUpdate(request);
                 this.logEvent({ message: 'send bike update requested', profile: this.getProfile(), update, request });
-                const device = this.device;
+                const device = this.getComms();
                 if (update.slope !== undefined) {
                     yield device.setSlope(update.slope);
                 }

package/lib/direct-connect/base/peripheral.js

@@ -471,7 +471,7 @@ class DirectConnectPeripheral {
         }
         if (incoming.length > header.length + 6) {
             this.remainingBuffer = Buffer.from(incoming.subarray(header.length + 6));
-            incoming = incoming.subarray(0, header.length + 6);
+            incoming = Buffer.from(incoming.subarray(0, header.length + 6));
         }
         return incoming;
     }
@@ -499,7 +499,6 @@ class DirectConnectPeripheral {
                     this.eventEmitter.emit(uuid, notification.body.characteristicData);
                 }
                 else {
-                    this.logEvent({ message: 'incoming message', path: this.getPath(), raw: incoming.toString('hex'), header });
                     this.eventEmitter.emit(`response-${header.seqNum}`, incoming);
                 }
             }

package/lib/types/adapter.d.ts

@@ -46,5 +46,6 @@ export interface IAdapter extends EventEmitter, IBike, ISensor {
     resume(): Promise<boolean>;
     connect(): Promise<boolean>;
     close(): Promise<boolean>;
+    resetData(): void;
     onData(callback: OnDeviceDataCallback): any;
 }

package/lib/utils/task.d.ts

@@ -30,15 +30,18 @@ export declare class InteruptableTask<T extends TaskState, P> {
     protected props?: TaskProps<T, P>;
     protected internalEvents: EventEmitter<[never]>;
     protected promise?: Promise<P>;
+    protected onStopNotifiers: Array<() => void>;
     constructor(promise: Promise<any>, props?: TaskProps<T, P>);
     getPromise(): Promise<P>;
     getState(): T;
     run(): Promise<P>;
+    notifyOnStop(cb: () => void): void;
     start(): void;
     stop(): Promise<boolean>;
     isRunning(): boolean;
     protected clearTimeout(): void;
     protected onTimeout(): void;
+    protected sendStopNotification(): void;
     protected logEvent(event: any): void;
 }
 export {};

package/lib/utils/task.js

@@ -20,6 +20,7 @@ class InteruptableTask {
         var _a;
         this.internalState = { isRunning: false };
         this.internalEvents = new events_1.default();
+        this.onStopNotifiers = [];
         this.state = ((_a = props === null || props === void 0 ? void 0 : props.state) !== null && _a !== void 0 ? _a : {});
         this.props = props;
         delete this.props.state;
@@ -39,6 +40,9 @@ class InteruptableTask {
             return this.internalState.promise;
         });
     }
+    notifyOnStop(cb) {
+        this.onStopNotifiers.push(cb);
+    }
     start() {
         this.internalState.promise = new Promise((resolve, reject) => {
             var _a;
@@ -59,8 +63,10 @@ class InteruptableTask {
                     isRunning: false,
                 };
                 this.internalEvents.removeAllListeners();
+                this.sendStopNotification();
                 if (this.getState().result === 'completed' || this.getState().result === 'error')
                     return;
+                this.getState().result = 'stopped';
                 if (this.props.onDone)
                     resolve(this.props.onDone(this.getState()));
                 else
@@ -119,6 +125,12 @@ class InteruptableTask {
         else
             resolve(null);
     }
+    sendStopNotification() {
+        this.onStopNotifiers.forEach((cb) => {
+            if (typeof cb === 'function')
+                cb();
+        });
+    }
     logEvent(event) {
         if (this.props.log)
             this.props.log(event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.0-beta.7",
+  "version": "2.3.0-beta.9",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",