incyclist-devices 2.3.0-beta.13 → 2.3.0-beta.15

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

@@ -56,8 +56,8 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData> extends Incy
     getProfile(): Profile;
     getLogData(data: any, excludeList: any): any;
     check(): Promise<boolean>;
-    checkCapabilities(): Promise<void>;
-    initControl(): Promise<void>;
+    protected checkCapabilities(): Promise<void>;
+    protected initControl(): Promise<void>;
     getDefaultStartupTimeout(): number;
     startPreChecks(props: AntDeviceProperties): Promise<'done' | 'connected' | 'connection-failed'>;
     resetStartStatus(): void;

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

@@ -21,7 +21,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     waitForPeripheral(): Promise<void>;
     updateSensor(peripheral: IBlePeripheral): void;
     close(): Promise<boolean>;
-    getComms(): TDevice;
+    getSensor(): TDevice;
     isEqual(settings: BleDeviceSettings): boolean;
     isSame(adapter: IAdapter): boolean;
     isConnected(): boolean;
@@ -44,7 +44,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     protected isStarting(): boolean;
     protected hasData(): boolean;
     protected waitForInitialData(startupTimeout: any): Promise<void>;
-    protected checkCapabilities(): void;
+    protected checkCapabilities(): Promise<void>;
     protected initControl(_props?: BleStartProperties): Promise<void>;
     protected startAdapter(startProps?: BleStartProperties): Promise<boolean>;
     startSensor(): Promise<boolean>;

package/lib/ble/base/adapter.js

@@ -63,7 +63,7 @@ class BleAdapter extends adpater_1.default {
             return true;
         });
     }
-    getComms() {
+    getSensor() {
         return this.device;
     }
     isEqual(settings) {
@@ -249,6 +249,8 @@ class BleAdapter extends adpater_1.default {
         });
     }
     checkCapabilities() {
+        return __awaiter(this, void 0, void 0, function* () {
+        });
     }
     initControl(_props) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -284,7 +286,7 @@ class BleAdapter extends adpater_1.default {
                     return false;
                 }
                 yield this.waitForInitialData(timeout);
-                this.checkCapabilities();
+                yield this.checkCapabilities();
                 if (this.hasCapability(types_1.IncyclistCapability.Control))
                     yield this.initControl(startProps);
                 this.stopped = false;
@@ -310,13 +312,13 @@ class BleAdapter extends adpater_1.default {
     startSensor() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (!((_a = this.getComms()) === null || _a === void 0 ? void 0 : _a.hasPeripheral())) {
+            if (!((_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.hasPeripheral())) {
                 yield this.waitForPeripheral();
             }
-            if (!this.getComms()) {
+            if (!this.getSensor()) {
                 return false;
             }
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             const connected = yield sensor.startSensor();
             yield sensor.subscribe();
             if (connected) {
@@ -335,7 +337,7 @@ class BleAdapter extends adpater_1.default {
             }
             let reason = 'unknown';
             let stopped = false;
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             try {
                 stopped = yield sensor.stopSensor();
             }
@@ -355,11 +357,11 @@ class BleAdapter extends adpater_1.default {
             }
             this.started = false;
             this.resetData();
-            if (!this.getComms()) {
+            if (!this.getSensor()) {
                 this.logEvent({ message: 'device stopped - not started yet', device: this.getName(), interface: this.getInterface() });
                 return true;
             }
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             sensor.reset();
             this.resetData();
             this.stopped = true;

package/lib/ble/base/interface.js

@@ -156,7 +156,7 @@ class BleInterface extends events_1.default {
                     .then(() => { return this.onScanDone(); })
                     .catch(() => []);
             }
-            this.logEvent({ message: 'starting scan ..' });
+            this.logEvent({ message: 'starting scan ..', interface: 'ble' });
             this.scanTask = new task_1.InteruptableTask(this.startScan(), {
                 timeout: props.timeout,
                 name: 'scan',
@@ -187,10 +187,12 @@ class BleInterface extends events_1.default {
         return this.buildDeviceSettings(this.matching);
     }
     pauseLogging() {
+        this.logEvent({ message: 'pausing logging' });
         this.logDisabled = true;
     }
     resumeLogging() {
         this.logDisabled = false;
+        this.logEvent({ message: 'resuming logging' });
     }
     isLoggingPaused() {
         return this.logDisabled;
@@ -368,9 +370,10 @@ class BleInterface extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isConnected() || !this.isDiscovering())
                 return;
+            this.addCompleting(announcement);
+            this.logEvent({ message: 'updateWithServices', peripheral: announcement.name });
             try {
-                yield this.discoverServices(announcement);
-                return announcement;
+                announcement.serviceUUIDs = yield this.discoverServices(announcement);
             }
             catch (err) {
                 this.logError(err, 'updateWithServices');
@@ -406,7 +409,7 @@ class BleInterface extends events_1.default {
                 this.logEvent({ message: 'discover services failed', reason: err.message, device });
             }
             peripheral === null || peripheral === void 0 ? void 0 : peripheral.removeAllListeners();
-            return device.serviceUUIDs;
+            return announcement.serviceUUIDs;
         });
     }
     isScanning() {
@@ -581,13 +584,13 @@ class BleInterface extends events_1.default {
     logEvent(event) {
         if (this.logDisabled && event.message !== 'Error')
             return;
-        this.getLogger().logEvent(event);
+        this.getLogger().logEvent(Object.assign(Object.assign({}, event), { interface: 'ble' }));
         const emitPayload = Object.assign({}, event);
         delete emitPayload.ts;
         this.emit('log', emitPayload);
         const w = global.window;
         if (this.debug || (w === null || w === void 0 ? void 0 : w.SERVICE_DEBUG) || process.env.DEBUG)
-            console.log(`~~~ ${this.logger.getName().toUpperCase()}-SVC`, event);
+            console.log(`~~~ ${this.logger.getName().toUpperCase()}-SVC`, Object.assign(Object.assign({}, event), { interface: 'ble' }));
     }
     logError(err, fn, args) {
         const logInfo = args || {};

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

@@ -23,7 +23,7 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected setConstants(): void;
     protected establishControl(): Promise<boolean>;
     protected sendInitialRequest(): Promise<void>;
-    protected checkCapabilities(): void;
+    protected checkCapabilities(): Promise<void>;
     sendUpdate(request: any, enforced?: boolean): Promise<void>;
     sendInitCommands(): Promise<boolean>;
 }

package/lib/ble/fm/adapter.js

@@ -47,7 +47,7 @@ class BleFmAdapter extends adapter_1.default {
     getSupportedCyclingModes() {
         var _a;
         const modes = [power_meter_1.default];
-        const features = (_a = this.getComms()) === null || _a === void 0 ? void 0 : _a.features;
+        const features = (_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.features;
         if (!features)
             return [power_meter_1.default, antble_smarttrainer_1.default, antble_erg_1.default];
         if (features.setPower === undefined || features.setPower)
@@ -58,7 +58,7 @@ class BleFmAdapter extends adapter_1.default {
     }
     getDefaultCyclingMode() {
         var _a;
-        const features = (_a = this.getComms()) === null || _a === void 0 ? void 0 : _a.features;
+        const features = (_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.features;
         if (!features)
             return new antble_smarttrainer_1.default(this);
         if (features.setSlope === undefined || features.setSlope)
@@ -128,7 +128,7 @@ class BleFmAdapter extends adapter_1.default {
     }
     setConstants() {
         const mode = this.getCyclingMode();
-        const sensor = this.getComms();
+        const sensor = this.getSensor();
         if (mode === null || mode === void 0 ? void 0 : mode.getSetting('bikeType')) {
             const bikeType = mode.getSetting('bikeType').toLowerCase();
             sensor.setCrr(consts_1.cRR);
@@ -151,7 +151,7 @@ class BleFmAdapter extends adapter_1.default {
                 return false;
             let hasControl = false;
             let tryCnt = 0;
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             return new Promise((resolve) => {
                 this.startTask.notifyOnStop(() => {
                     resolve(false);
@@ -182,23 +182,33 @@ class BleFmAdapter extends adapter_1.default {
         });
     }
     checkCapabilities() {
-        var _a, _b, _c;
-        const before = this.capabilities.join(',');
-        const sensor = this.getComms();
-        if (((_a = sensor.features) === null || _a === void 0 ? void 0 : _a.heartrate) && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
-            this.capabilities.push(types_1.IncyclistCapability.HeartRate);
-        }
-        if (((_b = sensor.features) === null || _b === void 0 ? void 0 : _b.cadence) && !this.hasCapability(types_1.IncyclistCapability.Cadence)) {
-            this.capabilities.push(types_1.IncyclistCapability.Cadence);
-        }
-        if (((_c = sensor.features) === null || _c === void 0 ? void 0 : _c.power) && !this.hasCapability(types_1.IncyclistCapability.Power)) {
-            this.capabilities.push(types_1.IncyclistCapability.Power);
-        }
-        const after = this.capabilities.join(',');
-        if (before !== after) {
-            this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
-            this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const before = this.capabilities.join(',');
+            const sensor = this.getSensor();
+            if (!sensor.features) {
+                try {
+                    yield sensor.getFitnessMachineFeatures();
+                }
+                catch (err) {
+                    this.logEvent({ message: 'error getting fitness machine features', device: this.getName(), interface: this.getInterface(), error: err });
+                }
+            }
+            if (((_a = sensor.features) === null || _a === void 0 ? void 0 : _a.heartrate) && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+                this.capabilities.push(types_1.IncyclistCapability.HeartRate);
+            }
+            if (((_b = sensor.features) === null || _b === void 0 ? void 0 : _b.cadence) && !this.hasCapability(types_1.IncyclistCapability.Cadence)) {
+                this.capabilities.push(types_1.IncyclistCapability.Cadence);
+            }
+            if (((_c = sensor.features) === null || _c === void 0 ? void 0 : _c.power) && !this.hasCapability(types_1.IncyclistCapability.Power)) {
+                this.capabilities.push(types_1.IncyclistCapability.Power);
+            }
+            const after = this.capabilities.join(',');
+            if (before !== after) {
+                this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
+                this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+            }
+        });
     }
     sendUpdate(request_1) {
         return __awaiter(this, arguments, void 0, function* (request, enforced = false) {
@@ -207,7 +217,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.getComms();
+                const device = this.getSensor();
                 if (update.slope !== undefined) {
                     yield device.setSlope(update.slope);
                 }

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

@@ -34,7 +34,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     protected parseHrm(_data: Uint8Array): IndoorBikeData;
     protected parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
     protected parseFitnessMachineStatus(_data: Uint8Array): IndoorBikeData;
-    protected getFitnessMachineFeatures(): Promise<IndoorBikeFeatures | undefined>;
+    getFitnessMachineFeatures(): Promise<IndoorBikeFeatures | undefined>;
     protected writeFtmsMessage(requestedOpCode: any, data: any, props?: BleWriteProps): Promise<number>;
     setTargetInclination(inclination: number): Promise<boolean>;
     setIndoorBikeSimulation(windSpeed: number, gradient: number, crr: number, cw: number): Promise<boolean>;

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

@@ -9,5 +9,5 @@ export default class BleTacxAdapter extends BleFmAdapter {
     updateSensor(peripheral: IBlePeripheral): void;
     getProfile(): LegacyProfile;
     protected initControl(props?: BleStartProperties): Promise<void>;
-    protected checkCapabilities(): void;
+    protected checkCapabilities(): Promise<void>;
 }

package/lib/ble/tacx/adapter.js

@@ -41,7 +41,7 @@ class BleTacxAdapter extends fm_1.BleFmAdapter {
     initControl(props) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const sensor = this.getComms();
+            const sensor = this.getSensor();
             const { user, wheelDiameter, gearRatio, bikeWeight = consts_1.DEFAULT_BIKE_WEIGHT } = props || {};
             const userWeight = ((_a = user === null || user === void 0 ? void 0 : user.weight) !== null && _a !== void 0 ? _a : consts_1.DEFAULT_USER_WEIGHT);
             sensor.sendTrackResistance(0.0);
@@ -51,15 +51,17 @@ class BleTacxAdapter extends fm_1.BleFmAdapter {
         });
     }
     checkCapabilities() {
-        const before = this.capabilities.join(',');
-        const sensor = this.getComms();
-        if (sensor.features && sensor.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
-            this.capabilities.push(types_1.IncyclistCapability.HeartRate);
-        }
-        const after = this.capabilities.join(',');
-        if (before !== after) {
-            this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            const before = this.capabilities.join(',');
+            const sensor = this.getSensor();
+            if (sensor.features && sensor.features.heartrate && !this.hasCapability(types_1.IncyclistCapability.HeartRate)) {
+                this.capabilities.push(types_1.IncyclistCapability.HeartRate);
+            }
+            const after = this.capabilities.join(',');
+            if (before !== after) {
+                this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
+            }
+        });
     }
 }
 BleTacxAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';

package/package.json

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