incyclist-devices 1.4.35 → 1.4.36

package/lib/ble/ble-interface.js

@@ -84,22 +84,26 @@ class BleInterface extends ble_1.BleInterfaceClass {
             try {
                 if (!this.connectState.isInitSuccess) {
                     const binding = this.getBinding()._bindings;
-                    const binding_init_original = binding.init.bind(binding);
-                    const self = this;
-                    binding.on('error', (err) => { this.getBinding().emit('error', err); });
-                    binding.init = function () {
-                        try {
-                            binding_init_original();
-                            self.connectState.isInitSuccess = true;
-                        }
-                        catch (err) {
-                            self.connectState.isInitSuccess = false;
-                            self.connectState.isConnected = false;
-                            self.connectState.isConnecting = false;
-                            self.logEvent({ message: 'connect result: error', error: err.message });
-                            return reject(new Error(err.message));
-                        }
-                    };
+                    if (binding) {
+                        const binding_init_original = binding.init.bind(binding);
+                        const self = this;
+                        binding.on('error', (err) => { this.getBinding().emit('error', err); });
+                        binding.init = function () {
+                            try {
+                                binding_init_original();
+                                self.connectState.isInitSuccess = true;
+                            }
+                            catch (err) {
+                                self.connectState.isInitSuccess = false;
+                                self.connectState.isConnected = false;
+                                self.connectState.isConnecting = false;
+                                self.logEvent({ message: 'connect result: error', error: err.message });
+                                return reject(new Error(err.message));
+                            }
+                        };
+                    }
+                    else {
+                    }
                 }
                 const state = this.getBinding().state;
                 if (state === ble_1.BleState.POWERED_ON) {
@@ -280,8 +284,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
             }
             const detectedPeripherals = {};
             this.devices = [];
-            if (scanForDevice)
-                this.logEvent({ message: 'search device request', device, deviceTypes });
+            if (scanForDevice) {
+                const { id, address, name } = device;
+                this.logEvent({ message: 'search device request', device: { id, address, name }, deviceTypes });
+            }
             else
                 this.logEvent({ message: 'scan start', services });
             return new Promise((resolve, reject) => {

package/lib/ble/hrm.d.ts

@@ -19,7 +19,7 @@ export default class BleHrmDevice extends BleDevice {
     constructor(props?: any);
     getProfile(): string;
     getServiceUUids(): string[];
-    parseHrm(data: Buffer): HrmData;
+    parseHrm(_data: Uint8Array): HrmData;
     onData(characteristic: string, data: Buffer): void;
     write(characteristic: any, data: any): Promise<boolean>;
     read(characteristic: any): Promise<Buffer>;

package/lib/ble/hrm.js

@@ -28,20 +28,20 @@ class BleHrmDevice extends ble_device_1.BleDevice {
     getServiceUUids() {
         return BleHrmDevice.services;
     }
-    parseHrm(data) {
+    parseHrm(_data) {
+        const data = Buffer.from(_data);
         try {
-            const ab = new Uint8Array(data);
-            const flags = ab[0];
-            let offset = 1;
+            const flags = data.readUInt8(0);
+            let offset = 2;
             if (flags % 1 === 0) {
-                this.heartrate = ab[1];
+                this.heartrate = data.readUInt8(1);
             }
             else {
-                this.heartrate = ab[1] + ab[2] * 256;
-                offset = 2;
+                this.heartrate = data.readUInt16LE(1);
+                offset = 3;
             }
             if (flags % 0xF) {
-                this.rr = (ab[offset + 1] + ab[offset + 2] * 256) / 1024;
+                this.rr = (data.readUInt16LE(offset)) / 1024;
             }
         }
         catch (err) {

package/lib/ble/pwr.d.ts

@@ -14,7 +14,7 @@ declare type PowerData = {
     accTorque?: number;
     time: number;
     rpm: number;
-    raw?: Buffer;
+    raw?: string;
 };
 declare type CrankData = {
     revolutions?: number;
@@ -39,7 +39,7 @@ export default class BleCyclingPowerDevice extends BleDevice {
         rpm: number;
         time: any;
     };
-    parsePower(data: Buffer): PowerData;
+    parsePower(_data: Uint8Array): PowerData;
     onData(characteristic: string, data: Buffer): void;
     write(characteristic: any, data: any): Promise<boolean>;
     read(characteristic: any): Promise<Buffer>;

package/lib/ble/pwr.js

@@ -66,7 +66,8 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
             this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
         return { rpm, time: this.timeOffset + c.time };
     }
-    parsePower(data) {
+    parsePower(_data) {
+        const data = Buffer.from(_data);
         try {
             let offset = 4;
             const flags = data.readUInt16LE(0);
@@ -91,7 +92,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         catch (err) {
         }
         const { instantaneousPower, balance, accTorque, rpm, time } = this;
-        return { instantaneousPower, balance, accTorque, rpm, time, raw: data };
+        return { instantaneousPower, balance, accTorque, rpm, time, raw: data.toString('hex') };
     }
     onData(characteristic, data) {
         if (characteristic.toLocaleLowerCase() === '2a63') {
@@ -176,7 +177,7 @@ class PwrAdapter extends Device_1.default {
         const data = {
             isPedalling: false,
             power: 0,
-            pedalRpm: 0,
+            pedalRpm: undefined,
             speed: 0,
             heartrate: 0,
             distanceInternal: 0,

package/lib/modes/power-meter.js

@@ -47,7 +47,7 @@ class PowerMeterCyclingMode extends power_base_1.default {
             let power = bikeData.power || 0;
             const slope = prevData.slope || 0;
             const distanceInternal = prevData.distanceInternal || 0;
-            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
+            if (bikeData.pedalRpm === 0 || bikeData.isPedalling === false) {
                 power = 0;
             }
             const m = this.getWeight();

package/package.json

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