incyclist-devices 2.3.0-beta.6 → 2.3.0-beta.8

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.d.ts

@@ -1,5 +1,5 @@
 import IncyclistDevice from "../../base/adpater";
-import { BleDeviceProperties, BleDeviceSettings, BleStartProperties, IBlePeripheral } from "../types";
+import { BleDeviceProperties, BleDeviceSettings, BleStartProperties, IBleInterface, IBlePeripheral } from "../types";
 import { IAdapter, IncyclistBikeData, IncyclistAdapterData, DeviceProperties } from "../../types";
 import { BleDeviceData } from "./types";
 import { LegacyProfile } from "../../antv2/types";
@@ -51,6 +51,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
+    protected getBle(): IBleInterface<any>;
     update(): void;
     setCyclingMode(mode: string | ICyclingMode, settings?: any, sendInitCommands?: boolean): void;
 }

package/lib/ble/base/adapter.js

@@ -38,20 +38,20 @@ class BleAdapter extends adpater_1.default {
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            return yield iface.connect();
+            const ble = this.getBle();
+            return yield ble.connect();
         });
     }
     getPeripheral() {
-        const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-        const p = iface === null || iface === void 0 ? void 0 : iface.createPeripheralFromSettings(this.settings);
+        const ble = this.getBle();
+        const p = ble === null || ble === void 0 ? void 0 : ble.createPeripheralFromSettings(this.settings);
         return p;
     }
     waitForPeripheral() {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'waiting for sensor ...', device: this.getName(), interface: this.getInterface() });
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            const peripheral = yield iface.waitForPeripheral(this.settings);
+            const ble = this.getBle();
+            const peripheral = yield ble.waitForPeripheral(this.settings);
             this.updateSensor(peripheral);
         });
     }
@@ -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();
@@ -256,11 +254,12 @@ class BleAdapter extends adpater_1.default {
     startAdapter(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const props = this.getStartProps(startProps);
-            const { timeout = this.getDefaultStartupTimeout() } = startProps;
+            const { timeout = this.getDefaultStartupTimeout() } = startProps !== null && startProps !== void 0 ? startProps : {};
             const wasPaused = this.paused;
             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;
         });
     }
@@ -349,8 +361,8 @@ class BleAdapter extends adpater_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const res = yield _super.pause.call(this);
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            iface.pauseLogging();
+            const ble = this.getBle();
+            ble.pauseLogging();
             return res;
         });
     }
@@ -359,12 +371,15 @@ class BleAdapter extends adpater_1.default {
             resume: { get: () => super.resume }
         });
         return __awaiter(this, void 0, void 0, function* () {
-            const iface = interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
-            iface.resumeLogging();
+            const ble = this.getBle();
+            ble.resumeLogging();
             const res = yield _super.resume.call(this);
             return res;
         });
     }
+    getBle() {
+        return interface_factory_1.BleMultiTransportInterfaceFactory.createInstance(this.getInterface());
+    }
     update() {
     }
     setCyclingMode(mode, settings, sendInitCommands) {

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.d.ts

@@ -27,7 +27,7 @@ export declare class DirectConnectPeripheral implements IBlePeripheral {
     onDisconnect(callback: () => void): void;
     discoverServices(): Promise<string[]>;
     discoverCharacteristics(serviceUUID: string): Promise<BleCharacteristic[]>;
-    subscribe(characteristicUUID: string, callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
+    subscribe(characteristicUUID: string, callback?: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
     unsubscribe(characteristicUUID: string): Promise<boolean>;
     subscribeAll(callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;
     subscribeSelected(characteristics: string[], callback: (characteristicUuid: string, data: Buffer) => void): Promise<boolean>;

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

@@ -133,6 +133,10 @@ class DirectConnectPeripheral {
     subscribe(characteristicUUID, callback) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const uuid = (0, utils_1.parseUUID)(characteristicUUID);
+            if (this.subscribed.includes(uuid)) {
+                return true;
+            }
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });
@@ -149,10 +153,12 @@ class DirectConnectPeripheral {
                 this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), rc, characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: response.toString('hex') });
                 const confirmed = res.body.characteristicUUID;
                 if ((0, utils_1.parseUUID)(confirmed) === (0, utils_1.parseUUID)(characteristicUUID)) {
-                    this.subscribed.push(characteristicUUID);
-                    this.eventEmitter.on((0, utils_1.parseUUID)(characteristicUUID), (data) => {
-                        callback(characteristicUUID, data);
-                    });
+                    this.subscribed.push((0, utils_1.parseUUID)(characteristicUUID));
+                    if (callback) {
+                        this.eventEmitter.on((0, utils_1.parseUUID)(characteristicUUID), (data) => {
+                            callback(characteristicUUID, data);
+                        });
+                    }
                     return true;
                 }
                 return false;
@@ -183,7 +189,7 @@ class DirectConnectPeripheral {
                     this.logEvent({ message: 'EnableCharacteristicNotifications response', path: this.getPath(), rc, characteristic: (0, utils_1.beautifyUUID)(res.body.characteristicUUID), raw: response.toString('hex') });
                     const confirmed = res.body.characteristicUUID;
                     if ((0, utils_1.parseUUID)(confirmed) === (0, utils_1.parseUUID)(characteristicUUID)) {
-                        this.subscribed.splice(this.subscribed.indexOf(characteristicUUID), 1);
+                        this.subscribed.splice(this.subscribed.indexOf((0, utils_1.parseUUID)(characteristicUUID)), 1);
                         this.eventEmitter.removeAllListeners((0, utils_1.parseUUID)(characteristicUUID));
                         return true;
                     }
@@ -282,7 +288,7 @@ class DirectConnectPeripheral {
         return __awaiter(this, void 0, void 0, function* () {
             const promises = [];
             this.subscribed.forEach(characteristicUUID => {
-                promises.push(this.unsubscribe(characteristicUUID));
+                promises.push(this.unsubscribe((0, utils_1.parseUUID)(characteristicUUID)));
             });
             yield Promise.allSettled(promises);
             return true;
@@ -318,17 +324,18 @@ class DirectConnectPeripheral {
     write(characteristicUUID, data, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise(resolve => {
+                const seqNo = this.getNextSeqNo();
+                const message = new messages_1.WriteCharacteristicMessage();
+                const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), characteristicData: data });
+                let response;
+                let characteristic = characteristicUUID;
                 if (!(options === null || options === void 0 ? void 0 : options.withoutResponse)) {
+                    this.subscribe(characteristicUUID);
                     const uuid = (0, utils_1.parseUUID)(characteristicUUID);
                     this.eventEmitter.once(uuid, (data) => {
                         resolve(data);
                     });
                 }
-                const seqNo = this.getNextSeqNo();
-                const message = new messages_1.WriteCharacteristicMessage();
-                const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), characteristicData: data });
-                let response;
-                let characteristic = characteristicUUID;
                 this.logEvent({ message: 'WriteCharacteristic request', path: this.getPath(), characteristic: (0, utils_1.beautifyUUID)(characteristicUUID),
                     data: data.toString('hex'),
                     raw: request.toString('hex') });

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,6 +63,7 @@ class InteruptableTask {
                     isRunning: false,
                 };
                 this.internalEvents.removeAllListeners();
+                this.sendStopNotification();
                 if (this.getState().result === 'completed' || this.getState().result === 'error')
                     return;
                 if (this.props.onDone)
@@ -119,6 +124,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.6",
+  "version": "2.3.0-beta.8",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",