incyclist-devices 1.4.27 → 1.4.28

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

@@ -27,6 +27,12 @@ export default class BleInterface extends BleInterfaceClass {
     devices: BleDeviceInfo[];
     logger: EventLogger;
     static deviceClasses: BleDeviceClassInfo[];
+    static _instance: BleInterface;
+    static getInstance(props?: {
+        binding?: BleBinding;
+        log?: boolean;
+        logger?: EventLogger;
+    }): BleInterface;
     constructor(props?: {
         binding?: BleBinding;
         log?: boolean;

package/lib/ble/ble-interface.js

@@ -24,6 +24,23 @@ class BleInterface extends ble_1.BleInterfaceClass {
             this.logger = new gd_eventlog_1.EventLogger('BLE');
         }
     }
+    static getInstance(props = {}) {
+        if (!BleInterface._instance) {
+            BleInterface._instance = new BleInterface(props);
+        }
+        else {
+            if (props.binding) {
+                BleInterface._instance.setBinding(props.binding);
+            }
+            if (props.logger) {
+                BleInterface._instance.logger = props.logger;
+            }
+            if (props.log && !BleInterface._instance.logger) {
+                BleInterface._instance.logger = new gd_eventlog_1.EventLogger('BLE');
+            }
+        }
+        return BleInterface._instance;
+    }
     static register(id, type, Class, services) {
         if (this.deviceClasses.find(i => i.id === id))
             return;

package/lib/ble/hrm.d.ts

@@ -9,7 +9,7 @@ import { EventLogger } from 'gd-eventlog';
 declare type HrmData = {
     heartrate: number;
     rr: number;
-    raw: Buffer;
+    raw: string;
 };
 export default class BleHrmDevice extends BleDevice {
     static services: string[];

package/lib/ble/hrm.js

@@ -47,7 +47,7 @@ class BleHrmDevice extends ble_device_1.BleDevice {
         catch (err) {
         }
         const { heartrate, rr } = this;
-        return { heartrate, rr, raw: data };
+        return { heartrate, rr, raw: data.toString('hex') };
     }
     onData(characteristic, data) {
         if (characteristic.toLocaleLowerCase() === '2a37') {

package/lib/ble/incyclist-protocol.js

@@ -32,7 +32,7 @@ class BleProtocol extends DeviceProtocol_1.default {
         super();
         const b = binding || BleProtocol._defaultBinding;
         this.logger = new gd_eventlog_1.EventLogger('BLE');
-        this.ble = new ble_interface_1.default({ binding: b, logger: this.logger });
+        this.ble = ble_interface_1.default.getInstance({ binding: b, logger: this.logger });
         BleProtocol._instances.push(this);
     }
     static setDefaultBinding(binding) {

package/package.json

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