🐛 (transport): Fix Chrome windows ble connect

LedgerHQ · Jan 27, 2025 · 8161b27 · 8161b27
1 parent ffaae72
commit 8161b27
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/.changeset/few-colts-jump.md b/.changeset/few-colts-jump.md
@@ -0,0 +1,5 @@
+---
+"@ledgerhq/device-transport-kit-web-ble": patch
+---
+
+Fix Chrome windows ble connect
diff --git a/packages/tools/esbuild-tools/build.mjs b/packages/tools/esbuild-tools/build.mjs
@@ -1,10 +1,15 @@
 #!/usr/bin/env zx
 
 import "zx/globals";
+import { usePowerShell } from "zx";
 import esbuild from "esbuild";
 import { nodeExternalsPlugin } from "esbuild-node-externals";
 import { replaceTscAliasPaths } from "tsc-alias";
 
+if (process.platform === "win32") {
+  usePowerShell();
+}
+
 const config = {
   minify: true,
   bundle: false,

diff --git a/packages/tools/esbuild-tools/watch.mjs b/packages/tools/esbuild-tools/watch.mjs
@@ -1,9 +1,14 @@
 #!/usr/bin/env zx
 import "zx/globals";
+import { usePowerShell } from "zx";
 import esbuild from "esbuild";
 import { nodeExternalsPlugin } from "esbuild-node-externals";
 import { replaceTscAliasPaths } from "tsc-alias";
 
+if (process.platform === "win32") {
+  usePowerShell();
+}
+
 const config = {
   entryPoints: ["index.ts"],
   minify: false,

diff --git a/packages/transport/web-ble/src/api/transport/WebBleTransport.ts b/packages/transport/web-ble/src/api/transport/WebBleTransport.ts
@@ -255,7 +255,12 @@ export class WebBleTransport implements Transport {
             );
             return discoveredDevice;
           } catch (error) {
-            await bleDevice.forget();
+            this._logger.error("Error while discovering device", {
+              data: { error, bleDevice },
+            });
+            if (bleDevice.forget) {
+              await bleDevice.forget();
+            }
             throw error;
           }
         }).caseOf({
@@ -350,7 +355,9 @@ export class WebBleTransport implements Transport {
 
       return Right(connectedDevice);
     } catch (error) {
-      await internalDevice.bleDevice.forget();
+      if (internalDevice.bleDevice.forget) {
+        await internalDevice.bleDevice.forget();
+      }
 
       this._internalDevicesById.delete(deviceId);