incyclist-devices 2.3.38 → 2.3.41

package/lib/antv2/base/adapter.js

@@ -171,7 +171,7 @@ class AntAdapter extends adpater_1.default {
                         clearInterval(iv);
                         resolve(true);
                     }
-                    if (!this.promiseWaitForData || this.stopped) {
+                    if (this.promiseWaitForData === undefined || this.promiseWaitForData === null || this.stopped) {
                         resolve(false);
                         clearInterval(iv);
                     }
@@ -186,7 +186,7 @@ class AntAdapter extends adpater_1.default {
                 return true;
             }
             const tsStart = Date.now();
-            if (this.promiseWaitForData) {
+            if (this.promiseWaitForData !== undefined && this.promiseWaitForData !== null) {
                 let hasData = false;
                 try {
                     hasData = yield this.promiseWaitForData;
@@ -201,7 +201,7 @@ class AntAdapter extends adpater_1.default {
                 this.promiseWaitForData = null;
                 return hasData;
             }
-            catch (err) {
+            catch (_b) {
                 this.promiseWaitForData = null;
                 return false;
             }
@@ -257,7 +257,7 @@ class AntAdapter extends adpater_1.default {
             try {
                 return yield this.start();
             }
-            catch (error) {
+            catch (_a) {
                 return false;
             }
         });
@@ -350,7 +350,7 @@ class AntAdapter extends adpater_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
             this.startStatus.sensorStarted = this.sensorConnected;
-            if (this.startStatus.sensorStarted || this.startStatus.sensorStarted)
+            if (this.startStatus.sensorStarted)
                 return;
             this.logEvent({ message: 'start sensor', device: this.getName(), props });
             try {

package/lib/antv2/base/interface.d.ts

@@ -2,7 +2,7 @@ import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
 import { Channel, IAntDevice, IChannel, ISensor } from "incyclist-ant-plus";
 import { AntDeviceSettings, AntScanProps, AntInterfaceProps } from "../types";
-import { IncyclistInterface } from "../../types";
+import { DeviceSettings, IncyclistInterface } from "../../types";
 import AntDeviceBinding from "./binding";
 type ChannelUsage = 'scan' | 'sensor';
 interface ChannelInfo {
@@ -52,5 +52,6 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     private blockChannel;
     private unblockChannel;
     stopSensor(sensor: ISensor): Promise<boolean>;
+    addKnownDevice(_settings: DeviceSettings): void;
 }
 export {};

package/lib/antv2/base/interface.js

@@ -412,6 +412,8 @@ class AntInterface extends events_1.default {
             }
         });
     }
+    addKnownDevice(_settings) {
+    }
 }
 AntInterface._instance = undefined;
 AntInterface.INTERFACE_NAME = 'ant';

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

@@ -94,6 +94,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected find(service: BlePeripheralAnnouncement): Announcement;
     protected getAll(): Announcement[];
     setDebug(enabled: boolean): void;
+    addKnownDevice(_settings: BleDeviceSettings): void;
     protected connectBle(): Promise<boolean>;
     protected waitForBleConnected(): Promise<boolean>;
     protected onError(err: Error): void;

package/lib/ble/base/interface.js

@@ -583,6 +583,8 @@ class BleInterface extends events_1.default {
     setDebug(enabled) {
         this.debug = enabled;
     }
+    addKnownDevice(_settings) {
+    }
     connectBle() {
         return __awaiter(this, void 0, void 0, function* () {
             this.currentBleState = this.getBinding().state;

package/lib/ble/cp/sensor.js

@@ -69,7 +69,7 @@ class BleCyclingPowerDevice extends sensor_1.TBleSensor {
                 this.time = time;
             }
         }
-        catch (err) {
+        catch (_a) {
         }
         const { instantaneousPower, balance, accTorque, rpm, time } = this;
         return { instantaneousPower, balance, accTorque, rpm, time, raw: `2a63:${data.toString('hex')}` };

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

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

package/lib/ble/fm/adapter.js

@@ -23,6 +23,7 @@ const types_1 = require("../../types");
 const utils_1 = require("../../utils/utils");
 const utils_2 = require("../utils");
 const play_1 = require("../zwift/play");
+const features_1 = require("../../features");
 const ZWIFT_PLAY_UUID = '0000000119ca465186e5fa29dcdd09d1';
 class BleFmAdapter extends adapter_1.default {
     constructor(settings, props) {
@@ -49,6 +50,8 @@ class BleFmAdapter extends adapter_1.default {
     }
     supportsVirtualShifting() {
         var _a, _b;
+        if (!this.getFeatureToggle().has('VirtualShifting'))
+            return false;
         return (_b = (_a = this.device) === null || _a === void 0 ? void 0 : _a.getSupportedServiceUUids()) === null || _b === void 0 ? void 0 : _b.some(s => (0, utils_2.matches)(s, ZWIFT_PLAY_UUID));
     }
     getSupportedCyclingModes() {
@@ -284,7 +287,7 @@ class BleFmAdapter extends adapter_1.default {
                             if (!this.zwiftPlay) {
                                 this.initVirtualShifting();
                             }
-                            if (this.zwiftPlay && !isNaN(update.gearRatio)) {
+                            if (this.zwiftPlay && !Number.isNaN(update.gearRatio)) {
                                 let slope = (_a = update.slope) !== null && _a !== void 0 ? _a : 0;
                                 if (slope === 0)
                                     slope = 0.01;
@@ -335,6 +338,9 @@ class BleFmAdapter extends adapter_1.default {
             }
         });
     }
+    getFeatureToggle() {
+        return (0, features_1.useFeatureToggle)();
+    }
 }
 BleFmAdapter.INCYCLIST_PROFILE_NAME = 'Smart Trainer';
 exports.default = BleFmAdapter;

package/lib/ble/hr/sensor.js

@@ -20,7 +20,7 @@ class BleHrmDevice extends sensor_1.TBleSensor {
                 this.rr = (data.readUInt16LE(offset)) / 1024;
             }
         }
-        catch (err) {
+        catch (_a) {
         }
         const { heartrate, rr } = this;
         return { heartrate, rr, raw: data.toString('hex') };

package/lib/ble/types.d.ts

@@ -72,6 +72,7 @@ export interface BleDeviceSettings extends DeviceSettings {
     profile?: string;
     address?: string;
     name?: string;
+    services?: string;
 }
 export interface BleDeviceProperties extends DeviceProperties {
     wheelDiameter?: number;

package/lib/ble/utils.js

@@ -24,7 +24,7 @@ function uuid(s) {
     if (s) {
         if (s.includes('-')) {
             const parts = s.split('-');
-            const uuidNo = parseInt('0x' + parts[0]);
+            const uuidNo = Number.parseInt('0x' + parts[0]);
             return uuidNo.toString(16).toLowerCase();
         }
         return s;

package/lib/ble/zwift/play/sensor.js

@@ -52,7 +52,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     onData(characteristic, data, isNotify) {
         const uuid = (0, utils_1.beautifyUUID)(characteristic).toLowerCase();
-        console.log('# data', uuid, data === null || data === void 0 ? void 0 : data.toString('hex'));
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
             this.onMeasurement(data);
         }

package/lib/direct-connect/base/interface.d.ts

@@ -11,6 +11,7 @@ import { InterfaceFactory } from "../../ble/base/types";
 interface Announcement {
     service: MulticastDnsAnnouncement;
     ts: number;
+    source?: string;
 }
 export default class DirectConnectInterface extends EventEmitter implements IBleInterface<MulticastDnsAnnouncement> {
     protected static _instance: DirectConnectInterface;
@@ -33,6 +34,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     createPeripheral(announcement: MulticastDnsAnnouncement): IBlePeripheral;
     createDeviceSetting(service: MulticastDnsAnnouncement): BleDeviceSettings;
     createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;
+    addKnownDevice(settings: BleDeviceSettings): void;
     getLogger(): EventLogger;
     setLogger(logger: EventLogger): void;
     getName(): string;
@@ -66,6 +68,8 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     logError(err: Error, fn: string, args?: any): void;
     protected getProtocol(announcement: MulticastDnsAnnouncement): BleProtocol;
     protected getBestDeviceMatch(DeviceClasses: (typeof TBleSensor)[]): typeof TBleSensor;
+    protected createAnnouncementFromSettings(settings: BleDeviceSettings): MulticastDnsAnnouncement;
+    protected getServiceUUIDs(settings: BleDeviceSettings): string[];
     protected getAdapterFactory(): BleAdapterFactory<any>;
 }
 export declare class DirectConnectInterfaceFactory extends InterfaceFactory {

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

@@ -19,7 +19,10 @@ const task_1 = require("../../utils/task");
 const peripheral_1 = require("./peripheral");
 const ble_1 = require("../../ble");
 const types_1 = require("../../ble/base/types");
+const consts_1 = require("../../ble/consts");
+const consts_2 = require("../../ble/wahoo/consts");
 const DC_TYPE = 'wahoo-fitness-tnp';
+const DC_PORT = 36866;
 const DC_EXPIRATION_TIMEOUT = 10 * 1000 * 60;
 let instanceId = 0;
 class DirectConnectInterface extends events_1.default {
@@ -66,12 +69,16 @@ class DirectConnectInterface extends events_1.default {
         return peripheral_1.DirectConnectPeripheral.create(announcement);
     }
     createDeviceSetting(service) {
+        var _a, _b;
         try {
             const name = service.name;
             const protocol = this.getProtocol(service);
-            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol };
+            const address = service.address;
+            const services = (_b = (_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.map(uuid => (0, ble_1.beautifyUUID)(uuid, false))) === null || _b === void 0 ? void 0 : _b.join(',');
+            console.log('# created device setting from announcement', name, service.serviceUUIDs, services);
+            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services };
         }
-        catch (_a) {
+        catch (_c) {
             return null;
         }
     }
@@ -81,6 +88,12 @@ class DirectConnectInterface extends events_1.default {
             return null;
         return this.createPeripheral(info.service);
     }
+    addKnownDevice(settings) {
+        const announcement = this.createAnnouncementFromSettings(settings);
+        if (announcement) {
+            this.addService(announcement, 'known-device');
+        }
+    }
     getLogger() {
         return this.logger;
     }
@@ -236,6 +249,7 @@ class DirectConnectInterface extends events_1.default {
         const device = this.createDeviceSetting(service);
         if (!device)
             return;
+        console.log('# emitting device', device, service);
         this.emit('device', device, service);
     }
     buildDeviceSettings(matching = []) {
@@ -243,15 +257,22 @@ class DirectConnectInterface extends events_1.default {
     }
     addService(service, source) {
         var _a, _b;
+        console.log(`# DirectConnectInterface.addService from ${source}`, service.name, service.serviceUUIDs);
+        const src = source === 'known-device' ? 'known-device' : 'mdns';
         try {
             service.transport = this.getName();
             const existing = this.find(service);
             if (existing) {
                 const idx = this.services.indexOf(existing);
                 this.services[idx] = { ts: Date.now(), service };
+                if (src !== 'known-device' && existing.source === 'known-device') {
+                    this.services[idx].source = src;
+                    this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
+                    this.emitDevice(service);
+                }
             }
             else {
-                this.services.push({ ts: Date.now(), service });
+                this.services.push({ ts: Date.now(), service, source: src });
                 if (!((_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.length))
                     return;
                 this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
@@ -306,6 +327,42 @@ class DirectConnectInterface extends events_1.default {
         details.sort((a, b) => b.priority - a.priority);
         return details[0].class;
     }
+    createAnnouncementFromSettings(settings) {
+        if (settings.protocol && settings.address) {
+            const announcement = {
+                name: settings.name,
+                address: settings.address,
+                protocol: 'tcp',
+                port: DC_PORT,
+                type: DC_TYPE,
+                transport: 'wifi',
+                serviceUUIDs: this.getServiceUUIDs(settings),
+            };
+            console.log('# created announcement from settings', announcement);
+            return announcement;
+        }
+    }
+    getServiceUUIDs(settings) {
+        if (settings.services && settings.services.length > 0) {
+            return settings.services.split(',').map(s => s.trim());
+        }
+        switch (settings.protocol) {
+            case 'fm':
+                return ['1826'];
+            case 'hr':
+                return ['180d'];
+            case 'wahoo':
+                return [consts_1.CSP, consts_2.WAHOO_ADVANCED_FTMS];
+            case 'cp':
+                return [consts_1.CSP];
+            case 'csc':
+                return [consts_1.CSC];
+            case 'zwift-play':
+                return ['0000000119ca465186e5fa29dcdd09d1'];
+            default:
+                return [];
+        }
+    }
     getAdapterFactory() {
         return ble_1.BleAdapterFactory.getInstance('wifi');
     }

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

@@ -154,7 +154,6 @@ class DirectConnectPeripheral {
             if (this.subscribed.includes(uuid)) {
                 return true;
             }
-            console.log('# subscribe ', characteristicUUID);
             const seqNo = this.getNextSeqNo();
             const message = new messages_1.EnableCharacteristicNotificationsMessage();
             const request = message.createRequest(seqNo, { characteristicUUID: (0, utils_1.parseUUID)(characteristicUUID), enable: true });

package/lib/direct-connect/messages/DiscoverCharacteristics.d.ts

@@ -18,5 +18,5 @@ export declare class DiscoverCharacteristicsMessage extends Message<TDCDiscoverC
     parseRequestBody(body: Buffer): TDCDiscoverCharacteristicsRequestBody;
     buildRequestBody(body: TDCDiscoverCharacteristicsRequestBody): Buffer;
     buildResponseBody(body: TDCDiscoverCharacteristicsResponseBody): Buffer;
-    parseResponseBody(body: Buffer): TDCDiscoverCharacteristicsResponseBody;
+    parseResponseBody(responseBody: Buffer): TDCDiscoverCharacteristicsResponseBody;
 }

package/lib/direct-connect/messages/DiscoverCharacteristics.js

@@ -25,9 +25,10 @@ class DiscoverCharacteristicsMessage extends message_1.Message {
         ]));
         return Buffer.concat([serviceUUIDBuffer, ...characteristicBuffers]);
     }
-    parseResponseBody(body) {
+    parseResponseBody(responseBody) {
+        const body = Buffer.from(responseBody);
         const length = body.length;
-        const serviceUUID = body.subarray(0, 16).toString("hex");
+        const serviceUUID = Buffer.from(body.subarray(0, 16)).toString("hex");
         const characteristicDefinitions = [];
         for (let i = 16; i < length; i += 17) {
             const characteristicUUID = Buffer.from(body.subarray(i, i + 16)).toString("hex");

package/lib/direct-connect/messages/DiscoverServices.d.ts

@@ -10,6 +10,6 @@ export interface TDCDiscoverServicesResponseBody extends TDCBody {
 export declare class DiscoverServiceMessage extends Message<EmptyBody, TDCDiscoverServicesResponseBody> {
     constructor();
     buildResponseBody(body: TDCDiscoverServicesResponseBody): Buffer;
-    parseResponseBody(body: Buffer): TDCDiscoverServicesResponseBody;
+    parseResponseBody(responseBody: Buffer): TDCDiscoverServicesResponseBody;
     verifyHeader(header: TDCMessageHeader): boolean;
 }

package/lib/direct-connect/messages/DiscoverServices.js

@@ -12,13 +12,15 @@ class DiscoverServiceMessage extends message_1.Message {
         const serviceBuffers = body.serviceDefinitions.map((service) => {
             return Buffer.from(service.serviceUUID, "hex");
         });
-        return Buffer.concat(serviceBuffers);
+        const response = Buffer.concat(serviceBuffers);
+        return response;
     }
-    parseResponseBody(body) {
+    parseResponseBody(responseBody) {
+        const body = Buffer.from(responseBody);
         const serviceDefinitions = [];
         const length = body.length;
         for (let i = 0; i < length; i += 16) {
-            const serviceUUID = body.subarray(i, i + 16).toString("hex");
+            const serviceUUID = Buffer.from(body.subarray(i, i + 16)).toString("hex");
             serviceDefinitions.push({ serviceUUID });
         }
         return { serviceDefinitions };

package/lib/direct-connect/messages/message.d.ts

@@ -9,7 +9,7 @@ export declare class Message<TReq extends TDCBody, TRes extends TDCBody> {
     createRequest(seqNum: any, body: TReq): Buffer;
     parseRequest(buffer: Buffer): TDCRequest<TReq>;
     prepareResponse(request: TDCRequest<TReq>, respCode: number, body: TRes): TDCResponse<TRes>;
-    parseResponse(buffer: Buffer): TDCResponse<TRes>;
+    parseResponse(response: Buffer): TDCResponse<TRes>;
     buildHeader(header: TDCMessageHeader, length: number): Buffer;
     buildResponseBody(body: TRes): Buffer;
     buildRequestBody(body: TReq): Buffer;

package/lib/direct-connect/messages/message.js

@@ -40,7 +40,8 @@ class Message {
         const header = Object.assign(Object.assign({}, request.header), { respCode });
         return { header, body };
     }
-    parseResponse(buffer) {
+    parseResponse(response) {
+        const buffer = Buffer.from(response);
         const header = (0, exports.parseHeader)(buffer);
         this.verifyHeader(header);
         const bodyBuffer = buffer.subarray(6);

package/lib/features/features.d.ts

@@ -0,0 +1,11 @@
+export type Feature = 'VirtualShifting';
+export declare class FeatureToggle {
+    protected static _instance: FeatureToggle;
+    static getInstance(): FeatureToggle;
+    protected enabled: Array<string>;
+    constructor();
+    add(feature: Feature): void;
+    remove(feature: Feature): void;
+    has(feature: Feature): boolean;
+}
+export declare const useFeatureToggle: () => FeatureToggle;

package/lib/features/features.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFeatureToggle = exports.FeatureToggle = void 0;
+class FeatureToggle {
+    static getInstance() {
+        if (!FeatureToggle._instance)
+            FeatureToggle._instance = new FeatureToggle();
+        return FeatureToggle._instance;
+    }
+    constructor() {
+        this.enabled = [];
+    }
+    add(feature) {
+        this.enabled.push(feature);
+    }
+    remove(feature) {
+        const index = this.enabled.indexOf(feature);
+        if (index > -1)
+            this.enabled.splice(index, 1);
+    }
+    has(feature) {
+        return this.enabled.includes(feature);
+    }
+}
+exports.FeatureToggle = FeatureToggle;
+const useFeatureToggle = () => {
+    return FeatureToggle.getInstance();
+};
+exports.useFeatureToggle = useFeatureToggle;

package/lib/features/index.d.ts

@@ -0,0 +1 @@
+export * from './features';

package/lib/features/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./features"), exports);

package/lib/index.d.ts

@@ -13,4 +13,5 @@ export * from './serial';
 export * from './ble';
 export * from './antv2';
 export * from './direct-connect';
+export * from './features';
 export { IAdapter, IncyclistDevice, IncyclistDeviceAdapter, DeviceSettings, DeviceProperties, AdapterFactory, InterfaceFactory, IncyclistInterface, INTERFACE, InterfaceProps, ICyclingMode, IncyclistAdapterData as DeviceData, IncyclistCapability, calc, };

package/lib/index.js

@@ -35,3 +35,4 @@ __exportStar(require("./serial"), exports);
 __exportStar(require("./ble"), exports);
 __exportStar(require("./antv2"), exports);
 __exportStar(require("./direct-connect"), exports);
+__exportStar(require("./features"), exports);

package/lib/modes/antble-smarttrainer.d.ts

@@ -55,5 +55,6 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected updateRequired(request?: UpdateRequest): boolean;
     sendBikeUpdate(incoming: UpdateRequest): UpdateRequest;
     protected getGearString(): string;
+    protected getFeatureToogle(): import("../features").FeatureToggle;
 }
 export {};

package/lib/modes/antble-smarttrainer.js

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
 const power_base_1 = __importDefault(require("./power-base"));
 const calculations_1 = __importStar(require("../utils/calculations"));
+const features_1 = require("../features");
 const MIN_POWER = 25;
 class SmartTrainerCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
@@ -71,6 +72,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     getConfig() {
         const config = super.getConfig();
+        if (!this.getFeatureToogle().has('VirtualShifting')) {
+            return config;
+        }
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
         if (!virtshift) {
@@ -90,7 +94,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     checkSlopeNoShiftig(request, newRequest = {}) {
         if (request.slope !== undefined) {
-            const targetSlope = newRequest.slope = parseFloat(request.slope.toFixed(1));
+            const targetSlope = newRequest.slope = Number.parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
             try {
                 const slopeAdj = targetSlope >= 0 ? this.getSetting('slopeAdj') : this.getSetting('slopeAdjDown');
@@ -112,7 +116,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     }
     checkSlopeWithSlopeDelta(request, newRequest = {}) {
         if (request.slope !== undefined) {
-            const targetSlope = newRequest.slope = parseFloat(request.slope.toFixed(1));
+            const targetSlope = newRequest.slope = Number.parseFloat(request.slope.toFixed(1));
             this.data.slope = newRequest.slope;
             const requestedSlope = targetSlope + this.getSlopeDelta();
             try {
@@ -130,9 +134,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             this.checkSlopeNoShiftig(request, newRequest);
             return;
         }
-        if (request.slope !== undefined) {
+        if (request.slope === undefined) {
+            console.log('# set simulated power (same slope):', { simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
+            this.logger.logEvent({ message: 'set simulated power (same slope)', simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
+        }
+        else {
             const prev = (_a = this.data.slope) !== null && _a !== void 0 ? _a : 0;
-            this.data.slope = parseFloat(request.slope.toFixed(1));
+            this.data.slope = Number.parseFloat(request.slope.toFixed(1));
             delete request.slope;
             delete newRequest.slope;
             this.simSlope = this.data.slope;
@@ -173,10 +181,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             }
             this.verifySimPower();
         }
-        else {
-            console.log('# set simulated power (same slope):', { simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
-            this.logger.logEvent({ message: 'set simulated power (same slope)', simPower: this.simPower, gear: this.gear, simSlope: this.simSlope, routeSlope: this.data.slope, cadence: this.data.pedalRpm, power: this.data.power });
-        }
         newRequest.targetPower = this.simPower;
     }
     checkSlope(request, newRequest = {}) {
@@ -342,6 +346,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     getVirtualShiftMode() {
+        if (!this.getFeatureToogle().has('VirtualShifting')) {
+            return 'Disabled';
+        }
         const virtshiftMode = this.getSetting('virtshift');
         if (virtshiftMode === 'Disabled') {
             return 'Disabled';
@@ -385,7 +392,6 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         return Object.assign(Object.assign({}, data), { gearStr });
     }
     updateRequired(request) {
-        console.log('# SmartTrainerCyclingMode updateRequired check');
         const virtshiftMode = this.getVirtualShiftMode();
         if (virtshiftMode === 'Adapter' || virtshiftMode === 'Simulated') {
             return true;
@@ -430,6 +436,9 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
         return (_d = this.gear) === null || _d === void 0 ? void 0 : _d.toString();
     }
+    getFeatureToogle() {
+        return (0, features_1.useFeatureToggle)();
+    }
 }
 SmartTrainerCyclingMode.config = {
     name: "Smart Trainer",

package/lib/modes/daum-premium-standard.js

@@ -43,7 +43,7 @@ class DaumClassicCyclingMode extends power_meter_1.default {
                 this.distanceOffset = calculateDistance - distanceBike;
                 distanceInternal = calculateDistance;
             }
-            data.speed = parseFloat(speed.toFixed(1));
+            data.speed = Number.parseFloat(speed.toFixed(1));
             data.power = Math.round(power);
             data.distanceInternal = distanceInternal;
             data.slope = slope;

package/lib/modes/daum-smarttrainer.js

@@ -53,12 +53,11 @@ class SmartTrainerCyclingMode extends base_1.CyclingModeBase {
         const minMaxStr = this.getSetting(`${source}Rings`);
         const values = minMaxStr.split('-');
         if (values[0] && values[1] && values[0] < values[1]) {
-            return [parseInt(values[0]), parseInt(values[1])];
+            return [Number.parseInt(values[0]), Number.parseInt(values[1])];
         }
         if (values[0] && values[1] && values[0] > values[1]) {
-            return [parseInt(values[1]), parseInt(values[0])];
+            return [Number.parseInt(values[1]), Number.parseInt(values[0])];
         }
-        return;
     }
     sendBikeUpdate(request) {
         const getData = () => {
@@ -70,7 +69,7 @@ class SmartTrainerCyclingMode extends base_1.CyclingModeBase {
         const event = Object.assign({}, this.event);
         if (this.data === undefined)
             event.noData = true;
-        const slope = request.slope === undefined ? request.slope : parseFloat(request.slope.toFixed(1));
+        const slope = request.slope === undefined ? request.slope : Number.parseFloat(request.slope.toFixed(1));
         if (slope !== undefined && (event.noData || Math.abs(slope - this.data.slope) >= 0.1))
             event.slopeUpdate = true;
         if (this.prevRequest === undefined)
@@ -231,7 +230,7 @@ class SmartTrainerCyclingMode extends base_1.CyclingModeBase {
                 const v = speed / 3.6;
                 distanceInternal += (v * duration);
             }
-            data.speed = parseFloat(speed.toFixed(1));
+            data.speed = Number.parseFloat(speed.toFixed(1));
             data.power = Math.round(power);
             data.distanceInternal = distanceInternal;
             data.distance = distance;
@@ -294,17 +293,18 @@ class SmartTrainerCyclingMode extends base_1.CyclingModeBase {
         return speed;
     }
     calculateTargetPower(request, speed) {
+        var _a, _b;
         const defaultPower = this.getSetting('startPower');
         const minPower = this.getSetting('minPower');
         const bikeType = this.getSetting('bikeType').toLowerCase();
         const m = this.getWeight();
         const prevData = this.data || {};
-        const slope = parseFloat((request.slope === undefined ? prevData.slope || 0 : request.slope).toFixed(1));
+        const slope = Number.parseFloat(((_b = (_a = request.slope) !== null && _a !== void 0 ? _a : prevData.slope) !== null && _b !== void 0 ? _b : 0).toFixed(1));
         let target = request.targetPower || defaultPower;
         if (prevData.speed !== undefined || speed !== undefined) {
             const v = speed ? speed / 3.6 : prevData.speed / 3.6;
             const calculatedPower = calculations_1.default.calculatePower(m, v, slope, { bikeType });
-            const power = (calculatedPower < minPower) ? minPower : calculatedPower;
+            const power = Math.max(calculatedPower, minPower);
             let belowMin = (calculatedPower < minPower);
             const powerDelta = power - prevData.power || 0;
             let target;

package/lib/serial/base/serial-interface.d.ts

@@ -2,7 +2,7 @@ import EventEmitter from "events";
 import { BindingInterface } from "@serialport/bindings-interface";
 import { SerialPortStream } from '@serialport/stream';
 import { SerialDeviceSettings, SerialScannerProps, PortMapping, SerialInterfaceProps } from "../types";
-import { IncyclistInterface } from "../../types";
+import { DeviceSettings, IncyclistInterface } from "../../types";
 import { EventLogger } from "gd-eventlog";
 export default class SerialInterface extends EventEmitter implements IncyclistInterface {
     ifaceName: string;
@@ -31,4 +31,5 @@ export default class SerialInterface extends EventEmitter implements IncyclistIn
     closePort(path: string): Promise<Boolean>;
     scan(props: SerialScannerProps): Promise<SerialDeviceSettings[]>;
     stopScan(): Promise<boolean>;
+    addKnownDevice(_settings: DeviceSettings): void;
 }

package/lib/serial/base/serial-interface.js

@@ -289,6 +289,8 @@ class SerialInterface extends events_1.default {
             return true;
         });
     }
+    addKnownDevice(_settings) {
+    }
 }
 SerialInterface._instances = [];
 exports.default = SerialInterface;

package/lib/serial/bindings/tcp.js

@@ -38,7 +38,7 @@ function scanPort(host, port) {
                 try {
                     socket.destroy();
                 }
-                catch (err) { }
+                catch (_a) { }
                 socket.removeAllListeners();
             };
             socket.setTimeout(1000);
@@ -47,7 +47,7 @@ function scanPort(host, port) {
             socket.on('ready', () => { resolve(true); cleanup(); });
             socket.connect(port, host);
         }
-        catch (err) {
+        catch (_a) {
             resolve(false);
         }
     });
@@ -109,10 +109,10 @@ exports.TCPBinding = {
                             return reject(new TypeError('"path" is not valid'));
                         host = res[0];
                         port = Number(res[1]);
-                        if (isNaN(port))
+                        if (Number.isNaN(port))
                             return reject(new TypeError('"path" is not valid'));
                     }
-                    catch (err) {
+                    catch (_a) {
                         return reject(new TypeError('"path" is not valid'));
                     }
                     const socket = new net_1.default.Socket();
@@ -207,11 +207,11 @@ class TCPPortBinding {
             if (!Buffer.isBuffer(buffer)) {
                 throw new TypeError('"buffer" is not a Buffer');
             }
-            if (typeof offset !== 'number' || isNaN(offset)) {
-                throw new TypeError(`"offset" is not an integer got "${isNaN(offset) ? 'NaN' : typeof offset}"`);
+            if (typeof offset !== 'number' || Number.isNaN(offset)) {
+                throw new TypeError(`"offset" is not an integer got "${Number.isNaN(offset) ? 'NaN' : typeof offset}"`);
             }
-            if (typeof length !== 'number' || isNaN(length)) {
-                throw new TypeError(`"length" is not an integer got "${isNaN(length) ? 'NaN' : typeof length}"`);
+            if (typeof length !== 'number' || Number.isNaN(length)) {
+                throw new TypeError(`"length" is not an integer got "${Number.isNaN(length) ? 'NaN' : typeof length}"`);
             }
             if (buffer.length < offset + length) {
                 throw new Error('buffer is too small');

package/lib/serial/daum/classic/adapter.d.ts

@@ -4,7 +4,7 @@ import { SerialDeviceSettings, SerialCommProps } from "../../types";
 import { IncyclistBikeData, ControllerConfig } from "../../../types";
 import Daum8008 from './comms';
 export default class DaumClassicAdapter extends DaumAdapter<SerialDeviceSettings, DaumClassicProperties, Daum8008> {
-    static NAME: string;
+    static readonly NAME = "Daum Classic";
     protected static controllers: ControllerConfig;
     protected name: string;
     protected id: string;

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

@@ -41,7 +41,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         else {
             serial = props.interface;
         }
-        if (!serial || !serial.binding)
+        if (!(serial === null || serial === void 0 ? void 0 : serial.binding))
             throw new Error(`unknonwn interface: ${ifaceName}`);
         const path = `${port}`;
         return { serial, path };
@@ -57,8 +57,8 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
     }
     performCheck() {
         return __awaiter(this, void 0, void 0, function* () {
-            var info = {};
-            const check = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            const info = {};
+            const check = () => __awaiter(this, void 0, void 0, function* () {
                 this.logEvent({ message: "checking device", port: this.getPort() });
                 try {
                     yield this.stop();
@@ -66,8 +66,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                         this.logEvent({ message: "checking device failed", port: this.getPort(), reason: 'timeout' });
                     });
                     if (!connected) {
-                        resolve(false);
-                        return;
+                        return false;
                     }
                     this.stopped = false;
                     const address = yield this.getComms().getAddress();
@@ -79,14 +78,14 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     this.pause();
                     this.started = false;
                     this.logEvent({ message: "checking device success", port: this.getPort(), info });
-                    resolve(true);
+                    return true;
                 }
                 catch (err) {
                     this.logEvent({ message: "checking device failed", port: this.getPort(), reason: err.message });
-                    resolve(false);
+                    return false;
                 }
-            }));
-            return yield (0, utils_1.waitWithTimeout)(check, 5000, () => {
+            });
+            return yield (0, utils_1.waitWithTimeout)(check(), 5000, () => {
                 this.logEvent({ message: "checking device failed", port: this.getPort(), reason: 'Timeout' });
                 return false;
             });
@@ -128,7 +127,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     try {
                         yield this.getComms().setBikeType(bikeType.toLowerCase());
                     }
-                    catch (err) {
+                    catch (_a) {
                     }
                     startState.setBikeType = true;
                 }

package/lib/serial/daum/classic/mock.js

@@ -198,7 +198,7 @@ class DaumClassicMockBinding extends binding_mock_1.MockPortBinding {
                         this.simulator.addHandle(to);
                     }
                 }
-                catch (err) {
+                catch (_a) {
                 }
                 this.writeOperation = null;
             }))();

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

@@ -405,25 +405,25 @@ class Daum8i extends comms_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const powerStr = typeof power === 'string' ? Number.parseFloat(power).toFixed(2) : power.toFixed(2);
             const str = yield this.sendStrCommand('setPower', `S23${powerStr}`);
-            return parseInt(str);
+            return Number.parseInt(str);
         });
     }
     getPower() {
         return __awaiter(this, void 0, void 0, function* () {
             const str = yield this.sendStrCommand('getPower', 'S23');
-            return parseInt(str);
+            return Number.parseInt(str);
         });
     }
     setGear(gear) {
         return __awaiter(this, void 0, void 0, function* () {
             const str = yield this.sendStrCommand('setGear', `M71${gear}`);
-            return parseInt(str);
+            return Number.parseInt(str);
         });
     }
     getGear() {
         return __awaiter(this, void 0, void 0, function* () {
             const str = yield this.sendStrCommand('getGear', 'M71');
-            return parseInt(str);
+            return Number.parseInt(str);
         });
     }
     sendReservedDaum8iCommand(logString, command, data) {
@@ -442,7 +442,7 @@ class Daum8i extends comms_1.default {
             }
             const cmdData = Uint8Array.from(buffer);
             const res = yield this.sendBinaryCommand(logString || 'ReservedCommand', 'M70', (0, utils_1.bin2esc)(cmdData));
-            const resData = Uint8Array.from(res, x => x.charCodeAt(0));
+            const resData = Uint8Array.from(res, x => x.codePointAt(0));
             const cmd = (0, utils_1.esc2bin)(resData);
             return cmd;
         });

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

@@ -224,7 +224,7 @@ class Daum8iMockBinding extends binding_mock_1.MockPortBinding {
                         this.waitingForCommand = true;
                     }
                 }
-                catch (err) {
+                catch (_a) {
                 }
             }
             else if (this.waitingForAck) {

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

@@ -26,7 +26,7 @@ exports.DEBUG_LOGGER = {
     logEvent: (event) => console.log(JSON.stringify(event))
 };
 const GS = 0x1D;
-const GS_CHAR = String.fromCharCode(GS);
+const GS_CHAR = String.fromCodePoint(GS);
 function responseLog(str) {
     if (str.includes(GS_CHAR)) {
         return str.split(GS_CHAR).join('/');
@@ -177,7 +177,7 @@ function hexstr(arr, start, len) {
     return str;
 }
 function ascii(c) {
-    return c.charCodeAt(0);
+    return c.codePointAt(0);
 }
 function getAsciiArrayFromStr(str) {
     if (str === undefined || str === null)
@@ -185,7 +185,7 @@ function getAsciiArrayFromStr(str) {
     const n = str.length;
     let result = [];
     for (let i = 0; i < n; i++) {
-        result.push(str.charCodeAt(i));
+        result.push(str.codePointAt(i));
     }
     return result;
 }
@@ -282,16 +282,16 @@ function routeToEpp(route, date) {
 }
 function parseTrainingData(payload) {
     const gearVal = (v) => v > 0 ? v - 1 : undefined;
-    const vals = payload.split(String.fromCharCode(GS));
+    const vals = payload.split(String.fromCodePoint(GS));
     const data = {
-        time: parseInt(vals[0]),
-        heartrate: parseInt(vals[1]),
-        speed: parseFloat(vals[2]) * 3.6,
-        slope: parseFloat(vals[3]),
-        distanceInternal: parseInt(vals[4]),
-        pedalRpm: parseFloat(vals[5]),
-        power: parseInt(vals[6]),
-        gear: gearVal(parseInt(vals[10])),
+        time: Number.parseInt(vals[0]),
+        heartrate: Number.parseInt(vals[1]),
+        speed: Number.parseFloat(vals[2]) * 3.6,
+        slope: Number.parseFloat(vals[3]),
+        distanceInternal: Number.parseInt(vals[4]),
+        pedalRpm: Number.parseFloat(vals[5]),
+        power: Number.parseInt(vals[6]),
+        gear: gearVal(Number.parseInt(vals[10])),
     };
     data.isPedalling = (data.pedalRpm > 0);
     return data;

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

@@ -25,7 +25,7 @@ export interface KettlerBikeData {
 export default class KettlerRacerAdapter extends SerialIncyclistDevice<DeviceProperties> {
     private id;
     private iv;
-    private requests;
+    private readonly requests;
     private internalData;
     private kettlerData;
     private updateBusy;

package/lib/serial/kettler/ergo-racer/adapter.js

@@ -171,18 +171,13 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
     }
     send(logStr, message, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const opened = yield this.waitForOpened();
-                    if (!opened) {
-                        reject(new Error('connection error'));
-                    }
-                }
-                catch (err) {
-                    reject(err);
-                }
+            const opened = yield this.waitForOpened();
+            if (!opened) {
+                throw (new Error('connection error'));
+            }
+            return new Promise((resolve, reject) => {
                 this.comms.send({ logStr, message, onResponse: resolve, onError: reject, timeout });
-            }));
+            });
         });
     }
     parseExtendedStatus(data) {
@@ -193,39 +188,39 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
         const states = data.split('\t');
         const result = {};
         if (states.length === 8) {
-            const hr = parseInt(states[0]);
-            if (!isNaN(hr)) {
+            const hr = Number.parseInt(states[0]);
+            if (!Number.isNaN(hr)) {
                 result.heartrate = hr;
             }
-            var cadence = parseInt(states[1]);
-            if (!isNaN(cadence)) {
+            const cadence = Number.parseInt(states[1]);
+            if (!Number.isNaN(cadence)) {
                 result.cadence = cadence;
             }
-            const speed = parseInt(states[2]);
-            if (!isNaN(speed)) {
+            const speed = Number.parseInt(states[2]);
+            if (!Number.isNaN(speed)) {
                 result.speed = speed * 0.1;
             }
-            const distance = parseInt(states[3]);
-            if (!isNaN(distance)) {
+            const distance = Number.parseInt(states[3]);
+            if (!Number.isNaN(distance)) {
                 result.distance = distance * 100;
             }
-            const requestedPower = parseInt(states[4]);
-            if (!isNaN(requestedPower)) {
+            const requestedPower = Number.parseInt(states[4]);
+            if (!Number.isNaN(requestedPower)) {
                 result.requestedPower = requestedPower;
             }
-            const energy = parseInt(states[5]);
-            if (!isNaN(energy)) {
+            const energy = Number.parseInt(states[5]);
+            if (!Number.isNaN(energy)) {
                 result.energy = energy;
             }
             const timeStr = states[6];
             const time = timeStr.split(':');
-            const hours = parseInt(time[0]);
-            const minutes = parseInt(time[1]);
-            if (!isNaN(hours) && !isNaN(minutes)) {
+            const hours = Number.parseInt(time[0]);
+            const minutes = Number.parseInt(time[1]);
+            if (!Number.isNaN(hours) && !Number.isNaN(minutes)) {
                 result.time = hours * 60 + minutes;
             }
-            const power = parseInt(states[7]);
-            if (!isNaN(power)) {
+            const power = Number.parseInt(states[7]);
+            if (!Number.isNaN(power)) {
                 result.power = power;
             }
             result.timestamp = Date.now();
@@ -234,7 +229,7 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
     }
     check() {
         return __awaiter(this, void 0, void 0, function* () {
-            var info = {};
+            const info = {};
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 this.logEvent({ message: "checking device", port: this.getPort() });
                 let iv = undefined;
@@ -275,7 +270,7 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
         return __awaiter(this, void 0, void 0, function* () {
             const props = this.getStartProps(startProps);
             this.logEvent({ message: 'start()' });
-            var info = {};
+            const info = {};
             yield this.waitForOpened(true);
             return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
                 try {
@@ -519,25 +514,20 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
     }
     waitForOpened() {
         return __awaiter(this, arguments, void 0, function* (retries = false) {
-            if (!retries) {
-                return yield this.comms.open();
-            }
-            else {
-                let opened;
-                let tries = 0;
-                while (!opened && tries < 3) {
-                    try {
-                        opened = yield this.comms.open();
-                        if (opened)
-                            return true;
-                    }
-                    catch (err) {
-                    }
-                    tries++;
-                    yield (0, utils_1.sleep)(500);
+            const maxTries = retries ? 3 : 1;
+            let opened = false;
+            let tries = 0;
+            while (!opened && tries < maxTries) {
+                try {
+                    opened = yield this.comms.open();
+                    if (opened)
+                        return true;
                 }
-                return false;
+                catch (_a) { }
+                tries++;
+                yield (0, utils_1.sleep)(500);
             }
+            return false;
         });
     }
     waitForClosed() {
@@ -554,7 +544,10 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
                     resolve(true);
                     cleanup();
                 };
-                const onError = (err) => { reject(err); cleanup(); };
+                const onError = (err) => {
+                    reject(err);
+                    cleanup();
+                };
                 const onOpen = () => { cleanup(); };
                 this.comms.on('closed', onClose);
                 this.comms.on('opened', onOpen);

package/lib/types/interface.d.ts

@@ -15,4 +15,5 @@ export interface IncyclistInterface extends EventEmitter {
     isConnected(): boolean;
     scan(props: IncyclistScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;
+    addKnownDevice?(settings: DeviceSettings): void;
 }

package/lib/utils/utils.js

@@ -73,16 +73,16 @@ function floatVal(d) {
         return;
     if (typeof d === 'number')
         return d;
-    const res = parseFloat(d);
-    return isNaN(res) ? undefined : res;
+    const res = Number.parseFloat(d);
+    return Number.isNaN(res) ? undefined : res;
 }
 function intVal(d) {
     if (d === undefined)
         return;
     if (typeof d === 'number')
         return Math.floor(d);
-    const res = parseInt(d);
-    return isNaN(res) ? undefined : res;
+    const res = Number.parseInt(d);
+    return Number.isNaN(res) ? undefined : res;
 }
 function hexstr(arr, start, len) {
     let str = "";
@@ -93,7 +93,7 @@ function hexstr(arr, start, len) {
         endIdx = arr.length;
     }
     let added = 0;
-    for (var i = startIdx; i < endIdx; i++) {
+    for (let i = startIdx; i < endIdx; i++) {
         const hex = Math.abs(arr[i]).toString(16).toUpperCase();
         if (added !== 0)
             str += ' ';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.38",
+  "version": "2.3.41",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",