incyclist-devices 2.0.2 → 2.0.4

package/lib/antv2/adapter-factory.d.ts

@@ -1,10 +1,11 @@
 import { Profile } from "incyclist-ant-plus";
-import AntAdapter from "./adapter";
+import { DeviceData } from "../types/data";
+import AntAdapter, { BaseDeviceData } from "./adapter";
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "./types";
 export type AntAdapterInfo = {
     antProfile: Profile;
     incyclistProfile: LegacyProfile;
-    Adapter: typeof AntAdapter;
+    Adapter: typeof AntAdapter<BaseDeviceData, DeviceData>;
 };
 export type AdapterQuery = {
     antProfile?: Profile;
@@ -15,7 +16,7 @@ export default class AntAdapterFactory {
     adapters: AntAdapterInfo[];
     static getInstance(): AntAdapterFactory;
     constructor();
-    register(antProfile: Profile, incyclistProfile: LegacyProfile, Adapter: typeof AntAdapter): void;
+    register<TDeviceData extends BaseDeviceData, TData>(antProfile: Profile, incyclistProfile: LegacyProfile, Adapter: typeof AntAdapter<TDeviceData, TData>): void;
     getAdapter(query?: AdapterQuery): any;
     createInstance(settings: AntDeviceSettings, props?: AntDeviceProperties): any;
     createFromDetected(profile: Profile, deviceID: number, props?: AntDeviceProperties): any;

package/lib/antv2/adapter.d.ts

@@ -4,15 +4,19 @@ import AntInterface from './ant-interface';
 import IncyclistDevice from '../base/adpater';
 import { AntDeviceProperties, AntDeviceSettings } from './types';
 import { DeviceProperties } from '../types/device';
-import { Bike, IncyclistDeviceAdapter, OnDeviceDataCallback } from '../types/adapter';
+import { Bike, IncyclistDeviceAdapter } from '../types/adapter';
 import CyclingMode from '../modes/cycling-mode';
 import { User } from '../types/user';
 export declare const DEFAULT_UPDATE_FREQUENCY = 1000;
-export default class AntAdapter extends IncyclistDevice {
+export type BaseDeviceData = {
+    DeviceID: number;
+    ManId?: number;
+};
+export default class AntAdapter<TDeviceData extends BaseDeviceData, TData> extends IncyclistDevice {
     sensor: ISensor;
     lastUpdate?: number;
-    data: any;
-    deviceData: any;
+    data: TData;
+    deviceData: TDeviceData;
     updateFrequency: number;
     channel: IChannel;
     ant: AntInterface;
@@ -22,7 +26,7 @@ export default class AntAdapter extends IncyclistDevice {
     bikeSettings: {
         weight?: number;
     };
-    onDataFn: OnDeviceDataCallback;
+    onDataFn: (data: TData) => void;
     startupRetryPause: number;
     protected ivDataTimeout: NodeJS.Timer;
     protected lastDataTS: number;
@@ -50,7 +54,7 @@ export default class AntAdapter extends IncyclistDevice {
     start(props?: AntDeviceProperties): Promise<boolean>;
     stop(): Promise<boolean>;
 }
-export declare class ControllableAntAdapter extends AntAdapter implements Bike {
+export declare class ControllableAntAdapter<TDeviceData extends BaseDeviceData, TData> extends AntAdapter<TDeviceData, TData> implements Bike {
     cyclingMode: CyclingMode;
     user?: User;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);

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

@@ -2,7 +2,16 @@ import { FitnessEquipmentSensorState, ISensor, Profile } from "incyclist-ant-plu
 import { ControllableAntAdapter } from "../adapter";
 import CyclingMode, { IncyclistBikeData, UpdateRequest } from '../../modes/cycling-mode';
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
-export default class AntFEAdapter extends ControllableAntAdapter {
+type FitnessEquipmentSensorData = {
+    speed: number;
+    slope: number;
+    power: number;
+    cadence: number;
+    heartrate: number;
+    distance: number;
+    timestamp: number;
+};
+export default class AntFEAdapter extends ControllableAntAdapter<FitnessEquipmentSensorState, FitnessEquipmentSensorData> {
     static INCYCLIST_PROFILE_NAME: LegacyProfile;
     static ANT_PROFILE_NAME: Profile;
     protected distanceInternal?: number;
@@ -20,9 +29,10 @@ export default class AntFEAdapter extends ControllableAntAdapter {
     onDeviceData(deviceData: FitnessEquipmentSensorState): void;
     canSendUpdate(): boolean;
     mapToCycleModeData(deviceData: FitnessEquipmentSensorState): IncyclistBikeData;
-    transformData(bikeData: IncyclistBikeData): any;
+    transformData(bikeData: IncyclistBikeData): FitnessEquipmentSensorData;
     start(props?: any): Promise<any>;
     setFEDefaultTimeout(): void;
     reconnect(): Promise<boolean>;
     setCyclingMode(mode: string | CyclingMode, settings?: any): void;
 }
+export {};

package/lib/antv2/fe/adapter.js

@@ -166,7 +166,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         }
         if (bikeData.distanceInternal !== undefined)
             this.distanceInternal = bikeData.distanceInternal;
-        let data = {
+        const data = {
             speed: bikeData.speed,
             slope: bikeData.slope,
             power: bikeData.power !== undefined ? Math.round(bikeData.power) : undefined,
@@ -180,6 +180,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const wasPaused = this.paused;
+            this.startProps = props || {};
             if (wasPaused)
                 this.resume();
             if (this.started && !wasPaused) {
@@ -188,7 +189,6 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             const connected = yield this.connect();
             if (!connected)
                 throw new Error(`could not start device, reason:could not connect`);
-            this.startProps = props;
             this.logEvent({ message: 'starting device', props, isStarted: this.started, isReconnecting: this.isReconnecting });
             const opts = props || {};
             const { args = {}, user = {} } = opts;
@@ -223,7 +223,9 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                         }
                         if (this.started && startSuccess === 1) {
                             try {
+                                console.log('~~~ Device: waiting for data', 'timeout=', timeout || 'unknown');
                                 yield this.waitForData(timeout);
+                                console.log('~~~ Device: data received');
                             }
                             catch (err) {
                                 stopTimeoutCheck();

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

@@ -1,7 +1,10 @@
 import { HeartRateSensorState, ISensor, Profile } from "incyclist-ant-plus";
 import AntAdapter from "../adapter";
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
-export default class AntHrAdapter extends AntAdapter {
+type HeartRateSensorData = {
+    heartrate: number;
+};
+export default class AntHrAdapter extends AntAdapter<HeartRateSensorState, HeartRateSensorData> {
     static INCYCLIST_PROFILE_NAME: LegacyProfile;
     static ANT_PROFILE_NAME: Profile;
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
@@ -13,3 +16,4 @@ export default class AntHrAdapter extends AntAdapter {
     mapData(deviceData: HeartRateSensorState): void;
     hasData(): boolean;
 }
+export {};

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

@@ -1,9 +1,16 @@
-import { ISensor, Profile } from "incyclist-ant-plus";
+import { BicyclePowerSensorState, ISensor, Profile } from "incyclist-ant-plus";
 import { ControllableAntAdapter } from "../adapter";
 import CyclingMode, { IncyclistBikeData } from '../../modes/cycling-mode';
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
-import { DeviceData } from "../../types/data";
-export default class AntPwrAdapter extends ControllableAntAdapter {
+type PowerSensorData = {
+    speed: number;
+    slope: number;
+    power: number;
+    cadence: number;
+    distance: number;
+    timestamp: number;
+};
+export default class AntPwrAdapter extends ControllableAntAdapter<BicyclePowerSensorState, PowerSensorData> {
     static INCYCLIST_PROFILE_NAME: LegacyProfile;
     static ANT_PROFILE_NAME: Profile;
     protected distanceInternal?: number;
@@ -19,6 +26,7 @@ export default class AntPwrAdapter extends ControllableAntAdapter {
     canSendUpdate(): boolean;
     sendUpdate(request: any): void;
     mapData(deviceData: any): IncyclistBikeData;
-    transformData(bikeData: IncyclistBikeData): DeviceData;
+    transformData(bikeData: IncyclistBikeData): PowerSensorData;
     hasData(): boolean;
 }
+export {};

package/lib/antv2/pwr/adapter.js

@@ -119,7 +119,7 @@ class AntPwrAdapter extends adapter_1.ControllableAntAdapter {
         }
         if (bikeData.distanceInternal !== undefined)
             this.distanceInternal = bikeData.distanceInternal;
-        let data = {
+        const data = {
             speed: bikeData.speed,
             slope: bikeData.slope,
             power: bikeData.power,

package/lib/modes/ble-erg-mode.js

@@ -34,6 +34,7 @@ class BleERGCyclingMode extends power_base_1.default {
     }
     getBikeInitRequest() {
         const startPower = Number(this.getSetting('startPower'));
+        this.prevRequest = { targetPower: startPower };
         return { targetPower: startPower };
     }
     sendBikeUpdate(request) {

package/lib/modes/ble-st-mode.js

@@ -32,6 +32,7 @@ class FtmsCyclingMode extends power_base_1.default {
         return config.properties.find(p => p.name === name);
     }
     getBikeInitRequest() {
+        this.prevRequest = { slope: 0 };
         return { slope: 0 };
     }
     sendBikeUpdate(request) {

package/lib/serial/daum/premium/adapter.js

@@ -25,6 +25,7 @@ const DAUM_PREMIUM_DEFAULT_PORT = 51955;
 const START_RETRY_TIMEOUT = 1500;
 const DEFAULT_GEAR = 10;
 const getBikeProps = (props) => {
+    console.log('~~~getBikeProps', props);
     const { host, port = DAUM_PREMIUM_DEFAULT_PORT, interface: ifaceName } = props;
     let serial;
     if (ifaceName && typeof ifaceName === 'string') {
@@ -46,6 +47,7 @@ const getBikeProps = (props) => {
 };
 class DaumPremiumAdapter extends DaumAdapter_1.default {
     constructor(settings, props) {
+        console.log('~~~ new premium adapter');
         const logger = new gd_eventlog_1.EventLogger('DaumPremium');
         const commProps = Object.assign(Object.assign({}, getBikeProps(settings)), { logger });
         const bike = new comms_1.default(commProps);

package/lib/serial/serial-interface.js

@@ -85,11 +85,13 @@ exports.SinglePathScanner = SinglePathScanner;
 class SerialInterface extends events_1.default {
     static getInstance(props) {
         const { ifaceName, binding, logger } = props;
+        console.log('~~~ new instance #1', ifaceName, serialport_1.default.getInstance().getBinding(ifaceName));
         let instance = SerialInterface._instances.find(i => i.ifaceName === ifaceName);
         if (!instance) {
             if (binding)
                 instance = new SerialInterface(props);
             else {
+                console.log('~~~ new instance', ifaceName, serialport_1.default.getInstance().getBinding(ifaceName));
                 instance = new SerialInterface({ ifaceName, binding: serialport_1.default.getInstance().getBinding(ifaceName), logger });
                 if (instance)
                     SerialInterface._instances.push(instance);

package/package.json

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