incyclist-devices 1.4.65 → 1.4.66

package/lib/ble/ble-device.js

@@ -47,7 +47,9 @@ class BleDevice extends ble_1.BleDeviceClass {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
     }
     setLogger(logger) {
         this.logger = logger;
@@ -244,7 +246,6 @@ class BleDevice extends ble_1.BleDeviceClass {
             if (writeIdx !== -1) {
                 const writeItem = this.writeQueue[writeIdx];
                 this.writeQueue.splice(writeIdx, 1);
-                console.log('~~~ write queue', this.writeQueue);
                 if (writeItem.resolve)
                     writeItem.resolve(data);
             }
@@ -255,9 +256,9 @@ class BleDevice extends ble_1.BleDeviceClass {
             try {
                 const connector = this.ble.getConnector(this.peripheral);
                 const isAlreadySubscribed = connector.isSubscribed(characteristicUuid);
-                console.log('~~~ write ', characteristicUuid, data.toString('hex'), isAlreadySubscribed, this.subscribedCharacteristics);
                 if (!withoutResponse && !isAlreadySubscribed) {
                     const connector = this.ble.getConnector(this.peripheral);
+                    connector.removeAllListeners(characteristicUuid);
                     connector.on(characteristicUuid, (uuid, data) => {
                         this.onData(uuid, data);
                     });
@@ -287,7 +288,7 @@ class BleDevice extends ble_1.BleDeviceClass {
                                 this.writeQueue.splice(writeId, 1);
                             this.logEvent({ message: 'writing response', err: 'timeout' });
                             reject(new Error('timeout'));
-                        }, 1000);
+                        }, 5000);
                         this.logEvent({ message: 'writing' });
                         characteristic.write(data, withoutResponse, (err) => {
                             clearTimeout(to);

package/lib/ble/ble-peripheral.js

@@ -31,7 +31,9 @@ class BlePeripheralConnector {
         if (this.logger) {
             this.logger.logEvent(event);
         }
-        console.log('~~~BLE:', event);
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -110,7 +112,6 @@ class BlePeripheralConnector {
                             try {
                                 yield this.subscribe(c.uuid);
                                 subscribed.push(c.uuid);
-                                this.state.subscribed.push(c.uuid);
                             }
                             catch (err) {
                                 this.logEvent({ message: 'cannot subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, error: err.message || err });
@@ -137,6 +138,7 @@ class BlePeripheralConnector {
                     reject(new Error('Characteristic not found'));
                     return;
                 }
+                characteristic.removeAllListeners('data');
                 characteristic.on('data', (data, _isNotification) => {
                     this.onData(characteristicUuid, data);
                 });
@@ -149,8 +151,10 @@ class BlePeripheralConnector {
                     this.logEvent({ message: 'subscribe result', characteristic: characteristicUuid, error: err });
                     if (err)
                         reject(err);
-                    else
+                    else {
+                        this.state.subscribed.push(characteristicUuid);
                         resolve(true);
+                    }
                 });
             }
             catch (err) {

package/lib/ble/fm.js

@@ -100,6 +100,23 @@ class BleFitnessMachineDevice extends ble_device_1.BleDevice {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                const connector = this.ble.getConnector(this.peripheral);
+                const isAlreadySubscribed = connector.isSubscribed(FTMS_CP);
+                if (!isAlreadySubscribed) {
+                    connector.removeAllListeners(FTMS_CP);
+                    let prev = undefined;
+                    let prevTS = undefined;
+                    connector.on(FTMS_CP, (uuid, data) => {
+                        const message = data.toString('hex');
+                        if (prevTS && prev && message === prev && Date.now() - prevTS < 500) {
+                            return;
+                        }
+                        prevTS = Date.now();
+                        prev = message;
+                        this.onData(uuid, data);
+                    });
+                    yield connector.subscribe(FTMS_CP);
+                }
                 this.logEvent({ message: 'get device info' });
                 yield _super.init.call(this);
                 yield this.getFitnessMachineFeatures();

package/lib/ble/wahoo-kickr.js

@@ -36,7 +36,7 @@ const ble_interface_1 = __importDefault(require("./ble-interface"));
 const Device_1 = require("../Device");
 const gd_eventlog_1 = require("gd-eventlog");
 const fm_1 = __importStar(require("./fm"));
-const WAHOO_ADVANCED_FTMS = 'a026e005';
+const WAHOO_ADVANCED_FTMS = 'a026e00b';
 const WAHOO_ADVANCED_TRAINER_CP = 'a026e037';
 const cwABike = {
     race: 0.35,
@@ -60,6 +60,23 @@ class WahooAdvancedFitnessMachineDevice extends fm_1.default {
         });
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                const connector = this.ble.getConnector(this.peripheral);
+                const isAlreadySubscribed = connector.isSubscribed(WAHOO_ADVANCED_TRAINER_CP);
+                if (!isAlreadySubscribed) {
+                    connector.removeAllListeners(WAHOO_ADVANCED_TRAINER_CP);
+                    let prev = undefined;
+                    let prevTS = undefined;
+                    connector.on(WAHOO_ADVANCED_TRAINER_CP, (uuid, data) => {
+                        const message = data.toString('hex');
+                        if (prevTS && prev && message === prev && Date.now() - prevTS < 500) {
+                            return;
+                        }
+                        prevTS = Date.now();
+                        prev = message;
+                        this.onData(uuid, data);
+                    });
+                    yield connector.subscribe(WAHOO_ADVANCED_TRAINER_CP);
+                }
                 this.logEvent({ message: 'get device info' });
                 yield _super.init.call(this);
                 this.logEvent({ message: 'device info', deviceInfo: this.deviceInfo, features: this.features });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.65",
+  "version": "1.4.66",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",