incyclist-devices 1.4.43 → 1.4.44

package/lib/ble/ble-interface.js

@@ -13,6 +13,8 @@ const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const ble_1 = require("./ble");
 const CONNECT_TIMEOUT = 5000;
+const DEFAULT_SCAN_TIMEOUT = 20000;
+const BACKGROUND_SCAN_TIMEOUT = 30000;
 class BleInterface extends ble_1.BleInterfaceClass {
     constructor(props = {}) {
         super(props);
@@ -72,7 +74,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
         const timeout = props.timeout || 2000;
         const runBackgroundScan = () => {
             this.scanState.isBackgroundScan = true;
-            this.scan({ timeout: 5000, isBackgroundScan: true })
+            this.scan({ timeout: BACKGROUND_SCAN_TIMEOUT, isBackgroundScan: true })
                 .then(() => {
                 this.scanState.isBackgroundScan = false;
             })
@@ -261,13 +263,13 @@ class BleInterface extends ble_1.BleInterfaceClass {
             }, 100);
         });
     }
-    connectDevice(requested, timeout = CONNECT_TIMEOUT) {
+    connectDevice(requested, timeout = DEFAULT_SCAN_TIMEOUT + CONNECT_TIMEOUT) {
         return __awaiter(this, void 0, void 0, function* () {
             const { id, name, address, getProfile } = requested;
             const profile = getProfile && typeof (getProfile) === 'function' ? getProfile() : undefined;
             this.logEvent({ message: 'connectDevice', id, name, address, profile, isbusy: this.scanState.isConnecting });
             if (this.scanState.isConnecting) {
-                yield this.waitForConnectFinished(10000);
+                yield this.waitForConnectFinished(CONNECT_TIMEOUT);
             }
             this.scanState.isConnecting = true;
             let devices = [];
@@ -278,7 +280,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     this.logEvent({ message: 'retry connect device', id, name, address, profile, retryCount });
                 }
                 try {
-                    devices = yield this.scan({ timeout, device: requested });
+                    devices = yield this.scan({ timeout: DEFAULT_SCAN_TIMEOUT, device: requested });
                     if (devices.length === 0) {
                         retryCount++;
                         retry = retryCount < 5;
@@ -348,7 +350,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
     }
     scan(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { timeout = 5000, deviceTypes = [], device } = props;
+            const { timeout = DEFAULT_SCAN_TIMEOUT, deviceTypes = [], device } = props;
             const scanForDevice = (device !== null && device !== undefined);
             const services = this.getServicesFromDeviceTypes(deviceTypes);
             const bleBinding = this.getBinding();

package/package.json

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