incyclist-devices 3.0.11 → 3.0.13

package/lib/cjs/ble/fm/adapter.js

@@ -117,7 +117,7 @@ class BleFmAdapter extends adapter_js_1.default {
     }
     transformData(bikeData) {
         if (bikeData === undefined)
-            return;
+            return {};
         let distance = 0;
         if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
             distance = Math.round(bikeData.distanceInternal - this.distanceInternal);

package/lib/cjs/ble/fm/sensor.js

@@ -22,6 +22,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     windSpeed = 0;
     wheelSize = 2100;
     ftmsServiceData;
+    rowerDataTS;
+    rowerMaxPower;
     constructor(peripheral, props) {
         super(peripheral, props);
         this.reset();
@@ -262,6 +264,12 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
     parseRowerData(_data) {
         const data = Buffer.from(_data);
         let offset = 2;
+        let maxPower;
+        if (!this.rowerDataTS || this.rowerDataTS + 1000 < Date.now()) {
+            this.rowerDataTS = Date.now();
+            maxPower = this.rowerMaxPower;
+            delete this.rowerMaxPower;
+        }
         if (data.length > 2) {
             try {
                 const flags = data.readUInt16LE(0);
@@ -294,12 +302,11 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                 if (flags & 0x0020) {
                     this.data.instantaneousPower = data.readInt16LE(offset);
                     offset += 2;
+                    this.rowerMaxPower = Math.max(this.rowerMaxPower ?? 0, this.data.instantaneousPower);
                 }
                 if (flags & 0x0040) {
                     this.data.averagePower = data.readInt16LE(offset);
                     offset += 2;
-                    this.data.instantaneousPower = data.readInt16LE(offset);
-                    offset += 2;
                 }
                 if (flags & 0x0080) {
                     this.data.resistanceLevel = data.readInt16LE(offset);
@@ -328,6 +335,8 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
                 if (flags & 0x1000) {
                     this.data.remainingTime = data.readUInt16LE(offset);
                 }
+                this.logEvent({ message: 'rower data', device: this.getName(), raw: data.toString('hex'), data: structuredClone(this.data), maxPower: this.rowerMaxPower });
+                this.data.instantaneousPower = this.rowerMaxPower;
             }
             catch (err) {
                 this.logEvent({ message: 'error', fn: 'parseRowerData()', device: this.getName(), data: data.toString('hex'), offset, error: err.message, stack: err.stack });
@@ -465,7 +474,7 @@ class BleFitnessMachineDevice extends sensor_js_1.TBleSensor {
             return this.ftmsServiceData;
         try {
             const peripheral = this.peripheral;
-            if (!peripheral.getServiceData)
+            if (peripheral?.getServiceData === undefined)
                 return;
             const bitSet = (value, bitNo) => (value & (0, utils_js_1.bit)(bitNo)) > 0;
             const data = peripheral.getServiceData(consts_js_1.FTMS);

package/lib/cjs/simulator/Simulator.js

@@ -189,5 +189,8 @@ class Simulator extends adpater_js_1.default {
             return;
         return this.getCyclingMode().buildUpdate(request);
     }
+    getSupportedSports() {
+        return ['cycling'];
+    }
 }
 exports.Simulator = Simulator;

package/lib/cjs/types/index.js

@@ -18,5 +18,4 @@ __exportStar(require("./adapter.js"), exports);
 __exportStar(require("./capabilities.js"), exports);
 __exportStar(require("./data.js"), exports);
 __exportStar(require("./device.js"), exports);
-__exportStar(require("./interface.js"), exports);
 __exportStar(require("./user.js"), exports);

package/lib/esm/ble/fm/adapter.js

@@ -112,7 +112,7 @@ export default class BleFmAdapter extends BleAdapter {
     }
     transformData(bikeData) {
         if (bikeData === undefined)
-            return;
+            return {};
         let distance = 0;
         if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
             distance = Math.round(bikeData.distanceInternal - this.distanceInternal);

package/lib/esm/ble/fm/sensor.js

@@ -20,6 +20,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     windSpeed = 0;
     wheelSize = 2100;
     ftmsServiceData;
+    rowerDataTS;
+    rowerMaxPower;
     constructor(peripheral, props) {
         super(peripheral, props);
         this.reset();
@@ -260,6 +262,12 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     parseRowerData(_data) {
         const data = Buffer.from(_data);
         let offset = 2;
+        let maxPower;
+        if (!this.rowerDataTS || this.rowerDataTS + 1000 < Date.now()) {
+            this.rowerDataTS = Date.now();
+            maxPower = this.rowerMaxPower;
+            delete this.rowerMaxPower;
+        }
         if (data.length > 2) {
             try {
                 const flags = data.readUInt16LE(0);
@@ -292,12 +300,11 @@ export default class BleFitnessMachineDevice extends TBleSensor {
                 if (flags & 0x0020) {
                     this.data.instantaneousPower = data.readInt16LE(offset);
                     offset += 2;
+                    this.rowerMaxPower = Math.max(this.rowerMaxPower ?? 0, this.data.instantaneousPower);
                 }
                 if (flags & 0x0040) {
                     this.data.averagePower = data.readInt16LE(offset);
                     offset += 2;
-                    this.data.instantaneousPower = data.readInt16LE(offset);
-                    offset += 2;
                 }
                 if (flags & 0x0080) {
                     this.data.resistanceLevel = data.readInt16LE(offset);
@@ -326,6 +333,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
                 if (flags & 0x1000) {
                     this.data.remainingTime = data.readUInt16LE(offset);
                 }
+                this.logEvent({ message: 'rower data', device: this.getName(), raw: data.toString('hex'), data: structuredClone(this.data), maxPower: this.rowerMaxPower });
+                this.data.instantaneousPower = this.rowerMaxPower;
             }
             catch (err) {
                 this.logEvent({ message: 'error', fn: 'parseRowerData()', device: this.getName(), data: data.toString('hex'), offset, error: err.message, stack: err.stack });
@@ -463,7 +472,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
             return this.ftmsServiceData;
         try {
             const peripheral = this.peripheral;
-            if (!peripheral.getServiceData)
+            if (peripheral?.getServiceData === undefined)
                 return;
             const bitSet = (value, bitNo) => (value & bit(bitNo)) > 0;
             const data = peripheral.getServiceData(FTMS);

package/lib/esm/simulator/Simulator.js

@@ -183,4 +183,7 @@ export class Simulator extends IncyclistDevice {
             return;
         return this.getCyclingMode().buildUpdate(request);
     }
+    getSupportedSports() {
+        return ['cycling'];
+    }
 }

package/lib/esm/types/index.js

@@ -2,5 +2,4 @@ export * from './adapter.js';
 export * from './capabilities.js';
 export * from './data.js';
 export * from './device.js';
-export * from './interface.js';
 export * from './user.js';

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

@@ -34,7 +34,7 @@ export default class BleFmAdapter extends BleAdapter<IndoorBikeData, BleFitnessM
     protected updateCyclingModeConfig(): void;
     protected checkCapabilities(): Promise<void>;
     protected updateCapabilitiesFromFeatures(features: IndoorBikeFeatures): void;
-    sendUpdate(request: any, enforced?: boolean): Promise<UpdateRequest | void>;
+    sendUpdate(request: UpdateRequest, enforced?: boolean): Promise<UpdateRequest | void>;
     sendInitCommands(): Promise<boolean>;
     protected getFeatureToggle(): import("../../features/features.js").FeatureToggle;
 }

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

@@ -19,6 +19,8 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     protected windSpeed: number;
     protected wheelSize: number;
     protected ftmsServiceData: FtmsServiceData;
+    protected rowerDataTS: number | undefined;
+    protected rowerMaxPower: number | undefined;
     constructor(peripheral: IBlePeripheral, props?: any);
     get features(): IndoorBikeFeatures;
     reset(): void;

package/lib/types/index.d.ts

@@ -20,4 +20,6 @@ export * from './direct-connect/index.js';
 export * from './features/index.js';
 export * from './proto/zwift_hub.js';
 export * from './bindings/index.js';
+export type * from './types/index.js';
+export type * from './ble/types.js';
 export { IAdapter, IncyclistDevice, IncyclistDeviceAdapter, DeviceSettings, DeviceProperties, AdapterFactory, InterfaceFactory, IncyclistInterface, INTERFACE, InterfaceProps, ICyclingMode, IncyclistAdapterData as DeviceData, IncyclistCapability, calc, MockBinding, BleHrMock, DaumClassicMock, DaumClassicSimulator, DaumClassicMockImpl, DaumPremiumMock, DaumPremiumMockImpl, DaumPremiumMockSimulator };

package/lib/types/simulator/Simulator.d.ts

@@ -1,13 +1,14 @@
 import SimulatorCyclingMode from '../modes/simulator.js';
 import IncyclistDevice from '../base/adpater.js';
-import { IAdapter, IncyclistBikeData, DeviceProperties, DeviceSettings } from '../types/index.js';
+import { IAdapter, IncyclistBikeData, DeviceProperties, DeviceSettings, ITrainer } from '../types/index.js';
 import { UpdateRequest } from '../modes/types.js';
+import { Sport } from '../types/sport.js';
 interface SimulatorProperties extends DeviceProperties {
     isBot?: boolean;
     settings?: any;
     activity?: any;
 }
-export declare class Simulator extends IncyclistDevice<SimulatorProperties> {
+export declare class Simulator extends IncyclistDevice<SimulatorProperties> implements ITrainer {
     static NAME: string;
     protected static controllers: {
         modes: (typeof SimulatorCyclingMode)[];
@@ -48,5 +49,6 @@ export declare class Simulator extends IncyclistDevice<SimulatorProperties> {
     canEmitData(): boolean;
     calculateDistance(speedKps: any, timeS: any): number;
     sendUpdate(request: any): Promise<UpdateRequest | void>;
+    getSupportedSports(): Array<Sport>;
 }
 export {};

package/lib/types/types/index.d.ts

@@ -2,5 +2,6 @@ export * from './adapter.js';
 export * from './capabilities.js';
 export * from './data.js';
 export * from './device.js';
-export * from './interface.js';
+export type * from './interface.js';
 export * from './user.js';
+export type * from './sport.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.11",
+    "version": "3.0.13",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",
@@ -30,14 +30,14 @@
         "@protobuf-ts/plugin": "^2.11.1",
         "@serialport/binding-mock": "^10.2.2",
         "@serialport/bindings-cpp": "^13.0.1",
-        "@stoprocent/noble": "^2.3.10",
-        "@types/node": "^25.1.0",
-        "@typescript-eslint/eslint-plugin": "^8.54.0",
-        "@typescript-eslint/parser": "^8.54.0",
+        "@stoprocent/noble": "^2.4.0",
+        "@types/node": "^25.6.0",
+        "@typescript-eslint/eslint-plugin": "^8.59.0",
+        "@typescript-eslint/parser": "^8.59.0",
         "@vitest/coverage-v8": "^4.0.18",
         "bonjour-service": "^1.3.0",
-        "eslint": "^9.39.2",
-        "protoc": "^33.4.0",
+        "eslint": "^9.39.4",
+        "protoc": "^33.6.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.9.3",
         "vitest": "^4.0.18"