incyclist-devices 2.4.9 → 2.4.10

package/lib/base/adpater.d.ts

@@ -19,6 +19,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     protected static controllers: ControllerConfig;
     protected user: User;
     protected data: IncyclistAdapterData;
+    protected debugLogEnabled: boolean;
     constructor(settings: DeviceSettings, props?: P);
     supportsVirtualShifting(): boolean;
     getLogger(): EventLogger;
@@ -73,5 +74,6 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     onData(callback: OnDeviceDataCallback): void;
     onScanStart(): void;
     onScanStop(): void;
+    protected initDebugLog(): void;
 }
 export type IncyclistDeviceAdapter = IncyclistDevice<DeviceProperties>;

package/lib/base/adpater.js

@@ -31,6 +31,7 @@ class IncyclistDevice extends events_1.default {
         this.user = {};
         this.data = {};
         this.cyclingMode = this.getDefaultCyclingMode();
+        this.debugLogEnabled = false;
     }
     supportsVirtualShifting() {
         return false;
@@ -46,11 +47,9 @@ class IncyclistDevice extends events_1.default {
     logEvent(event) {
         if (!this.logger || this.paused)
             return;
+        if (this.isDebugEnabled() && !this.debugLogEnabled)
+            this.initDebugLog();
         this.logger.logEvent(event);
-        if (this.isDebugEnabled()) {
-            const logText = `~~~ ${this.getInterface()}: ${this.logger.getName()}`;
-            console.log(logText, event);
-        }
     }
     getName() {
         return this.settings.name;
@@ -298,6 +297,26 @@ class IncyclistDevice extends events_1.default {
     onScanStop() {
         this.scanning = false;
     }
+    initDebugLog() {
+        if (this.debugLogEnabled) {
+            return;
+        }
+        if (this.isDebugEnabled() && this.logger) {
+            const logText = `~~~ ${this.getInterface()}: ${this.logger.getName()}`;
+            const logEvent = this.logger.logEvent.bind(this.logger);
+            this.logger.logEvent = (event) => {
+                try {
+                    logEvent(event);
+                }
+                catch (_a) { }
+                try {
+                    console.log(logText, event);
+                }
+                catch (_b) { }
+            };
+            this.debugLogEnabled = true;
+        }
+    }
 }
 IncyclistDevice.controllers = {};
 exports.default = IncyclistDevice;

package/lib/ble/fm/adapter.js

@@ -145,8 +145,10 @@ class BleFmAdapter extends adapter_1.default {
     initVirtualShifting() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            this.logEvent({ message: 'init virtual shifting', hasSensor: this.zwiftPlay !== undefined });
             try {
-                this.zwiftPlay = (_a = this.zwiftPlay) !== null && _a !== void 0 ? _a : new play_1.BleZwiftPlaySensor(this.device);
+                this.zwiftPlay = (_a = this.zwiftPlay) !== null && _a !== void 0 ? _a : new play_1.BleZwiftPlaySensor(this.device, { logger: this.logger, isTrainer: true });
+                this.zwiftPlay.initHubService(false);
             }
             catch (err) {
                 this.logEvent({ message: 'could not init virtual shifting', reason: err.message });

package/lib/ble/zwift/play/sensor.d.ts

@@ -1,3 +1,4 @@
+import { EventLogger } from "gd-eventlog";
 import { LegacyProfile } from "../../../antv2/types";
 import { HubCommand, HubRequest, SimulationParam } from "../../../proto/zwift_hub";
 import { TBleSensor } from "../../base/sensor";
@@ -7,7 +8,11 @@ type ButtonState = {
     pressed: boolean;
     timestamp: number;
 };
-type DeviceType = 'left' | 'right' | 'click';
+type BleZwiftPlaySensorProps = {
+    logger?: EventLogger;
+    isTrainer?: boolean;
+};
+type DeviceType = 'left' | 'right' | 'click' | 'hub';
 export declare class BleZwiftPlaySensor extends TBleSensor {
     static readonly profile: LegacyProfile;
     static readonly protocol: BleProtocol;
@@ -15,7 +20,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     static readonly characteristics: any[];
     static readonly detectionPriority = 1;
     protected emitter: EventEmitter;
-    protected paired: boolean;
+    protected isHubPairConfirmed: boolean;
     protected encrypted: boolean;
     protected deviceKey: Buffer;
     protected prevClickMessage: string;
@@ -30,7 +35,9 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     protected isHubServicePaired: boolean;
     protected isHubServiceSubscribed: boolean;
     protected initHubServicePromise: Promise<boolean>;
-    constructor(peripheral: IBlePeripheral | TBleSensor, props?: any);
+    protected pairPromise: Promise<boolean>;
+    protected subscribePromise: Promise<boolean>;
+    constructor(peripheral: IBlePeripheral | TBleSensor, props?: BleZwiftPlaySensorProps);
     reconnectSensor(): Promise<void>;
     stopSensor(): Promise<boolean>;
     protected getRequiredCharacteristics(): Array<string>;

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

@@ -17,7 +17,12 @@ const crypto_1 = require("crypto");
 const events_1 = require("events");
 class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     constructor(peripheral, props) {
-        if (peripheral &&
+        if ((props === null || props === void 0 ? void 0 : props.isTrainer) && peripheral) {
+            const sensor = peripheral;
+            super(sensor.getPeripheral(), props);
+            this.isFM = true;
+        }
+        else if (peripheral &&
             'startSensor' in peripheral && typeof peripheral.startSensor === 'function' &&
             'getPeripheral' in peripheral && typeof peripheral.getPeripheral === 'function') {
             super(peripheral.getPeripheral(), props);
@@ -70,28 +75,35 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     setSimulationData(data) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
-            if (!this.isHubServiceActive) {
-                yield this.initHubService(false);
+            try {
+                if (!this.isHubServiceActive) {
+                    yield this.initHubService(false);
+                }
+                if (!this.isHubServiceActive || !this.isHubPairConfirmed)
+                    return;
+                const crrx100000 = Math.round((_a = data === null || data === void 0 ? void 0 : data.crrx100000) !== null && _a !== void 0 ? _a : 400);
+                const cWax10000 = Math.round((_b = data === null || data === void 0 ? void 0 : data.cWax10000) !== null && _b !== void 0 ? _b : 5100);
+                const windx100 = Math.round((_c = data === null || data === void 0 ? void 0 : data.windx100) !== null && _c !== void 0 ? _c : 0);
+                let inclineX100 = Math.round((_d = data === null || data === void 0 ? void 0 : data.inclineX100) !== null && _d !== void 0 ? _d : 1);
+                if (inclineX100 === 0 || Number.isNaN(inclineX100))
+                    inclineX100 = 1;
+                const simulation = { inclineX100, crrx100000, cWax10000, windx100 };
+                yield this.sendHubCommand({ simulation });
+                yield this.requestDataUpdate(512);
+            }
+            catch (err) {
+                this.logger.logEvent({ message: "error", fn: 'setSimulationData', data, error: err.message, stack: err.stack });
             }
-            const crrx100000 = Math.round((_a = data === null || data === void 0 ? void 0 : data.crrx100000) !== null && _a !== void 0 ? _a : 400);
-            const cWax10000 = Math.round((_b = data === null || data === void 0 ? void 0 : data.cWax10000) !== null && _b !== void 0 ? _b : 5100);
-            const windx100 = Math.round((_c = data === null || data === void 0 ? void 0 : data.windx100) !== null && _c !== void 0 ? _c : 0);
-            let inclineX100 = Math.round((_d = data === null || data === void 0 ? void 0 : data.inclineX100) !== null && _d !== void 0 ? _d : 1);
-            if (inclineX100 === 0 || Number.isNaN(inclineX100))
-                inclineX100 = 1;
-            const simulation = { inclineX100, crrx100000, cWax10000, windx100 };
-            console.log('# set simulation data', simulation);
-            yield this.sendHubCommand({ simulation });
-            yield this.requestDataUpdate(512);
         });
     }
     setGearRatio(gearRatio) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                console.log('# set gear ratio', gearRatio);
                 if (!this.isHubServiceActive) {
                     yield this.initHubService();
                 }
+                if (!this.isHubServiceActive || !this.isHubPairConfirmed)
+                    return;
                 const gearRatioX10000 = Math.round(gearRatio * 10000);
                 const bikeWeightx100 = 10 * 100;
                 const riderWeightx100 = 75 * 100;
@@ -102,7 +114,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                 yield this.requestDataUpdate(512);
             }
             catch (err) {
-                console.log('# set gear ratio failed', err);
+                this.logger.logEvent({ message: "error", fn: 'setGearRatio', gearRatio, error: err.message, stack: err.stack });
             }
             return gearRatio;
         });
@@ -115,6 +127,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     onMeasurement(d) {
         const data = Buffer.from(d);
+        this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         if ((data === null || data === void 0 ? void 0 : data.length) < 1) {
             console.log('Invalid click measurement data', data.toString('hex'));
             return false;
@@ -144,22 +157,35 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     initHubService() {
         return __awaiter(this, arguments, void 0, function* (setSimulation = true) {
+            var _a;
             if (!this.isHubServiceActive && this.initHubServicePromise !== undefined) {
                 yield this.initHubServicePromise;
             }
             if (this.isHubServiceActive)
                 return true;
-            this.logEvent({ message: 'init hub service', paired: this.paired, subscribed: this.isHubServiceSubscribed });
-            console.log('# init Hub Service');
+            this.logEvent({ message: 'init hub service', paired: this.isHubPairConfirmed, subscribed: this.isHubServiceSubscribed });
             if (!this.isHubServicePaired) {
-                yield this.pair();
+                this.logEvent({ message: 'pair hub service' });
+                this.pairPromise = this.pair();
+                const paired = yield this.pairPromise;
+                this.pairPromise = undefined;
+                if (!paired)
+                    return false;
             }
             if (!this.isHubServiceSubscribed) {
-                yield this.subscribe();
-                this.isHubServiceSubscribed = true;
+                this.logEvent({ message: 'subscribe to hub service characteristics' });
+                this.subscribePromise = (_a = this.subscribePromise) !== null && _a !== void 0 ? _a : this.subscribe();
+                const subscribed = yield this.subscribePromise;
+                this.subscribePromise = undefined;
+                this.isHubServiceSubscribed = subscribed;
+                if (!subscribed)
+                    return false;
+                this.logEvent({ message: 'subscribed to hub service characteristics' });
             }
             this.initHubServicePromise = new Promise((done) => {
+                this.logEvent({ message: 'send hub init message' });
                 let timeout = setTimeout(() => {
+                    this.logEvent({ message: 'could not init hub service', reason: 'timeout' });
                     done(false);
                 }, 2000);
                 this.once('hub-riding-data', () => {
@@ -168,8 +194,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                         timeout = undefined;
                     }
                     this.isHubServiceActive = true;
-                    console.log('# init hub service completed');
-                    this.logEvent({ message: 'init hub service done', paired: this.paired, subscribed: this.isHubServiceSubscribed });
+                    this.logEvent({ message: 'init hub service done', paired: this.isHubServicePaired, confirmed: this.isHubPairConfirmed, subscribed: this.isHubServiceSubscribed });
                     if (setSimulation) {
                         this.logEvent({ message: 'hub: send initial simulation data' });
                         this.setSimulationData().then(() => {
@@ -189,7 +214,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                         clearTimeout(timeout);
                         timeout = undefined;
                     }
-                    console.log('# init hub service timeout');
                     done(false);
                     this.logEvent({ message: 'could not init hub service', reason: err.message });
                 });
@@ -200,7 +224,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     sendHubRequest(request) {
         return __awaiter(this, void 0, void 0, function* () {
             const message = Buffer.from(zwift_hub_1.HubRequest.toBinary(request));
-            console.log('# sending hub request', request, message);
             this.logEvent({ mesage: 'send zwift hub request', request });
             return yield this.sendPlayCommand(0x00, message);
         });
@@ -208,7 +231,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     sendHubCommand(command) {
         return __awaiter(this, void 0, void 0, function* () {
             const message = Buffer.from(zwift_hub_1.HubCommand.toBinary(command));
-            console.log('# sending hub command', command, message);
             this.logEvent({ mesage: 'send zwift hub command', command });
             return yield this.sendPlayCommand(0x04, message);
         });
@@ -218,7 +240,6 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
             this.tsLastRidingData = Date.now();
             const data = zwift_hub_1.HubRidingData.fromBinary(m);
             this.emit('hub-riding-data', data);
-            console.log('#riding data', data);
             this.logEvent({ message: 'riding data received', power: data.power, cadence: data.cadence, Speed: data.speedX100 / 100, heartrate: data.hR, unknown1: data.unknown1, unknown2: data.unknown2 });
         }
         catch (err) {
@@ -231,13 +252,11 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
             const { messageType, payload } = envelope;
             if (messageType < 16) {
                 const deviceInfo = zwift_hub_1.DeviceInformationContent.fromBinary(payload);
-                console.log('# deviceInfo', deviceInfo);
                 this.emit('hub-device-info', deviceInfo);
                 this.logEvent({ message: 'hub device info update', deviceInfo });
             }
             else if (messageType >= 512 && messageType < 526) {
                 const si = zwift_hub_1.DeviceSettings.fromBinary(payload);
-                console.log('# settings', si === null || si === void 0 ? void 0 : si.subContent);
                 this.emit('hub-settings', si === null || si === void 0 ? void 0 : si.subContent);
                 this.logEvent({ message: 'hub settings update', settings: si === null || si === void 0 ? void 0 : si.subContent });
             }
@@ -287,11 +306,11 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     onPingMessage(message) {
         const idle = zwift_hub_1.Idle.fromBinary(message);
-        console.log('# ping message', idle);
-        this.emit('data', { deviceType: this.deviceType, paired: this.paired, alive: true, ts: Date.now() });
+        this.emit('data', { deviceType: this.deviceType, paired: this.isHubPairConfirmed, alive: true, ts: Date.now() });
     }
     onResponse(d) {
         const data = Buffer.from(d);
+        this.logEvent({ message: 'got hub message', raw: data.toString('hex'), str: data.toString() });
         if ((data === null || data === void 0 ? void 0 : data.length) < 1) {
             console.log('Invalid response data', data.toString('hex'));
             return false;
@@ -303,9 +322,9 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
         }
         else {
             const len = data.length;
-            if (len === 6 && data.toString() === 'RideOn') {
+            if (len == 6 && data.toString() === 'RideOn') {
                 this.encrypted = false;
-                this.paired = true;
+                this.isHubPairConfirmed = true;
                 this.emitter.emit('paired');
                 try {
                     this.emit('data', { deviceType: this.deviceType, paired: true, ts: Date.now() });
@@ -318,7 +337,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                 const message = Buffer.from(data.subarray(6, 2)).toString('hex');
                 if (message === '0900') {
                     this.encrypted = true;
-                    this.paired = true;
+                    this.isHubPairConfirmed = true;
                     this.deviceKey = data.subarray(8);
                     this.emitter.emit('paired');
                     try {
@@ -332,6 +351,17 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                     this.logEvent({ message: 'Pairing failed! ', reason: 'unknown message', raw: message });
                 }
             }
+            else if (Buffer.from(data.subarray(0, 6)).toString() === 'RideOn') {
+                this.encrypted = false;
+                this.isHubPairConfirmed = true;
+                this.emitter.emit('paired');
+                try {
+                    this.emit('data', { deviceType: this.deviceType, paired: true, ts: Date.now() });
+                }
+                catch (err) {
+                    this.logEvent({ message: 'error', fn: 'onPairResponse', error: err.message, stack: err.stack });
+                }
+            }
             return true;
         }
     }
@@ -352,12 +382,22 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     pair() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
             if (this.isHubServicePaired)
                 return true;
+            if (this.pairPromise !== undefined) {
+                const paired = yield this.pairPromise;
+                this.pairPromise = undefined;
+                if (paired)
+                    return;
+            }
             let manufacturerData;
             try {
-                if (this.peripheral.getManufacturerData) {
+                if (this.isFM) {
+                    this.deviceType = 'hub';
+                    this.encrypted = false;
+                }
+                else if (this.peripheral.getManufacturerData) {
                     manufacturerData = this.getManufacturerData();
                     if (manufacturerData === null || manufacturerData === void 0 ? void 0 : manufacturerData.startsWith('4a09')) {
                         const typeVal = Number('0x' + manufacturerData.substring(2, 4));
@@ -373,23 +413,29 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                         }
                     }
                 }
-                if (!this.encryptedSupported()) {
+                if (!this.deviceType && !this.encryptedSupported()) {
                     this.deviceType = 'click';
                     this.encrypted = false;
                 }
+                this.deviceType = (_a = this.deviceType) !== null && _a !== void 0 ? _a : 'click';
                 this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
                 let message;
-                if (!this.encrypted) {
-                    message = this.isFM ? Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]) : Buffer.from('RideOn');
+                if (this.isFM) {
+                    message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]);
                 }
-                else {
+                else if (this.encrypted) {
                     const { publicKey, privateKey } = this.createKeyPair();
-                    this.privateKey = (_a = this.privateKey) !== null && _a !== void 0 ? _a : Buffer.from(privateKey);
-                    this.publicKey = (_b = this.publicKey) !== null && _b !== void 0 ? _b : Buffer.from(publicKey);
+                    this.privateKey = (_b = this.privateKey) !== null && _b !== void 0 ? _b : Buffer.from(privateKey);
+                    this.publicKey = (_c = this.publicKey) !== null && _c !== void 0 ? _c : Buffer.from(publicKey);
                     message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x03]), this.publicKey]);
                 }
+                else {
+                    message = Buffer.from('RideOn');
+                }
+                this.logEvent({ message: `send rideOn` });
                 yield this.write((0, utils_1.fullUUID)('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
                 this.isHubServicePaired = true;
+                this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
                 return true;
             }
             catch (err) {
@@ -412,7 +458,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
         });
     }
     setInitialState() {
-        this.paired = false;
+        this.isHubPairConfirmed = false;
         this.encrypted = false;
         this.deviceKey = null;
         this.isHubServicePaired = false;

package/lib/modes/antble-smarttrainer.js

@@ -40,6 +40,7 @@ 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 utils_1 = require("../utils/utils");
 const MIN_POWER = 25;
 class SmartTrainerCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
@@ -54,7 +55,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     getBikeInitRequest() {
         const virtshiftMode = this.getVirtualShiftMode();
         if (virtshiftMode === 'Adapter') {
-            this.gear = this.getSetting('startGear');
+            this.gear = (0, utils_1.intVal)(this.getSetting('startGear'));
             const gearRatio = this.gearRatios[this.gear - 1];
             return { slope: 0, gearRatio };
         }
@@ -254,6 +255,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         }
     }
     checkGearChange(request, newRequest = {}) {
+        var _a, _b;
         const virtshiftMode = this.getVirtualShiftMode();
         switch (virtshiftMode) {
             case 'SlopeDelta':
@@ -267,11 +269,11 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 if (request.gearDelta !== undefined) {
                     const oldGear = this.gear;
                     if (this.gear === undefined) {
-                        const initialGear = Number(this.getSetting('startGear'));
-                        this.gear = initialGear + Number(request.gearDelta);
+                        const initialGear = (0, utils_1.intVal)(this.getSetting('startGear'));
+                        this.gear = initialGear + ((_a = (0, utils_1.intVal)(request.gearDelta)) !== null && _a !== void 0 ? _a : 0);
                     }
                     else {
-                        this.gear += Number(request.gearDelta);
+                        this.gear += ((_b = (0, utils_1.intVal)(request.gearDelta)) !== null && _b !== void 0 ? _b : 0);
                     }
                     if (this.gear < 1) {
                         this.gear = 1;
@@ -290,6 +292,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 break;
             case 'Adapter':
                 if (request.gearRatio !== undefined) {
+                    const oldGear = this.gear;
                     newRequest.gearRatio = request.gearRatio;
                     if (this.gear === undefined) {
                         const requestedRatio = request.gearRatio;
@@ -303,11 +306,13 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                             }
                         }
                         this.gear = closestIndex + 1;
+                        this.logger.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
                     }
                 }
                 else if (request.gearDelta !== undefined) {
+                    const oldGear = this.gear;
                     if (this.gear === undefined) {
-                        const initialGear = Number(this.getSetting('startGear'));
+                        const initialGear = (0, utils_1.intVal)(this.getSetting('startGear'));
                         this.gear = initialGear + request.gearDelta;
                     }
                     else {
@@ -321,13 +326,15 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                     }
                     delete request.gearDelta;
                     newRequest.gearRatio = this.gearRatios[this.gear];
+                    this.logger.logEvent({ message: 'gear changed', gear: this.gear, gearRatio: newRequest.gearRatio, oldGear });
                 }
                 else {
                     if (this.gear === undefined) {
-                        const initialGear = Number(this.getSetting('startGear'));
+                        const initialGear = (0, utils_1.intVal)(this.getSetting('startGear'));
                         this.gear = initialGear + request.gearDelta;
                     }
                     newRequest.gearRatio = this.gearRatios[this.gear];
+                    this.logger.logEvent({ message: 'gear initialized', gear: this.gear, gearRatio: newRequest.gearRatio });
                 }
                 break;
             case 'Disabled':

package/package.json

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