@webview-bridge/react-native 1.7.6 → 1.7.7

package/dist/index.cjs

@@ -435,7 +435,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 // src/createWebView.tsx
-var import_utils3 = require("@webview-bridge/utils");
+var import_utils4 = require("@webview-bridge/utils");
 var import_react = require("react");
 var import_react_native_webview = __toESM(require("react-native-webview"), 1);
 // src/integrations/bridge.ts
@@ -571,7 +571,9 @@ var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName) {
     return "\nif (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}\ntrue;\n");
 };
 // src/integrations/console.ts
-var INJECT_DEBUG = '\n{\n  const originalConsoleLog = console.log;\n  const originalConsoleError = console.error;\n  const originalConsoleWarn = console.warn;\n\n  console.log = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "log", args: message } }),\n    );\n    originalConsoleLog.apply(console, arguments);\n  };\n\n  console.error = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "error", args: message } }),\n    );\n    originalConsoleError.apply(console, arguments);\n  };\n\n  console.warn = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "warn", args: message } }),\n    );\n    originalConsoleWarn.apply(console, arguments);\n  };\n};\n';
+var import_utils2 = require("@webview-bridge/utils");
+var injectionDetectKey = "__bridge_debug_injected_".concat((0, import_utils2.createRandomId)());
+var INJECT_DEBUG = '\n{\n  if (window["'.concat(injectionDetectKey, '"]) {\n    return;\n  }\n\n  window["').concat(injectionDetectKey, '"] = true;\n  const originalConsoleLog = console.log;\n  const originalConsoleError = console.error;\n  const originalConsoleWarn = console.warn;\n\n  console.log = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "log", args: message } }),\n    );\n    originalConsoleLog.apply(console, arguments);\n  };\n\n  console.error = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "error", args: message } }),\n    );\n    originalConsoleError.apply(console, arguments);\n  };\n\n  console.warn = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "warn", args: message } }),\n    );\n    originalConsoleWarn.apply(console, arguments);\n  };\n};\n');
 var handleLog = function(type, message) {
     var _JSON_parse = _to_array(JSON.parse(message)), formatMessage = _JSON_parse[0], parsedMessage = _JSON_parse.slice(1);
     var webviewMark = "(WebView) ";
@@ -603,7 +605,7 @@ var handleLog = function(type, message) {
     }
 };
 // src/integrations/handleRegisterWebMethod.ts
-var import_utils2 = require("@webview-bridge/utils");
+var import_utils3 = require("@webview-bridge/utils");
 // src/error.ts
 var WebMethodError = /*#__PURE__*/ function(Error1) {
     _inherits(WebMethodError, Error1);
@@ -628,11 +630,11 @@ var handleRegisterWebMethod = function(emitter, webview, bridgeNames, responseTi
                 for(_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
                     args[_key] = _arguments[_key];
                 }
-                eventId = (0, import_utils2.createRandomId)();
+                eventId = (0, import_utils3.createRandomId)();
                 return [
                     2,
                     Promise.race([
-                        (0, import_utils2.createResolver)({
+                        (0, import_utils3.createResolver)({
                             emitter: emitter,
                             methodName: methodName,
                             eventId: eventId,
@@ -641,7 +643,7 @@ var handleRegisterWebMethod = function(emitter, webview, bridgeNames, responseTi
                             },
                             failHandler: new WebMethodError(methodName)
                         }),
-                        (0, import_utils2.timeout)(responseTimeout)
+                        (0, import_utils3.timeout)(responseTimeout)
                     ])
                 ];
             });
@@ -659,7 +661,7 @@ var createWebView = function(param) {
         }
     };
     var webviewRefList = [];
-    var emitter = (0, import_utils3.createEvents)();
+    var emitter = (0, import_utils4.createEvents)();
     bridge2.subscribe(function(state) {
         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
         try {

package/dist/index.js

@@ -477,7 +477,9 @@ var SAFE_NATIVE_EMITTER_THROW_BY_BRIDGE_ID = function(bridgeId, eventName) {
     return "\nif (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}\ntrue;\n");
 };
 // src/integrations/console.ts
-var INJECT_DEBUG = '\n{\n  const originalConsoleLog = console.log;\n  const originalConsoleError = console.error;\n  const originalConsoleWarn = console.warn;\n\n  console.log = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "log", args: message } }),\n    );\n    originalConsoleLog.apply(console, arguments);\n  };\n\n  console.error = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "error", args: message } }),\n    );\n    originalConsoleError.apply(console, arguments);\n  };\n\n  console.warn = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "warn", args: message } }),\n    );\n    originalConsoleWarn.apply(console, arguments);\n  };\n};\n';
+import { createRandomId } from "@webview-bridge/utils";
+var injectionDetectKey = "__bridge_debug_injected_".concat(createRandomId());
+var INJECT_DEBUG = '\n{\n  if (window["'.concat(injectionDetectKey, '"]) {\n    return;\n  }\n\n  window["').concat(injectionDetectKey, '"] = true;\n  const originalConsoleLog = console.log;\n  const originalConsoleError = console.error;\n  const originalConsoleWarn = console.warn;\n\n  console.log = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "log", args: message } }),\n    );\n    originalConsoleLog.apply(console, arguments);\n  };\n\n  console.error = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "error", args: message } }),\n    );\n    originalConsoleError.apply(console, arguments);\n  };\n\n  console.warn = function() {\n    var message = JSON.stringify(Array.from(arguments));\n    window.ReactNativeWebView?.postMessage(\n      JSON.stringify({ type: "log", body: { method: "warn", args: message } }),\n    );\n    originalConsoleWarn.apply(console, arguments);\n  };\n};\n');
 var handleLog = function(type, message) {
     var _JSON_parse = _to_array(JSON.parse(message)), formatMessage = _JSON_parse[0], parsedMessage = _JSON_parse.slice(1);
     var webviewMark = "(WebView) ";
@@ -509,7 +511,7 @@ var handleLog = function(type, message) {
     }
 };
 // src/integrations/handleRegisterWebMethod.ts
-import { createRandomId, createResolver, timeout } from "@webview-bridge/utils";
+import { createRandomId as createRandomId2, createResolver, timeout } from "@webview-bridge/utils";
 // src/error.ts
 var WebMethodError = /*#__PURE__*/ function(Error1) {
     "use strict";
@@ -535,7 +537,7 @@ var handleRegisterWebMethod = function(emitter, webview, bridgeNames, responseTi
                 for(_len = _arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++){
                     args[_key] = _arguments[_key];
                 }
-                eventId = createRandomId();
+                eventId = createRandomId2();
                 return [
                     2,
                     Promise.race([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webview-bridge/react-native",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "type": "module",
   "description": "Fully Type-Safe Integration for React Native WebView and Web",
   "main": "dist/index.cjs",
@@ -39,8 +39,8 @@
     "react-native-webview": "*"
   },
   "dependencies": {
-    "@webview-bridge/utils": "1.7.6",
-    "@webview-bridge/types": "1.7.6",
+    "@webview-bridge/utils": "1.7.7",
+    "@webview-bridge/types": "1.7.7",
     "use-sync-external-store": "^1.2.0"
   },
   "scripts": {

package/src/integrations/console.ts

@@ -1,5 +1,15 @@
+import { createRandomId } from "@webview-bridge/utils";
+
+// prevent name collision with other libraries
+const injectionDetectKey = `__bridge_debug_injected_${createRandomId()}`;
+
 export const INJECT_DEBUG = `
 {
+  if (window["${injectionDetectKey}"]) {
+    return;
+  }
+
+  window["${injectionDetectKey}"] = true;
   const originalConsoleLog = console.log;
   const originalConsoleError = console.error;
   const originalConsoleWarn = console.warn;