incyclist-devices 3.0.16 → 3.0.18

package/lib/cjs/ble/base/adapter.js

@@ -29,7 +29,8 @@ class BleAdapter extends adpater_js_1.default {
         if (settings.name?.match(/\d/g) || settings.address === undefined)
             return this.getName();
         else {
-            const addressHash = settings.id?.slice(-4)?.toUpperCase() ?? (settings.address?.substring(0, 2) ?? '') + (settings.address?.slice(-2) ?? '');
+            const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+            const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
             return `${this.getName()} ${addressHash}`;
         }
     }

package/lib/cjs/ble/base/interface.js

@@ -267,7 +267,7 @@ class BleInterface extends node_events_1.EventEmitter {
         return new peripheral_js_1.BlePeripheral(announcement);
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service?.name === settings.name || a.service?.peripheral?.address === settings.address);
+        const info = this.getAll().find(a => a.service?.peripheral?.address === settings.address);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -281,7 +281,7 @@ class BleInterface extends node_events_1.EventEmitter {
             if (!wasDiscovering)
                 this.startPeripheralScan();
             const onDevice = (device) => {
-                if (device.name === settings.name || device.address === settings.address) {
+                if (device.address === settings.address) {
                     const peripheral = this.createPeripheralFromSettings(device);
                     if (peripheral) {
                         this.off('device', onDevice);
@@ -588,7 +588,7 @@ class BleInterface extends node_events_1.EventEmitter {
         return supported.length > 0;
     }
     find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
+        return this.services.find(a => a.service.name === service.name && a.service?.peripheral?.address && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);

package/lib/cjs/ble/base/peripheral.js

@@ -50,6 +50,7 @@ class BlePeripheral {
         if (this.connectPromise !== undefined) {
             return this.connectPromise.then(() => this.connected);
         }
+        let address;
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
@@ -60,7 +61,8 @@ class BlePeripheral {
             if (!this.ble.isConnected()) {
                 return done();
             }
-            this.logEvent({ message: 'connect peripheral', address: peripheral.address });
+            address = peripheral.address;
+            this.logEvent({ message: 'connect peripheral', address });
             peripheral.connectAsync().then(() => {
                 this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
@@ -75,11 +77,12 @@ class BlePeripheral {
         });
         await this.connectPromise;
         delete this.connectPromise;
+        this.logEvent({ message: 'connect peripheral result', address, connected: this.connected });
         return this.connected;
     }
     async disconnect(connectionLost = false) {
         this.disconnecting = true;
-        if (this.isConnected()) {
+        if (this.isConnected() || connectionLost) {
             await this.unsubscribeAll(connectionLost);
         }
         Object.keys(this.characteristics).forEach(uuid => {
@@ -101,13 +104,14 @@ class BlePeripheral {
                     .catch(() => { });
             }
             peripheral.removeAllListeners();
+            this.ble.unregisterConnected(peripheral.id);
         }
         else {
             delete this.onDisconnectHandler;
         }
-        this.ble.unregisterConnected(peripheral.id);
         this.connected = false;
         this.disconnecting = false;
+        this.logEvent({ message: 'peripheral disconnect completed', address: peripheral.address });
         return !this.connected;
     }
     isConnected() {
@@ -200,8 +204,12 @@ class BlePeripheral {
     }
     async subscribe(characteristicUUID, callback) {
         try {
-            if (this.disconnecting || !this.connected)
+            if (this.disconnecting || !this.connected) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not connected',
+                    disconnecting: this.disconnecting, connected: this.connected
+                });
                 return false;
+            }
             const uuid = (0, utils_js_2.beautifyUUID)(characteristicUUID);
             const onData = (data, isNotify) => {
                 try {
@@ -211,6 +219,7 @@ class BlePeripheral {
             };
             const subscription = this.subscribed.find(s => s.uuid === uuid);
             if (subscription) {
+                this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                 const c = this.getRawCharacteristic(characteristicUUID);
                 if (c) {
                     c.off('data', onData);
@@ -220,11 +229,13 @@ class BlePeripheral {
             }
             let c = await this.queryRawCharacteristic(characteristicUUID).catch(() => null);
             if (!c) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not found' });
                 return false;
             }
             return new Promise((resolve, reject) => {
                 const info = this.subscribed.find(s => s.uuid === characteristicUUID);
                 if (info) {
+                    this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                     return Promise.resolve(true);
                 }
                 this.logEvent({ message: 'subscribe request', address: this.getPeripheral().address, characteristic: uuid, success: true });
@@ -287,6 +298,8 @@ class BlePeripheral {
         }
     }
     async subscribeSelected(characteristics, callback) {
+        const uuids = characteristics != null ? characteristics.map(c => (0, utils_js_2.beautifyUUID)(c)).join('|') : 'none';
+        this.logEvent({ message: 'peripheral subscribe selected', uuids });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -349,6 +362,7 @@ class BlePeripheral {
         }
     }
     async subscribeAll(callback) {
+        this.logEvent({ message: 'peripheral subscribe all' });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -360,6 +374,7 @@ class BlePeripheral {
         return success;
     }
     async unsubscribeAll(connectionLost = false) {
+        this.logEvent({ message: 'peripheral unsubscribe all', connectionLost });
         if (connectionLost) {
             this.subscribed = [];
             return;

package/lib/cjs/ble/fm/adapter.js

@@ -235,11 +235,9 @@ class BleFmAdapter extends adapter_js_1.default {
     async checkCapabilities() {
         const before = this.capabilities.join(',');
         const sensor = this.getSensor();
-        let updateRequired = false;
         if (!sensor.features) {
             try {
                 await sensor.getFitnessMachineFeatures();
-                updateRequired = true;
             }
             catch (err) {
                 this.logEvent({ message: 'error getting fitness machine features', device: this.getName(), interface: this.getInterface(), error: err });
@@ -252,10 +250,6 @@ class BleFmAdapter extends adapter_js_1.default {
         if (before !== after) {
             this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
             this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
-            updateRequired = true;
-        }
-        if (updateRequired) {
-            this.updateCyclingModeConfig();
         }
     }
     updateCapabilitiesFromFeatures(features) {

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

@@ -11,6 +11,7 @@ const index_js_1 = require("../../../types/index.js");
 class ZwiftPlayAdapter extends adapter_js_1.default {
     static INCYCLIST_PROFILE_NAME = 'Controller';
     static CAPABILITIES = [index_js_1.IncyclistCapability.AppControl];
+    keyPressedHandler;
     constructor(settings, props) {
         super(settings, props);
         this.logger = new gd_eventlog_1.EventLogger('ZwiftPlay');
@@ -25,9 +26,13 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
             let connected = await super.startSensor();
             if (connected) {
                 const sensor = this.getSensor();
-                sensor.on('key-pressed', (event) => {
-                    this.emit('key-pressed', this.getSettings(), event);
-                });
+                if (this.keyPressedHandler) {
+                    sensor.off('key-pressed', this.keyPressedHandler);
+                }
+                else {
+                    this.keyPressedHandler = this.onKeyPressed.bind(this);
+                }
+                sensor.on('key-pressed', this.keyPressedHandler);
             }
             return connected;
         }
@@ -36,10 +41,18 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
             return false;
         }
     }
+    onKeyPressed(event) {
+        this.emit('key-pressed', this.getSettings(), event);
+    }
+    isEqual(settings) {
+        const equal = super.isEqual(settings) &&
+            settings.address == this.settings.address;
+        return equal;
+    }
     isSame(adapter) {
         if (!(adapter instanceof ZwiftPlayAdapter))
             return false;
-        return this.isEqual(adapter.settings);
+        return this.isEqual(adapter.settings) && this.getUniqueName() === adapter.getUniqueName();
     }
     updateSensor(peripheral) {
         this.device = new sensor_js_1.BleZwiftPlaySensor(peripheral, { logger: this.logger });
@@ -47,6 +60,22 @@ class ZwiftPlayAdapter extends adapter_js_1.default {
     getProfile() {
         return ZwiftPlayAdapter.INCYCLIST_PROFILE_NAME;
     }
+    getUniqueName() {
+        return this.getName();
+    }
+    getName() {
+        const settings = this.settings;
+        let name = settings.name;
+        if (settings.name === 'Zwift-Ride') {
+            if (this.device.getDeviceType() === 'ride-left')
+                name = name + '-L';
+            if (this.device.getDeviceType() === 'ride-right')
+                name = name + '-R';
+        }
+        const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+        const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
+        return `${name} ${addressHash}`;
+    }
     getDisplayName() {
         return this.getName();
     }

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

@@ -67,6 +67,42 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     getRequiredCharacteristics() {
         return ['00000002-19ca-4651-86e5-fa29dcdd09d1', '00000004-19ca-4651-86e5-fa29dcdd09d1'];
     }
+    getDeviceType() {
+        if (this.deviceType)
+            return this.deviceType;
+        if (this.isFM) {
+            this.deviceType = 'hub';
+        }
+        else if (this.peripheral?.getManufacturerData) {
+            const manufacturerData = this.getManufacturerData();
+            if (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';
+                }
+                else if (typeVal === 3) {
+                    this.deviceType = 'left';
+                }
+                else if (typeVal === 7) {
+                    this.deviceType = 'ride-right';
+                }
+                else if (typeVal === 8) {
+                    this.deviceType = 'ride-left';
+                }
+            }
+        }
+        console.log('# [ZwiftPlay] device type ', this.deviceType, this.peripheral?.getInfo().name, this.peripheral?.getInfo().address);
+        if (!this.deviceType && !this.encryptedSupported()) {
+            this.deviceType = 'click';
+            this.encrypted = false;
+        }
+        this.deviceType = this.deviceType ?? 'click';
+        return this.deviceType;
+    }
     onData(characteristic, data, isNotify) {
         const uuid = (0, utils_js_1.beautifyUUID)(characteristic).toLowerCase();
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
@@ -154,7 +190,6 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     onMeasurement(d) {
         const data = Buffer.from(d);
-        this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         if (data?.length < 1) {
             console.log('Invalid click measurement data', data.toString('hex'));
             return false;
@@ -182,9 +217,10 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         else if (type === 0x3c) {
             this.onDeviceInformation(message);
         }
+        else if (type === 0x15) {
+        }
         else {
-            console.log('Unknown click measurement type', type, message.toString('hex'));
-            this.emit('data', { raw: data.toString('hex') });
+            this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         }
         return true;
     }
@@ -293,17 +329,27 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         try {
             const data = zwift_hub_js_1.RideKeyPadStatus.fromBinary(m);
             const buttonNames = new Map([
+                [0x01, 'left'],
+                [0x02, 'up'],
+                [0x04, 'right'],
+                [0x08, 'down'],
                 [0x10, 'a'],
                 [0x20, 'b'],
                 [0x40, 'y'],
                 [0x80, 'z'],
+                [0x0100, 'l-shift-up'],
+                [0x0200, 'l-shift-down'],
                 [0x1000, 'r-shift-up'],
                 [0x2000, 'r-shift-down'],
-                [0x4000, 'ride-on'],
-                [0x8000, 'r-power']
+                [0x0400, 'l-power-up'],
+                [0x4000, 'r-power-up'],
+                [0x0800, 'l-power'],
+                [0x8000, 'r-power'],
             ]);
             const buttonMap = data.buttonMap ?? 0;
             const currentPresses = new Set();
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             buttonNames.forEach((name, bit) => {
                 const isPressed = (buttonMap & bit) === 0;
                 if (isPressed) {
@@ -318,19 +364,11 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 if (!currentPresses.has(bit) && state.pressed) {
                     const keyName = buttonNames.get(bit);
                     const duration = Date.now() - state.timestamp;
+                    this.logEvent({ message: 'key pressed', key: keyName, name, address, duration, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
                     this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
                 }
             });
-            const pressedButtons = Array.from(currentPresses).map(bit => ({
-                bit: `0x${bit.toString(16).padStart(8, '0')}`,
-                name: buttonNames.get(bit)
-            }));
-            this.logEvent({
-                message: 'ride keypad status received',
-                buttonMap: `0x${buttonMap.toString(16)}`,
-                buttons: pressedButtons
-            });
         }
         catch (err) {
             this.logEvent({ message: 'Error', fn: 'onRideKeyPadStatus', error: err.message, stack: err.stack });
@@ -363,6 +401,8 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     onClickButtonMessage(d) {
         try {
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             const message = Buffer.from(d);
             const messageStr = message.toString('hex');
             if (messageStr === this.prevClickMessage) {
@@ -373,6 +413,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 const prev = { ...this.upState };
                 this.upState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'up', name, address, duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'up', duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -383,6 +424,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 const prev = { ...this.downState };
                 this.downState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'down', name, address, duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'down', duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -481,7 +523,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 this.deviceType = 'hub';
                 this.encrypted = false;
             }
-            else if (this.peripheral.getManufacturerData) {
+            else if (this.peripheral?.getManufacturerData) {
                 manufacturerData = this.getManufacturerData();
                 if (manufacturerData?.startsWith('4a09')) {
                     const typeVal = Number('0x' + manufacturerData.substring(2, 4));
@@ -495,6 +537,12 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                     else if (typeVal === 3) {
                         this.deviceType = 'left';
                     }
+                    else if (typeVal === 7) {
+                        this.deviceType = 'ride-right';
+                    }
+                    else if (typeVal === 8) {
+                        this.deviceType = 'ride-left';
+                    }
                 }
             }
             if (!this.deviceType && !this.encryptedSupported()) {
@@ -502,7 +550,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
                 this.encrypted = false;
             }
             this.deviceType = this.deviceType ?? 'click';
-            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             let message;
             if (this.isFM) {
                 message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]);
@@ -519,7 +567,7 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
             this.logEvent({ message: `send rideOn` });
             await this.write((0, utils_js_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 });
+            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             return true;
         }
         catch (err) {
@@ -530,6 +578,15 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
     }
     reset() {
     }
+    getManufacturerData() {
+        const data = this.peripheral?.getManufacturerData?.();
+        if (typeof data === 'string')
+            return data;
+        if (Buffer.isBuffer(data)) {
+            return data.toString('hex');
+        }
+        return undefined;
+    }
     getCrypto() {
         let crypto = index_js_1.BindingsFactory.getInstance()?.getBinding()?.crypto;
         if (!crypto)
@@ -559,14 +616,5 @@ class BleZwiftPlaySensor extends sensor_js_1.TBleSensor {
         delete this.prevHubSettings;
         this.rideKeyPadStates = new Map();
     }
-    getManufacturerData() {
-        const data = this.peripheral.getManufacturerData();
-        if (typeof data === 'string')
-            return data;
-        if (Buffer.isBuffer(data)) {
-            return data.toString('hex');
-        }
-        return undefined;
-    }
 }
 exports.BleZwiftPlaySensor = BleZwiftPlaySensor;

package/lib/cjs/modes/antble-smarttrainer.js

@@ -99,34 +99,40 @@ class SmartTrainerCyclingMode extends power_base_js_1.default {
         if (startGearIdx !== -1) {
             config.properties.splice(startGearIdx, 1);
         }
+        try {
+            const device = this.adapter?.getName();
+            this.logger.logEvent({ message: 'reset config', device });
+        }
+        catch { }
     }
     getConfig() {
         const config = super.getConfig();
-        const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift && !this.adapter?.supportsVirtualShifting()) {
-            const options = virtShiftEnabled ? [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' }
-            ] :
-                [
+        if (!virtshift) {
+            const device = this.adapter?.getName();
+            const supportsZwift = this.adapter?.supportsVirtualShifting();
+            this.logger.logEvent({ message: 'prepare gear settings config', device, supportsZwift });
+            if (supportsZwift) {
+                const options = [
                     'Disabled',
-                    { key: 'Mixed', display: 'Enabled' }
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' },
+                    { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
                 ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
-            config.properties.push(virtshift);
-        }
-        if (!virtshift && virtShiftEnabled && this.adapter?.supportsVirtualShifting()) {
-            const options = [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' },
-                { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
-            ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
-            config.properties.push(virtshift);
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
+                config.properties.push(virtshift);
+            }
+            else {
+                const options = [
+                    'Disabled',
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' }
+                ];
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: types_js_1.CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
+                config.properties.push(virtshift);
+            }
+            this.logger.logEvent({ message: 'gear settings config', config: config.properties });
         }
         if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: types_js_1.CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => s?.virtshift === 'Incyclist' || s?.virtshift === 'SmartTrainer' };

package/lib/esm/ble/base/adapter.js

@@ -24,7 +24,8 @@ export default class BleAdapter extends IncyclistDevice {
         if (settings.name?.match(/\d/g) || settings.address === undefined)
             return this.getName();
         else {
-            const addressHash = settings.id?.slice(-4)?.toUpperCase() ?? (settings.address?.substring(0, 2) ?? '') + (settings.address?.slice(-2) ?? '');
+            const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+            const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
             return `${this.getName()} ${addressHash}`;
         }
     }

package/lib/esm/ble/base/interface.js

@@ -264,7 +264,7 @@ export class BleInterface extends EventEmitter {
         return new BlePeripheral(announcement);
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service?.name === settings.name || a.service?.peripheral?.address === settings.address);
+        const info = this.getAll().find(a => a.service?.peripheral?.address === settings.address);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -278,7 +278,7 @@ export class BleInterface extends EventEmitter {
             if (!wasDiscovering)
                 this.startPeripheralScan();
             const onDevice = (device) => {
-                if (device.name === settings.name || device.address === settings.address) {
+                if (device.address === settings.address) {
                     const peripheral = this.createPeripheralFromSettings(device);
                     if (peripheral) {
                         this.off('device', onDevice);
@@ -585,7 +585,7 @@ export class BleInterface extends EventEmitter {
         return supported.length > 0;
     }
     find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
+        return this.services.find(a => a.service.name === service.name && a.service?.peripheral?.address && a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - BLE_EXPIRATION_TIMEOUT);

package/lib/esm/ble/base/peripheral.js

@@ -47,6 +47,7 @@ export class BlePeripheral {
         if (this.connectPromise !== undefined) {
             return this.connectPromise.then(() => this.connected);
         }
+        let address;
         this.connectPromise = new Promise((done) => {
             const peripheral = this.getPeripheral();
             this.connected = false;
@@ -57,7 +58,8 @@ export class BlePeripheral {
             if (!this.ble.isConnected()) {
                 return done();
             }
-            this.logEvent({ message: 'connect peripheral', address: peripheral.address });
+            address = peripheral.address;
+            this.logEvent({ message: 'connect peripheral', address });
             peripheral.connectAsync().then(() => {
                 this.ble.registerConnected(this, peripheralId);
                 peripheral.once('disconnect', () => { this.onPeripheralDisconnect(); });
@@ -72,11 +74,12 @@ export class BlePeripheral {
         });
         await this.connectPromise;
         delete this.connectPromise;
+        this.logEvent({ message: 'connect peripheral result', address, connected: this.connected });
         return this.connected;
     }
     async disconnect(connectionLost = false) {
         this.disconnecting = true;
-        if (this.isConnected()) {
+        if (this.isConnected() || connectionLost) {
             await this.unsubscribeAll(connectionLost);
         }
         Object.keys(this.characteristics).forEach(uuid => {
@@ -98,13 +101,14 @@ export class BlePeripheral {
                     .catch(() => { });
             }
             peripheral.removeAllListeners();
+            this.ble.unregisterConnected(peripheral.id);
         }
         else {
             delete this.onDisconnectHandler;
         }
-        this.ble.unregisterConnected(peripheral.id);
         this.connected = false;
         this.disconnecting = false;
+        this.logEvent({ message: 'peripheral disconnect completed', address: peripheral.address });
         return !this.connected;
     }
     isConnected() {
@@ -197,8 +201,12 @@ export class BlePeripheral {
     }
     async subscribe(characteristicUUID, callback) {
         try {
-            if (this.disconnecting || !this.connected)
+            if (this.disconnecting || !this.connected) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not connected',
+                    disconnecting: this.disconnecting, connected: this.connected
+                });
                 return false;
+            }
             const uuid = beautifyUUID(characteristicUUID);
             const onData = (data, isNotify) => {
                 try {
@@ -208,6 +216,7 @@ export class BlePeripheral {
             };
             const subscription = this.subscribed.find(s => s.uuid === uuid);
             if (subscription) {
+                this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                 const c = this.getRawCharacteristic(characteristicUUID);
                 if (c) {
                     c.off('data', onData);
@@ -217,11 +226,13 @@ export class BlePeripheral {
             }
             let c = await this.queryRawCharacteristic(characteristicUUID).catch(() => null);
             if (!c) {
+                this.logEvent({ message: 'peripheral subscribe failed', uuid: characteristicUUID, reason: 'not found' });
                 return false;
             }
             return new Promise((resolve, reject) => {
                 const info = this.subscribed.find(s => s.uuid === characteristicUUID);
                 if (info) {
+                    this.logEvent({ message: 'peripheral subscribe skipped', uuid: characteristicUUID, reason: 'already subscribed' });
                     return Promise.resolve(true);
                 }
                 this.logEvent({ message: 'subscribe request', address: this.getPeripheral().address, characteristic: uuid, success: true });
@@ -284,6 +295,8 @@ export class BlePeripheral {
         }
     }
     async subscribeSelected(characteristics, callback) {
+        const uuids = characteristics != null ? characteristics.map(c => beautifyUUID(c)).join('|') : 'none';
+        this.logEvent({ message: 'peripheral subscribe selected', uuids });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -346,6 +359,7 @@ export class BlePeripheral {
         }
     }
     async subscribeAll(callback) {
+        this.logEvent({ message: 'peripheral subscribe all' });
         if (!this.discoveredServiceUUIds) {
             try {
                 await this.discoverServices();
@@ -357,6 +371,7 @@ export class BlePeripheral {
         return success;
     }
     async unsubscribeAll(connectionLost = false) {
+        this.logEvent({ message: 'peripheral unsubscribe all', connectionLost });
         if (connectionLost) {
             this.subscribed = [];
             return;

package/lib/esm/ble/fm/adapter.js

@@ -230,11 +230,9 @@ export default class BleFmAdapter extends BleAdapter {
     async checkCapabilities() {
         const before = this.capabilities.join(',');
         const sensor = this.getSensor();
-        let updateRequired = false;
         if (!sensor.features) {
             try {
                 await sensor.getFitnessMachineFeatures();
-                updateRequired = true;
             }
             catch (err) {
                 this.logEvent({ message: 'error getting fitness machine features', device: this.getName(), interface: this.getInterface(), error: err });
@@ -247,10 +245,6 @@ export default class BleFmAdapter extends BleAdapter {
         if (before !== after) {
             this.logEvent({ message: 'device capabilities updated', name: this.getSettings().name, interface: this.getSettings().interface, capabilities: this.capabilities });
             this.emit('device-info', this.getSettings(), { capabilities: this.capabilities });
-            updateRequired = true;
-        }
-        if (updateRequired) {
-            this.updateCyclingModeConfig();
         }
     }
     updateCapabilitiesFromFeatures(features) {

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

@@ -5,6 +5,7 @@ import { IncyclistCapability } from '../../../types/index.js';
 export class ZwiftPlayAdapter extends BleAdapter {
     static INCYCLIST_PROFILE_NAME = 'Controller';
     static CAPABILITIES = [IncyclistCapability.AppControl];
+    keyPressedHandler;
     constructor(settings, props) {
         super(settings, props);
         this.logger = new EventLogger('ZwiftPlay');
@@ -19,9 +20,13 @@ export class ZwiftPlayAdapter extends BleAdapter {
             let connected = await super.startSensor();
             if (connected) {
                 const sensor = this.getSensor();
-                sensor.on('key-pressed', (event) => {
-                    this.emit('key-pressed', this.getSettings(), event);
-                });
+                if (this.keyPressedHandler) {
+                    sensor.off('key-pressed', this.keyPressedHandler);
+                }
+                else {
+                    this.keyPressedHandler = this.onKeyPressed.bind(this);
+                }
+                sensor.on('key-pressed', this.keyPressedHandler);
             }
             return connected;
         }
@@ -30,10 +35,18 @@ export class ZwiftPlayAdapter extends BleAdapter {
             return false;
         }
     }
+    onKeyPressed(event) {
+        this.emit('key-pressed', this.getSettings(), event);
+    }
+    isEqual(settings) {
+        const equal = super.isEqual(settings) &&
+            settings.address == this.settings.address;
+        return equal;
+    }
     isSame(adapter) {
         if (!(adapter instanceof ZwiftPlayAdapter))
             return false;
-        return this.isEqual(adapter.settings);
+        return this.isEqual(adapter.settings) && this.getUniqueName() === adapter.getUniqueName();
     }
     updateSensor(peripheral) {
         this.device = new BleZwiftPlaySensor(peripheral, { logger: this.logger });
@@ -41,6 +54,22 @@ export class ZwiftPlayAdapter extends BleAdapter {
     getProfile() {
         return ZwiftPlayAdapter.INCYCLIST_PROFILE_NAME;
     }
+    getUniqueName() {
+        return this.getName();
+    }
+    getName() {
+        const settings = this.settings;
+        let name = settings.name;
+        if (settings.name === 'Zwift-Ride') {
+            if (this.device.getDeviceType() === 'ride-left')
+                name = name + '-L';
+            if (this.device.getDeviceType() === 'ride-right')
+                name = name + '-R';
+        }
+        const id = (settings.id ?? settings.address ?? '').replace(/[:\-]/g, '');
+        const addressHash = id.length > 4 ? id.slice(-4).toUpperCase() : id.toUpperCase();
+        return `${name} ${addressHash}`;
+    }
     getDisplayName() {
         return this.getName();
     }

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

@@ -64,6 +64,42 @@ export class BleZwiftPlaySensor extends TBleSensor {
     getRequiredCharacteristics() {
         return ['00000002-19ca-4651-86e5-fa29dcdd09d1', '00000004-19ca-4651-86e5-fa29dcdd09d1'];
     }
+    getDeviceType() {
+        if (this.deviceType)
+            return this.deviceType;
+        if (this.isFM) {
+            this.deviceType = 'hub';
+        }
+        else if (this.peripheral?.getManufacturerData) {
+            const manufacturerData = this.getManufacturerData();
+            if (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';
+                }
+                else if (typeVal === 3) {
+                    this.deviceType = 'left';
+                }
+                else if (typeVal === 7) {
+                    this.deviceType = 'ride-right';
+                }
+                else if (typeVal === 8) {
+                    this.deviceType = 'ride-left';
+                }
+            }
+        }
+        console.log('# [ZwiftPlay] device type ', this.deviceType, this.peripheral?.getInfo().name, this.peripheral?.getInfo().address);
+        if (!this.deviceType && !this.encryptedSupported()) {
+            this.deviceType = 'click';
+            this.encrypted = false;
+        }
+        this.deviceType = this.deviceType ?? 'click';
+        return this.deviceType;
+    }
     onData(characteristic, data, isNotify) {
         const uuid = beautifyUUID(characteristic).toLowerCase();
         if (uuid === '00000002-19ca-4651-86e5-fa29dcdd09d1') {
@@ -151,7 +187,6 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     onMeasurement(d) {
         const data = Buffer.from(d);
-        this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         if (data?.length < 1) {
             console.log('Invalid click measurement data', data.toString('hex'));
             return false;
@@ -179,9 +214,10 @@ export class BleZwiftPlaySensor extends TBleSensor {
         else if (type === 0x3c) {
             this.onDeviceInformation(message);
         }
+        else if (type === 0x15) {
+        }
         else {
-            console.log('Unknown click measurement type', type, message.toString('hex'));
-            this.emit('data', { raw: data.toString('hex') });
+            this.logEvent({ message: 'got hub notification', raw: data.toString('hex') });
         }
         return true;
     }
@@ -290,17 +326,27 @@ export class BleZwiftPlaySensor extends TBleSensor {
         try {
             const data = RideKeyPadStatus.fromBinary(m);
             const buttonNames = new Map([
+                [0x01, 'left'],
+                [0x02, 'up'],
+                [0x04, 'right'],
+                [0x08, 'down'],
                 [0x10, 'a'],
                 [0x20, 'b'],
                 [0x40, 'y'],
                 [0x80, 'z'],
+                [0x0100, 'l-shift-up'],
+                [0x0200, 'l-shift-down'],
                 [0x1000, 'r-shift-up'],
                 [0x2000, 'r-shift-down'],
-                [0x4000, 'ride-on'],
-                [0x8000, 'r-power']
+                [0x0400, 'l-power-up'],
+                [0x4000, 'r-power-up'],
+                [0x0800, 'l-power'],
+                [0x8000, 'r-power'],
             ]);
             const buttonMap = data.buttonMap ?? 0;
             const currentPresses = new Set();
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             buttonNames.forEach((name, bit) => {
                 const isPressed = (buttonMap & bit) === 0;
                 if (isPressed) {
@@ -315,19 +361,11 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 if (!currentPresses.has(bit) && state.pressed) {
                     const keyName = buttonNames.get(bit);
                     const duration = Date.now() - state.timestamp;
+                    this.logEvent({ message: 'key pressed', key: keyName, name, address, duration, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: keyName, duration, deviceType: this.deviceType });
                     this.rideKeyPadStates.set(bit, { pressed: false, timestamp: Date.now() });
                 }
             });
-            const pressedButtons = Array.from(currentPresses).map(bit => ({
-                bit: `0x${bit.toString(16).padStart(8, '0')}`,
-                name: buttonNames.get(bit)
-            }));
-            this.logEvent({
-                message: 'ride keypad status received',
-                buttonMap: `0x${buttonMap.toString(16)}`,
-                buttons: pressedButtons
-            });
         }
         catch (err) {
             this.logEvent({ message: 'Error', fn: 'onRideKeyPadStatus', error: err.message, stack: err.stack });
@@ -360,6 +398,8 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     onClickButtonMessage(d) {
         try {
+            const address = this.peripheral?.getInfo()?.address;
+            const name = this.peripheral?.getInfo()?.name;
             const message = Buffer.from(d);
             const messageStr = message.toString('hex');
             if (messageStr === this.prevClickMessage) {
@@ -370,6 +410,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 const prev = { ...this.upState };
                 this.upState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'up', name, address, duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'up', duration: this.upState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -380,6 +421,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 const prev = { ...this.downState };
                 this.downState = { pressed: false, timestamp: Date.now() };
                 if (prev.pressed) {
+                    this.logEvent({ message: 'key pressed', key: 'down', name, address, duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                     this.emit('key-pressed', { key: 'down', duration: this.downState.timestamp - prev.timestamp, deviceType: this.deviceType });
                 }
             }
@@ -478,7 +520,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 this.deviceType = 'hub';
                 this.encrypted = false;
             }
-            else if (this.peripheral.getManufacturerData) {
+            else if (this.peripheral?.getManufacturerData) {
                 manufacturerData = this.getManufacturerData();
                 if (manufacturerData?.startsWith('4a09')) {
                     const typeVal = Number('0x' + manufacturerData.substring(2, 4));
@@ -492,6 +534,12 @@ export class BleZwiftPlaySensor extends TBleSensor {
                     else if (typeVal === 3) {
                         this.deviceType = 'left';
                     }
+                    else if (typeVal === 7) {
+                        this.deviceType = 'ride-right';
+                    }
+                    else if (typeVal === 8) {
+                        this.deviceType = 'ride-left';
+                    }
                 }
             }
             if (!this.deviceType && !this.encryptedSupported()) {
@@ -499,7 +547,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
                 this.encrypted = false;
             }
             this.deviceType = this.deviceType ?? 'click';
-            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'Play protocol pairing info', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             let message;
             if (this.isFM) {
                 message = Buffer.concat([Buffer.from('RideOn'), Buffer.from([0x02, 0x01])]);
@@ -516,7 +564,7 @@ export class BleZwiftPlaySensor extends TBleSensor {
             this.logEvent({ message: `send rideOn` });
             await this.write(fullUUID('00000003-19ca-4651-86e5-fa29dcdd09d1'), message, { withoutResponse: true });
             this.isHubServicePaired = true;
-            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData });
+            this.logEvent({ message: 'pairing done', deviceType: this.deviceType, encrypted: this.encrypted, manufacturerData: this.getManufacturerData() });
             return true;
         }
         catch (err) {
@@ -527,6 +575,15 @@ export class BleZwiftPlaySensor extends TBleSensor {
     }
     reset() {
     }
+    getManufacturerData() {
+        const data = this.peripheral?.getManufacturerData?.();
+        if (typeof data === 'string')
+            return data;
+        if (Buffer.isBuffer(data)) {
+            return data.toString('hex');
+        }
+        return undefined;
+    }
     getCrypto() {
         let crypto = BindingsFactory.getInstance()?.getBinding()?.crypto;
         if (!crypto)
@@ -556,13 +613,4 @@ export class BleZwiftPlaySensor extends TBleSensor {
         delete this.prevHubSettings;
         this.rideKeyPadStates = new Map();
     }
-    getManufacturerData() {
-        const data = this.peripheral.getManufacturerData();
-        if (typeof data === 'string')
-            return data;
-        if (Buffer.isBuffer(data)) {
-            return data.toString('hex');
-        }
-        return undefined;
-    }
 }

package/lib/esm/modes/antble-smarttrainer.js

@@ -61,34 +61,40 @@ export default class SmartTrainerCyclingMode extends PowerBasedCyclingModeBase {
         if (startGearIdx !== -1) {
             config.properties.splice(startGearIdx, 1);
         }
+        try {
+            const device = this.adapter?.getName();
+            this.logger.logEvent({ message: 'reset config', device });
+        }
+        catch { }
     }
     getConfig() {
         const config = super.getConfig();
-        const virtShiftEnabled = this.getFeatureToogle().has('VirtualShifting');
         let virtshift = config.properties.find(p => p.key === 'virtshift');
         let startGear = config.properties.find(p => p.key === 'startGear');
-        if (!virtshift && !this.adapter?.supportsVirtualShifting()) {
-            const options = virtShiftEnabled ? [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' }
-            ] :
-                [
+        if (!virtshift) {
+            const device = this.adapter?.getName();
+            const supportsZwift = this.adapter?.supportsVirtualShifting();
+            this.logger.logEvent({ message: 'prepare gear settings config', device, supportsZwift });
+            if (supportsZwift) {
+                const options = [
                     'Disabled',
-                    { key: 'Mixed', display: 'Enabled' }
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' },
+                    { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
                 ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
-            config.properties.push(virtshift);
-        }
-        if (!virtshift && virtShiftEnabled && this.adapter?.supportsVirtualShifting()) {
-            const options = [
-                'Disabled',
-                { key: 'Incyclist', display: 'App only (beta)' },
-                { key: 'Mixed', display: 'App + Bike' },
-                { key: 'SmartTrainer', display: 'SmartTreiner (beta)' }
-            ];
-            virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
-            config.properties.push(virtshift);
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Mixed' };
+                config.properties.push(virtshift);
+            }
+            else {
+                const options = [
+                    'Disabled',
+                    { key: 'Incyclist', display: 'App only (beta)' },
+                    { key: 'Mixed', display: 'App + Bike' }
+                ];
+                virtshift = { key: 'virtshift', name: 'Virtual Shifting', description: 'Enable virtual shifting', type: CyclingModeProperyType.SingleSelect, options, default: 'Disabled' };
+                config.properties.push(virtshift);
+            }
+            this.logger.logEvent({ message: 'gear settings config', config: config.properties });
         }
         if (virtshift && !startGear) {
             startGear = { key: 'startGear', name: 'Initial Gear', description: 'Initial Gear', type: CyclingModeProperyType.Integer, default: 12, min: 1, max: 24, condition: (s) => s?.virtshift === 'Incyclist' || s?.virtshift === 'SmartTrainer' };

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

@@ -7,12 +7,17 @@ import { BleDeviceSettings, IBlePeripheral } from '../../types.js';
 export declare class ZwiftPlayAdapter extends BleAdapter<BleDeviceData, BleZwiftPlaySensor> {
     protected static INCYCLIST_PROFILE_NAME: LegacyProfile;
     protected static CAPABILITIES: IncyclistCapability[];
+    protected keyPressedHandler?: (event: any) => void;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     protected checkCapabilities(): Promise<void>;
     startSensor(): Promise<boolean>;
+    protected onKeyPressed(event: any): void;
+    isEqual(settings: BleDeviceSettings): boolean;
     isSame(adapter: IAdapter): boolean;
     updateSensor(peripheral: IBlePeripheral): void;
     getProfile(): LegacyProfile;
+    getUniqueName(): string;
+    getName(): string;
     getDisplayName(): string;
     mapData(deviceData: BleDeviceData): IncyclistAdapterData;
 }

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

@@ -13,7 +13,7 @@ type BleZwiftPlaySensorProps = {
     logger?: EventLogger;
     isTrainer?: boolean;
 };
-type DeviceType = 'left' | 'right' | 'click' | 'hub';
+type DeviceType = 'left' | 'right' | 'click' | 'hub' | 'ride-left' | 'ride-right';
 export declare class BleZwiftPlaySensor extends TBleSensor {
     static readonly profile: LegacyProfile;
     static readonly protocol: BleProtocol;
@@ -45,6 +45,7 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     reconnectSensor(): Promise<boolean>;
     stopSensor(): Promise<boolean>;
     protected getRequiredCharacteristics(): Array<string>;
+    getDeviceType(): DeviceType;
     onData(characteristic: string, data: Buffer, isNotify?: boolean): boolean;
     requestDataUpdate(dataId: number): Promise<void>;
     setSimulationData(data?: SimulationParam): Promise<void>;
@@ -65,10 +66,10 @@ export declare class BleZwiftPlaySensor extends TBleSensor {
     read(characteristic: string, ignoreErrors?: boolean): Promise<Buffer | null>;
     pair(): Promise<boolean>;
     reset(): void;
+    getManufacturerData(): string;
     protected getCrypto(): ICryptoBinding;
     protected encryptedSupported(): boolean;
     protected createKeyPair(): any;
     protected setInitialState(): void;
-    protected getManufacturerData(): string;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.16",
+    "version": "3.0.18",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",