@getuserfeedback/react-native 4.0.28 → 4.0.31

package/dist/core-webview-host-controller.d.ts

@@ -11,6 +11,7 @@ export declare const createCoreWebViewHostController: (input: {
     bridgeId: string;
     onConnected: (connection: CoreWebViewHostConnection) => void;
     onDisconnected?: () => void;
+    onActivationRetryExhausted?: (error: Error) => void;
     activationRetryIntervalMs?: number;
     activationRetryTimeoutMs?: number;
 }) => CoreWebViewHostController;

package/dist/core-webview-host-controller.js

@@ -1,6 +1,6 @@
 import { buildCoreWebViewBridgeScript, buildCoreWebViewHostMessageScript, } from "./core-webview-bridge-adapter.js";
 import { createWebViewHostController, } from "./webview-host-controller.js";
-export const createCoreWebViewHostController = (input) => createWebViewHostController(Object.assign(Object.assign({}, input), { connectionLabel: "Core WebView host", buildActivationScript: buildCoreWebViewBridgeScript, buildHostMessageScript: buildCoreWebViewHostMessageScript, onConnected: (connection) => {
+export const createCoreWebViewHostController = (input) => createWebViewHostController(Object.assign(Object.assign({}, input), { connectionLabel: "Core WebView host", buildActivationScript: buildCoreWebViewBridgeScript, buildHostMessageScript: buildCoreWebViewHostMessageScript, onActivationRetryExhausted: input.onActivationRetryExhausted, onConnected: (connection) => {
         input.onConnected({
             disconnect: connection.disconnect,
             generation: connection.generation,

package/dist/core-webview-host.d.ts

@@ -3,6 +3,7 @@ import { type CoreWebViewHostConnection } from "./core-webview-host-controller.j
 export type CoreWebViewHostProps = {
     coreUrl: string;
     onConnected: (connection: CoreWebViewHostConnection) => void;
+    onActivationRetryExhausted?: (error: Error) => void;
     onDisconnected?: () => void;
     onInvalidMessage?: (error: Error, value: unknown) => void;
     webViewComponent?: ComponentType<Record<string, unknown>>;

package/dist/core-webview-host.js

@@ -22,7 +22,7 @@ const CORE_WEBVIEW_HOST_STYLE = {
     top: 0,
     width: 1,
 };
-function CoreWebViewHostDocument({ externalCoreUrl, onConnected, onDisconnected, onInvalidMessage, webViewComponent, webViewProps, }) {
+function CoreWebViewHostDocument({ externalCoreUrl, onConnected, onActivationRetryExhausted, onDisconnected, onInvalidMessage, webViewComponent, webViewProps, }) {
     const bridgeIdRef = useRef(null);
     if (bridgeIdRef.current === null) {
         nextBridgeId += 1;
@@ -33,10 +33,16 @@ function CoreWebViewHostDocument({ externalCoreUrl, onConnected, onDisconnected,
     const onDisconnectedRef = useRef(onDisconnected);
     onConnectedRef.current = onConnected;
     onDisconnectedRef.current = onDisconnected;
+    const onActivationRetryExhaustedRef = useRef(onActivationRetryExhausted);
+    onActivationRetryExhaustedRef.current = onActivationRetryExhausted;
     const controllerRef = useRef(null);
     if (controllerRef.current === null) {
         controllerRef.current = createCoreWebViewHostController({
             bridgeId,
+            onActivationRetryExhausted: (error) => {
+                var _a;
+                (_a = onActivationRetryExhaustedRef.current) === null || _a === void 0 ? void 0 : _a.call(onActivationRetryExhaustedRef, error);
+            },
             onConnected: (connection) => {
                 onConnectedRef.current(connection);
             },

package/dist/native-runtime-root.js

@@ -61,6 +61,16 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
             reportError(error);
         }
     }, [reportError]);
+    const reportStartupTerminalError = useCallback((error) => {
+        var _a;
+        try {
+            (_a = onStartupTerminalErrorRef.current) === null || _a === void 0 ? void 0 : _a.call(onStartupTerminalErrorRef, error);
+        }
+        catch (observerError) {
+            reportError(observerError);
+        }
+        reportError(error);
+    }, [reportError]);
     const handleConnected = useCallback((coreConnection) => {
         const previousSession = sessionRef.current;
         if (previousSession) {
@@ -121,7 +131,6 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
             })
                 .then(commitSession)
                 .catch((error) => {
-                var _a;
                 if (sessionRef.current !== nextSession) {
                     return;
                 }
@@ -138,14 +147,11 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
                 }
                 else {
                     startupRetryAttemptedRef.current = false;
-                    try {
-                        (_a = onStartupTerminalErrorRef.current) === null || _a === void 0 ? void 0 : _a.call(onStartupTerminalErrorRef, error instanceof Error ? error : new Error(String(error)));
-                    }
-                    catch (observerError) {
-                        reportError(observerError);
-                    }
+                    reportStartupTerminalError(error instanceof Error ? error : new Error(String(error)));
+                }
+                if (shouldRetry) {
+                    reportError(error);
                 }
-                reportError(error);
             });
             return;
         }
@@ -154,6 +160,7 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
         notifyCommandSessionObserver,
         startupCommandSettlementTimeoutMs,
         reportError,
+        reportStartupTerminalError,
     ]);
     const handleDisconnected = useCallback(() => {
         const currentSession = sessionRef.current;
@@ -199,6 +206,7 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
         coreUrl,
         key: `${coreUrl}:${coreHostRevision}`,
         onConnected: handleConnected,
+        onActivationRetryExhausted: reportStartupTerminalError,
         onDisconnected: handleDisconnected,
         onInvalidMessage,
         webViewComponent: coreWebViewComponent,

package/dist/version.js

@@ -3,4 +3,4 @@ const reactNativeSdkVersion = typeof __GX_REACT_NATIVE_SDK_VERSION__ === "string
     : "";
 // Build scripts patch this fallback to the package version for published artifacts.
 // Source-linked workspace usage keeps the local fallback.
-export const REACT_NATIVE_SDK_VERSION = reactNativeSdkVersion.length > 0 ? reactNativeSdkVersion : "4.0.28";
+export const REACT_NATIVE_SDK_VERSION = reactNativeSdkVersion.length > 0 ? reactNativeSdkVersion : "4.0.31";

package/dist/webview-document-host.js

@@ -41,14 +41,23 @@ export function WebViewDocumentHost({ bridgeId, buildDocumentStartScript, contro
     const callerOnLoadStart = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onLoadStart);
     const callerOnLoad = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onLoad);
     const callerOnMessage = toEventHandler(webViewProps === null || webViewProps === void 0 ? void 0 : webViewProps.onMessage);
-    useEffect(() => () => {
-        controller.detach();
+    const webViewHandleRef = useRef(null);
+    useEffect(() => {
+        const currentHandle = webViewHandleRef.current;
+        if (currentHandle) {
+            controller.attach(currentHandle);
+        }
+        return () => {
+            controller.detach();
+        };
     }, [controller]);
     const setWebViewRef = useCallback((handle) => {
         if (!handle || typeof handle.injectJavaScript !== "function") {
+            webViewHandleRef.current = null;
             controller.detach();
             return;
         }
+        webViewHandleRef.current = handle;
         controller.attach(handle);
     }, [controller]);
     const handleLoadStart = useCallback((event) => {

package/dist/webview-host-controller.d.ts

@@ -41,6 +41,7 @@ export declare const createWebViewHostController: <TMessage extends WebViewBridg
     }) => string;
     onConnected: (connection: WebViewHostConnection<TMessage>) => void;
     onDisconnected?: () => void;
+    onActivationRetryExhausted?: (error: Error) => void;
     activationRetryIntervalMs?: number;
     activationRetryTimeoutMs?: number;
 }) => WebViewHostController<TMessage>;

package/dist/webview-host-controller.js

@@ -18,6 +18,11 @@ export const createWebViewHostController = (input) => {
         }
         activationRetryDeadline = null;
     };
+    const reportActivationRetryExhausted = () => {
+        var _a;
+        clearActivationRetry();
+        (_a = input.onActivationRetryExhausted) === null || _a === void 0 ? void 0 : _a.call(input, new Error(`${input.connectionLabel} activation retries exhausted after ${String(activationRetryTimeoutMs)}ms`));
+    };
     const injectActivation = () => {
         const snapshot = session.getSnapshot();
         if (!handle || !isLoadComplete || snapshot.state !== "awaitingConnection") {
@@ -33,28 +38,37 @@ export const createWebViewHostController = (input) => {
         }
         catch (_a) {
             // A newly attached WebView can reject injection transiently. The
-            // existing activation retry and page-side timeout own recovery.
+            // bounded retry loop reports when it can no longer recover delivery.
         }
     };
     const scheduleActivationRetry = () => {
         if (activationRetryTimer !== null ||
             activationRetryDeadline === null ||
-            Date.now() >= activationRetryDeadline ||
             !handle ||
             !isLoadComplete ||
             session.getSnapshot().state !== "awaitingConnection") {
             return;
         }
-        activationRetryTimer = setTimeout(() => {
+        if (Date.now() >= activationRetryDeadline) {
+            reportActivationRetryExhausted();
+            return;
+        }
+        const timer = setTimeout(() => {
+            if (activationRetryTimer !== timer) {
+                return;
+            }
             activationRetryTimer = null;
-            if (activationRetryDeadline === null ||
-                Date.now() >= activationRetryDeadline) {
-                clearActivationRetry();
+            if (activationRetryDeadline === null) {
+                return;
+            }
+            if (Date.now() >= activationRetryDeadline) {
+                reportActivationRetryExhausted();
                 return;
             }
             injectActivation();
             scheduleActivationRetry();
         }, activationRetryIntervalMs);
+        activationRetryTimer = timer;
     };
     const activateUntilConnected = () => {
         if (session.getSnapshot().state !== "awaitingConnection") {
@@ -99,6 +113,7 @@ export const createWebViewHostController = (input) => {
         }
     };
     const disconnect = () => {
+        clearActivationRetry();
         session.close();
         dropActiveConnection();
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getuserfeedback/react-native",
-  "version": "4.0.28",
+  "version": "4.0.31",
   "description": "getuserfeedback React Native SDK",
   "keywords": [
     "getuserfeedback",
@@ -44,8 +44,8 @@
     "lint": "biome check ."
   },
   "dependencies": {
-    "@getuserfeedback/protocol": "^3.30.3",
-    "@getuserfeedback/sdk": "^0.12.26",
+    "@getuserfeedback/protocol": "^3.30.4",
+    "@getuserfeedback/sdk": "^0.12.27",
     "robot3": "^1.2.0"
   },
   "peerDependencies": {