incyclist-devices 1.4.31 → 1.4.34

package/lib/ble/ble-device.js

@@ -89,7 +89,7 @@ class BleDevice extends ble_1.BleDeviceClass {
                     characteristics.forEach(c => {
                         if (c.properties.find(p => p === 'notify')) {
                             c.on('data', (data, _isNotification) => {
-                                this.onData(c.uuid, data);
+                                this.onData(ble_1.uuid(c.uuid), data);
                             });
                             c.subscribe((err) => {
                                 if (err)

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

@@ -9,7 +9,7 @@ export interface ConnectState {
     isConnecting: boolean;
     isConnected: boolean;
     timeout?: NodeJS.Timeout;
-    isOpened: boolean;
+    isInitSuccess: boolean;
 }
 export interface BleDeviceInfo {
     device: BleDeviceClass;

package/lib/ble/ble-interface.js

@@ -10,12 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
+const utils_1 = require("../utils");
 const ble_1 = require("./ble");
 class BleInterface extends ble_1.BleInterfaceClass {
     constructor(props = {}) {
         super(props);
         this.scanState = { isScanning: false, timeout: undefined };
-        this.connectState = { isConnecting: false, isConnected: false, isOpened: false };
+        this.connectState = { isConnecting: false, isConnected: false, isInitSuccess: false };
         this.devices = [];
         if (props.logger)
             this.logger = props.logger;
@@ -73,31 +74,44 @@ class BleInterface extends ble_1.BleInterfaceClass {
             this.logEvent({ message: 'connect request' });
             if (!this.getBinding())
                 return Promise.reject(new Error('no binding defined'));
-            if (!this.connectState.isOpened) {
-                this.connectState.timeout = setTimeout(() => {
-                    this.connectState.isConnected = false;
-                    this.connectState.isConnecting = false;
-                    this.connectState.timeout = null;
-                    this.logEvent({ message: 'connect result: timeout' });
-                    reject(new Error('timeout'));
-                }, timeout);
-                try {
+            this.connectState.timeout = setTimeout(() => {
+                this.connectState.isConnected = false;
+                this.connectState.isConnecting = false;
+                this.connectState.timeout = null;
+                this.logEvent({ message: 'connect result: timeout' });
+                reject(new Error('timeout'));
+            }, timeout);
+            try {
+                if (!this.connectState.isInitSuccess) {
                     const binding = this.getBinding()._bindings;
                     const binding_init_original = binding.init.bind(binding);
                     const self = this;
                     binding.init = function () {
                         try {
                             binding_init_original();
-                            self.connectState.isOpened = true;
+                            self.connectState.isInitSuccess = true;
                         }
                         catch (err) {
-                            self.connectState.isOpened = false;
+                            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));
                         }
                     };
+                }
+                const state = this.getBinding().state;
+                if (state === ble_1.BleState.POWERED_ON) {
+                    clearTimeout(this.connectState.timeout);
+                    this.connectState.timeout = null;
+                    this.getBinding().removeAllListeners('stateChange');
+                    this.getBinding().on('stateChange', this.onStateChange.bind(this));
+                    this.connectState.isConnected = true;
+                    this.connectState.isConnecting = false;
+                    this.logEvent({ message: 'connect result: success' });
+                    return resolve(true);
+                }
+                else {
                     this.getBinding().once('error', (err) => {
                         this.connectState.isConnected = true;
                         this.connectState.isConnecting = false;
@@ -116,17 +130,20 @@ class BleInterface extends ble_1.BleInterfaceClass {
                             this.logEvent({ message: 'connect result: success' });
                             return resolve(true);
                         }
+                        else {
+                            this.logEvent({ message: 'BLE state change', state });
+                        }
                     });
                 }
-                catch (err) {
-                    this.connectState.isConnected = false;
-                    this.connectState.isConnecting = false;
-                    if (this.connectState.timeout)
-                        clearTimeout(this.connectState.timeout);
-                    this.connectState.timeout = null;
-                    this.logEvent({ message: 'connect result: error', error: err.message });
-                    return reject(new Error('bluetooth unavailable, cause: ' + err.message));
-                }
+            }
+            catch (err) {
+                this.connectState.isConnected = false;
+                this.connectState.isConnecting = false;
+                if (this.connectState.timeout)
+                    clearTimeout(this.connectState.timeout);
+                this.connectState.timeout = null;
+                this.logEvent({ message: 'connect result: error', error: err.message });
+                return reject(new Error('bluetooth unavailable, cause: ' + err.message));
             }
         });
     }
@@ -173,10 +190,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
             });
         };
         if (typeof services === 'string') {
-            return get(deviceTypes, (s) => s === services);
+            return get(deviceTypes, (s) => s === ble_1.uuid(services));
         }
         if (Array.isArray(services)) {
-            return get(deviceTypes, s => services.includes(s));
+            return get(deviceTypes, s => services.map(ble_1.uuid).includes(s));
         }
         return [];
     }
@@ -209,8 +226,33 @@ class BleInterface extends ble_1.BleInterfaceClass {
     }
     connectDevice(requested, timeout = 2000) {
         return __awaiter(this, void 0, void 0, function* () {
-            const devices = yield this.scan({ timeout, device: requested });
-            const { id, address, name } = requested;
+            const { id, name, address } = requested;
+            this.logEvent({ message: 'connectDevice', id, name, address });
+            let devices = [];
+            let retry = false;
+            let retryCount = 0;
+            do {
+                if (retryCount > 0) {
+                    this.logEvent({ message: 'retry connect device', retryCount });
+                }
+                try {
+                    devices = yield this.scan({ timeout, device: requested });
+                    if (devices.length === 0) {
+                        retryCount++;
+                        retry = retryCount < 5;
+                    }
+                }
+                catch (err) {
+                    if (err.message === 'scanning already in progress') {
+                        this.logEvent({ message: 'scan busy' });
+                        yield utils_1.sleep(1000);
+                        retryCount++;
+                        retry = retryCount < 5;
+                        continue;
+                    }
+                    throw err;
+                }
+            } while (devices.length === 0 && retry);
             if (devices.length === 0)
                 throw new Error('device not found');
             if (devices[0]) {
@@ -236,6 +278,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 yield this.connect();
             }
             const detectedPeripherals = {};
+            this.devices = [];
             if (scanForDevice)
                 this.logEvent({ message: 'search device request', device, deviceTypes });
             else
@@ -275,13 +318,16 @@ class BleInterface extends ble_1.BleInterfaceClass {
                                 const d = new C({ peripheral });
                                 d.setInterface(this);
                                 if (scanForDevice) {
-                                    if ((device.id && d.id === device.id) || (device.address && d.address === device.address) || (device.name && d.name === device.name))
+                                    if ((device.id && device.id !== '' && d.id === device.id) ||
+                                        (device.address && device.address !== '' && d.address === device.address) ||
+                                        (device.name && device.name !== '' && d.name === device.name))
                                         cntFound++;
                                 }
                                 else
                                     cntFound++;
-                                if (cntFound > 0) {
-                                    this.logEvent({ message: 'scan: device found', device: d.name, services: d.services.join(',') });
+                                const existing = this.devices.find(i => i.device.id === d.id);
+                                if (cntFound > 0 && !existing) {
+                                    this.logEvent({ message: 'scan: device found', device: d.name, address: d.address, services: d.services.join(',') });
                                     this.devices.push({ device: d, isConnected: false });
                                     this.emit('device', d);
                                 }
@@ -291,9 +337,12 @@ class BleInterface extends ble_1.BleInterfaceClass {
                                         this.scanState.timeout = null;
                                         bleBinding.stopScanning(() => {
                                             this.scanState.isScanning = false;
+                                            resolve([d]);
                                         });
                                     }
-                                    resolve([d]);
+                                    else {
+                                        resolve([d]);
+                                    }
                                 }
                             });
                         }
@@ -301,10 +350,10 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 });
                 this.scanState.timeout = setTimeout(() => {
                     this.scanState.timeout = null;
-                    this.logEvent({ message: 'scan result: devices found', devices: this.devices.map(i => i.device.name) });
-                    resolve(this.devices.map(i => i.device));
+                    this.logEvent({ message: 'scan result: devices found', devices: this.devices.map(i => i.device.name + (!i.device.name || i.device.name === '') ? `addr=${i.device.address}` : '') });
                     bleBinding.stopScanning(() => {
                         this.scanState.isScanning = false;
+                        resolve(this.devices.map(i => i.device));
                     });
                 }, timeout);
             });

package/lib/ble/ble.d.ts

@@ -23,6 +23,7 @@ export interface BleBinding extends EventEmitter {
     startScanning(serviceUUIDs?: string[], allowDuplicates?: boolean, callback?: (error?: Error) => void): void;
     stopScanning(callback?: () => void): void;
     _bindings: any;
+    state: string;
 }
 export declare type ScanProps = {
     timeout?: number;
@@ -79,3 +80,4 @@ export declare enum BleState {
     POWERED_OFF = "poweredOff",
     POWERED_ON = "poweredOn"
 }
+export declare const uuid: (s: any) => any;

package/lib/ble/ble.js

@@ -49,3 +49,13 @@ var BleState;
     BleState["POWERED_OFF"] = "poweredOff";
     BleState["POWERED_ON"] = "poweredOn";
 })(BleState = exports.BleState || (exports.BleState = {}));
+exports.uuid = (s) => {
+    if (s) {
+        if (s.includes('-')) {
+            const parts = s.split('-');
+            const uuidNo = parseInt('0x' + parts[0]);
+            return uuidNo.toString(16);
+        }
+        return s;
+    }
+};

package/lib/ble/hrm.js

@@ -113,7 +113,7 @@ class HrmAdapter extends Device_1.default {
             }
             catch (err) {
                 this.logger.logEvent({ message: 'start result: error', error: err.message });
-                return false;
+                throw new Error(`could not start device, reason:${err.message}`);
             }
         });
     }

package/lib/ble/pwr.js

@@ -226,7 +226,7 @@ class PwrAdapter extends Device_1.default {
             }
             catch (err) {
                 this.logger.logEvent({ message: 'start result: error', error: err.message });
-                return false;
+                throw new Error(`could not start device, reason:${err.message}`);
             }
         });
     }

package/package.json

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