incyclist-devices 2.3.25 → 2.3.27

package/lib/antv2/fe/adapter.js

@@ -43,14 +43,7 @@ class AntFEAdapter extends adapter_1.default {
             if (this.promiseStop)
                 return;
             if (this.promiseSendUpdate) {
-                let stack;
-                try {
-                    throw new Error();
-                }
-                catch (err) {
-                    stack = err.stack;
-                }
-                this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy', stack });
+                this.logEvent({ message: 'send bike update skipped', device: this.getName(), request, reason: 'busy' });
                 return;
             }
             let isReset = request.reset && Object.keys(request).length === 1;

package/lib/ble/base/adapter.js

@@ -257,8 +257,10 @@ class BleAdapter extends adpater_1.default {
         });
     }
     getStartLogProps(props) {
+        var _a;
+        const capabilities = (_a = this.props) === null || _a === void 0 ? void 0 : _a.capabilities;
         const { user, userWeight, bikeWeight, timeout, wheelDiameter, restart, scanOnly } = props !== null && props !== void 0 ? props : {};
-        return { user, userWeight, bikeWeight, wheelDiameter, timeout, restart, scanOnly };
+        return { user, userWeight, bikeWeight, wheelDiameter, timeout, restart, scanOnly, capabilities };
     }
     startAdapter(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -292,7 +294,8 @@ class BleAdapter extends adpater_1.default {
                 }
                 yield this.waitForInitialData(timeout);
                 yield this.checkCapabilities();
-                if (this.hasCapability(types_1.IncyclistCapability.Control))
+                const skipControl = this.props.capabilities && !this.props.capabilities.includes(types_1.IncyclistCapability.Control);
+                if (this.hasCapability(types_1.IncyclistCapability.Control) && !skipControl)
                     yield this.initControl(startProps);
                 this.stopped = false;
                 this.started = true;

package/lib/ble/fm/adapter.js

@@ -47,6 +47,8 @@ class BleFmAdapter extends adapter_1.default {
     getSupportedCyclingModes() {
         var _a;
         const modes = [power_meter_1.default];
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return modes;
         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];
@@ -58,6 +60,8 @@ class BleFmAdapter extends adapter_1.default {
     }
     getDefaultCyclingMode() {
         var _a;
+        if (this.props.capabilities && this.props.capabilities.indexOf(types_1.IncyclistCapability.Control) === -1)
+            return new power_meter_1.default(this);
         const features = (_a = this.getSensor()) === null || _a === void 0 ? void 0 : _a.features;
         if (!features)
             return new antble_smarttrainer_1.default(this);

package/lib/ble/fm/sensor.js

@@ -267,16 +267,20 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
     }
     getFitnessMachineFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (this._features)
                 return this._features;
             try {
                 const data = yield this.read('2acc');
                 const buffer = data ? Buffer.from(data) : undefined;
+                const services = ((_a = this.peripheral) === null || _a === void 0 ? void 0 : _a.services) || [];
+                let power = services.some(s => (0, utils_1.matches)(s.uuid, '1818'));
+                let heartrate = services.some(s => (0, utils_1.matches)(s.uuid, '180d'));
                 if (buffer) {
                     const fitnessMachine = buffer.readUInt32LE(0);
                     const targetSettings = buffer.readUInt32LE(4);
-                    const power = (fitnessMachine & consts_2.FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
-                    const heartrate = (fitnessMachine & consts_2.FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
+                    power = power || (fitnessMachine & consts_2.FitnessMachineFeatureFlag.PowerMeasurementSupported) !== 0;
+                    heartrate = heartrate || (fitnessMachine & consts_2.FitnessMachineFeatureFlag.HeartRateMeasurementSupported) !== 0;
                     const cadence = (fitnessMachine & consts_2.FitnessMachineFeatureFlag.CadenceSupported) !== 0;
                     const setSlope = (targetSettings & consts_2.TargetSettingFeatureFlag.IndoorBikeSimulationParametersSupported) !== 0
                         || (targetSettings & consts_2.TargetSettingFeatureFlag.InclinationTargetSettingSupported) !== 0;

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

@@ -66,9 +66,14 @@ class DirectConnectInterface extends events_1.default {
         return peripheral_1.DirectConnectPeripheral.create(announcement);
     }
     createDeviceSetting(service) {
-        const name = service.name;
-        const protocol = this.getProtocol(service);
-        return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol };
+        try {
+            const name = service.name;
+            const protocol = this.getProtocol(service);
+            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol };
+        }
+        catch (_a) {
+            return null;
+        }
     }
     createPeripheralFromSettings(settings) {
         const info = this.getAll().find(a => a.service.name === settings.name);
@@ -228,7 +233,10 @@ class DirectConnectInterface extends events_1.default {
         });
     }
     emitDevice(service) {
-        this.emit('device', this.createDeviceSetting(service), service);
+        const device = this.createDeviceSetting(service);
+        if (!device)
+            return;
+        this.emit('device', device, service);
     }
     buildDeviceSettings(matching = []) {
         return matching.map((name) => ({ interface: DirectConnectInterface.INTERFACE_NAME, name }));

package/lib/types/device.d.ts

@@ -1,6 +1,7 @@
 import { EventLogger } from "gd-eventlog";
 import { IncyclistInterface } from "./interface";
 import { User } from "./user";
+import { IncyclistCapability } from "./capabilities";
 export declare enum INTERFACE {
     SERIAL = "serial",
     TCPIP = "tcpip",
@@ -15,6 +16,7 @@ export type DeviceProperties = {
     user?: User;
     userWeight?: number;
     bikeWeight?: number;
+    capabilities?: IncyclistCapability[];
 };
 export interface DeviceStartProperties extends DeviceProperties {
     timeout?: number;

package/package.json

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