@webview-bridge/react-native 1.7.8 → 1.7.9

package/dist/index.cjs

@@ -103,6 +103,13 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _is_native_function(fn) {
     return Function.toString.call(fn).indexOf("[native code]") !== -1;
 }
@@ -440,6 +447,34 @@ var import_react = require("react");
 var import_react_native_webview = __toESM(require("react-native-webview"), 1);
 // src/integrations/bridge.ts
 var import_utils = require("@webview-bridge/utils");
+// src/error.ts
+var WebMethodError = /*#__PURE__*/ function(Error1) {
+    _inherits(WebMethodError, Error1);
+    function WebMethodError(methodName) {
+        _class_call_check(this, WebMethodError);
+        var _this;
+        _this = _call_super(this, WebMethodError, [
+            "An error occurred in the WebMethod.current.".concat(methodName)
+        ]);
+        _this.name = "WebMethodError";
+        return _this;
+    }
+    return WebMethodError;
+}(_wrap_native_super(Error));
+function serializeError(error) {
+    return JSON.stringify(error, function(_, value) {
+        if (_instanceof(value, Error)) {
+            return {
+                name: value.name,
+                message: value.message,
+                stack: value.stack,
+                __isError: true
+            };
+        }
+        return value;
+    });
+}
+// src/integrations/bridge.ts
 var bridge = function(procedures) {
     var getState = function() {
         return state;
@@ -501,8 +536,9 @@ var handleBridge = /*#__PURE__*/ function() {
                     bridge2 = param.bridge, method = param.method, args = param.args, webview = param.webview, eventId = param.eventId, bridgeId = param.bridgeId;
                     _bridge = bridge2.getState();
                     _method = _bridge[method];
-                    handleThrow = function() {
-                        webview.injectJavaScript(SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(bridgeId, "".concat(method, "-").concat(eventId)));
+                    handleThrow = function(error) {
+                        var serializedError = error ? serializeError(error) : true;
+                        webview.injectJavaScript(SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(bridgeId, "".concat(method, "-").concat(eventId), serializedError));
                     };
                     if (!(method in _bridge)) {
                         handleThrow();
@@ -536,7 +572,7 @@ var handleBridge = /*#__PURE__*/ function() {
                     ];
                 case 3:
                     error = _state.sent();
-                    handleThrow();
+                    handleThrow(_instanceof(error, Error) ? error : new Error(String(error)));
                     console.error(error);
                     return [
                         3,
@@ -567,8 +603,9 @@ var SAFE_NATIVE_EMITTER_EMIT_BY_BRIDGE_ID = function(bridgeId, eventName, data)
     var dataString = JSON.stringify(data);
     return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', ").concat(dataString, ");\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', ").concat(dataString, ");\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', ").concat(dataString, "]);\n        }\n        return true;\n    })();\n");
 };
-var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName) {
-    return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', {}, true);\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', {}, true);\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', {}, true]);\n        }\n        return true;\n    })();\n");
+var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName, serializedError) {
+    var serializedErrorString = JSON.stringify(serializedError);
+    return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', {}, ").concat(serializedErrorString, ");\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', {}, ").concat(serializedErrorString, ");\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', {}, ").concat(serializedErrorString, "]);\n        }\n        return true;\n    })();\n");
 };
 // src/integrations/console.ts
 var INJECT_DEBUG = function(uniqueId) {
@@ -606,21 +643,6 @@ var handleLog = function(type, message) {
 };
 // src/integrations/handleRegisterWebMethod.ts
 var import_utils2 = require("@webview-bridge/utils");
-// src/error.ts
-var WebMethodError = /*#__PURE__*/ function(Error1) {
-    _inherits(WebMethodError, Error1);
-    function WebMethodError(methodName) {
-        _class_call_check(this, WebMethodError);
-        var _this;
-        _this = _call_super(this, WebMethodError, [
-            "An error occurred in the WebMethod.current.".concat(methodName)
-        ]);
-        _this.name = "WebMethodError";
-        return _this;
-    }
-    return WebMethodError;
-}(_wrap_native_super(Error));
-// src/integrations/handleRegisterWebMethod.ts
 var handleRegisterWebMethod = function(emitter, webview, bridgeNames, responseTimeout) {
     return bridgeNames.reduce(function(acc, methodName) {
         acc[methodName] = /*#__PURE__*/ _async_to_generator(function() {
@@ -922,7 +944,7 @@ var postMessageSchema = function(schema) {
     return schema;
 };
 // src/useBridge.ts
-var import_with_selector = require("use-sync-external-store/with-selector.js");
+var import_with_selector = require("use-sync-external-store/with-selector");
 function useBridge(store, selector) {
     var $selector = selector !== null && selector !== void 0 ? selector : function(state) {
         return state;

package/dist/index.d.cts

@@ -153,7 +153,7 @@ declare const INJECT_BRIDGE_METHODS: (bridgeNames: string[]) => string;
 declare const INJECT_BRIDGE_STATE: (initialState: Record<string, Primitive>) => string;
 declare const SAFE_NATIVE_EMITTER_EMIT: (eventName: string, data: unknown) => string;
 declare const SAFE_NATIVE_EMITTER_EMIT_BY_BRIDGE_ID: (bridgeId: string, eventName: string, data: unknown) => string;
-declare const SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID: (bridgeId: string, eventName: string) => string;
+declare const SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID: (bridgeId: string, eventName: string, serializedError: string | true) => string;
 
 declare const postMessageSchema: <T extends PostMessageSchemaObject>(schema: T) => T;
 

package/dist/index.d.ts

@@ -153,7 +153,7 @@ declare const INJECT_BRIDGE_METHODS: (bridgeNames: string[]) => string;
 declare const INJECT_BRIDGE_STATE: (initialState: Record<string, Primitive>) => string;
 declare const SAFE_NATIVE_EMITTER_EMIT: (eventName: string, data: unknown) => string;
 declare const SAFE_NATIVE_EMITTER_EMIT_BY_BRIDGE_ID: (bridgeId: string, eventName: string, data: unknown) => string;
-declare const SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID: (bridgeId: string, eventName: string) => string;
+declare const SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID: (bridgeId: string, eventName: string, serializedError: string | true) => string;
 
 declare const postMessageSchema: <T extends PostMessageSchemaObject>(schema: T) => T;
 

package/dist/index.js

@@ -103,6 +103,13 @@ function _inherits(subClass, superClass) {
     });
     if (superClass) _set_prototype_of(subClass, superClass);
 }
+function _instanceof(left, right) {
+    if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
+        return !!right[Symbol.hasInstance](left);
+    } else {
+        return left instanceof right;
+    }
+}
 function _is_native_function(fn) {
     return Function.toString.call(fn).indexOf("[native code]") !== -1;
 }
@@ -346,6 +353,35 @@ import { forwardRef, useEffect, useImperativeHandle, useLayoutEffect, useMemo, u
 import WebView from "react-native-webview";
 // src/integrations/bridge.ts
 import { equals, removeUndefinedKeys } from "@webview-bridge/utils";
+// src/error.ts
+var WebMethodError = /*#__PURE__*/ function(Error1) {
+    "use strict";
+    _inherits(WebMethodError, Error1);
+    function WebMethodError(methodName) {
+        _class_call_check(this, WebMethodError);
+        var _this;
+        _this = _call_super(this, WebMethodError, [
+            "An error occurred in the WebMethod.current.".concat(methodName)
+        ]);
+        _this.name = "WebMethodError";
+        return _this;
+    }
+    return WebMethodError;
+}(_wrap_native_super(Error));
+function serializeError(error) {
+    return JSON.stringify(error, function(_, value) {
+        if (_instanceof(value, Error)) {
+            return {
+                name: value.name,
+                message: value.message,
+                stack: value.stack,
+                __isError: true
+            };
+        }
+        return value;
+    });
+}
+// src/integrations/bridge.ts
 var bridge = function(procedures) {
     var getState = function() {
         return state;
@@ -407,8 +443,9 @@ var handleBridge = /*#__PURE__*/ function() {
                     bridge2 = param.bridge, method = param.method, args = param.args, webview = param.webview, eventId = param.eventId, bridgeId = param.bridgeId;
                     _bridge = bridge2.getState();
                     _method = _bridge[method];
-                    handleThrow = function() {
-                        webview.injectJavaScript(SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(bridgeId, "".concat(method, "-").concat(eventId)));
+                    handleThrow = function(error) {
+                        var serializedError = error ? serializeError(error) : true;
+                        webview.injectJavaScript(SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(bridgeId, "".concat(method, "-").concat(eventId), serializedError));
                     };
                     if (!(method in _bridge)) {
                         handleThrow();
@@ -442,7 +479,7 @@ var handleBridge = /*#__PURE__*/ function() {
                     ];
                 case 3:
                     error = _state.sent();
-                    handleThrow();
+                    handleThrow(_instanceof(error, Error) ? error : new Error(String(error)));
                     console.error(error);
                     return [
                         3,
@@ -473,8 +510,9 @@ var SAFE_NATIVE_EMITTER_EMIT_BY_BRIDGE_ID = function(bridgeId, eventName, data)
     var dataString = JSON.stringify(data);
     return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', ").concat(dataString, ");\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', ").concat(dataString, ");\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', ").concat(dataString, "]);\n        }\n        return true;\n    })();\n");
 };
-var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName) {
-    return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', {}, true);\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', {}, true);\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', {}, true]);\n        }\n        return true;\n    })();\n");
+var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName, serializedError) {
+    var serializedErrorString = JSON.stringify(serializedError);
+    return "\n    (function() {\n        if (window.nativeEmitterMap && window.nativeEmitterMap['".concat(bridgeId, "']) {\n            window.nativeEmitterMap['").concat(bridgeId, "'].emit('").concat(eventName, "', {}, ").concat(serializedErrorString, ");\n        } else if (window.nativeEmitter) {\n            // @deprecated This version is not used after 1.7.2\n            window.nativeEmitter.emit('").concat(eventName, "', {}, ").concat(serializedErrorString, ");\n        } else {\n            window.nativeBatchedEvents = window.nativeBatchedEvents || [];\n            window.nativeBatchedEvents.push(['").concat(eventName, "', {}, ").concat(serializedErrorString, "]);\n        }\n        return true;\n    })();\n");
 };
 // src/integrations/console.ts
 var INJECT_DEBUG = function(uniqueId) {
@@ -512,22 +550,6 @@ var handleLog = function(type, message) {
 };
 // src/integrations/handleRegisterWebMethod.ts
 import { createRandomId, createResolver, timeout } from "@webview-bridge/utils";
-// src/error.ts
-var WebMethodError = /*#__PURE__*/ function(Error1) {
-    "use strict";
-    _inherits(WebMethodError, Error1);
-    function WebMethodError(methodName) {
-        _class_call_check(this, WebMethodError);
-        var _this;
-        _this = _call_super(this, WebMethodError, [
-            "An error occurred in the WebMethod.current.".concat(methodName)
-        ]);
-        _this.name = "WebMethodError";
-        return _this;
-    }
-    return WebMethodError;
-}(_wrap_native_super(Error));
-// src/integrations/handleRegisterWebMethod.ts
 var handleRegisterWebMethod = function(emitter, webview, bridgeNames, responseTimeout) {
     return bridgeNames.reduce(function(acc, methodName) {
         acc[methodName] = /*#__PURE__*/ _async_to_generator(function() {
@@ -829,7 +851,7 @@ var postMessageSchema = function(schema) {
     return schema;
 };
 // src/useBridge.ts
-import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector.js";
+import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector";
 function useBridge(store, selector) {
     var $selector = selector !== null && selector !== void 0 ? selector : function(state) {
         return state;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webview-bridge/react-native",
-  "version": "1.7.8",
+  "version": "1.7.9",
   "type": "module",
   "description": "Fully Type-Safe Integration for React Native WebView and Web",
   "main": "dist/index.cjs",
@@ -17,10 +17,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/gronxb/webview-bridge.git"
-  },
+  "repository": "https://github.com/gronxb/webview-bridge",
   "license": "MIT",
   "files": [
     "dist",
@@ -29,7 +26,7 @@
   ],
   "devDependencies": {
     "@types/react": "^18.2.25",
-    "@types/use-sync-external-store": "^0.0.6",
+    "@types/use-sync-external-store": "^1.5.0",
     "react": "^18.3.1",
     "react-native-webview": "^13.12.0",
     "typescript": "^5.6.2"
@@ -39,9 +36,9 @@
     "react-native-webview": "*"
   },
   "dependencies": {
-    "@webview-bridge/utils": "1.7.8",
-    "@webview-bridge/types": "1.7.8",
-    "use-sync-external-store": "^1.2.0"
+    "use-sync-external-store": "1.6.0",
+    "@webview-bridge/types": "1.7.9",
+    "@webview-bridge/utils": "1.7.9"
   },
   "scripts": {
     "build": "tsup --config ./tsup.config.ts",

package/src/error.ts

@@ -4,3 +4,17 @@ export class WebMethodError extends Error {
     this.name = "WebMethodError";
   }
 }
+
+export function serializeError(error: Error) {
+  return JSON.stringify(error, (_, value) => {
+    if (value instanceof Error) {
+      return {
+        name: value.name,
+        message: value.message,
+        stack: value.stack,
+        __isError: true,
+      };
+    }
+    return value;
+  });
+}

package/src/integrations/bridge.ts

@@ -6,6 +6,7 @@ import type {
 } from "@webview-bridge/types";
 import { equals, removeUndefinedKeys } from "@webview-bridge/utils";
 import type WebView from "react-native-webview";
+import { serializeError } from "../error";
 
 export type StoreCallback<T> = ({
   get,
@@ -83,9 +84,14 @@ export const handleBridge = async ({
   const _bridge = bridge.getState();
 
   const _method = _bridge[method];
-  const handleThrow = () => {
+  const handleThrow = (error?: Error) => {
+    const serializedError = error ? serializeError(error) : true;
     webview.injectJavaScript(
-      SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(bridgeId, `${method}-${eventId}`),
+      SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID(
+        bridgeId,
+        `${method}-${eventId}`,
+        serializedError,
+      ),
     );
   };
   if (!(method in _bridge)) {
@@ -107,7 +113,7 @@ export const handleBridge = async ({
       ),
     );
   } catch (error) {
-    handleThrow();
+    handleThrow(error instanceof Error ? error : new Error(String(error)));
     console.error(error);
   }
 };
@@ -171,17 +177,21 @@ export const SAFE_NATIVE_EMITTER_EMIT_BY_BRIDGE_ID = (
 export const SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = (
   bridgeId: string,
   eventName: string,
-) => `
+  serializedError: string | true,
+) => {
+  const serializedErrorString = JSON.stringify(serializedError);
+  return `
     (function() {
         if (window.nativeEmitterMap && window.nativeEmitterMap['${bridgeId}']) {
-            window.nativeEmitterMap['${bridgeId}'].emit('${eventName}', {}, true);
+            window.nativeEmitterMap['${bridgeId}'].emit('${eventName}', {}, ${serializedErrorString});
         } else if (window.nativeEmitter) {
             // @deprecated This version is not used after 1.7.2
-            window.nativeEmitter.emit('${eventName}', {}, true);
+            window.nativeEmitter.emit('${eventName}', {}, ${serializedErrorString});
         } else {
             window.nativeBatchedEvents = window.nativeBatchedEvents || [];
-            window.nativeBatchedEvents.push(['${eventName}', {}, true]);
+            window.nativeBatchedEvents.push(['${eventName}', {}, ${serializedErrorString}]);
         }
         return true;
     })();
 `;
+};

package/src/useBridge.ts

@@ -1,5 +1,5 @@
 import type { Bridge, BridgeStore, ExtractStore } from "@webview-bridge/types";
-import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector.js";
+import { useSyncExternalStoreWithSelector } from "use-sync-external-store/with-selector";
 
 export function useBridge<T extends Bridge>(
   store: BridgeStore<T>,