fix(hci): Possible fixes for timeouts

modum-io · May 17, 2021 · 16fbb91 · 16fbb91
1 parent a982fa1
commit 16fbb91
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 25 deletions.
diff --git a/lib/bindings/hci/Adapter.js b/lib/bindings/hci/Adapter.js
diff --git a/lib/bindings/hci/Adapter.js.map b/lib/bindings/hci/Adapter.js.map
diff --git a/lib/bindings/hci/misc/Hci.d.ts.map b/lib/bindings/hci/misc/Hci.d.ts.map
diff --git a/lib/bindings/hci/misc/Hci.js b/lib/bindings/hci/misc/Hci.js
diff --git a/lib/bindings/hci/misc/Hci.js.map b/lib/bindings/hci/misc/Hci.js.map
diff --git a/src/bindings/hci/Adapter.ts b/src/bindings/hci/Adapter.ts
@@ -4,8 +4,8 @@ import { HciGattLocal } from './gatt';
 import { Gap, Hci } from './misc';
 import { HciPeripheral } from './Peripheral';
 
-const SCAN_ENABLE_TIMEOUT = 1000;
-const ADVERTISING_ENABLE_TIMEOUT = 1000;
+const SCAN_ENABLE_TIMEOUT = 5000;
+const ADVERTISING_ENABLE_TIMEOUT = 5000;
 
 interface Advertisement {
 	localName: string;
@@ -300,7 +300,7 @@ export class HciAdapter extends Adapter {
 						this.scanEnableTimer = setTimeout(() => enableScanning(), SCAN_ENABLE_TIMEOUT);
 					});
 			};
-			enableScanning();
+			this.scanEnableTimer = setTimeout(() => enableScanning(), SCAN_ENABLE_TIMEOUT);
 		}
 	};
 
@@ -318,7 +318,7 @@ export class HciAdapter extends Adapter {
 						this.advertisingEnableTimer = setTimeout(() => enableAdvertising(), ADVERTISING_ENABLE_TIMEOUT);
 					});
 			};
-			enableAdvertising();
+			this.advertisingEnableTimer = setTimeout(() => enableAdvertising(), ADVERTISING_ENABLE_TIMEOUT);
 		}
 	};
 

diff --git a/src/bindings/hci/misc/Hci.ts b/src/bindings/hci/misc/Hci.ts
@@ -631,12 +631,6 @@ export class Hci extends TypedEmitter<HciEvents> {
 			};
 
 			const rejectHandler = async (error?: Error) => {
-				try {
-					await this.cancelLeConn();
-				} catch {
-					// NO-OP
-				}
-
 				cleanup();
 
 				if (error) {
@@ -649,7 +643,16 @@ export class Hci extends TypedEmitter<HciEvents> {
 			this.on('leConnComplete', onComplete);
 
 			const timeoutError = new HciError(`Creating connection timed out`);
-			timeout = setTimeout(() => rejectHandler(timeoutError), 2 * this.cmdTimeout);
+			timeout = setTimeout(async () => {
+				// If we timed out we should cancel our connection attempt
+				try {
+					await this.cancelLeConn();
+				} catch {
+					// NO-OP
+				}
+
+				rejectHandler(timeoutError);
+			}, this.connTimeout);
 
 			this.sendCommand(cmd, true).catch((err) => rejectHandler(err));
 		});