@getuserfeedback/react-native 4.0.3 → 4.0.5

package/dist/index.js

@@ -53,9 +53,6 @@ const createReactNativeFlowRunController = (flowId, { enqueueFlowCommand, enqueu
         reportCommandError(error instanceof Error ? error : new Error(String(error)));
         throw error;
     });
-    const clearResolvedHandle = () => {
-        handleClient.clearResolvedHandle();
-    };
     const reset = () => {
         handleClient.reset();
     };
@@ -91,8 +88,10 @@ const createReactNativeFlowRunController = (flowId, { enqueueFlowCommand, enqueu
         close: () => {
             return reportAsyncCommandError(handleClient.runResolvedHandleCommand((flowHandleId) => flowHandleId, enqueueScopedClose));
         },
-        clearResolvedHandle,
         hasFlowHandleId: (flowHandleId) => handleClient.getHandleId() === flowHandleId,
+        invalidateResolvedHandle: (flowHandleId) => {
+            handleClient.invalidateResolvedHandle(flowHandleId);
+        },
         reset,
         resetIdleHandle,
     };
@@ -414,7 +413,7 @@ export function GetUserFeedbackProvider({ autoInit = true, children, commandTime
     const handleFlowHandleInvalidated = useCallback((flowHandleId) => {
         for (const flowRun of flowRunsRef.current.values()) {
             if (flowRun.hasFlowHandleId(flowHandleId)) {
-                flowRun.clearResolvedHandle();
+                flowRun.invalidateResolvedHandle(flowHandleId);
             }
         }
         setWidgetHostVisibility((visibility) => clearFlowHandleFromVisibility(visibility, flowHandleId));

package/dist/native-core-command-session.d.ts

@@ -2,7 +2,9 @@ import { type CoreCommandEnvelope } from "@getuserfeedback/protocol";
 import { type CommandSettledSuccessDetail } from "@getuserfeedback/protocol/host";
 import type { NativeCoreCommandChannel } from "./native-core-command-channel.js";
 export type NativeCoreCommandSession = {
-    dispatch: (envelope: CoreCommandEnvelope) => Promise<CommandSettledSuccessDetail>;
+    dispatch: (envelope: CoreCommandEnvelope, options?: {
+        settlementTimeoutMs?: number;
+    }) => Promise<CommandSettledSuccessDetail>;
 };
 type NativeCoreCommandSessionOwner = {
     dispose: () => void;
@@ -10,5 +12,6 @@ type NativeCoreCommandSessionOwner = {
 };
 export declare function createNativeCoreCommandSession(input: {
     channel: NativeCoreCommandChannel;
+    settlementTimeoutMs?: number;
 }): NativeCoreCommandSessionOwner;
 export {};

package/dist/native-core-command-session.js

@@ -1,6 +1,7 @@
 import { coreCommandEnvelopeSchema, } from "@getuserfeedback/protocol";
-import { toCommandSettlementError, } from "@getuserfeedback/protocol/host";
+import { CommandSettlementTimeoutError, toCommandSettlementError, } from "@getuserfeedback/protocol/host";
 import { createPendingCommandTracker } from "./view-orchestration-runtime.js";
+const DEFAULT_COMMAND_SETTLEMENT_TIMEOUT_MS = 30000;
 class NativeCoreCommandSessionClosedError extends Error {
     constructor(requestId) {
         super("Native core command session closed before settlement");
@@ -24,7 +25,16 @@ function toCommandSettledDetail(settlement) {
 export function createNativeCoreCommandSession(input) {
     const pendingCommands = createPendingCommandTracker();
     const pendingIdentityByRequestId = new Map();
+    const timeoutByRequestId = new Map();
     let disposed = false;
+    const clearPendingTimeout = (requestId) => {
+        const timeout = timeoutByRequestId.get(requestId);
+        if (timeout === undefined) {
+            return;
+        }
+        clearTimeout(timeout);
+        timeoutByRequestId.delete(requestId);
+    };
     const unsubscribeSettlements = input.channel.subscribe((settlement) => {
         const detail = toCommandSettledDetail(settlement);
         const pendingIdentity = pendingIdentityByRequestId.get(detail.requestId);
@@ -34,6 +44,7 @@ export function createNativeCoreCommandSession(input) {
             return;
         }
         pendingIdentityByRequestId.delete(detail.requestId);
+        clearPendingTimeout(detail.requestId);
         if (detail.ok) {
             pendingCommands.resolve(detail.requestId, detail);
             return;
@@ -42,7 +53,8 @@ export function createNativeCoreCommandSession(input) {
     });
     return {
         session: {
-            dispatch: async (envelope) => {
+            dispatch: async (envelope, options) => {
+                var _a, _b;
                 if (disposed) {
                     return Promise.reject(new Error("Native core command session is closed"));
                 }
@@ -52,11 +64,17 @@ export function createNativeCoreCommandSession(input) {
                     instanceId: canonicalEnvelope.instanceId,
                     kind: canonicalEnvelope.command.kind,
                 });
+                timeoutByRequestId.set(canonicalEnvelope.requestId, setTimeout(() => {
+                    pendingIdentityByRequestId.delete(canonicalEnvelope.requestId);
+                    timeoutByRequestId.delete(canonicalEnvelope.requestId);
+                    pendingCommands.reject(canonicalEnvelope.requestId, new CommandSettlementTimeoutError(canonicalEnvelope.requestId));
+                }, Math.max(0, (_b = (_a = options === null || options === void 0 ? void 0 : options.settlementTimeoutMs) !== null && _a !== void 0 ? _a : input.settlementTimeoutMs) !== null && _b !== void 0 ? _b : DEFAULT_COMMAND_SETTLEMENT_TIMEOUT_MS)));
                 try {
                     input.channel.post(canonicalEnvelope);
                 }
                 catch (error) {
                     pendingIdentityByRequestId.delete(canonicalEnvelope.requestId);
+                    clearPendingTimeout(canonicalEnvelope.requestId);
                     pendingCommands.reject(canonicalEnvelope.requestId, error instanceof Error ? error : new Error(String(error)));
                 }
                 return settlement;
@@ -69,6 +87,10 @@ export function createNativeCoreCommandSession(input) {
             disposed = true;
             unsubscribeSettlements();
             pendingIdentityByRequestId.clear();
+            for (const timeout of timeoutByRequestId.values()) {
+                clearTimeout(timeout);
+            }
+            timeoutByRequestId.clear();
             pendingCommands.reset((requestId) => new NativeCoreCommandSessionClosedError(requestId));
         },
     };

package/dist/native-runtime-root.js

@@ -19,26 +19,10 @@ import { NativeViewHostProjection, } from "./native-view-host-projection.js";
 import { createNativeViewRecordController, } from "./native-view-record-controller.js";
 import { createProviderCommandEnvelope, REACT_NATIVE_CLIENT_META, } from "./provider-command-helpers.js";
 const DEFAULT_STARTUP_COMMAND_SETTLEMENT_TIMEOUT_MS = 30000;
-function dispatchStartupCommand(input) {
-    let timeoutId;
-    const timeout = new Promise((_resolve, reject) => {
-        timeoutId = setTimeout(() => reject(new CommandSettlementTimeoutError(input.envelope.requestId)), Math.max(0, input.timeoutMs));
-    });
-    return Promise.race([
-        input.commandSession.dispatch(input.envelope).then(() => undefined),
-        timeout,
-    ]).finally(() => {
-        if (timeoutId !== undefined) {
-            clearTimeout(timeoutId);
-        }
-    });
-}
 async function dispatchStartupCommands(input) {
     for (const command of input.commands) {
-        await dispatchStartupCommand({
-            commandSession: input.commandSession,
-            envelope: command,
-            timeoutMs: input.timeoutMs,
+        await input.commandSession.dispatch(command, {
+            settlementTimeoutMs: input.timeoutMs,
         });
     }
 }
@@ -135,6 +119,7 @@ export function NativeRuntimeRoot({ coreUrl, coreWebViewComponent, coreWebViewPr
                 commandChannelOwner.dispose();
                 controller.dispose();
                 const shouldRetry = !(error instanceof CommandSettlementError) &&
+                    !(error instanceof CommandSettlementTimeoutError) &&
                     !startupRetryAttemptedRef.current;
                 if (shouldRetry) {
                     startupRetryAttemptedRef.current = true;

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.3";
+export const REACT_NATIVE_SDK_VERSION = reactNativeSdkVersion.length > 0 ? reactNativeSdkVersion : "4.0.5";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getuserfeedback/react-native",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "getuserfeedback React Native SDK",
   "keywords": [
     "getuserfeedback",
@@ -44,8 +44,8 @@
     "lint": "biome check ."
   },
   "dependencies": {
-    "@getuserfeedback/protocol": "^3.25.0",
-    "@getuserfeedback/sdk": "^0.12.12",
+    "@getuserfeedback/protocol": "^3.25.1",
+    "@getuserfeedback/sdk": "^0.12.13",
     "robot3": "^1.2.0"
   },
   "peerDependencies": {