incyclist-devices 2.3.19 → 2.3.24

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

@@ -46,6 +46,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     protected waitForInitialData(startupTimeout: any): Promise<void>;
     protected checkCapabilities(): Promise<void>;
     protected initControl(_props?: BleStartProperties): Promise<void>;
+    protected getStartLogProps(props: BleStartProperties): BleStartProperties;
     protected startAdapter(startProps?: BleStartProperties): Promise<boolean>;
     startSensor(): Promise<boolean>;
     protected onDisconnectDone(): Promise<void>;

package/lib/ble/base/adapter.js

@@ -256,9 +256,14 @@ class BleAdapter extends adpater_1.default {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }
+    getStartLogProps(props) {
+        const { user, userWeight, bikeWeight, timeout, wheelDiameter, restart, scanOnly } = props !== null && props !== void 0 ? props : {};
+        return { user, userWeight, bikeWeight, wheelDiameter, timeout, restart, scanOnly };
+    }
     startAdapter(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
             const props = this.getStartProps(startProps);
+            const logProps = this.getStartLogProps(props);
             const { timeout = this.getDefaultStartupTimeout() } = startProps !== null && startProps !== void 0 ? startProps : {};
             const wasPaused = this.paused;
             const preCheckResult = yield this.startPreChecks(props);
@@ -272,16 +277,16 @@ class BleAdapter extends adpater_1.default {
                 yield (0, utils_1.resolveNextTick)();
                 return false;
             }
-            this.logEvent({ message: 'starting device', device: this.getName(), interface: this.getInterface(), props, isStarted: this.started });
+            this.logEvent({ message: 'starting device', device: this.getName(), interface: this.getInterface(), props: logProps, 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 });
+                    this.logEvent({ message: 'peripheral connected', device: this.getName(), interface: this.getInterface() });
                 }
                 else {
-                    this.logEvent({ message: 'peripheral connection failed', device: this.getName(), interface: this.getInterface(), reason: 'unknown', props });
+                    this.logEvent({ message: 'peripheral connection failed', device: this.getName(), interface: this.getInterface(), reason: 'unknown' });
                     this.stopped = true;
                     return false;
                 }

package/lib/ble/fm/sensor.js

@@ -207,7 +207,7 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
             }
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'parseIndoorBikeData()', data: data.toString('hex'), offset, error: err.message | err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'parseIndoorBikeData()', data: data.toString('hex'), offset, error: err.message, stack: err.stack });
         }
         return Object.assign(Object.assign({}, this.data), { raw: `2ad2:${data.toString('hex')}` });
     }

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

@@ -3,7 +3,7 @@ import { CrankData } from "../cp";
 import { IndoorBikeData } from "../fm";
 import BleFitnessMachineDevice from "../fm/sensor";
 import { BleProtocol } from "../types";
-import { BleFeBikeData } from "./types";
+import { BleFeBikeData, FECState } from "./types";
 export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineDevice {
     static readonly profile: LegacyProfile;
     static readonly protocol: BleProtocol;
@@ -17,6 +17,7 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     protected data: BleFeBikeData;
     protected hasFECData: boolean;
     protected messageCnt: number;
+    protected currentState: FECState;
     protected tacxRx: string;
     protected tacxTx: string;
     protected prevMessages: Record<string, {

package/lib/ble/tacx/sensor.js

@@ -221,7 +221,8 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
                 break;
             case 2:
                 this.data.State = 'READY';
-                this.resetState();
+                if (this.currentState !== 'READY')
+                    this.resetState();
                 break;
             case 3:
                 this.data.State = 'IN_USE';
@@ -235,6 +236,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
         }
         if (capStateBF & 0x80) {
         }
+        this.currentState = this.data.State;
     }
     parseGeneralFE(data) {
         const equipmentTypeBF = data.readUInt8(1);

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

@@ -1,10 +1,11 @@
 import { IndoorBikeData } from "../fm";
+export type FECState = 'OFF' | 'READY' | 'IN_USE' | 'FINISHED';
 export interface BleFeBikeData extends IndoorBikeData {
     EquipmentType?: 'Treadmill' | 'Elliptical' | 'StationaryBike' | 'Rower' | 'Climber' | 'NordicSkier' | 'Trainer' | 'General';
     RealSpeed?: number;
     VirtualSpeed?: number;
     HeartRateSource?: 'HandContact' | 'EM' | 'ANT+';
-    State?: 'OFF' | 'READY' | 'IN_USE' | 'FINISHED';
+    State?: FECState;
     EventCount?: number;
     AccumulatedPower?: number;
     TrainerStatus?: number;

package/lib/serial/daum/premium/utils.d.ts

@@ -47,5 +47,5 @@ export declare const FileTimeSupport: {
 };
 export declare function routeToEpp(route: Route, date?: Date): Uint8Array;
 export declare function parseTrainingData(payload: string): IncyclistBikeData;
-export declare function getPersonData(user: User): Buffer;
+export declare function getPersonData(user: User): Buffer<ArrayBuffer>;
 export declare function parsePersonData(buffer: Buffer): User;

package/lib/serial/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.19",
+  "version": "2.3.24",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@serialport/parser-readline": "^10.5.0",
     "@serialport/stream": "^10.5.0",
-    "incyclist-ant-plus": "^0.3.3",
+    "incyclist-ant-plus": "^0.3.5",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {
@@ -17,14 +17,14 @@
     "@serialport/binding-mock": "^10.2.2",
     "@serialport/bindings-cpp": "^10.8.0",
     "@stoprocent/noble": "^1.15.2",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.5.0",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.15.18",
     "bonjour-service": "^1.3.0",
-    "eslint": "^8.47.0",
+    "eslint": "^8.57.1",
     "eslint-config-react-app": "^7.0.1",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.4",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.3.4",
+    "typescript": "^5.8.3"
   },
   "scripts": {
     "lint": "eslint . --ext .ts",