incyclist-devices 2.3.31 → 2.3.33

package/lib/antv2/fe/adapter.js

@@ -61,7 +61,8 @@ class AntFEAdapter extends adapter_1.default {
                     this.promiseSendUpdate = fe.sendTrackResistance(update.slope);
                 }
                 if (update.targetPower !== undefined) {
-                    this.promiseSendUpdate = fe.sendTargetPower(update.targetPower);
+                    const tp = update.targetPower > 0 ? update.targetPower : 0;
+                    this.promiseSendUpdate = fe.sendTargetPower(tp);
                 }
                 yield this.promiseSendUpdate;
                 delete this.promiseSendUpdate;
@@ -112,6 +113,7 @@ class AntFEAdapter extends adapter_1.default {
             power: adapterData.power,
             speed: adapterData.speed,
             cadence: adapterData.pedalRpm,
+            gearStr: adapterData.gearStr,
             timestamp: Date.now()
         });
         if (adapterData.distanceInternal !== undefined) {

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

@@ -19,6 +19,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     connect(): Promise<boolean>;
     getPeripheral(): IBlePeripheral;
     waitForPeripheral(): Promise<void>;
+    protected updateSettings(peripheral: IBlePeripheral): void;
     updateSensor(peripheral: IBlePeripheral): void;
     close(): Promise<boolean>;
     getSensor(): TDevice;

package/lib/ble/base/adapter.js

@@ -27,12 +27,12 @@ class BleAdapter extends adpater_1.default {
         this.updateFrequency = 1000;
     }
     getUniqueName() {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         const settings = this.settings;
         if (((_a = settings.name) === null || _a === void 0 ? void 0 : _a.match(/\d/g)) || settings.address === undefined)
             return this.getName();
         else {
-            const addressHash = settings.address.substring(0, 2) + settings.address.slice(-2);
+            const addressHash = (_d = (_c = (_b = settings.id) === null || _b === void 0 ? void 0 : _b.slice(-4)) === null || _c === void 0 ? void 0 : _c.toUpperCase()) !== null && _d !== void 0 ? _d : ((_f = (_e = settings.address) === null || _e === void 0 ? void 0 : _e.substring(0, 2)) !== null && _f !== void 0 ? _f : '') + ((_h = (_g = settings.address) === null || _g === void 0 ? void 0 : _g.slice(-2)) !== null && _h !== void 0 ? _h : '');
             return `${this.getName()} ${addressHash}`;
         }
     }
@@ -53,8 +53,21 @@ class BleAdapter extends adpater_1.default {
             const ble = this.getBle();
             const peripheral = yield ble.waitForPeripheral(this.settings);
             this.updateSensor(peripheral);
+            this.updateSettings(peripheral);
         });
     }
+    updateSettings(peripheral) {
+        var _a, _b, _c;
+        try {
+            const info = peripheral.getInfo();
+            const settings = Object.assign({}, this.settings);
+            settings.id = (_a = settings.id) !== null && _a !== void 0 ? _a : info.id;
+            settings.address = (_b = settings.address) !== null && _b !== void 0 ? _b : info.address;
+            settings.name = (_c = settings.name) !== null && _c !== void 0 ? _c : info.name;
+            this.settings = settings;
+        }
+        catch (_d) { }
+    }
     updateSensor(peripheral) {
         throw new Error('method not implemented');
     }
@@ -285,6 +298,7 @@ class BleAdapter extends adpater_1.default {
                 this.stopped = false;
                 const connected = yield this.startSensor();
                 if (connected) {
+                    this.updateSettings(this.getPeripheral());
                     this.logEvent({ message: 'peripheral connected', device: this.getName(), interface: this.getInterface() });
                 }
                 else {

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

@@ -62,8 +62,8 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     resumeLogging(): void;
     isLoggingPaused(): boolean;
     createPeripheral(announcement: BlePeripheralAnnouncement): IBlePeripheral;
-    createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;
-    waitForPeripheral(settings: DeviceSettings): Promise<IBlePeripheral>;
+    createPeripheralFromSettings(settings: BleDeviceSettings): IBlePeripheral;
+    waitForPeripheral(settings: BleDeviceSettings): Promise<IBlePeripheral>;
     createDeviceSetting(service: BlePeripheralAnnouncement): BleDeviceSettings;
     protected reconnect(): Promise<void>;
     protected startPeripheralScan(retry?: boolean): Promise<void>;

package/lib/ble/base/interface.js

@@ -248,7 +248,7 @@ class BleInterface extends events_1.default {
         return new peripheral_1.BlePeripheral(announcement);
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service.name === settings.name);
+        const info = this.getAll().find(a => { var _a, _b, _c; return ((_a = a.service) === null || _a === void 0 ? void 0 : _a.name) === settings.name || ((_c = (_b = a.service) === null || _b === void 0 ? void 0 : _b.peripheral) === null || _c === void 0 ? void 0 : _c.address) === settings.address; });
         if (!(info === null || info === void 0 ? void 0 : info.service))
             return null;
         return this.createPeripheral(info.service);
@@ -262,8 +262,8 @@ class BleInterface extends events_1.default {
             if (!wasDiscovering)
                 this.startPeripheralScan();
             const onDevice = (device) => {
-                if (device.name === settings.name) {
-                    const peripheral = this.createPeripheralFromSettings(settings);
+                if (device.name === settings.name || device.address === settings.address) {
+                    const peripheral = this.createPeripheralFromSettings(device);
                     if (peripheral) {
                         this.off('device', onDevice);
                         if (!wasDiscovering)

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

@@ -1,4 +1,4 @@
-import { BleCharacteristic, BlePeripheralAnnouncement, BleRawCharacteristic, BleRawPeripheral, BleService, BleWriteProps, IBlePeripheral } from "../types";
+import { BleCharacteristic, BleDeviceIdentifier, BlePeripheralAnnouncement, BleRawCharacteristic, BleRawPeripheral, BleService, BleWriteProps, IBlePeripheral } from "../types";
 import { BleInterface } from "./interface";
 export declare class BlePeripheral implements IBlePeripheral {
     protected announcement: BlePeripheralAnnouncement;
@@ -17,6 +17,7 @@ export declare class BlePeripheral implements IBlePeripheral {
     constructor(announcement: BlePeripheralAnnouncement);
     get services(): BleService[];
     getPeripheral(): BleRawPeripheral;
+    getInfo(): BleDeviceIdentifier;
     connect(): Promise<boolean>;
     disconnect(connectionLost?: boolean): Promise<boolean>;
     isConnected(): boolean;

package/lib/ble/base/peripheral.js

@@ -29,6 +29,14 @@ class BlePeripheral {
     getPeripheral() {
         return this.announcement.peripheral;
     }
+    getInfo() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        return {
+            id: (_b = (_a = this.announcement) === null || _a === void 0 ? void 0 : _a.peripheral) === null || _b === void 0 ? void 0 : _b.id,
+            address: (_d = (_c = this.announcement) === null || _c === void 0 ? void 0 : _c.peripheral) === null || _d === void 0 ? void 0 : _d.address,
+            name: (_g = (_f = (_e = this.announcement) === null || _e === void 0 ? void 0 : _e.advertisement) === null || _f === void 0 ? void 0 : _f.localName) !== null && _g !== void 0 ? _g : (_j = (_h = this.announcement) === null || _h === void 0 ? void 0 : _h.peripheral) === null || _j === void 0 ? void 0 : _j.id,
+        };
+    }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isConnected())

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

@@ -1,4 +1,5 @@
-import { IBleInterface } from "../types";
+import { DeviceSettings } from "../../types";
+import { BleProtocol, IBleInterface } from "../types";
 export interface BleDeviceData {
 }
 export interface IInterfaceFactory {
@@ -7,3 +8,8 @@ export interface IInterfaceFactory {
 export declare class InterfaceFactory implements IInterfaceFactory {
     getInterface(): IBleInterface<any>;
 }
+export interface BleDeviceSettings extends DeviceSettings {
+    id?: string;
+    protocol?: BleProtocol;
+    address?: string;
+}

package/lib/ble/fm/adapter.js

@@ -246,7 +246,8 @@ class BleFmAdapter extends adapter_1.default {
                         yield device.setSlope(update.slope);
                     }
                     if (update.targetPower !== undefined) {
-                        yield device.setTargetPower(update.targetPower);
+                        const tp = update.targetPower > 0 ? update.targetPower : 0;
+                        yield device.setTargetPower(tp);
                     }
                 }
             }

package/lib/ble/types.d.ts

@@ -61,6 +61,11 @@ export interface BleDeviceConstructProps extends BlePeripheralAnnouncement {
     log?: boolean;
     logger?: EventLogger;
 }
+export interface BleDeviceIdentifier {
+    id?: string;
+    address?: string;
+    name?: string;
+}
 export interface BleDeviceSettings extends DeviceSettings {
     id?: string;
     protocol: BleProtocol;
@@ -154,6 +159,7 @@ export interface IBlePeripheral {
     read(characteristicUUID: string): Promise<Buffer>;
     write(characteristicUUID: string, data: Buffer, options?: BleWriteProps): Promise<Buffer>;
     getManufacturerData?(): Buffer;
+    getInfo(): BleDeviceIdentifier;
 }
 export interface IBleSensor extends EventEmitter {
     startSensor(): Promise<boolean>;

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

@@ -3,13 +3,12 @@ import { LegacyProfile } from '../../../antv2/types';
 import BleAdapter from '../../base/adapter';
 import { BleZwiftPlaySensor } from './sensor';
 import { DeviceProperties, IAdapter, IncyclistAdapterData, IncyclistCapability } from '../../../types';
-import { BleDeviceSettings, BleStartProperties, IBlePeripheral } from '../../types';
+import { BleDeviceSettings, IBlePeripheral } from '../../types';
 export declare class ZwiftPlayAdapter extends BleAdapter<BleDeviceData, BleZwiftPlaySensor> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static CAPABILITIES: IncyclistCapability[];
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     protected checkCapabilities(): Promise<void>;
-    start(startProps?: BleStartProperties): Promise<boolean>;
     startSensor(): Promise<boolean>;
     isSame(adapter: IAdapter): boolean;
     updateSensor(peripheral: IBlePeripheral): void;

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

@@ -29,9 +29,6 @@ class ZwiftPlayAdapter extends adapter_1.default {
             return;
         });
     }
-    start(startProps) {
-        return super.start(startProps);
-    }
     startSensor() {
         const _super = Object.create(null, {
             startSensor: { get: () => super.startSensor }

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

@@ -35,7 +35,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     read(characteristic: string, ignoreErrors?: boolean): Promise<Buffer | null>;
     pair(): Promise<boolean>;
     reset(): void;
-    protected encrpytedSupported(): boolean;
+    protected encryptedSupported(): boolean;
     protected createKeyPair(): import("crypto").KeyPairSyncResult<Buffer<ArrayBufferLike>, Buffer<ArrayBufferLike>>;
     protected setInitialState(): void;
     protected getManufacturerData(): string;

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

@@ -172,13 +172,15 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     pair() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            let manufacturerData;
             try {
                 if (this.peripheral.getManufacturerData) {
-                    const manufacturerData = this.getManufacturerData();
+                    manufacturerData = this.getManufacturerData();
                     if (manufacturerData === null || manufacturerData === void 0 ? void 0 : manufacturerData.startsWith('4a09')) {
                         const typeVal = Number('0x' + manufacturerData.substring(2, 4));
                         if (typeVal === 9) {
                             this.deviceType = 'click';
+                            this.encrypted = false;
                         }
                         else if (typeVal === 2) {
                             this.deviceType = 'right';
@@ -188,13 +190,14 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
                         }
                     }
                 }
-                else if (!this.encrpytedSupported()) {
+                if (!this.encryptedSupported()) {
                     this.deviceType = 'click';
+                    this.encrypted = false;
                 }
+                this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
                 let message;
-                if (this.deviceType === 'click') {
+                if (!this.encrypted) {
                     message = Buffer.from('RideOn');
-                    this.encrypted = false;
                 }
                 else {
                     const { publicKey, privateKey } = this.createKeyPair();
@@ -213,7 +216,7 @@ class BleZwiftPlaySensor extends sensor_1.TBleSensor {
     }
     reset() {
     }
-    encrpytedSupported() {
+    encryptedSupported() {
         return crypto_1.generateKeyPairSync !== undefined && typeof (crypto_1.generateKeyPairSync) === 'function';
     }
     createKeyPair() {

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

@@ -1,4 +1,4 @@
-import { BleCharacteristic, BleService, BleWriteProps, IBlePeripheral } from "../../ble/types";
+import { BleCharacteristic, BleDeviceIdentifier, BleService, BleWriteProps, IBlePeripheral } from "../../ble/types";
 import { DirectConnectBinding, MulticastDnsAnnouncement, Socket } from "../bindings";
 import { InteruptableTask, TaskState } from "../../utils/task";
 import DirectConnectInterface from "./interface";
@@ -19,6 +19,7 @@ export declare class DirectConnectPeripheral implements IBlePeripheral {
     protected subscribed: Array<string>;
     protected onDisconnectHandler: () => void;
     constructor(announcement: MulticastDnsAnnouncement);
+    getInfo(): BleDeviceIdentifier;
     get services(): BleService[];
     connect(): Promise<boolean>;
     disconnect(connectionLost?: boolean): Promise<boolean>;

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

@@ -38,8 +38,17 @@ class DirectConnectPeripheral {
         this.eventEmitter = new events_1.default();
         this.subscribed = [];
     }
+    getInfo() {
+        var _a, _b, _c, _d;
+        return {
+            id: (_b = (_a = this.announcement) === null || _a === void 0 ? void 0 : _a.address) === null || _b === void 0 ? void 0 : _b.replace(/:/g, ''),
+            address: (_c = this.announcement) === null || _c === void 0 ? void 0 : _c.address,
+            name: (_d = this.announcement) === null || _d === void 0 ? void 0 : _d.name
+        };
+    }
     get services() {
-        const services = this.announcement.serviceUUIDs;
+        var _a, _b;
+        const services = (_b = (_a = this.announcement) === null || _a === void 0 ? void 0 : _a.serviceUUIDs) !== null && _b !== void 0 ? _b : [];
         return services.map(s => ({ uuid: s }));
     }
     connect() {

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

@@ -44,6 +44,7 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase i
     protected checkSlopeWithSimulatedShifting(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkSlope(request: UpdateRequest, newRequest?: UpdateRequest): void;
     checkGearChange(request: UpdateRequest, newRequest?: UpdateRequest): void;
+    protected verifySimPower(): void;
     protected checkEmptyRequest(newRequest: UpdateRequest): void;
     protected getVirtualShiftMode(): VirtshiftMode;
     updateData(bikeData: IncyclistBikeData, log?: boolean): IncyclistBikeData;

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 MIN_POWER = 25;
 class SmartTrainerCyclingMode extends power_base_1.default {
     constructor(adapter, props) {
         super(adapter, props);
@@ -111,7 +112,8 @@ class SmartTrainerCyclingMode extends power_base_1.default {
     checkSlopeWithSimulatedShifting(request, newRequest = {}) {
         var _a, _b, _c, _d;
         if (this.gear === undefined) {
-            return this.checkSlopeNoShiftig(request, newRequest);
+            this.checkSlopeNoShiftig(request, newRequest);
+            return;
         }
         if (request.slope !== undefined) {
             const prev = (_a = this.data.slope) !== null && _a !== void 0 ? _a : 0;
@@ -126,22 +128,14 @@ class SmartTrainerCyclingMode extends power_base_1.default {
             }
             catch (_e) {
             }
-            if (this.data.slope === prev) {
-                newRequest.targetPower = this.simPower;
-                return;
-            }
-            else {
+            if (this.data.slope !== prev) {
                 const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
                 const m = (_c = (_b = this.adapter) === null || _b === void 0 ? void 0 : _b.getWeight()) !== null && _c !== void 0 ? _c : 85;
                 this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = this.simSlope) !== null && _d !== void 0 ? _d : 0);
-                newRequest.targetPower = this.simPower;
+                this.verifySimPower();
             }
-            if (this.simPower < 0)
-                this.simPower = 0;
-        }
-        else {
-            newRequest.targetPower = this.simPower;
         }
+        newRequest.targetPower = this.simPower;
     }
     checkSlope(request, newRequest = {}) {
         const virtshiftMode = this.getVirtualShiftMode();
@@ -190,6 +184,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                     const virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(this.data.pedalRpm, this.gearRatios[this.gear - 1]);
                     const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
                     this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : this.data.slope) !== null && _d !== void 0 ? _d : 0);
+                    this.verifySimPower();
                 }
                 break;
             case 'Adapter':
@@ -198,6 +193,14 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 break;
         }
     }
+    verifySimPower() {
+        if (this.simPower < 0) {
+            this.simPower = 0;
+        }
+        if (this.data.pedalRpm > 0 && this.simPower < MIN_POWER) {
+            this.simPower = MIN_POWER;
+        }
+    }
     checkEmptyRequest(newRequest) {
         if (Object.keys(newRequest).length === 0) {
             if (this.prevRequest) {
@@ -242,6 +245,7 @@ class SmartTrainerCyclingMode extends power_base_1.default {
                 virtualSpeed = (0, calculations_1.calculateVirtualSpeed)(data.pedalRpm, this.gearRatios[this.gear - 1]);
                 const m = (_b = (_a = this.adapter) === null || _a === void 0 ? void 0 : _a.getWeight()) !== null && _b !== void 0 ? _b : 85;
                 this.simPower = calculations_1.default.calculatePower(m, virtualSpeed, (_d = (_c = this.simSlope) !== null && _c !== void 0 ? _c : data.slope) !== null && _d !== void 0 ? _d : 0);
+                this.verifySimPower();
             }
         }
         return data;
@@ -279,10 +283,10 @@ class SmartTrainerCyclingMode extends power_base_1.default {
         const mode = this.getVirtualShiftMode();
         if (mode === "Disabled")
             return undefined;
-        if (this.gear === undefined || this.gear === null)
+        if (mode === 'Simulated' && (this.gear === undefined || this.gear === null))
             return '';
         if (mode === "SlopeDelta")
-            return this.gear > 0 ? `+${this.gear}` : `${this.gear}`;
+            return this.gearDelta > 0 ? `+${this.gearDelta}` : `${this.gearDelta}`;
         return this.gear.toString();
     }
 }

package/package.json

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