@webview-bridge/web 1.1.2 → 1.2.0

package/dist/commonjs/index.cjs

@@ -57,10 +57,10 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, method, eventId, evaluate, failHandler = false) => {
+var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = false) => {
   return new Promise((resolve, reject) => {
     const unbind = emitter2.on(
-      `${method}-${eventId}`,
+      `${methodName}-${eventId}`,
       (data, throwOccurred) => {
         unbind();
         if (throwOccurred) {
@@ -104,26 +104,26 @@ var timeout = (ms, throwOnError = true) => {
 
 // src/linkNativeMethod.ts
 var emitter = createEvents();
-var createNativeMethod = (method, timeoutMs, throwOnError) => (...args) => {
+var createNativeMethod = (methodName, timeoutMs, throwOnError) => (...args) => {
   const eventId = createRandomId();
   return Promise.race([
     createResolver(
       emitter,
-      method,
+      methodName,
       eventId,
       () => {
         window.ReactNativeWebView?.postMessage(
           JSON.stringify({
             type: "bridge",
             body: {
-              method,
+              method: methodName,
               eventId,
               args
             }
           })
         );
       },
-      throwOnError && new NativeMethodError(method)
+      throwOnError && new NativeMethodError(methodName)
     ),
     timeout(timeoutMs, throwOnError)
   ]);
@@ -135,7 +135,8 @@ var linkNativeMethod = (options = {
   const {
     timeout: timeoutMs = 2e3,
     throwOnError = false,
-    onFallback
+    onFallback,
+    onReady
   } = options;
   if (!window.ReactNativeWebView) {
     console.warn("[WebViewBridge] Not in a WebView environment");
@@ -148,62 +149,64 @@ var linkNativeMethod = (options = {
     return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
   };
   const target = bridgeMethods.reduce(
-    (acc, method) => {
+    (acc, methodName) => {
       return {
         ...acc,
-        [method]: createNativeMethod(
-          method,
+        [methodName]: createNativeMethod(
+          methodName,
           timeoutMs,
-          willMethodThrowOnError(method)
+          willMethodThrowOnError(methodName)
         )
       };
     },
     {
       isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-      isNativeMethodAvailable(method) {
-        return typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method);
+      isNativeMethodAvailable(methodName) {
+        return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
       }
     }
   );
   const loose = new Proxy(target, {
-    get: (target2, method) => {
-      if (method in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
-        method
+    get: (target2, methodName) => {
+      if (methodName in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+        methodName
       )) {
-        return target2[method];
+        return target2[methodName];
       }
       return createNativeMethod(
-        method,
+        methodName,
         timeoutMs,
-        willMethodThrowOnError(method)
+        willMethodThrowOnError(methodName)
       );
     }
   });
   Object.assign(target, { loose });
-  return new Proxy(target, {
-    get: (target2, method) => {
-      if (method in target2) {
-        return target2[method];
+  const proxy = new Proxy(target, {
+    get: (target2, methodName) => {
+      if (methodName in target2) {
+        return target2[methodName];
       }
       window.ReactNativeWebView?.postMessage(
         JSON.stringify({
           type: "fallback",
           body: {
-            method
+            method: methodName
           }
         })
       );
-      onFallback?.(method);
-      if (willMethodThrowOnError(method)) {
-        return () => Promise.reject(new MethodNotFoundError(method));
+      onFallback?.(methodName);
+      if (willMethodThrowOnError(methodName)) {
+        return () => Promise.reject(new MethodNotFoundError(methodName));
       } else {
         console.warn(
-          `[WebViewBridge] ${method} is not defined, using fallback.`
+          `[WebViewBridge] ${methodName} is not defined, using fallback.`
         );
       }
       return () => Promise.resolve();
     }
   });
+  onReady?.(proxy);
+  return proxy;
 };
 
 // src/registerWebMethod.ts

package/dist/module/index.mjs

@@ -28,10 +28,10 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, method, eventId, evaluate, failHandler = false) => {
+var createResolver = (emitter2, methodName, eventId, evaluate, failHandler = false) => {
   return new Promise((resolve, reject) => {
     const unbind = emitter2.on(
-      `${method}-${eventId}`,
+      `${methodName}-${eventId}`,
       (data, throwOccurred) => {
         unbind();
         if (throwOccurred) {
@@ -75,26 +75,26 @@ var timeout = (ms, throwOnError = true) => {
 
 // src/linkNativeMethod.ts
 var emitter = createEvents();
-var createNativeMethod = (method, timeoutMs, throwOnError) => (...args) => {
+var createNativeMethod = (methodName, timeoutMs, throwOnError) => (...args) => {
   const eventId = createRandomId();
   return Promise.race([
     createResolver(
       emitter,
-      method,
+      methodName,
       eventId,
       () => {
         window.ReactNativeWebView?.postMessage(
           JSON.stringify({
             type: "bridge",
             body: {
-              method,
+              method: methodName,
               eventId,
               args
             }
           })
         );
       },
-      throwOnError && new NativeMethodError(method)
+      throwOnError && new NativeMethodError(methodName)
     ),
     timeout(timeoutMs, throwOnError)
   ]);
@@ -106,7 +106,8 @@ var linkNativeMethod = (options = {
   const {
     timeout: timeoutMs = 2e3,
     throwOnError = false,
-    onFallback
+    onFallback,
+    onReady
   } = options;
   if (!window.ReactNativeWebView) {
     console.warn("[WebViewBridge] Not in a WebView environment");
@@ -119,62 +120,64 @@ var linkNativeMethod = (options = {
     return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
   };
   const target = bridgeMethods.reduce(
-    (acc, method) => {
+    (acc, methodName) => {
       return {
         ...acc,
-        [method]: createNativeMethod(
-          method,
+        [methodName]: createNativeMethod(
+          methodName,
           timeoutMs,
-          willMethodThrowOnError(method)
+          willMethodThrowOnError(methodName)
         )
       };
     },
     {
       isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-      isNativeMethodAvailable(method) {
-        return typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method);
+      isNativeMethodAvailable(methodName) {
+        return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
       }
     }
   );
   const loose = new Proxy(target, {
-    get: (target2, method) => {
-      if (method in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
-        method
+    get: (target2, methodName) => {
+      if (methodName in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+        methodName
       )) {
-        return target2[method];
+        return target2[methodName];
       }
       return createNativeMethod(
-        method,
+        methodName,
         timeoutMs,
-        willMethodThrowOnError(method)
+        willMethodThrowOnError(methodName)
       );
     }
   });
   Object.assign(target, { loose });
-  return new Proxy(target, {
-    get: (target2, method) => {
-      if (method in target2) {
-        return target2[method];
+  const proxy = new Proxy(target, {
+    get: (target2, methodName) => {
+      if (methodName in target2) {
+        return target2[methodName];
       }
       window.ReactNativeWebView?.postMessage(
         JSON.stringify({
           type: "fallback",
           body: {
-            method
+            method: methodName
           }
         })
       );
-      onFallback?.(method);
-      if (willMethodThrowOnError(method)) {
-        return () => Promise.reject(new MethodNotFoundError(method));
+      onFallback?.(methodName);
+      if (willMethodThrowOnError(methodName)) {
+        return () => Promise.reject(new MethodNotFoundError(methodName));
       } else {
         console.warn(
-          `[WebViewBridge] ${method} is not defined, using fallback.`
+          `[WebViewBridge] ${methodName} is not defined, using fallback.`
         );
       }
       return () => Promise.resolve();
     }
   });
+  onReady?.(proxy);
+  return proxy;
 };
 
 // src/registerWebMethod.ts

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

@@ -2,6 +2,7 @@ import { Bridge, NativeMethod } from "./types";
 export interface LinkNativeMethodOptions<BridgeObject extends Bridge> {
     timeout?: number;
     throwOnError?: boolean | (keyof BridgeObject)[] | string[];
-    onFallback?: (method: string) => void;
+    onFallback?: (methodName: string) => void;
+    onReady?: (method: NativeMethod<BridgeObject>) => void;
 }
 export declare const linkNativeMethod: <BridgeObject extends Bridge>(options?: LinkNativeMethodOptions<BridgeObject>) => NativeMethod<BridgeObject>;

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

@@ -12,5 +12,5 @@ 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>, method: string, eventId: string, evaluate: () => void, failHandler?: Error | false) => Promise<unknown>;
+export declare const createResolver: (emitter: EventEmitter<DefaultEvents>, methodName: string, eventId: string, evaluate: () => void, failHandler?: Error | false) => Promise<unknown>;
 export {};

package/package.json

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