@getuserfeedback/react-native 4.0.21 → 4.0.22

package/dist/native-view-host-projection.js

@@ -10,7 +10,7 @@ function NativeViewHostProjectionEntry({ controller, nativeViewComponent, onInva
         detach === null || detach === void 0 ? void 0 : detach();
     }, []);
     const handleConnected = useCallback((connection) => {
-        const controllerDetach = controller.attachViewReadinessConnection({
+        const controllerDetach = controller.attachViewConnection({
             allocationId: record.allocationId,
             connection,
         });

package/dist/native-view-record-controller.d.ts

@@ -15,7 +15,7 @@ export type NativeViewRecord = Readonly<{
     viewId: string;
 }>;
 export type NativeViewRecordController = {
-    attachViewReadinessConnection(input: {
+    attachViewConnection(input: {
         allocationId: number;
         connection: ViewWebViewHostConnection;
     }): (() => void) | null;

package/dist/native-view-record-controller.js

@@ -1,6 +1,7 @@
 import { coreViewHostActionSchema, } from "@getuserfeedback/protocol/internal/core-view-host-actions";
-import { actionRequestCloseViewSchema, buildEventLayoutTransactionCommitted, buildEventViewSize, eventViewSizeSchema, } from "@getuserfeedback/protocol/internal/view-host-control-messages";
+import { actionRequestCloseViewSchema, actionViewConnectSchema, buildEventLayoutTransactionCommitted, buildEventViewSize, eventViewSizeSchema, } from "@getuserfeedback/protocol/internal/view-host-control-messages";
 import { buildEventViewClosed, buildEventViewPrerendered, } from "@getuserfeedback/protocol/internal/view-host-lifecycle-events";
+import { bindViewHostControlEnvelope, bindViewToCoreRelayEnvelope, parseCoreToViewRelayEnvelope, } from "@getuserfeedback/protocol/internal/view-relay-contract";
 import { createViewPreparationReadinessRegistry, createViewPreparationRegistry, } from "./view-orchestration-runtime.js";
 const createNativeViewReadinessRegistry = () => createViewPreparationReadinessRegistry();
 export function createNativeViewRecordController(input) {
@@ -41,9 +42,9 @@ export function createNativeViewRecordController(input) {
         if (entries.get(entry.viewId) !== entry) {
             return false;
         }
-        const detachViewReadiness = entry.viewReadinessDetach;
-        entry.viewReadinessDetach = null;
-        detachViewReadiness === null || detachViewReadiness === void 0 ? void 0 : detachViewReadiness();
+        const detachViewConnection = entry.viewConnectionDetach;
+        entry.viewConnectionDetach = null;
+        detachViewConnection === null || detachViewConnection === void 0 ? void 0 : detachViewConnection();
         entries.delete(entry.viewId);
         if (!disposed) {
             notify();
@@ -74,14 +75,17 @@ export function createNativeViewRecordController(input) {
             isActive: false,
             isClosing: false,
             isPreparationCommitted: false,
+            isViewConnected: false,
+            isViewRelayDraining: false,
             layoutReportRevision: 0,
             openRequest: toOpenRequestMetadata(action.openRequest),
+            pendingCoreToViewMessages: [],
             preparation,
             size: null,
             srcdoc: action.srcdoc,
             committedLayoutReportOccurrence: null,
             viewConnection: null,
-            viewReadinessDetach: null,
+            viewConnectionDetach: null,
             viewId: action.viewId,
         };
         entries.set(action.viewId, entry);
@@ -109,25 +113,65 @@ export function createNativeViewRecordController(input) {
             closeEntry(entry);
         }
     };
+    const drainCoreToViewMessages = (entry) => {
+        if (coreConnectionFailed ||
+            disposed ||
+            entry.isViewRelayDraining ||
+            !entry.isViewConnected ||
+            !entry.viewConnection ||
+            entries.get(entry.viewId) !== entry) {
+            return;
+        }
+        entry.isViewRelayDraining = true;
+        try {
+            while (!coreConnectionFailed &&
+                !disposed &&
+                entry.isViewConnected &&
+                entry.viewConnection !== null &&
+                entries.get(entry.viewId) === entry &&
+                entry.pendingCoreToViewMessages.length > 0) {
+                const message = entry.pendingCoreToViewMessages.shift();
+                entry.viewConnection.transport.postMessage(message);
+            }
+        }
+        catch (error) {
+            failCoreConnection(error, "Native Core-to-View relay delivery failed");
+        }
+        finally {
+            entry.isViewRelayDraining = false;
+        }
+    };
+    const enqueueCoreToViewMessage = (entry, message) => {
+        entry.pendingCoreToViewMessages.push(message);
+        drainCoreToViewMessages(entry);
+    };
     const handleCoreMessage = (value) => {
         if (coreConnectionFailed || disposed) {
             return;
         }
-        const parsed = coreViewHostActionSchema.safeParse(value);
-        if (!parsed.success ||
-            parsed.data.gen !== input.coreConnection.generation) {
+        const action = coreViewHostActionSchema.safeParse(value);
+        if (action.success && action.data.gen === input.coreConnection.generation) {
+            switch (action.data.t) {
+                case "getuserfeedback:action:prerenderView":
+                    handlePrerender(action.data);
+                    break;
+                case "getuserfeedback:action:activateView":
+                    handleActivate(action.data);
+                    break;
+                case "getuserfeedback:action:closeView":
+                    handleClose(action.data);
+                    break;
+            }
             return;
         }
-        switch (parsed.data.t) {
-            case "getuserfeedback:action:prerenderView":
-                handlePrerender(parsed.data);
-                break;
-            case "getuserfeedback:action:activateView":
-                handleActivate(parsed.data);
-                break;
-            case "getuserfeedback:action:closeView":
-                handleClose(parsed.data);
-                break;
+        const relay = parseCoreToViewRelayEnvelope(value, {
+            generation: input.coreConnection.generation,
+        });
+        if (relay) {
+            const entry = entries.get(relay.viewId);
+            if (entry) {
+                enqueueCoreToViewMessage(entry, relay.message);
+            }
         }
     };
     const completeConnectionReadiness = (entry, size) => {
@@ -205,7 +249,7 @@ export function createNativeViewRecordController(input) {
                 failCoreConnection(error, "Native view layout commit delivery failed");
             }
         },
-        attachViewReadinessConnection({ allocationId, connection }) {
+        attachViewConnection({ allocationId, connection }) {
             if (coreConnectionFailed || disposed) {
                 return null;
             }
@@ -216,7 +260,7 @@ export function createNativeViewRecordController(input) {
                 connection.generation !== input.coreConnection.generation) {
                 return null;
             }
-            const previousDetach = entry.viewReadinessDetach;
+            const previousDetach = entry.viewConnectionDetach;
             const connectionReadiness = createNativeViewReadinessRegistry().begin(viewId);
             let detached = false;
             let subscribed = false;
@@ -229,9 +273,10 @@ export function createNativeViewRecordController(input) {
                 detached = true;
                 unsubscribe();
                 connectionReadiness.release();
-                if (entry.viewReadinessDetach === detach) {
-                    entry.viewReadinessDetach = null;
+                if (entry.viewConnectionDetach === detach) {
+                    entry.viewConnectionDetach = null;
                     entry.viewConnection = null;
+                    entry.isViewConnected = false;
                     entry.committedLayoutReportOccurrence = null;
                     if (entry.size !== null) {
                         entry.size = null;
@@ -246,7 +291,7 @@ export function createNativeViewRecordController(input) {
                     detached ||
                     disposed ||
                     entries.get(viewId) !== entry ||
-                    entry.viewReadinessDetach !== detach) {
+                    entry.viewConnectionDetach !== detach) {
                     return;
                 }
                 try {
@@ -261,22 +306,50 @@ export function createNativeViewRecordController(input) {
                     detached ||
                     disposed ||
                     entries.get(viewId) !== entry ||
-                    entry.viewReadinessDetach !== detach) {
+                    entry.viewConnectionDetach !== detach) {
+                    return;
+                }
+                const connected = actionViewConnectSchema.safeParse(value);
+                if (connected.success) {
+                    if (connected.data.gen === input.coreConnection.generation &&
+                        connected.data.viewId === viewId) {
+                        entry.isViewConnected = true;
+                        drainCoreToViewMessages(entry);
+                    }
                     return;
                 }
-                const closeRequest = actionRequestCloseViewSchema.safeParse(value);
-                if (closeRequest.success) {
-                    if (closeRequest.data.gen === input.coreConnection.generation &&
-                        (closeRequest.data.viewId === undefined ||
-                            closeRequest.data.viewId === viewId)) {
+                const control = bindViewHostControlEnvelope(value, {
+                    generation: input.coreConnection.generation,
+                    viewId,
+                });
+                if ((control === null || control === void 0 ? void 0 : control.t) === "getuserfeedback:action:viewConnect") {
+                    return;
+                }
+                if ((control === null || control === void 0 ? void 0 : control.t) === "getuserfeedback:action:requestCloseView") {
+                    const closeRequest = actionRequestCloseViewSchema.safeParse(control);
+                    if (closeRequest.success) {
                         closeViewFromRequest(entry, closeRequest.data);
                     }
                     return;
                 }
-                const parsed = eventViewSizeSchema.safeParse(value);
+                const parsed = eventViewSizeSchema.safeParse(control);
                 if (!parsed.success ||
-                    parsed.data.gen !== input.coreConnection.generation ||
-                    (parsed.data.viewId !== undefined && parsed.data.viewId !== viewId)) {
+                    parsed.data.gen !== input.coreConnection.generation) {
+                    if (!entry.isViewConnected) {
+                        return;
+                    }
+                    const relay = bindViewToCoreRelayEnvelope(value, {
+                        generation: input.coreConnection.generation,
+                        viewId,
+                    });
+                    if (relay) {
+                        try {
+                            input.coreConnection.transport.postMessage(relay);
+                        }
+                        catch (error) {
+                            failCoreConnection(error, "Native View-to-Core relay delivery failed");
+                        }
+                    }
                     return;
                 }
                 const size = toViewSizeReport(parsed.data);
@@ -304,7 +377,7 @@ export function createNativeViewRecordController(input) {
             }
             catch (error) {
                 connectionReadiness.release();
-                reportError(error, "Native view readiness subscription failed");
+                reportError(error, "Native view connection subscription failed");
                 return null;
             }
             unsubscribe = subscribedUnsubscribe;
@@ -313,8 +386,9 @@ export function createNativeViewRecordController(input) {
                 connectionReadiness.release();
                 return null;
             }
-            entry.viewReadinessDetach = detach;
+            entry.viewConnectionDetach = detach;
             entry.viewConnection = connection;
+            entry.isViewConnected = false;
             entry.committedLayoutReportOccurrence = null;
             previousDetach === null || previousDetach === void 0 ? void 0 : previousDetach();
             if (entry.size !== null) {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getuserfeedback/react-native",
-  "version": "4.0.21",
+  "version": "4.0.22",
   "description": "getuserfeedback React Native SDK",
   "keywords": [
     "getuserfeedback",