fix: no error should occur when the timeout is set to 0 (gronxb#41)

xingh · Apr 28, 2024 · 6d48c92 · 6d48c92
1 parent 20f885a
commit 6d48c92
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/packages/web/src/linkBridge.ts b/packages/web/src/linkBridge.ts
@@ -43,30 +43,32 @@ const createNativeMethod =
   (...args: unknown[]) => {
     const eventId = createRandomId();
 
-    return Promise.race([
-      createResolver({
-        emitter,
-        methodName,
-        eventId,
-        evaluate: () => {
-          window.ReactNativeWebView?.postMessage(
-            JSON.stringify({
-              type: "bridge",
-              body: {
-                method: methodName,
-                eventId,
-                args,
-              },
-            }),
-          );
-        },
-        onFallback: () => {
-          onFallback?.(methodName, args);
-        },
-        failHandler: throwOnError && new NativeMethodError(methodName),
-      }),
-      timeout(timeoutMs, throwOnError),
-    ]);
+    return Promise.race(
+      [
+        createResolver({
+          emitter,
+          methodName,
+          eventId,
+          evaluate: () => {
+            window.ReactNativeWebView?.postMessage(
+              JSON.stringify({
+                type: "bridge",
+                body: {
+                  method: methodName,
+                  eventId,
+                  args,
+                },
+              }),
+            );
+          },
+          onFallback: () => {
+            onFallback?.(methodName, args);
+          },
+          failHandler: throwOnError && new NativeMethodError(methodName),
+        }),
+        timeoutMs > 0 && timeout(timeoutMs, throwOnError),
+      ].filter(Boolean),
+    );
   };
 
 export const linkBridge = <