@webview-bridge/web 1.0.5 → 1.1.0

package/dist/commonjs/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   MethodNotFoundError: () => MethodNotFoundError,
+  NativeMethodError: () => NativeMethodError,
   linkNativeMethod: () => linkNativeMethod,
   registerWebMethod: () => registerWebMethod
 });
@@ -33,6 +34,12 @@ var MethodNotFoundError = class extends Error {
     this.name = "MethodNotFoundError";
   }
 };
+var NativeMethodError = class extends Error {
+  constructor(methodName) {
+    super(`An error occurred in the native bridge: ${methodName}`);
+    this.name = "NativeMethodError";
+  }
+};
 
 // ../../shared/util/src/createEvents.ts
 var createEvents = () => ({
@@ -50,12 +57,23 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, method, eventId, evaluate) => {
-  return new Promise((resolve) => {
-    const unbind = emitter2.on(`${method}-${eventId}`, (data) => {
-      unbind();
-      resolve(data);
-    });
+var createResolver = (emitter2, method, eventId, evaluate, failHandler = false) => {
+  return new Promise((resolve, reject) => {
+    const unbind = emitter2.on(
+      `${method}-${eventId}`,
+      (data, throwOccurred) => {
+        unbind();
+        if (throwOccurred) {
+          if (failHandler instanceof Error) {
+            reject(failHandler);
+          } else {
+            resolve(void 0);
+          }
+        } else {
+          resolve(data);
+        }
+      }
+    );
     evaluate();
   });
 };
@@ -72,16 +90,44 @@ var createRandomId = (size = ID_LENGTH) => {
 };
 
 // ../../shared/util/src/timeout.ts
-var timeout = (ms) => {
-  return new Promise((_, reject) => {
+var timeout = (ms, throwOnError = true) => {
+  return new Promise((resolve, reject) => {
     setTimeout(() => {
-      reject(new Error("Timeout"));
+      if (throwOnError) {
+        reject(new Error("Timeout"));
+      } else {
+        resolve(void 0);
+      }
     }, ms);
   });
 };
 
 // src/linkNativeMethod.ts
 var emitter = createEvents();
+var createNativeMethod = (method, timeoutMs, throwOnError) => (...args) => {
+  const eventId = createRandomId();
+  return Promise.race([
+    createResolver(
+      emitter,
+      method,
+      eventId,
+      () => {
+        window.ReactNativeWebView?.postMessage(
+          JSON.stringify({
+            type: "bridge",
+            body: {
+              method,
+              eventId,
+              args
+            }
+          })
+        );
+      },
+      throwOnError && new NativeMethodError(method)
+    ),
+    timeout(timeoutMs, throwOnError)
+  ]);
+};
 var linkNativeMethod = (options = {
   timeout: 2e3,
   throwOnError: false
@@ -98,35 +144,42 @@ var linkNativeMethod = (options = {
   if (!window.nativeEmitter) {
     window.nativeEmitter = emitter;
   }
+  const willMethodThrowOnError = (methodName) => {
+    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
+  };
   const target = bridgeMethods.reduce(
     (acc, method) => {
       return {
         ...acc,
-        [method]: (...args) => {
-          const eventId = createRandomId();
-          return Promise.race([
-            createResolver(emitter, method, eventId, () => {
-              window.ReactNativeWebView?.postMessage(
-                JSON.stringify({
-                  type: "bridge",
-                  body: {
-                    method,
-                    eventId,
-                    args
-                  }
-                })
-              );
-            }),
-            timeout(timeoutMs)
-          ]);
-        }
+        [method]: createNativeMethod(
+          method,
+          timeoutMs,
+          willMethodThrowOnError(method)
+        )
       };
     },
     {
       isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-      isNativeMethodAvailable: (method) => typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method)
+      isNativeMethodAvailable(method) {
+        return typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method);
+      }
     }
   );
+  const loose = new Proxy(target, {
+    get: (target2, method) => {
+      if (method in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+        method
+      )) {
+        return target2[method];
+      }
+      return createNativeMethod(
+        method,
+        timeoutMs,
+        willMethodThrowOnError(method)
+      );
+    }
+  });
+  Object.assign(target, { loose });
   return new Proxy(target, {
     get: (target2, method) => {
       if (method in target2) {
@@ -141,9 +194,7 @@ var linkNativeMethod = (options = {
         })
       );
       onFallback?.(method);
-      if (throwOnError === true) {
-        return () => Promise.reject(new MethodNotFoundError(method));
-      } else if (Array.isArray(throwOnError) && throwOnError.includes(method)) {
+      if (willMethodThrowOnError(method)) {
         return () => Promise.reject(new MethodNotFoundError(method));
       } else {
         console.warn(
@@ -196,6 +247,7 @@ var registerWebMethod = (bridge) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MethodNotFoundError,
+  NativeMethodError,
   linkNativeMethod,
   registerWebMethod
 });

package/dist/module/index.mjs

@@ -5,6 +5,12 @@ var MethodNotFoundError = class extends Error {
     this.name = "MethodNotFoundError";
   }
 };
+var NativeMethodError = class extends Error {
+  constructor(methodName) {
+    super(`An error occurred in the native bridge: ${methodName}`);
+    this.name = "NativeMethodError";
+  }
+};
 
 // ../../shared/util/src/createEvents.ts
 var createEvents = () => ({
@@ -22,12 +28,23 @@ var createEvents = () => ({
     };
   }
 });
-var createResolver = (emitter2, method, eventId, evaluate) => {
-  return new Promise((resolve) => {
-    const unbind = emitter2.on(`${method}-${eventId}`, (data) => {
-      unbind();
-      resolve(data);
-    });
+var createResolver = (emitter2, method, eventId, evaluate, failHandler = false) => {
+  return new Promise((resolve, reject) => {
+    const unbind = emitter2.on(
+      `${method}-${eventId}`,
+      (data, throwOccurred) => {
+        unbind();
+        if (throwOccurred) {
+          if (failHandler instanceof Error) {
+            reject(failHandler);
+          } else {
+            resolve(void 0);
+          }
+        } else {
+          resolve(data);
+        }
+      }
+    );
     evaluate();
   });
 };
@@ -44,16 +61,44 @@ var createRandomId = (size = ID_LENGTH) => {
 };
 
 // ../../shared/util/src/timeout.ts
-var timeout = (ms) => {
-  return new Promise((_, reject) => {
+var timeout = (ms, throwOnError = true) => {
+  return new Promise((resolve, reject) => {
     setTimeout(() => {
-      reject(new Error("Timeout"));
+      if (throwOnError) {
+        reject(new Error("Timeout"));
+      } else {
+        resolve(void 0);
+      }
     }, ms);
   });
 };
 
 // src/linkNativeMethod.ts
 var emitter = createEvents();
+var createNativeMethod = (method, timeoutMs, throwOnError) => (...args) => {
+  const eventId = createRandomId();
+  return Promise.race([
+    createResolver(
+      emitter,
+      method,
+      eventId,
+      () => {
+        window.ReactNativeWebView?.postMessage(
+          JSON.stringify({
+            type: "bridge",
+            body: {
+              method,
+              eventId,
+              args
+            }
+          })
+        );
+      },
+      throwOnError && new NativeMethodError(method)
+    ),
+    timeout(timeoutMs, throwOnError)
+  ]);
+};
 var linkNativeMethod = (options = {
   timeout: 2e3,
   throwOnError: false
@@ -70,35 +115,42 @@ var linkNativeMethod = (options = {
   if (!window.nativeEmitter) {
     window.nativeEmitter = emitter;
   }
+  const willMethodThrowOnError = (methodName) => {
+    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
+  };
   const target = bridgeMethods.reduce(
     (acc, method) => {
       return {
         ...acc,
-        [method]: (...args) => {
-          const eventId = createRandomId();
-          return Promise.race([
-            createResolver(emitter, method, eventId, () => {
-              window.ReactNativeWebView?.postMessage(
-                JSON.stringify({
-                  type: "bridge",
-                  body: {
-                    method,
-                    eventId,
-                    args
-                  }
-                })
-              );
-            }),
-            timeout(timeoutMs)
-          ]);
-        }
+        [method]: createNativeMethod(
+          method,
+          timeoutMs,
+          willMethodThrowOnError(method)
+        )
       };
     },
     {
       isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-      isNativeMethodAvailable: (method) => typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method)
+      isNativeMethodAvailable(method) {
+        return typeof method === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(method);
+      }
     }
   );
+  const loose = new Proxy(target, {
+    get: (target2, method) => {
+      if (method in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+        method
+      )) {
+        return target2[method];
+      }
+      return createNativeMethod(
+        method,
+        timeoutMs,
+        willMethodThrowOnError(method)
+      );
+    }
+  });
+  Object.assign(target, { loose });
   return new Proxy(target, {
     get: (target2, method) => {
       if (method in target2) {
@@ -113,9 +165,7 @@ var linkNativeMethod = (options = {
         })
       );
       onFallback?.(method);
-      if (throwOnError === true) {
-        return () => Promise.reject(new MethodNotFoundError(method));
-      } else if (Array.isArray(throwOnError) && throwOnError.includes(method)) {
+      if (willMethodThrowOnError(method)) {
         return () => Promise.reject(new MethodNotFoundError(method));
       } else {
         console.warn(
@@ -167,6 +217,7 @@ var registerWebMethod = (bridge) => {
 };
 export {
   MethodNotFoundError,
+  NativeMethodError,
   linkNativeMethod,
   registerWebMethod
 };

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

@@ -1,3 +1,6 @@
 export declare class MethodNotFoundError extends Error {
     constructor(methodName: string);
 }
+export declare class NativeMethodError extends Error {
+    constructor(methodName: string);
+}

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

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

package/dist/typescript/packages/web/src/types/index.d.ts

@@ -1,6 +1,12 @@
 export type AsyncFunction = (...args: any[]) => Promise<any>;
 export type Bridge = Record<string, AsyncFunction>;
-export type WithAvailable<T> = {
+export type NativeMethod<T> = {
     isWebViewBridgeAvailable: boolean;
-    isNativeMethodAvailable: (method: keyof T) => boolean;
+    isNativeMethodAvailable(method: keyof T): boolean;
+    isNativeMethodAvailable(method: string): boolean;
+    loose: {
+        [K in keyof T]: (...args: any[]) => any;
+    } & {
+        [key: string]: (...args: any[]) => any;
+    };
 } & T;

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

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

@@ -1 +1 @@
-export declare const timeout: (ms: number) => Promise<unknown>;
+export declare const timeout: (ms: number, throwOnError?: boolean) => Promise<unknown>;

package/package.json

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