fix(connect): fix potential device hang after received message asseti…

…on error
trezor · Jan 22, 2025 · 59d6e69 · 59d6e69
1 parent bc385c2
commit 59d6e69
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/packages/connect/src/device/DeviceCommands.ts b/packages/connect/src/device/DeviceCommands.ts
@@ -354,10 +354,20 @@ export class DeviceCommands {
         } catch (error) {
             // handle possible race condition
             // Bridge may have some unread message in buffer, read it
-            await this.transport.receive({
-                session: this.transportSession,
-                protocol: this.device.protocol,
-            });
+            const abortController = new AbortController();
+            const timeout = setTimeout(() => {
+                abortController.abort();
+            }, 500);
+
+            await this.transport
+                .receive({
+                    session: this.transportSession,
+                    protocol: this.device.protocol,
+                    signal: abortController.signal,
+                })
+                .finally(() => {
+                    clearTimeout(timeout);
+                });
             // throw error anyway, next call should be resolved properly
             throw error;
         }