@dynamic-labs/react-native-extension 4.55.0 → 4.57.0

package/index.cjs

@@ -33,7 +33,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var version = "4.55.0";
+var version = "4.57.0";
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -45,6 +45,12 @@ function _extends() {
   }, _extends.apply(null, arguments);
 }
 
+class WebViewFailedToLoadError extends Error {
+  constructor() {
+    super('Could not load Dynamic WebView');
+  }
+}
+
 const logger = new logger$1.Logger('react-native-extension');
 
 const useMessageTransportWebViewBridge = (core, webViewRef) => {
@@ -160,9 +166,12 @@ const useWebViewRecoveryTimeout = ({
   webViewUrl,
   disableRecovery,
   recoveryTimeout,
-  setWebViewUrl
+  setWebViewUrl,
+  onFailedToLoadAfterClearState: _onFailedToLoadAfterClearState = () => {}
 }) => {
   const timeoutRef = react.useRef(null);
+  const onFailedToLoadAfterClearStateRef = react.useRef(_onFailedToLoadAfterClearState);
+  onFailedToLoadAfterClearStateRef.current = _onFailedToLoadAfterClearState;
   /**
    * Clear timeout on unmount
    */
@@ -179,6 +188,7 @@ const useWebViewRecoveryTimeout = ({
     }
     if (hasClearStateInUrl(webViewUrl)) {
       logger.debug('timeout recovery: disabled because webview already cleared its state', webViewUrl.toString());
+      onFailedToLoadAfterClearStateRef.current();
       return;
     }
     logger.debug('timeout recovery: registering timeout', webViewUrl.toString());
@@ -300,6 +310,11 @@ const WebView = ({
     });
   }, [core]);
   react.useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(blockAndReloadWebView), [core, blockAndReloadWebView]);
+  const setWebViewLoadError = react.useCallback(() => {
+    // Error was already thrown, do not throw again
+    if (core.initialization.error instanceof WebViewFailedToLoadError) return;
+    core.initialization.error = new WebViewFailedToLoadError();
+  }, [core]);
   /**
    * Reload the webview with a clean state when a timeout is reached
    * and the webview did not get to the loaded state yet
@@ -307,13 +322,21 @@ const WebView = ({
   const startRecoveryTimeout = useWebViewRecoveryTimeout({
     core,
     disableRecovery: _disableRecovery,
+    onFailedToLoadAfterClearState: setWebViewLoadError,
     recoveryTimeout: _recoveryTimeout,
     setWebViewUrl,
     webViewUrl
   });
-  const setWebViewLoadError = react.useCallback(() => {
-    core.initialization.error = new Error('Could not load Dynamic WebView');
-  }, [core]);
+  const webViewLoadErrorCountRef = react.useRef(0);
+  const onWebViewLoadError = react.useCallback(() => {
+    webViewLoadErrorCountRef.current = webViewLoadErrorCountRef.current + 1;
+    /**
+     * This is the first attempt to load the webview, do not throw an error
+     * because the recovery system will attempt to reload the webview
+     */
+    if (webViewLoadErrorCountRef.current === 1) return;
+    setWebViewLoadError();
+  }, [setWebViewLoadError]);
   const {
     onLoad,
     onLoadStart
@@ -333,7 +356,7 @@ const WebView = ({
     webviewDebuggingEnabled: _webviewDebuggingEnabled,
     onContentProcessDidTerminate: blockAndReloadWebView,
     onRenderProcessGone: blockAndReloadWebView,
-    onError: () => setWebViewLoadError(),
+    onError: onWebViewLoadError,
     setSupportMultipleWindows: false,
     onShouldStartLoadWithRequest: request => {
       const requestUrl = getUrl(request.url);
@@ -660,3 +683,4 @@ const ReactNativeExtension = ({
 assertPackageVersion.assertPackageVersion('@dynamic-labs/react-native-extension', version);
 
 exports.ReactNativeExtension = ReactNativeExtension;
+exports.WebViewFailedToLoadError = WebViewFailedToLoadError;

package/index.js

@@ -11,7 +11,7 @@ import { openAuthSessionAsync } from 'expo-web-browser';
 import { getItemAsync, deleteItemAsync, setItemAsync } from 'expo-secure-store';
 import { createPasskey, PasskeyStamper } from '@turnkey/react-native-passkey-stamper';
 
-var version = "4.55.0";
+var version = "4.57.0";
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -23,6 +23,12 @@ function _extends() {
   }, _extends.apply(null, arguments);
 }
 
+class WebViewFailedToLoadError extends Error {
+  constructor() {
+    super('Could not load Dynamic WebView');
+  }
+}
+
 const logger = new Logger('react-native-extension');
 
 const useMessageTransportWebViewBridge = (core, webViewRef) => {
@@ -138,9 +144,12 @@ const useWebViewRecoveryTimeout = ({
   webViewUrl,
   disableRecovery,
   recoveryTimeout,
-  setWebViewUrl
+  setWebViewUrl,
+  onFailedToLoadAfterClearState: _onFailedToLoadAfterClearState = () => {}
 }) => {
   const timeoutRef = useRef(null);
+  const onFailedToLoadAfterClearStateRef = useRef(_onFailedToLoadAfterClearState);
+  onFailedToLoadAfterClearStateRef.current = _onFailedToLoadAfterClearState;
   /**
    * Clear timeout on unmount
    */
@@ -157,6 +166,7 @@ const useWebViewRecoveryTimeout = ({
     }
     if (hasClearStateInUrl(webViewUrl)) {
       logger.debug('timeout recovery: disabled because webview already cleared its state', webViewUrl.toString());
+      onFailedToLoadAfterClearStateRef.current();
       return;
     }
     logger.debug('timeout recovery: registering timeout', webViewUrl.toString());
@@ -278,6 +288,11 @@ const WebView = ({
     });
   }, [core]);
   useEffect(() => core.messageTransport.recoveryManager.onRecoveryRequested(blockAndReloadWebView), [core, blockAndReloadWebView]);
+  const setWebViewLoadError = useCallback(() => {
+    // Error was already thrown, do not throw again
+    if (core.initialization.error instanceof WebViewFailedToLoadError) return;
+    core.initialization.error = new WebViewFailedToLoadError();
+  }, [core]);
   /**
    * Reload the webview with a clean state when a timeout is reached
    * and the webview did not get to the loaded state yet
@@ -285,13 +300,21 @@ const WebView = ({
   const startRecoveryTimeout = useWebViewRecoveryTimeout({
     core,
     disableRecovery: _disableRecovery,
+    onFailedToLoadAfterClearState: setWebViewLoadError,
     recoveryTimeout: _recoveryTimeout,
     setWebViewUrl,
     webViewUrl
   });
-  const setWebViewLoadError = useCallback(() => {
-    core.initialization.error = new Error('Could not load Dynamic WebView');
-  }, [core]);
+  const webViewLoadErrorCountRef = useRef(0);
+  const onWebViewLoadError = useCallback(() => {
+    webViewLoadErrorCountRef.current = webViewLoadErrorCountRef.current + 1;
+    /**
+     * This is the first attempt to load the webview, do not throw an error
+     * because the recovery system will attempt to reload the webview
+     */
+    if (webViewLoadErrorCountRef.current === 1) return;
+    setWebViewLoadError();
+  }, [setWebViewLoadError]);
   const {
     onLoad,
     onLoadStart
@@ -311,7 +334,7 @@ const WebView = ({
     webviewDebuggingEnabled: _webviewDebuggingEnabled,
     onContentProcessDidTerminate: blockAndReloadWebView,
     onRenderProcessGone: blockAndReloadWebView,
-    onError: () => setWebViewLoadError(),
+    onError: onWebViewLoadError,
     setSupportMultipleWindows: false,
     onShouldStartLoadWithRequest: request => {
       const requestUrl = getUrl(request.url);
@@ -637,4 +660,4 @@ const ReactNativeExtension = ({
 
 assertPackageVersion('@dynamic-labs/react-native-extension', version);
 
-export { ReactNativeExtension };
+export { ReactNativeExtension, WebViewFailedToLoadError };

package/package.json

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

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

@@ -6,6 +6,7 @@ type UseWebViewRecoveryTimeoutProps = {
     disableRecovery: boolean;
     recoveryTimeout: number;
     setWebViewUrl: Dispatch<SetStateAction<URL>>;
+    onFailedToLoadAfterClearState?: () => void;
 };
-export declare const useWebViewRecoveryTimeout: ({ core, webViewUrl, disableRecovery, recoveryTimeout, setWebViewUrl, }: UseWebViewRecoveryTimeoutProps) => () => void;
+export declare const useWebViewRecoveryTimeout: ({ core, webViewUrl, disableRecovery, recoveryTimeout, setWebViewUrl, onFailedToLoadAfterClearState, }: UseWebViewRecoveryTimeoutProps) => () => void;
 export {};

package/src/errors/WebViewFailedToLoadError.d.ts

@@ -0,0 +1,3 @@
+export declare class WebViewFailedToLoadError extends Error {
+    constructor();
+}

package/src/index.d.ts

@@ -1 +1,2 @@
 export { ReactNativeExtension, type IReactNativeExtension, } from './ReactNativeExtension';
+export { WebViewFailedToLoadError } from './errors/WebViewFailedToLoadError';