@webview-bridge/web 1.4.0 → 1.4.2

package/dist/commonjs/index.cjs

@@ -58,7 +58,14 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = false) => {
+var createResolver = ({
+  emitter: emitter2,
+  evaluate,
+  eventId,
+  failHandler = false,
+  methodName,
+  onFallback
+}) => {
   return new Promise((resolve, reject) => {
     const unbind = emitter2.on(
       `${methodName}-${eventId}`,
@@ -66,6 +73,7 @@ var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = fal
         unbind();
         if (throwOccurred) {
           if (failHandler instanceof Error) {
+            onFallback?.();
             reject(failHandler);
           } else {
             resolve(void 0);
@@ -214,29 +222,39 @@ var linkBridgeStore = (initialState = {}) => {
 };
 
 // src/linkBridge.ts
-var createNativeMethod = (methodName, timeoutMs, throwOnError) => (...args) => {
+var createNativeMethod = ({
+  methodName,
+  throwOnError,
+  timeoutMs,
+  onFallback
+}) => (...args) => {
   const eventId = createRandomId();
-  return Promise.race([
-    createResolver(
-      emitter,
-      methodName,
-      eventId,
-      () => {
-        window.ReactNativeWebView?.postMessage(
-          JSON.stringify({
-            type: "bridge",
-            body: {
-              method: methodName,
-              eventId,
-              args
-            }
-          })
-        );
-      },
-      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)
+  );
 };
 var linkBridge = (options = {
   timeout: 2e3,
@@ -270,11 +288,12 @@ var linkBridge = (options = {
     (acc, methodName) => {
       return {
         ...acc,
-        [methodName]: createNativeMethod(
+        [methodName]: createNativeMethod({
           methodName,
           timeoutMs,
-          willMethodThrowOnError(methodName)
-        )
+          throwOnError: willMethodThrowOnError(methodName),
+          onFallback
+        })
       };
     },
     {}
@@ -286,11 +305,12 @@ var linkBridge = (options = {
       )) {
         return target2[methodName];
       }
-      return createNativeMethod(
+      return createNativeMethod({
         methodName,
         timeoutMs,
-        willMethodThrowOnError(methodName)
-      );
+        throwOnError: willMethodThrowOnError(methodName),
+        onFallback
+      });
     }
   });
   Object.assign(target, {
@@ -314,9 +334,11 @@ var linkBridge = (options = {
           }
         })
       );
-      onFallback?.(methodName);
       if (willMethodThrowOnError(methodName)) {
-        return () => Promise.reject(new MethodNotFoundError(methodName));
+        return (...args) => {
+          onFallback?.(methodName, args);
+          Promise.reject(new MethodNotFoundError(methodName));
+        };
       } else {
         console.warn(
           `[WebViewBridge] ${methodName} is not defined, using fallback.`

package/dist/module/index.mjs

@@ -28,7 +28,14 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = false) => {
+var createResolver = ({
+  emitter: emitter2,
+  evaluate,
+  eventId,
+  failHandler = false,
+  methodName,
+  onFallback
+}) => {
   return new Promise((resolve, reject) => {
     const unbind = emitter2.on(
       `${methodName}-${eventId}`,
@@ -36,6 +43,7 @@ var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = fal
         unbind();
         if (throwOccurred) {
           if (failHandler instanceof Error) {
+            onFallback?.();
             reject(failHandler);
           } else {
             resolve(void 0);
@@ -184,29 +192,39 @@ var linkBridgeStore = (initialState = {}) => {
 };
 
 // src/linkBridge.ts
-var createNativeMethod = (methodName, timeoutMs, throwOnError) => (...args) => {
+var createNativeMethod = ({
+  methodName,
+  throwOnError,
+  timeoutMs,
+  onFallback
+}) => (...args) => {
   const eventId = createRandomId();
-  return Promise.race([
-    createResolver(
-      emitter,
-      methodName,
-      eventId,
-      () => {
-        window.ReactNativeWebView?.postMessage(
-          JSON.stringify({
-            type: "bridge",
-            body: {
-              method: methodName,
-              eventId,
-              args
-            }
-          })
-        );
-      },
-      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)
+  );
 };
 var linkBridge = (options = {
   timeout: 2e3,
@@ -240,11 +258,12 @@ var linkBridge = (options = {
     (acc, methodName) => {
       return {
         ...acc,
-        [methodName]: createNativeMethod(
+        [methodName]: createNativeMethod({
           methodName,
           timeoutMs,
-          willMethodThrowOnError(methodName)
-        )
+          throwOnError: willMethodThrowOnError(methodName),
+          onFallback
+        })
       };
     },
     {}
@@ -256,11 +275,12 @@ var linkBridge = (options = {
       )) {
         return target2[methodName];
       }
-      return createNativeMethod(
+      return createNativeMethod({
         methodName,
         timeoutMs,
-        willMethodThrowOnError(methodName)
-      );
+        throwOnError: willMethodThrowOnError(methodName),
+        onFallback
+      });
     }
   });
   Object.assign(target, {
@@ -284,9 +304,11 @@ var linkBridge = (options = {
           }
         })
       );
-      onFallback?.(methodName);
       if (willMethodThrowOnError(methodName)) {
-        return () => Promise.reject(new MethodNotFoundError(methodName));
+        return (...args) => {
+          onFallback?.(methodName, args);
+          Promise.reject(new MethodNotFoundError(methodName));
+        };
       } else {
         console.warn(
           `[WebViewBridge] ${methodName} is not defined, using fallback.`

package/dist/typescript/packages/web/src/linkBridge.d.ts

@@ -3,7 +3,7 @@ import { LinkBridge } from "./types";
 export interface LinkBridgeOptions<T extends BridgeStore<T extends Bridge ? T : any>> {
     timeout?: number;
     throwOnError?: boolean | (keyof ExtractStore<T>)[] | string[];
-    onFallback?: (methodName: string) => void;
+    onFallback?: (methodName: string, args: unknown[]) => void;
     onReady?: (method: LinkBridge<ExcludePrimitive<ExtractStore<T>>, Omit<T, "setState">>) => void;
 }
 export declare const linkBridge: <T extends BridgeStore<T extends Bridge ? T : any>>(options?: LinkBridgeOptions<T>) => LinkBridge<ExcludePrimitive<ExtractStore<T>>, Omit<T, "setState">>;

package/dist/typescript/shared/util/src/createEvents.d.ts

@@ -12,5 +12,13 @@ export interface EventEmitter<Events extends EventsMap = DefaultEvents> {
     on<K extends keyof Events>(this: this, event: K, cb: Events[K]): () => void;
 }
 export declare const createEvents: <Events extends EventsMap = DefaultEvents>() => EventEmitter<Events>;
-export declare const createResolver: (emitter: EventEmitter<DefaultEvents>, methodName: string, eventId: string, evaluate: () => void, failHandler?: Error | false) => Promise<unknown>;
+export interface CreateResolverOptions {
+    emitter: EventEmitter<DefaultEvents>;
+    evaluate: () => void;
+    eventId: string;
+    failHandler?: Error | false;
+    methodName: string;
+    onFallback?: () => void;
+}
+export declare const createResolver: ({ emitter, evaluate, eventId, failHandler, methodName, onFallback, }: CreateResolverOptions) => Promise<unknown>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@webview-bridge/web",
   "type": "module",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Fully Type-Safe Integration for React Native WebView and Web",
   "publishConfig": {
     "access": "public"