@dynamic-labs/react-native-extension 4.72.0 → 4.76.0

package/index.cjs

@@ -34,7 +34,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var version = "4.72.0";
+var version = "4.76.0";
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -90,7 +90,14 @@ const useMessageTransportWebViewBridge = (core, webViewRef) => {
     const sendMessageToWebView = message => {
       var _a;
       if (!webViewRef.current) {
-        logger.debug('WebView ref not found');
+        logger.instrument('WebView ref not found — dropping message', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.message_dropped',
+          messageOrigin: message.origin,
+          messageType: message.type,
+          time: 0
+        });
         return;
       }
       /**
@@ -152,6 +159,7 @@ const styles = reactNative.StyleSheet.create({
 
 const CLEAR_STATE_PARAM = 'clear-state';
 const ENVIRONMENT_ID_PARAM = 'environmentId';
+const WEBVIEW_START_TIME_PARAM = 'webviewStartTime';
 
 const setClearStateToUrl = webViewUrl => {
   const newWebViewUrl = new URL(webViewUrl);
@@ -188,7 +196,13 @@ const useWebViewRecoveryTimeout = ({
       return;
     }
     if (hasClearStateInUrl(webViewUrl)) {
-      logger.debug('timeout recovery: disabled because webview already cleared its state', webViewUrl.toString());
+      logger.instrument('Webview failed to load after clearing its state', {
+        environmentId: core.environmentId,
+        hostSdkSessionId: core.hostSdkSessionId,
+        key: 'webview.failed_to_load_after_clear_state',
+        time: 0,
+        webviewUrl: webViewUrl.toString()
+      });
       onFailedToLoadAfterClearStateRef.current();
       return;
     }
@@ -198,14 +212,26 @@ const useWebViewRecoveryTimeout = ({
     }
     timeoutRef.current = setTimeout(() => {
       if (!core.messageTransport.isBlocked()) {
-        logger.debug('timeout recovery: skip the timeout because the webview did load');
+        logger.instrument('Webview recovery skipped because the webview did load', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.recovery_skipped',
+          time: 0,
+          webviewUrl: webViewUrl.toString()
+        });
         return;
       }
       core.messageTransport.block();
       // Increase the retry
       setWebViewUrl(webViewUrl => {
         const newWebViewUrl = setClearStateToUrl(webViewUrl);
-        logger.debug('timeout recovery: reloading webview to clear its state', newWebViewUrl.toString());
+        logger.instrument('timeout recovery: reloading webview to clear its state', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.recovery_by_clear_state',
+          time: 0,
+          webviewUrl: webViewUrl.toString()
+        });
         return newWebViewUrl;
       });
     }, recoveryTimeout);
@@ -257,6 +283,11 @@ const assignEnvironmentIdToUrl = (url, environmentId) => {
   return _url;
 };
 
+const assignStartTimeToUrl = url => {
+  url.searchParams.set(WEBVIEW_START_TIME_PARAM, Date.now().toString());
+  return url;
+};
+
 const waasOrigins = ['https://app.dynamic-preprod.xyz', 'https://app.dynamicauth.com'];
 const turnkeyOrigins = ['https://recovery.turnkey.com', 'https://export.turnkey.com'];
 const WebView = ({
@@ -271,8 +302,7 @@ const WebView = ({
   const {
     visible
   } = useWebViewVisibility(core);
-  const [webViewUrl, setWebViewUrl] = react.useState(assignEnvironmentIdToUrl(initialWebViewUrl, core.environmentId));
-  const webViewKey = react.useMemo(() => webViewUrl.toString(), [webViewUrl]);
+  const [webViewUrl, setWebViewUrl] = react.useState(() => assignStartTimeToUrl(assignEnvironmentIdToUrl(initialWebViewUrl, core.environmentId)));
   const {
     onMessageHandler
   } = useMessageTransportWebViewBridge(core, webViewRef);
@@ -286,7 +316,7 @@ const WebView = ({
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps -- we only care about the unmount callback
   []);
-  const blockAndReloadWebView = react.useCallback(() => {
+  const blockAndReloadWebView = react.useCallback(reason => {
     /**
      * Should not reload the webview if it is already blocked
      * and loading a new page
@@ -303,14 +333,22 @@ const WebView = ({
      * the webview is reloading
      */
     core.messageTransport.block();
-    // Increase the retry
     setWebViewUrl(webViewUrl => {
       const newWebViewUrl = increaseRetryToUrl(webViewUrl);
-      logger.debug('Reloading webview', newWebViewUrl.toString());
+      logger.instrument('Reloading webview', {
+        environmentId: core.environmentId,
+        hostSdkSessionId: core.hostSdkSessionId,
+        key: 'webview.reloading',
+        newWebViewUrl,
+        reason,
+        time: 0,
+        webviewUrl: webViewUrl.toString()
+      });
       return newWebViewUrl;
     });
   }, [core]);
-  react.useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(blockAndReloadWebView), [core, blockAndReloadWebView]);
+  const blockAndReloadWebViewOsKill = react.useCallback(() => blockAndReloadWebView('os_kill'), [blockAndReloadWebView]);
+  react.useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(() => blockAndReloadWebView('recovery')), [core, blockAndReloadWebView]);
   const setWebViewLoadError = react.useCallback(() => {
     // Error was already thrown, do not throw again
     if (core.initialization.error instanceof WebViewFailedToLoadError) return;
@@ -355,8 +393,8 @@ const WebView = ({
     onLoad: onLoad,
     hideKeyboardAccessoryView: true,
     webviewDebuggingEnabled: _webviewDebuggingEnabled,
-    onContentProcessDidTerminate: blockAndReloadWebView,
-    onRenderProcessGone: blockAndReloadWebView,
+    onContentProcessDidTerminate: blockAndReloadWebViewOsKill,
+    onRenderProcessGone: blockAndReloadWebViewOsKill,
     onError: onWebViewLoadError,
     setSupportMultipleWindows: false,
     onShouldStartLoadWithRequest: request => {
@@ -377,7 +415,7 @@ const WebView = ({
       }
       return false;
     }
-  }, webViewKey);
+  });
 };
 const getUrl = url => {
   try {

package/index.js

@@ -1,6 +1,6 @@
 import { assertPackageVersion } from '@dynamic-labs/assert-package-version';
 import { StyleSheet, Platform } from 'react-native';
-import { useEffect, useRef, useState, useCallback, useMemo } from 'react';
+import { useEffect, useRef, useState, useCallback } from 'react';
 import { WebView as WebView$1 } from 'react-native-webview';
 import { Logger } from '@dynamic-labs/logger';
 import { messageTransportDataJsonReviver, parseMessageTransportData, messageTransportDataJsonReplacer, createRequestChannel } from '@dynamic-labs/message-transport';
@@ -12,7 +12,7 @@ import { getItemAsync, deleteItemAsync, setItemAsync } from 'expo-secure-store';
 import { createPasskey, PasskeyStamper } from '@turnkey/react-native-passkey-stamper';
 import { requireNativeModule } from 'expo-modules-core';
 
-var version = "4.72.0";
+var version = "4.76.0";
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -68,7 +68,14 @@ const useMessageTransportWebViewBridge = (core, webViewRef) => {
     const sendMessageToWebView = message => {
       var _a;
       if (!webViewRef.current) {
-        logger.debug('WebView ref not found');
+        logger.instrument('WebView ref not found — dropping message', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.message_dropped',
+          messageOrigin: message.origin,
+          messageType: message.type,
+          time: 0
+        });
         return;
       }
       /**
@@ -130,6 +137,7 @@ const styles = StyleSheet.create({
 
 const CLEAR_STATE_PARAM = 'clear-state';
 const ENVIRONMENT_ID_PARAM = 'environmentId';
+const WEBVIEW_START_TIME_PARAM = 'webviewStartTime';
 
 const setClearStateToUrl = webViewUrl => {
   const newWebViewUrl = new URL(webViewUrl);
@@ -166,7 +174,13 @@ const useWebViewRecoveryTimeout = ({
       return;
     }
     if (hasClearStateInUrl(webViewUrl)) {
-      logger.debug('timeout recovery: disabled because webview already cleared its state', webViewUrl.toString());
+      logger.instrument('Webview failed to load after clearing its state', {
+        environmentId: core.environmentId,
+        hostSdkSessionId: core.hostSdkSessionId,
+        key: 'webview.failed_to_load_after_clear_state',
+        time: 0,
+        webviewUrl: webViewUrl.toString()
+      });
       onFailedToLoadAfterClearStateRef.current();
       return;
     }
@@ -176,14 +190,26 @@ const useWebViewRecoveryTimeout = ({
     }
     timeoutRef.current = setTimeout(() => {
       if (!core.messageTransport.isBlocked()) {
-        logger.debug('timeout recovery: skip the timeout because the webview did load');
+        logger.instrument('Webview recovery skipped because the webview did load', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.recovery_skipped',
+          time: 0,
+          webviewUrl: webViewUrl.toString()
+        });
         return;
       }
       core.messageTransport.block();
       // Increase the retry
       setWebViewUrl(webViewUrl => {
         const newWebViewUrl = setClearStateToUrl(webViewUrl);
-        logger.debug('timeout recovery: reloading webview to clear its state', newWebViewUrl.toString());
+        logger.instrument('timeout recovery: reloading webview to clear its state', {
+          environmentId: core.environmentId,
+          hostSdkSessionId: core.hostSdkSessionId,
+          key: 'webview.recovery_by_clear_state',
+          time: 0,
+          webviewUrl: webViewUrl.toString()
+        });
         return newWebViewUrl;
       });
     }, recoveryTimeout);
@@ -235,6 +261,11 @@ const assignEnvironmentIdToUrl = (url, environmentId) => {
   return _url;
 };
 
+const assignStartTimeToUrl = url => {
+  url.searchParams.set(WEBVIEW_START_TIME_PARAM, Date.now().toString());
+  return url;
+};
+
 const waasOrigins = ['https://app.dynamic-preprod.xyz', 'https://app.dynamicauth.com'];
 const turnkeyOrigins = ['https://recovery.turnkey.com', 'https://export.turnkey.com'];
 const WebView = ({
@@ -249,8 +280,7 @@ const WebView = ({
   const {
     visible
   } = useWebViewVisibility(core);
-  const [webViewUrl, setWebViewUrl] = useState(assignEnvironmentIdToUrl(initialWebViewUrl, core.environmentId));
-  const webViewKey = useMemo(() => webViewUrl.toString(), [webViewUrl]);
+  const [webViewUrl, setWebViewUrl] = useState(() => assignStartTimeToUrl(assignEnvironmentIdToUrl(initialWebViewUrl, core.environmentId)));
   const {
     onMessageHandler
   } = useMessageTransportWebViewBridge(core, webViewRef);
@@ -264,7 +294,7 @@ const WebView = ({
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps -- we only care about the unmount callback
   []);
-  const blockAndReloadWebView = useCallback(() => {
+  const blockAndReloadWebView = useCallback(reason => {
     /**
      * Should not reload the webview if it is already blocked
      * and loading a new page
@@ -281,14 +311,22 @@ const WebView = ({
      * the webview is reloading
      */
     core.messageTransport.block();
-    // Increase the retry
     setWebViewUrl(webViewUrl => {
       const newWebViewUrl = increaseRetryToUrl(webViewUrl);
-      logger.debug('Reloading webview', newWebViewUrl.toString());
+      logger.instrument('Reloading webview', {
+        environmentId: core.environmentId,
+        hostSdkSessionId: core.hostSdkSessionId,
+        key: 'webview.reloading',
+        newWebViewUrl,
+        reason,
+        time: 0,
+        webviewUrl: webViewUrl.toString()
+      });
       return newWebViewUrl;
     });
   }, [core]);
-  useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(blockAndReloadWebView), [core, blockAndReloadWebView]);
+  const blockAndReloadWebViewOsKill = useCallback(() => blockAndReloadWebView('os_kill'), [blockAndReloadWebView]);
+  useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(() => blockAndReloadWebView('recovery')), [core, blockAndReloadWebView]);
   const setWebViewLoadError = useCallback(() => {
     // Error was already thrown, do not throw again
     if (core.initialization.error instanceof WebViewFailedToLoadError) return;
@@ -333,8 +371,8 @@ const WebView = ({
     onLoad: onLoad,
     hideKeyboardAccessoryView: true,
     webviewDebuggingEnabled: _webviewDebuggingEnabled,
-    onContentProcessDidTerminate: blockAndReloadWebView,
-    onRenderProcessGone: blockAndReloadWebView,
+    onContentProcessDidTerminate: blockAndReloadWebViewOsKill,
+    onRenderProcessGone: blockAndReloadWebViewOsKill,
     onError: onWebViewLoadError,
     setSupportMultipleWindows: false,
     onShouldStartLoadWithRequest: request => {
@@ -355,7 +393,7 @@ const WebView = ({
       }
       return false;
     }
-  }, webViewKey);
+  });
 };
 const getUrl = url => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/react-native-extension",
-  "version": "4.72.0",
+  "version": "4.76.0",
   "main": "./index.cjs",
   "module": "./index.js",
   "types": "./src/index.d.ts",
@@ -18,11 +18,11 @@
     "@turnkey/react-native-passkey-stamper": "1.2.7",
     "@react-native-documents/picker": "^11.0.0",
     "react-native-fs": ">=2.20.0",
-    "@dynamic-labs/assert-package-version": "4.72.0",
-    "@dynamic-labs/client": "4.72.0",
-    "@dynamic-labs/logger": "4.72.0",
-    "@dynamic-labs/message-transport": "4.72.0",
-    "@dynamic-labs/webview-messages": "4.72.0"
+    "@dynamic-labs/assert-package-version": "4.76.0",
+    "@dynamic-labs/client": "4.76.0",
+    "@dynamic-labs/logger": "4.76.0",
+    "@dynamic-labs/message-transport": "4.76.0",
+    "@dynamic-labs/webview-messages": "4.76.0"
   },
   "peerDependencies": {
     "react": ">=18.0.0 <20.0.0",

package/src/components/WebView/constants.d.ts

@@ -1,2 +1,3 @@
 export declare const CLEAR_STATE_PARAM = "clear-state";
 export declare const ENVIRONMENT_ID_PARAM = "environmentId";
+export declare const WEBVIEW_START_TIME_PARAM = "webviewStartTime";

package/src/components/WebView/utils/assignStartTimeToUrl/assignStartTimeToUrl.d.ts

@@ -0,0 +1 @@
+export declare const assignStartTimeToUrl: (url: URL) => URL;

package/src/components/WebView/utils/assignStartTimeToUrl/index.d.ts

@@ -0,0 +1 @@
+export { assignStartTimeToUrl } from './assignStartTimeToUrl';