incyclist-devices 2.3.5 → 2.3.7

package/lib/ble/base/adapter.js

@@ -294,6 +294,7 @@ class BleAdapter extends adpater_1.default {
                 if (wasPaused)
                     this.resume();
                 if (!this.isStarting()) {
+                    this.logEvent({ message: 'start result: interrupted', device: this.getName(), interface: this.getInterface(), protocol: this.getProtocolName() });
                     this.started = false;
                     this.stopped = true;
                     return false;

package/lib/ble/base/interface.js

@@ -247,6 +247,14 @@ class BleInterface extends events_1.default {
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            let error;
+            try {
+                throw new Error('');
+            }
+            catch (err) {
+                error = err;
+            }
+            this.logEvent({ message: 'reconnecting interface', stack: error.stack });
             yield this.disconnect();
             yield this.connect(true);
         });

package/lib/ble/cp/sensor.d.ts

@@ -22,6 +22,6 @@ export default class BleCyclingPowerDevice extends TBleSensor {
     };
     parsePower(_data: Uint8Array): PowerData;
     protected getRequiredCharacteristics(): Array<string>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
     reset(): void;
 }

package/lib/ble/cp/sensor.js

@@ -77,7 +77,8 @@ class BleCyclingPowerDevice extends sensor_1.TBleSensor {
     getRequiredCharacteristics() {
         return [consts_1.CSP_MEASUREMENT];
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         const hasData = super.onData(characteristic, data);
         if (!hasData)
             return false;

package/lib/ble/csc/sensor.d.ts

@@ -16,6 +16,6 @@ export declare class BleCyclingSpeedCadenceDevice extends TBleSensor {
     constructor(peripheral: any, props?: any);
     protected getRequiredCharacteristics(): Array<string>;
     getFeatures(): Promise<BleCSCFeatures>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
     reset(): void;
 }

package/lib/ble/csc/sensor.js

@@ -38,7 +38,8 @@ class BleCyclingSpeedCadenceDevice extends sensor_1.TBleSensor {
             }
         });
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         const hasData = super.onData(characteristic, data);
         if (!hasData)
             return false;

package/lib/ble/fm/adapter.js

@@ -213,6 +213,8 @@ class BleFmAdapter extends adapter_1.default {
         return __awaiter(this, arguments, void 0, function* (request, enforced = false) {
             if (!enforced && (this.paused || !this.device))
                 return;
+            if (!enforced && (this.stopped && !this.isStarting()))
+                return;
             try {
                 const update = this.getCyclingMode().sendBikeUpdate(request);
                 this.logEvent({ message: 'send bike update requested', profile: this.getProfile(), update, request });

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

@@ -21,7 +21,7 @@ export default class BleFitnessMachineDevice extends TBleSensor {
     get features(): IndoorBikeFeatures;
     reset(): void;
     protected getRequiredCharacteristics(): Array<string>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
     setCrr(crr: number): void;
     getCrr(): number;
     setCw(cw: number): void;

package/lib/ble/fm/sensor.js

@@ -35,7 +35,8 @@ class BleFitnessMachineDevice extends sensor_1.TBleSensor {
     getRequiredCharacteristics() {
         return [consts_1.INDOOR_BIKE_DATA, '2a37', consts_1.FTMS_STATUS];
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         try {
             const hasData = super.onData(characteristic, data);
             if (!hasData)

package/lib/ble/hr/sensor.d.ts

@@ -13,5 +13,5 @@ export default class BleHrmDevice extends TBleSensor {
     parseHrm(_data: Uint8Array): HrmData;
     reset(): void;
     protected getRequiredCharacteristics(): Array<string>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
 }

package/lib/ble/hr/sensor.js

@@ -32,7 +32,8 @@ class BleHrmDevice extends sensor_1.TBleSensor {
     getRequiredCharacteristics() {
         return [consts_1.HR_MEASUREMENT];
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         const hasData = super.onData(characteristic, data);
         if (!hasData)
             return;

package/lib/ble/tacx/sensor.d.ts

@@ -26,7 +26,7 @@ export default class TacxAdvancedFitnessMachineDevice extends BleFitnessMachineD
     constructor(peripheral: any, props?: any);
     reset(): void;
     protected getRequiredCharacteristics(): Array<string>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
     protected isDuplicate(characteristic: string, data: Buffer): boolean;
     setTargetPower(power: number): Promise<boolean>;
     setSlope(slope: any): Promise<boolean>;

package/lib/ble/tacx/sensor.js

@@ -36,7 +36,8 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
     getRequiredCharacteristics() {
         return [consts_1.INDOOR_BIKE_DATA, '2a37', consts_1.FTMS_STATUS, consts_1.CSP_MEASUREMENT, consts_1.CSC_MEASUREMENT, this.tacxRx];
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         const isDuplicate = this.isDuplicate(characteristic, data);
         if (isDuplicate) {
             return false;
@@ -75,7 +76,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
             return res;
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'tacx.onData()', error: err.message || err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'tacx.onData()', error: err.message || err, stack: err.stack, dataType: typeof (characteristicData) });
         }
     }
     isDuplicate(characteristic, data) {
@@ -427,7 +428,7 @@ class TacxAdvancedFitnessMachineDevice extends sensor_1.default {
                 res.raw = data.toString('hex');
         }
         catch (err) {
-            this.logEvent({ message: 'error', fn: 'parseFECMessage()', error: err.message || err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'parseFECMessage()', error: err.message || err, stack: err.stack, dataType: typeof (data) });
         }
         return res;
     }

package/lib/ble/wahoo/sensor.d.ts

@@ -27,7 +27,7 @@ export default class BleWahooDevice extends BleFitnessMachineDevice {
     isMatching(serviceUUIDs: string[]): boolean;
     reset(): void;
     protected getRequiredCharacteristics(): Array<string>;
-    onData(characteristic: string, data: Buffer): boolean;
+    onData(characteristic: string, characteristicData: Buffer): boolean;
     requestControl(): Promise<boolean>;
     setTargetPower(power: number): Promise<boolean>;
     setSlope(slope: any): Promise<boolean>;

package/lib/ble/wahoo/sensor.js

@@ -42,7 +42,8 @@ class BleWahooDevice extends sensor_1.default {
     getRequiredCharacteristics() {
         return [consts_2.INDOOR_BIKE_DATA, consts_2.FTMS_STATUS, consts_2.CSP_MEASUREMENT, consts_2.HR_MEASUREMENT];
     }
-    onData(characteristic, data) {
+    onData(characteristic, characteristicData) {
+        const data = Buffer.from(characteristicData);
         const uuid = (0, utils_1.beautifyUUID)(characteristic).toLowerCase();
         let res;
         switch (uuid) {

package/package.json

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