@webview-bridge/web 1.5.0 → 1.5.1-rc.1

package/dist/commonjs/index.cjs

@@ -1,8 +1,25 @@
 "use strict";
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -16,6 +33,30 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
 
 // src/index.ts
 var src_exports = {};
@@ -52,14 +93,16 @@ var createEvents = () => ({
     }
   },
   on(event, cb) {
-    this.events[event]?.push(cb) || (this.events[event] = [cb]);
+    var _a;
+    ((_a = this.events[event]) == null ? void 0 : _a.push(cb)) || (this.events[event] = [cb]);
     return () => {
-      this.events[event] = this.events[event]?.filter((i) => cb !== i);
+      var _a2;
+      this.events[event] = (_a2 = this.events[event]) == null ? void 0 : _a2.filter((i) => cb !== i);
     };
   }
 });
 var createResolver = ({
-  emitter: emitter2,
+  emitter,
   evaluate,
   eventId,
   failHandler = false,
@@ -67,13 +110,13 @@ var createResolver = ({
   onFallback
 }) => {
   return new Promise((resolve, reject) => {
-    const unbind = emitter2.on(
+    const unbind = emitter.on(
       `${methodName}-${eventId}`,
       (data, throwOccurred) => {
         unbind();
         if (throwOccurred) {
           if (failHandler instanceof Error) {
-            onFallback?.();
+            onFallback == null ? void 0 : onFallback();
             reject(failHandler);
           } else {
             resolve(void 0);
@@ -172,23 +215,11 @@ var timeout = (ms, throwOnError = true) => {
   });
 };
 
-// src/internal/emitter.ts
-var emitter = createEvents();
-
 // src/internal/linkBridgeStore.ts
-var linkBridgeStore = (initialState = {}) => {
-  if (!window.ReactNativeWebView) {
-    console.warn("[WebViewBridge] Not in a WebView environment");
-  }
-  if (!window.nativeEmitter) {
-    window.nativeEmitter = emitter;
-  }
+var linkBridgeStore = (emitter, initialState = {}, nativeInitialState = {}) => {
   const getState = () => state;
   const setState = (newState) => {
-    const _newState = {
-      ...state,
-      ...removeUndefinedKeys(newState)
-    };
+    const _newState = __spreadValues(__spreadValues({}, state), removeUndefinedKeys(newState));
     if (equals(state, _newState)) {
       return;
     }
@@ -199,21 +230,7 @@ var linkBridgeStore = (initialState = {}) => {
   emitter.on("bridgeStateChange", (data) => {
     setState(data);
   });
-  document.addEventListener("visibilitychange", () => {
-    if (document.visibilityState === "visible") {
-      window.ReactNativeWebView?.postMessage(
-        JSON.stringify({
-          type: "getBridgeState"
-        })
-      );
-    }
-  });
-  window.ReactNativeWebView?.postMessage(
-    JSON.stringify({
-      type: "getBridgeState"
-    })
-  );
-  let state = { ...initialState, ...window.__bridgeInitialState__ };
+  let state = __spreadValues(__spreadValues({}, initialState), nativeInitialState);
   const listeners = /* @__PURE__ */ new Set();
   const emitChange = (newState, prevState) => {
     for (const listener of listeners) {
@@ -230,45 +247,160 @@ var linkBridgeStore = (initialState = {}) => {
   };
 };
 
-// src/linkBridge.ts
-var createNativeMethod = ({
-  methodName,
-  throwOnError,
-  timeoutMs,
-  onFallback
-}) => (...args) => {
-  const eventId = createRandomId();
-  return Promise.race(
-    [
-      createResolver({
-        emitter,
-        methodName,
-        eventId,
-        evaluate: () => {
-          window.ReactNativeWebView?.postMessage(
-            JSON.stringify({
-              type: "bridge",
-              body: {
+// src/internal/bridgeInstance.ts
+var BridgeInstance = class {
+  constructor(emitter, bridgeMethods, options) {
+    this.emitter = emitter;
+    this.bridgeMethods = bridgeMethods;
+    this.options = options;
+    __publicField(this, "defaultTimeoutMs", 2e3);
+    __publicField(this, "$proxy");
+    this.$proxy = this.hydrate(bridgeMethods);
+  }
+  postMessage(type, body) {
+    var _a;
+    (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
+      JSON.stringify(
+        body ? {
+          type,
+          body
+        } : {
+          type
+        }
+      )
+    );
+  }
+  createNativeMethod(methodName, throwOnError, timeoutMs, onFallback) {
+    return (...args) => {
+      const eventId = createRandomId();
+      return Promise.race(
+        [
+          createResolver({
+            emitter: this.emitter,
+            methodName,
+            eventId,
+            evaluate: () => {
+              this.postMessage("bridge", {
                 method: methodName,
                 eventId,
                 args
-              }
-            })
+              });
+            },
+            onFallback: () => {
+              onFallback == null ? void 0 : onFallback(methodName, args);
+            },
+            failHandler: throwOnError && new NativeMethodError(methodName)
+          }),
+          timeoutMs > 0 && timeout(timeoutMs, throwOnError)
+        ].filter(Boolean)
+      );
+    };
+  }
+  willMethodThrowOnError(methodName) {
+    const { throwOnError } = this.options;
+    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
+  }
+  createLoose(initialState) {
+    const { timeout: timeoutMs = this.defaultTimeoutMs, onFallback } = this.options;
+    return new Proxy(initialState, {
+      get: (target, methodName) => {
+        if (methodName in target && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+          methodName
+        )) {
+          return target[methodName];
+        }
+        return this.createNativeMethod(
+          methodName,
+          this.willMethodThrowOnError(methodName),
+          timeoutMs,
+          onFallback
+        );
+      }
+    });
+  }
+  hydrate(bridgeMethods, nativeInitialState = {}) {
+    var _a;
+    const {
+      timeout: timeoutMs = this.defaultTimeoutMs,
+      onFallback,
+      onReady
+    } = this.options;
+    const initialState = bridgeMethods.reduce(
+      (acc, methodName) => {
+        return __spreadProps(__spreadValues({}, acc), {
+          [methodName]: this.createNativeMethod(
+            methodName,
+            this.willMethodThrowOnError(methodName),
+            timeoutMs,
+            onFallback
+          )
+        });
+      },
+      {}
+    );
+    const loose = this.createLoose(initialState);
+    const store = linkBridgeStore(
+      this.emitter,
+      initialState,
+      nativeInitialState
+    );
+    Object.assign(initialState, {
+      loose,
+      store,
+      isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
+      isNativeMethodAvailable(methodName) {
+        return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
+      },
+      addEventListener: (eventName, listener) => {
+        return this.emitter.on(`postMessage/${String(eventName)}`, listener);
+      }
+    });
+    document.addEventListener("visibilitychange", () => {
+      if (document.visibilityState === "visible") {
+        this.postMessage("getBridgeState");
+      }
+    });
+    this.postMessage("getBridgeState");
+    const proxy = new Proxy(initialState, {
+      get: (target, methodName) => {
+        if (methodName in target) {
+          return target[methodName];
+        }
+        this.postMessage("fallback", {
+          method: methodName
+        });
+        if (this.willMethodThrowOnError(methodName)) {
+          return (...args) => {
+            onFallback == null ? void 0 : onFallback(methodName, args);
+            return Promise.reject(new MethodNotFoundError(methodName));
+          };
+        } else {
+          console.warn(
+            `[WebViewBridge] ${methodName} is not defined, using fallback.`
           );
-        },
-        onFallback: () => {
-          onFallback?.(methodName, args);
-        },
-        failHandler: throwOnError && new NativeMethodError(methodName)
-      }),
-      timeoutMs > 0 && timeout(timeoutMs, throwOnError)
-    ].filter(Boolean)
-  );
+        }
+        return () => Promise.resolve();
+      }
+    });
+    for (const [eventName, ...args] of (_a = window.nativeBatchedEvents) != null ? _a : []) {
+      this.emitter.emit(eventName, ...args);
+    }
+    window.nativeBatchedEvents = [];
+    onReady == null ? void 0 : onReady(proxy);
+    this.$proxy = proxy;
+    return proxy;
+  }
+  get proxy() {
+    return this.$proxy;
+  }
 };
+
+// src/linkBridge.ts
 var linkBridge = (options = {
   timeout: 2e3,
   throwOnError: false
 }) => {
+  var _a;
   if (typeof window === "undefined") {
     return {
       store: {
@@ -277,94 +409,23 @@ var linkBridge = (options = {
       }
     };
   }
-  const {
-    timeout: timeoutMs = 2e3,
-    throwOnError = false,
-    onFallback,
-    onReady
-  } = options;
   if (!window.ReactNativeWebView) {
     console.warn("[WebViewBridge] Not in a WebView environment");
   }
-  const bridgeMethods = window.__bridgeMethods__ ?? [];
+  const emitter = createEvents();
   if (!window.nativeEmitter) {
     window.nativeEmitter = emitter;
   }
-  const willMethodThrowOnError = (methodName) => {
-    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
-  };
-  const target = bridgeMethods.reduce(
-    (acc, methodName) => {
-      return {
-        ...acc,
-        [methodName]: createNativeMethod({
-          methodName,
-          timeoutMs,
-          throwOnError: willMethodThrowOnError(methodName),
-          onFallback
-        })
-      };
-    },
-    {}
-  );
-  const loose = new Proxy(target, {
-    get: (target2, methodName) => {
-      if (methodName in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
-        methodName
-      )) {
-        return target2[methodName];
-      }
-      return createNativeMethod({
-        methodName,
-        timeoutMs,
-        throwOnError: willMethodThrowOnError(methodName),
-        onFallback
-      });
-    }
-  });
-  Object.assign(target, {
-    loose,
-    store: linkBridgeStore(target),
-    isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-    isNativeMethodAvailable(methodName) {
-      return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
-    },
-    addEventListener: (eventName, listener) => {
-      return emitter.on(`postMessage/${String(eventName)}`, listener);
-    }
-  });
-  const proxy = new Proxy(target, {
-    get: (target2, methodName) => {
-      if (methodName in target2) {
-        return target2[methodName];
-      }
-      window.ReactNativeWebView?.postMessage(
-        JSON.stringify({
-          type: "fallback",
-          body: {
-            method: methodName
-          }
-        })
-      );
-      if (willMethodThrowOnError(methodName)) {
-        return (...args) => {
-          onFallback?.(methodName, args);
-          Promise.reject(new MethodNotFoundError(methodName));
-        };
-      } else {
-        console.warn(
-          `[WebViewBridge] ${methodName} is not defined, using fallback.`
-        );
-      }
-      return () => Promise.resolve();
-    }
-  });
-  for (const [eventName, ...args] of window.nativeBatchedEvents ?? []) {
-    emitter.emit(eventName, ...args);
+  const bridgeMethods = (_a = window.__bridgeMethods__) != null ? _a : [];
+  const instance = new BridgeInstance(emitter, bridgeMethods, options);
+  if (bridgeMethods.length === 0) {
+    const unsubscribe = emitter.on("hydrate", ({ bridgeMethods: bridgeMethods2 }) => {
+      instance.hydrate(bridgeMethods2);
+      unsubscribe();
+    });
   }
-  window.nativeBatchedEvents = [];
-  onReady?.(proxy);
-  return proxy;
+  instance.hydrate(bridgeMethods);
+  return instance.proxy;
 };
 
 // src/linkNativeMethod.ts
@@ -383,31 +444,33 @@ var registerWebMethod = (bridge) => {
   }
   const bridgeEntries = Object.entries(bridge);
   const bridgeNames = Object.keys(bridge);
-  const emitter2 = createEvents();
-  window.webEmitter = emitter2;
+  const emitter = createEvents();
+  window.webEmitter = emitter;
   for (const [funcName, func] of bridgeEntries) {
-    const $func = async (eventId, args) => {
+    const $func = (eventId, args) => __async(void 0, null, function* () {
+      var _a, _b;
       try {
-        const value = await func(...args);
-        window.ReactNativeWebView?.postMessage(
+        const value = yield func(...args);
+        (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
           JSON.stringify({
             type: "webMethodResponse",
             body: { funcName, eventId, value }
           })
         );
       } catch (e) {
-        window.ReactNativeWebView?.postMessage(
+        (_b = window.ReactNativeWebView) == null ? void 0 : _b.postMessage(
           JSON.stringify({
             type: "webMethodError",
             body: { funcName, eventId, error: JSON.stringify(e) }
           })
         );
       }
-    };
-    emitter2.on(funcName, $func);
+    });
+    emitter.on(funcName, $func);
   }
   const register = () => {
-    window.ReactNativeWebView?.postMessage(
+    var _a;
+    (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
       JSON.stringify({
         type: "registerWebMethod",
         body: { bridgeNames }
@@ -420,8 +483,9 @@ var registerWebMethod = (bridge) => {
     return bridge;
   }
   document.addEventListener("visibilitychange", () => {
+    var _a;
     if (document.visibilityState === "visible") {
-      window.ReactNativeWebView?.postMessage(
+      (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
         JSON.stringify({
           type: "registerWebMethod",
           body: { bridgeNames }

package/dist/module/index.mjs

@@ -1,3 +1,47 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+
 // src/error.ts
 var MethodNotFoundError = class extends Error {
   constructor(methodName) {
@@ -22,14 +66,16 @@ var createEvents = () => ({
     }
   },
   on(event, cb) {
-    this.events[event]?.push(cb) || (this.events[event] = [cb]);
+    var _a;
+    ((_a = this.events[event]) == null ? void 0 : _a.push(cb)) || (this.events[event] = [cb]);
     return () => {
-      this.events[event] = this.events[event]?.filter((i) => cb !== i);
+      var _a2;
+      this.events[event] = (_a2 = this.events[event]) == null ? void 0 : _a2.filter((i) => cb !== i);
     };
   }
 });
 var createResolver = ({
-  emitter: emitter2,
+  emitter,
   evaluate,
   eventId,
   failHandler = false,
@@ -37,13 +83,13 @@ var createResolver = ({
   onFallback
 }) => {
   return new Promise((resolve, reject) => {
-    const unbind = emitter2.on(
+    const unbind = emitter.on(
       `${methodName}-${eventId}`,
       (data, throwOccurred) => {
         unbind();
         if (throwOccurred) {
           if (failHandler instanceof Error) {
-            onFallback?.();
+            onFallback == null ? void 0 : onFallback();
             reject(failHandler);
           } else {
             resolve(void 0);
@@ -142,23 +188,11 @@ var timeout = (ms, throwOnError = true) => {
   });
 };
 
-// src/internal/emitter.ts
-var emitter = createEvents();
-
 // src/internal/linkBridgeStore.ts
-var linkBridgeStore = (initialState = {}) => {
-  if (!window.ReactNativeWebView) {
-    console.warn("[WebViewBridge] Not in a WebView environment");
-  }
-  if (!window.nativeEmitter) {
-    window.nativeEmitter = emitter;
-  }
+var linkBridgeStore = (emitter, initialState = {}, nativeInitialState = {}) => {
   const getState = () => state;
   const setState = (newState) => {
-    const _newState = {
-      ...state,
-      ...removeUndefinedKeys(newState)
-    };
+    const _newState = __spreadValues(__spreadValues({}, state), removeUndefinedKeys(newState));
     if (equals(state, _newState)) {
       return;
     }
@@ -169,21 +203,7 @@ var linkBridgeStore = (initialState = {}) => {
   emitter.on("bridgeStateChange", (data) => {
     setState(data);
   });
-  document.addEventListener("visibilitychange", () => {
-    if (document.visibilityState === "visible") {
-      window.ReactNativeWebView?.postMessage(
-        JSON.stringify({
-          type: "getBridgeState"
-        })
-      );
-    }
-  });
-  window.ReactNativeWebView?.postMessage(
-    JSON.stringify({
-      type: "getBridgeState"
-    })
-  );
-  let state = { ...initialState, ...window.__bridgeInitialState__ };
+  let state = __spreadValues(__spreadValues({}, initialState), nativeInitialState);
   const listeners = /* @__PURE__ */ new Set();
   const emitChange = (newState, prevState) => {
     for (const listener of listeners) {
@@ -200,45 +220,160 @@ var linkBridgeStore = (initialState = {}) => {
   };
 };
 
-// src/linkBridge.ts
-var createNativeMethod = ({
-  methodName,
-  throwOnError,
-  timeoutMs,
-  onFallback
-}) => (...args) => {
-  const eventId = createRandomId();
-  return Promise.race(
-    [
-      createResolver({
-        emitter,
-        methodName,
-        eventId,
-        evaluate: () => {
-          window.ReactNativeWebView?.postMessage(
-            JSON.stringify({
-              type: "bridge",
-              body: {
+// src/internal/bridgeInstance.ts
+var BridgeInstance = class {
+  constructor(emitter, bridgeMethods, options) {
+    this.emitter = emitter;
+    this.bridgeMethods = bridgeMethods;
+    this.options = options;
+    __publicField(this, "defaultTimeoutMs", 2e3);
+    __publicField(this, "$proxy");
+    this.$proxy = this.hydrate(bridgeMethods);
+  }
+  postMessage(type, body) {
+    var _a;
+    (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
+      JSON.stringify(
+        body ? {
+          type,
+          body
+        } : {
+          type
+        }
+      )
+    );
+  }
+  createNativeMethod(methodName, throwOnError, timeoutMs, onFallback) {
+    return (...args) => {
+      const eventId = createRandomId();
+      return Promise.race(
+        [
+          createResolver({
+            emitter: this.emitter,
+            methodName,
+            eventId,
+            evaluate: () => {
+              this.postMessage("bridge", {
                 method: methodName,
                 eventId,
                 args
-              }
-            })
+              });
+            },
+            onFallback: () => {
+              onFallback == null ? void 0 : onFallback(methodName, args);
+            },
+            failHandler: throwOnError && new NativeMethodError(methodName)
+          }),
+          timeoutMs > 0 && timeout(timeoutMs, throwOnError)
+        ].filter(Boolean)
+      );
+    };
+  }
+  willMethodThrowOnError(methodName) {
+    const { throwOnError } = this.options;
+    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
+  }
+  createLoose(initialState) {
+    const { timeout: timeoutMs = this.defaultTimeoutMs, onFallback } = this.options;
+    return new Proxy(initialState, {
+      get: (target, methodName) => {
+        if (methodName in target && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
+          methodName
+        )) {
+          return target[methodName];
+        }
+        return this.createNativeMethod(
+          methodName,
+          this.willMethodThrowOnError(methodName),
+          timeoutMs,
+          onFallback
+        );
+      }
+    });
+  }
+  hydrate(bridgeMethods, nativeInitialState = {}) {
+    var _a;
+    const {
+      timeout: timeoutMs = this.defaultTimeoutMs,
+      onFallback,
+      onReady
+    } = this.options;
+    const initialState = bridgeMethods.reduce(
+      (acc, methodName) => {
+        return __spreadProps(__spreadValues({}, acc), {
+          [methodName]: this.createNativeMethod(
+            methodName,
+            this.willMethodThrowOnError(methodName),
+            timeoutMs,
+            onFallback
+          )
+        });
+      },
+      {}
+    );
+    const loose = this.createLoose(initialState);
+    const store = linkBridgeStore(
+      this.emitter,
+      initialState,
+      nativeInitialState
+    );
+    Object.assign(initialState, {
+      loose,
+      store,
+      isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
+      isNativeMethodAvailable(methodName) {
+        return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
+      },
+      addEventListener: (eventName, listener) => {
+        return this.emitter.on(`postMessage/${String(eventName)}`, listener);
+      }
+    });
+    document.addEventListener("visibilitychange", () => {
+      if (document.visibilityState === "visible") {
+        this.postMessage("getBridgeState");
+      }
+    });
+    this.postMessage("getBridgeState");
+    const proxy = new Proxy(initialState, {
+      get: (target, methodName) => {
+        if (methodName in target) {
+          return target[methodName];
+        }
+        this.postMessage("fallback", {
+          method: methodName
+        });
+        if (this.willMethodThrowOnError(methodName)) {
+          return (...args) => {
+            onFallback == null ? void 0 : onFallback(methodName, args);
+            return Promise.reject(new MethodNotFoundError(methodName));
+          };
+        } else {
+          console.warn(
+            `[WebViewBridge] ${methodName} is not defined, using fallback.`
           );
-        },
-        onFallback: () => {
-          onFallback?.(methodName, args);
-        },
-        failHandler: throwOnError && new NativeMethodError(methodName)
-      }),
-      timeoutMs > 0 && timeout(timeoutMs, throwOnError)
-    ].filter(Boolean)
-  );
+        }
+        return () => Promise.resolve();
+      }
+    });
+    for (const [eventName, ...args] of (_a = window.nativeBatchedEvents) != null ? _a : []) {
+      this.emitter.emit(eventName, ...args);
+    }
+    window.nativeBatchedEvents = [];
+    onReady == null ? void 0 : onReady(proxy);
+    this.$proxy = proxy;
+    return proxy;
+  }
+  get proxy() {
+    return this.$proxy;
+  }
 };
+
+// src/linkBridge.ts
 var linkBridge = (options = {
   timeout: 2e3,
   throwOnError: false
 }) => {
+  var _a;
   if (typeof window === "undefined") {
     return {
       store: {
@@ -247,94 +382,23 @@ var linkBridge = (options = {
       }
     };
   }
-  const {
-    timeout: timeoutMs = 2e3,
-    throwOnError = false,
-    onFallback,
-    onReady
-  } = options;
   if (!window.ReactNativeWebView) {
     console.warn("[WebViewBridge] Not in a WebView environment");
   }
-  const bridgeMethods = window.__bridgeMethods__ ?? [];
+  const emitter = createEvents();
   if (!window.nativeEmitter) {
     window.nativeEmitter = emitter;
   }
-  const willMethodThrowOnError = (methodName) => {
-    return throwOnError === true || Array.isArray(throwOnError) && throwOnError.includes(methodName);
-  };
-  const target = bridgeMethods.reduce(
-    (acc, methodName) => {
-      return {
-        ...acc,
-        [methodName]: createNativeMethod({
-          methodName,
-          timeoutMs,
-          throwOnError: willMethodThrowOnError(methodName),
-          onFallback
-        })
-      };
-    },
-    {}
-  );
-  const loose = new Proxy(target, {
-    get: (target2, methodName) => {
-      if (methodName in target2 && !["isWebViewBridgeAvailable", "isNativeMethodAvailable"].includes(
-        methodName
-      )) {
-        return target2[methodName];
-      }
-      return createNativeMethod({
-        methodName,
-        timeoutMs,
-        throwOnError: willMethodThrowOnError(methodName),
-        onFallback
-      });
-    }
-  });
-  Object.assign(target, {
-    loose,
-    store: linkBridgeStore(target),
-    isWebViewBridgeAvailable: Boolean(window.ReactNativeWebView) && bridgeMethods.length > 0,
-    isNativeMethodAvailable(methodName) {
-      return typeof methodName === "string" && Boolean(window.ReactNativeWebView) && bridgeMethods.includes(methodName);
-    },
-    addEventListener: (eventName, listener) => {
-      return emitter.on(`postMessage/${String(eventName)}`, listener);
-    }
-  });
-  const proxy = new Proxy(target, {
-    get: (target2, methodName) => {
-      if (methodName in target2) {
-        return target2[methodName];
-      }
-      window.ReactNativeWebView?.postMessage(
-        JSON.stringify({
-          type: "fallback",
-          body: {
-            method: methodName
-          }
-        })
-      );
-      if (willMethodThrowOnError(methodName)) {
-        return (...args) => {
-          onFallback?.(methodName, args);
-          Promise.reject(new MethodNotFoundError(methodName));
-        };
-      } else {
-        console.warn(
-          `[WebViewBridge] ${methodName} is not defined, using fallback.`
-        );
-      }
-      return () => Promise.resolve();
-    }
-  });
-  for (const [eventName, ...args] of window.nativeBatchedEvents ?? []) {
-    emitter.emit(eventName, ...args);
+  const bridgeMethods = (_a = window.__bridgeMethods__) != null ? _a : [];
+  const instance = new BridgeInstance(emitter, bridgeMethods, options);
+  if (bridgeMethods.length === 0) {
+    const unsubscribe = emitter.on("hydrate", ({ bridgeMethods: bridgeMethods2 }) => {
+      instance.hydrate(bridgeMethods2);
+      unsubscribe();
+    });
   }
-  window.nativeBatchedEvents = [];
-  onReady?.(proxy);
-  return proxy;
+  instance.hydrate(bridgeMethods);
+  return instance.proxy;
 };
 
 // src/linkNativeMethod.ts
@@ -353,31 +417,33 @@ var registerWebMethod = (bridge) => {
   }
   const bridgeEntries = Object.entries(bridge);
   const bridgeNames = Object.keys(bridge);
-  const emitter2 = createEvents();
-  window.webEmitter = emitter2;
+  const emitter = createEvents();
+  window.webEmitter = emitter;
   for (const [funcName, func] of bridgeEntries) {
-    const $func = async (eventId, args) => {
+    const $func = (eventId, args) => __async(void 0, null, function* () {
+      var _a, _b;
       try {
-        const value = await func(...args);
-        window.ReactNativeWebView?.postMessage(
+        const value = yield func(...args);
+        (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
           JSON.stringify({
             type: "webMethodResponse",
             body: { funcName, eventId, value }
           })
         );
       } catch (e) {
-        window.ReactNativeWebView?.postMessage(
+        (_b = window.ReactNativeWebView) == null ? void 0 : _b.postMessage(
           JSON.stringify({
             type: "webMethodError",
             body: { funcName, eventId, error: JSON.stringify(e) }
           })
         );
       }
-    };
-    emitter2.on(funcName, $func);
+    });
+    emitter.on(funcName, $func);
   }
   const register = () => {
-    window.ReactNativeWebView?.postMessage(
+    var _a;
+    (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
       JSON.stringify({
         type: "registerWebMethod",
         body: { bridgeNames }
@@ -390,8 +456,9 @@ var registerWebMethod = (bridge) => {
     return bridge;
   }
   document.addEventListener("visibilitychange", () => {
+    var _a;
     if (document.visibilityState === "visible") {
-      window.ReactNativeWebView?.postMessage(
+      (_a = window.ReactNativeWebView) == null ? void 0 : _a.postMessage(
         JSON.stringify({
           type: "registerWebMethod",
           body: { bridgeNames }

package/dist/typescript/packages/web/src/internal/bridgeInstance.d.ts

@@ -0,0 +1,18 @@
+import type { Bridge, BridgeStore, ExcludePrimitive, ExtractStore, ParserSchema } from "../../../../shared/util/src/types";
+import { DefaultEmitter } from "../../../../shared/util/src";
+import { LinkBridgeOptions } from "../linkBridge";
+import { LinkBridge } from "../types";
+export declare class BridgeInstance<T extends BridgeStore<T extends Bridge ? T : any>, V extends ParserSchema<any> = ParserSchema<any>> {
+    emitter: DefaultEmitter;
+    bridgeMethods: string[];
+    private options;
+    private defaultTimeoutMs;
+    private $proxy;
+    constructor(emitter: DefaultEmitter, bridgeMethods: string[], options: LinkBridgeOptions<T, V>);
+    private postMessage;
+    private createNativeMethod;
+    private willMethodThrowOnError;
+    private createLoose;
+    hydrate(bridgeMethods: string[], nativeInitialState?: Partial<T>): LinkBridge<ExtractStore<T>, Omit<T, "setState">, V>;
+    get proxy(): LinkBridge<ExcludePrimitive<ExtractStore<T>>, Omit<T, "setState">, V>;
+}

package/dist/typescript/packages/web/src/internal/linkBridgeStore.d.ts

@@ -1,6 +1,7 @@
 import { Bridge, BridgeStore, OnlyJSON } from "../../../../shared/util/src/types";
+import { DefaultEmitter } from "../../../../shared/util/src";
 export type Store<BridgeObject extends Bridge> = ({ get, set, }: {
     get: () => BridgeObject;
     set: (newState: Partial<OnlyJSON<BridgeObject>>) => void;
 }) => BridgeObject;
-export declare const linkBridgeStore: <T extends BridgeStore<T extends Bridge ? T : any>>(initialState?: Partial<T>) => Omit<T, "setState">;
+export declare const linkBridgeStore: <T extends BridgeStore<T extends Bridge ? T : any>>(emitter: DefaultEmitter, initialState?: Partial<T>, nativeInitialState?: Partial<T>) => Omit<T, "setState">;

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

@@ -11,9 +11,10 @@ export interface EventEmitter<Events extends EventsMap = DefaultEvents> {
     }>;
     on<K extends keyof Events>(this: this, event: K, cb: Events[K]): () => void;
 }
+export type DefaultEmitter = EventEmitter<DefaultEvents>;
 export declare const createEvents: <Events extends EventsMap = DefaultEvents>() => EventEmitter<Events>;
 export interface CreateResolverOptions {
-    emitter: EventEmitter<DefaultEvents>;
+    emitter: DefaultEmitter;
     evaluate: () => void;
     eventId: string;
     failHandler?: Error | false;

package/package.json

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