incyclist-devices 2.2.0 → 2.2.2

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

@@ -20,7 +20,7 @@ export default class AntFEAdapter extends AntAdapter<FitnessEquipmentSensorState
     constructor(settings: AntDeviceSettings, props?: AntDeviceProperties);
     getDisplayName(): string;
     isReconnecting(): boolean;
-    sendUpdate(request: UpdateRequest, forced?: boolean): Promise<void>;
+    sendUpdate(request: UpdateRequest, forced?: boolean): Promise<UpdateRequest | void>;
     onDeviceData(deviceData: FitnessEquipmentSensorState): void;
     mapData(deviceData: FitnessEquipmentSensorState): IncyclistBikeData;
     transformData(adapterData: IncyclistBikeData, deviceData: FitnessEquipmentSensorState): void;

package/lib/antv2/fe/adapter.js

@@ -59,6 +59,7 @@ class AntFEAdapter extends adapter_1.default {
                 }
                 yield this.promiseSendUpdate;
                 delete this.promiseSendUpdate;
+                return update;
             }
             catch (err) {
                 delete this.promiseSendUpdate;

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

@@ -2,6 +2,7 @@ import { BicyclePowerSensorState, Profile } from "incyclist-ant-plus";
 import AntAdapter from "../base/adapter";
 import { AntDeviceProperties, AntDeviceSettings, LegacyProfile } from "../types";
 import { ControllerConfig, IncyclistBikeData } from "../../types";
+import { UpdateRequest } from "../../modes/types";
 export default class AntPwrAdapter extends AntAdapter<BicyclePowerSensorState> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static ANT_PROFILE_NAME: Profile;
@@ -10,4 +11,5 @@ export default class AntPwrAdapter extends AntAdapter<BicyclePowerSensorState> {
     mapData(deviceData: BicyclePowerSensorState): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): void;
     hasData(): boolean;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
 }

package/lib/antv2/pwr/adapter.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,6 +56,18 @@ class AntPwrAdapter extends adapter_1.default {
         const hasData = has(Power) || has(CalculatedPower) || has(Cadence) || has(CalculatedCadence);
         return hasData;
     }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.isPaused() || this.isStopped())
+                    return;
+                return yield this.getCyclingMode().sendBikeUpdate(request);
+            }
+            catch (err) {
+                this.logEvent({ message: 'Error', fn: 'sendUpdate', error: err.message });
+            }
+        });
+    }
 }
 AntPwrAdapter.INCYCLIST_PROFILE_NAME = 'Power Meter';
 AntPwrAdapter.ANT_PROFILE_NAME = 'PWR';

package/lib/base/adpater.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import ICyclingMode, { CyclingMode } from "../modes/types";
+import ICyclingMode, { CyclingMode, UpdateRequest } from "../modes/types";
 import { DeviceProperties, DeviceSettings, ControllerConfig, IAdapter, OnDeviceDataCallback, IncyclistCapability, IncyclistAdapterData, User } from "../types";
 import { EventLogger } from "gd-eventlog";
 import EventEmitter from "events";
@@ -52,7 +52,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     getDefaultCyclingMode(): ICyclingMode;
     setBikeProps(props: P): void;
     sendInitCommands(): Promise<boolean>;
-    sendUpdate(request: any): void;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
     setUser(user: User): void;
     getUser(): User;
     getWeight(): number;

package/lib/base/adpater.js

@@ -194,14 +194,16 @@ class IncyclistDevice extends events_1.default {
         });
     }
     sendUpdate(request) {
-        if (!this.isControllable())
-            return;
-        if (this.isPaused() || this.isStopped())
-            return;
-        if (!this.hasCapability(types_1.IncyclistCapability.Control))
-            this.getCyclingMode().sendBikeUpdate(request);
-        else
-            throw new Error('method not implemented');
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isControllable())
+                return;
+            if (this.isPaused() || this.isStopped())
+                return;
+            if (!this.hasCapability(types_1.IncyclistCapability.Control))
+                return yield this.getCyclingMode().sendBikeUpdate(request);
+            else
+                throw new Error('method not implemented');
+        });
     }
     setUser(user) {
         this.user = user;

package/lib/ble/base/adapter.js

@@ -127,7 +127,7 @@ class BleAdapter extends adpater_1.default {
             this.emitData(this.data);
         }
         catch (err) {
-            this.logEvent({ message: 'Error', fn: 'onDeviceData', error: err.message });
+            this.logEvent({ message: 'Error', fn: 'onDeviceData', error: err.message, stack: err.stack });
         }
     }
     mapData(deviceData) {

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

@@ -4,6 +4,7 @@ import { PowerData } from './types';
 import { BleDeviceSettings } from '../types';
 import { DeviceProperties, IncyclistBikeData, IncyclistAdapterData, ControllerConfig, IAdapter } from '../../types';
 import { LegacyProfile } from '../../antv2/types';
+import { UpdateRequest } from '../../modes/types';
 export default class PwrAdapter extends BleAdapter<PowerData, BleCyclingPowerDevice> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static controllers: ControllerConfig;
@@ -16,5 +17,5 @@ export default class PwrAdapter extends BleAdapter<PowerData, BleCyclingPowerDev
     mapData(deviceData: PowerData): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): IncyclistAdapterData;
     stop(): Promise<boolean>;
-    sendUpdate(request: any): void;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
 }

package/lib/ble/cp/adapter.js

@@ -89,12 +89,16 @@ class PwrAdapter extends adapter_1.default {
         });
     }
     sendUpdate(request) {
-        try {
-            super.sendUpdate(request);
-        }
-        catch (err) {
-            this.logEvent({ message: 'Error', fn: 'sendUpdate', error: err.message });
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.isPaused() || this.isStopped())
+                    return;
+                return yield this.getCyclingMode().sendBikeUpdate(request);
+            }
+            catch (err) {
+                this.logEvent({ message: 'Error', fn: 'sendUpdate', error: err.message });
+            }
+        });
     }
 }
 PwrAdapter.INCYCLIST_PROFILE_NAME = 'Power Meter';

package/lib/serial/daum/DaumAdapter.d.ts

@@ -6,6 +6,7 @@ import { DaumSerialComms } from './types';
 import { SerialIncyclistDevice } from '../base/adapter';
 import SerialInterface from '../base/serial-interface';
 import EventEmitter from 'events';
+import { UpdateRequest } from '../../modes/types';
 export default class DaumAdapter<S extends SerialDeviceSettings, P extends DeviceProperties, C extends DaumSerialComms> extends SerialIncyclistDevice<P> {
     protected static controllers: ControllerConfig;
     comms: C;
@@ -52,7 +53,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     reconnect(): Promise<boolean>;
     logEvent(event: any): void;
     stop(): Promise<boolean>;
-    sendUpdate(request: any): Promise<unknown>;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
     update(): Promise<void>;
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
@@ -60,6 +61,6 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     transformData(cyclingData: IncyclistBikeData, fromBike?: boolean): IncyclistAdapterData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;
-    processClientRequest(request: any): Promise<unknown>;
+    processClientRequest(request: any): Promise<UpdateRequest>;
     getDeviceInfo(): Promise<any>;
 }

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

@@ -450,7 +450,7 @@ class Daum8i extends comms_1.default {
     setPerson(person) {
         return __awaiter(this, void 0, void 0, function* () {
             const { sex, age, length, weight } = person;
-            const logStr = `setPerson(${sex === undefined ? '' : sex},${age === undefined ? '' : age},${length === undefined ? '' : length},${weight === undefined ? '' : length})`;
+            const logStr = `setPerson(${sex !== null && sex !== void 0 ? sex : ''},${age !== null && age !== void 0 ? age : ''},${length !== null && length !== void 0 ? length : ''},${weight !== null && weight !== void 0 ? weight : ''})`;
             const res = yield this.sendReservedDaum8iCommand(logStr, utils_1.ReservedCommands.PERSON_SET, (0, utils_1.getPersonData)(person));
             const buffer = Buffer.from(res);
             const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;

package/lib/serial/kettler/ergo-racer/adapter.d.ts

@@ -6,6 +6,7 @@ import { Command } from "../types";
 import { SerialIncyclistDevice } from "../../base/adapter";
 import SerialInterface from "../../base/serial-interface";
 import { ControllerConfig, IAdapter, IncyclistAdapterData, DeviceProperties } from "../../../types";
+import { UpdateRequest } from "../../../modes/types";
 export interface KettlerRacerCommand extends Command {
 }
 export interface KettlerExtendedBikeData {
@@ -74,9 +75,9 @@ export default class KettlerRacerAdapter extends SerialIncyclistDevice<DevicePro
     sendRequest(request: any): Promise<any>;
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
-    sendUpdate(request: any): Promise<unknown>;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
     refreshRequests(): void;
-    processClientRequest(request: any): Promise<unknown>;
+    processClientRequest(request: any): Promise<UpdateRequest>;
     connect(): Promise<boolean>;
     close(): Promise<boolean>;
     waitForOpened(retries?: boolean): Promise<boolean>;

package/lib/simulator/Simulator.d.ts

@@ -2,6 +2,7 @@
 import SimulatorCyclingMode from '../modes/simulator';
 import IncyclistDevice from '../base/adpater';
 import { IAdapter, IncyclistBikeData, DeviceProperties, DeviceSettings } from '../types';
+import { UpdateRequest } from '../modes/types';
 interface SimulatorProperties extends DeviceProperties {
     isBot?: boolean;
     settings?: any;
@@ -47,6 +48,6 @@ export declare class Simulator extends IncyclistDevice<SimulatorProperties> {
     update(): void;
     canEmitData(): boolean;
     calculateDistance(speedKps: any, timeS: any): number;
-    sendUpdate(request: any): import("..").UpdateRequest;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
 }
 export {};

package/lib/simulator/Simulator.js

@@ -185,9 +185,11 @@ class Simulator extends adpater_1.default {
         return timeS * speedKps / 3.6;
     }
     sendUpdate(request) {
-        if (this.paused)
-            return;
-        return this.getCyclingMode().sendBikeUpdate(request);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.paused)
+                return;
+            return yield this.getCyclingMode().sendBikeUpdate(request);
+        });
     }
 }
 exports.Simulator = Simulator;

package/lib/types/adapter.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import EventEmitter from "events";
-import ICyclingMode, { CyclingMode } from "../modes/types";
+import ICyclingMode, { CyclingMode, UpdateRequest } from "../modes/types";
 import { IncyclistCapability } from "./capabilities";
 import { IncyclistAdapterData } from "./data";
 import { DeviceProperties, DeviceSettings } from "./device";
@@ -17,7 +17,7 @@ export interface IBike {
     getDefaultCyclingMode(): ICyclingMode;
     setBikeProps(props: DeviceProperties): void;
     sendInitCommands(): Promise<boolean>;
-    sendUpdate(request: any): any;
+    sendUpdate(request: any): Promise<UpdateRequest | void>;
     setUser(user: User): void;
     getWeight(): number;
     getUser(): User;

package/package.json

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