@snowcone-app/ui 0.9.2 → 0.9.4

package/dist/index.d.cts

@@ -2928,6 +2928,10 @@ declare function useShopOptional(): ShopContextValue | undefined;
 interface MockupResult {
     mockupId: string;
     imageUrl: string;
+    /** The canvas version this frame was rendered from (see getCanvasVersion). */
+    requestVersion?: number;
+    /** Per-placement versions folded into this frame (servers with per-placement stamps; see getLatestSentVersions). */
+    versions?: Record<string, number>;
 }
 type RealtimeState = RealtimeContextValue;
 interface RealtimeContextValue {
@@ -3043,6 +3047,19 @@ interface RealtimeContextValue {
      * subsequent blobs to the same placement.
      */
     subscribeBlobSent: (callback: (placement: string) => void) => () => void;
+    /**
+     * The canvas version the session last sent (0 before the first edit
+     * reaches the server). Every rendered result carries the `requestVersion`
+     * it was rendered from: a picture whose version is below this one shows an
+     * older design. Read it after a `subscribeBlobSent` notification.
+     */
+    getCanvasVersion: () => number;
+    /**
+     * The latest canvas version sent per placement. With a server that stamps
+     * `versions` on every frame, a picture is current exactly when, for every
+     * placement here, its frame's `versions[placement]` is at least this.
+     */
+    getLatestSentVersions: () => Record<string, number>;
     flushPendingBlobs: () => void;
     hasPendingBlobs: () => boolean;
     subscribePipelineSettled: (callback: () => void) => () => void;

package/dist/index.d.ts

@@ -2928,6 +2928,10 @@ declare function useShopOptional(): ShopContextValue | undefined;
 interface MockupResult {
     mockupId: string;
     imageUrl: string;
+    /** The canvas version this frame was rendered from (see getCanvasVersion). */
+    requestVersion?: number;
+    /** Per-placement versions folded into this frame (servers with per-placement stamps; see getLatestSentVersions). */
+    versions?: Record<string, number>;
 }
 type RealtimeState = RealtimeContextValue;
 interface RealtimeContextValue {
@@ -3043,6 +3047,19 @@ interface RealtimeContextValue {
      * subsequent blobs to the same placement.
      */
     subscribeBlobSent: (callback: (placement: string) => void) => () => void;
+    /**
+     * The canvas version the session last sent (0 before the first edit
+     * reaches the server). Every rendered result carries the `requestVersion`
+     * it was rendered from: a picture whose version is below this one shows an
+     * older design. Read it after a `subscribeBlobSent` notification.
+     */
+    getCanvasVersion: () => number;
+    /**
+     * The latest canvas version sent per placement. With a server that stamps
+     * `versions` on every frame, a picture is current exactly when, for every
+     * placement here, its frame's `versions[placement]` is at least this.
+     */
+    getLatestSentVersions: () => Record<string, number>;
     flushPendingBlobs: () => void;
     hasPendingBlobs: () => boolean;
     subscribePipelineSettled: (callback: () => void) => () => void;

package/dist/index.js

@@ -5703,6 +5703,11 @@ async function compositeCroppedFrame(args) {
 import { jsx as jsx52 } from "react/jsx-runtime";
 var DEFAULT_ARTBOARD_SIZE = 2e3;
 var MAX_CONCURRENT_BLOBS = 5;
+function mergeMockupIds(current, extra) {
+  const out = [...current];
+  for (const id of extra) if (!out.includes(id)) out.push(id);
+  return out;
+}
 var RealtimeContext = createContext8(
   void 0
 );
@@ -5781,6 +5786,12 @@ function RealtimeProvider({
     },
     onError: (error, detail) => {
       console.error(`[RealtimeProvider] Render error [${detail.code}]:`, error);
+      if (detail.code.startsWith("E_RERENDER_") && pendingRerenderRef.current.length > 0) {
+        const ids = pendingRerenderRef.current;
+        pendingRerenderRef.current = [];
+        forceRerenderByConfigRef.current?.(ids);
+        return;
+      }
       if (detail.mockupId) {
         const id = detail.mockupId;
         setUnavailableMockups((prev) => prev.get(id)?.code === detail.code ? prev : new Map(prev).set(id, detail));
@@ -5806,7 +5817,9 @@ function RealtimeProvider({
     disconnect,
     flushPendingBlobs,
     hasPendingBlobs,
-    getLastSentVersion
+    getLastSentVersion,
+    getLatestSentVersions,
+    rerender: rerenderRaw
   } = realtimeMockup;
   const mockupResultsRef = useRef12([]);
   const mockupSubscribersRef = useRef12(
@@ -5843,6 +5856,18 @@ function RealtimeProvider({
   const compositeQueueRef = useRef12(/* @__PURE__ */ new Map());
   const compositeBusyRef = useRef12(/* @__PURE__ */ new Set());
   const compositeCanvasRef = useRef12(null);
+  const requestedMockupIdsRef = useRef12([]);
+  const serverStampsVersionsRef = useRef12(false);
+  const pendingRerenderRef = useRef12([]);
+  const forceRerenderByConfigRef = useRef12(null);
+  const fullFrameRerenderIdsRef = useRef12(/* @__PURE__ */ new Set());
+  const fullFrameRerenderTimerRef = useRef12(null);
+  useEffect17(
+    () => () => {
+      if (fullFrameRerenderTimerRef.current) clearTimeout(fullFrameRerenderTimerRef.current);
+    },
+    []
+  );
   const registerBlobUrl = useCallback10((blobOrUrl, placementName) => {
     let url;
     if (blobOrUrl instanceof Blob) {
@@ -5874,6 +5899,7 @@ function RealtimeProvider({
       const base = lastConfigBaseRef.current;
       if (!base) return;
       croppedActiveRef.current = withCrop;
+      requestedMockupIdsRef.current = base.mockupIds ?? [];
       sendConfigRaw({
         ...base,
         placementSettings: { ...placementSettingsOverridesRef.current },
@@ -5886,6 +5912,65 @@ function RealtimeProvider({
     if (!croppedActiveRef.current) return;
     sendCropConfig(false);
   }, [sendCropConfig]);
+  const sendFullFrameConfig = useCallback10(
+    (mockupIds) => {
+      const base = lastConfigBaseRef.current;
+      if (!base) return;
+      sendConfigRaw({
+        ...base,
+        mockupIds,
+        placementSettings: { ...placementSettingsOverridesRef.current }
+      });
+    },
+    [sendConfigRaw]
+  );
+  const forceRerenderByConfig = useCallback10(
+    (failed) => {
+      const inForce = requestedMockupIdsRef.current;
+      const fp = (list) => [...list].sort().join(",");
+      const step = fp(failed) !== fp(inForce) ? failed : inForce.slice(0, -1);
+      if (step.length === 0) {
+        console.error(
+          `[RealtimeProvider] E_OVERLAY_RERENDER_UNAVAILABLE: cannot force a full-frame re-render of ${failed.join(", ")} (single-mockup session on a box without \`rerender\`); it updates on the next edit.`
+        );
+        sendFullFrameConfig(inForce);
+        return;
+      }
+      sendFullFrameConfig(step);
+      sendFullFrameConfig(inForce);
+    },
+    [sendFullFrameConfig]
+  );
+  forceRerenderByConfigRef.current = forceRerenderByConfig;
+  const rerenderFullFrame = useCallback10(
+    (mockupId) => {
+      fullFrameRerenderIdsRef.current.add(mockupId);
+      if (fullFrameRerenderTimerRef.current) return;
+      fullFrameRerenderTimerRef.current = setTimeout(() => {
+        fullFrameRerenderTimerRef.current = null;
+        const failed = [...fullFrameRerenderIdsRef.current];
+        fullFrameRerenderIdsRef.current.clear();
+        if (!lastConfigBaseRef.current || failed.length === 0) return;
+        const previous = requestedMockupIdsRef.current;
+        const ids = mergeMockupIds(previous, failed);
+        croppedActiveRef.current = false;
+        requestedMockupIdsRef.current = ids;
+        const fp = (list) => [...list].sort().join(",");
+        if (fp(ids) !== fp(previous)) {
+          sendFullFrameConfig(ids);
+          return;
+        }
+        if (serverStampsVersionsRef.current) {
+          sendFullFrameConfig(ids);
+          pendingRerenderRef.current = failed;
+          if (rerenderRaw(failed)) return;
+          pendingRerenderRef.current = [];
+        }
+        forceRerenderByConfig(failed);
+      }, 0);
+    },
+    [sendFullFrameConfig, forceRerenderByConfig, rerenderRaw]
+  );
   const maybeFlipCrop = useCallback10(() => {
     if (!croppedDeliveryEnabled || !cropCapableRef.current) return;
     if (croppedActiveRef.current) return;
@@ -5919,6 +6004,10 @@ function RealtimeProvider({
         else merged.push(result);
       });
       mockupResultsRef.current = merged;
+      if (pendingRerenderRef.current.length > 0) {
+        const delivered = new Set(results.map((r) => r.mockupId));
+        pendingRerenderRef.current = pendingRerenderRef.current.filter((id) => !delivered.has(id));
+      }
       const clearedPlacements = /* @__PURE__ */ new Set();
       results.forEach((result) => {
         const wasPending = pendingMockupIdsRef.current.has(result.mockupId);
@@ -5985,8 +6074,7 @@ function RealtimeProvider({
         console.error(
           `[RealtimeProvider] E_OVERLAY_NO_BACKGROUND: cropped frame for ${result.mockupId} has no frozen background \u2014 falling back to full-frame and re-rendering it.`
         );
-        unflipCrop();
-        updateMockupIdsRaw([result.mockupId]);
+        rerenderFullFrame(result.mockupId);
         return;
       }
       try {
@@ -6004,16 +6092,18 @@ function RealtimeProvider({
         if (gen !== sceneGenRef.current) return;
         deliverResults([{ ...result, imageUrl: registerBlobUrl(blob) }]);
       } catch (err) {
+        if (gen !== sceneGenRef.current || compositeQueueRef.current.has(result.mockupId) || processedFrameRef.current.get(result.mockupId) !== result.imageUrl) {
+          return;
+        }
         console.error(
           "[RealtimeProvider] E_OVERLAY_COMPOSITE_FAILED: cropped-frame composite failed \u2014 full-frame delivery for the rest of this session.",
           err
         );
         cropCapableRef.current = false;
-        unflipCrop();
-        updateMockupIdsRaw([result.mockupId]);
+        rerenderFullFrame(result.mockupId);
       }
     },
-    [deliverResults, registerBlobUrl, unflipCrop, updateMockupIdsRaw]
+    [deliverResults, registerBlobUrl, rerenderFullFrame]
   );
   const pumpCompositeQueue = useCallback10(
     (mockupId) => {
@@ -6039,6 +6129,9 @@ function RealtimeProvider({
     }
     console.log(`[RTP] rawMockupResults changed: ${rawMockupResults.length} result(s)`, rawMockupResults.map((r) => `${r.mockupId}${r.imageUrl ? " \u2713url" : " \u2717NO-URL"}${r.cropRect ? " [crop]" : ""}`));
     const displayable = [];
+    if (!serverStampsVersionsRef.current && rawMockupResults.some((r) => r.versions && typeof r.versions === "object")) {
+      serverStampsVersionsRef.current = true;
+    }
     rawMockupResults.forEach((result) => {
       if (!result.imageUrl) {
         console.log(`[RTP] Result for ${result.mockupId} has NO imageUrl \u2014 not caching, pending NOT cleared`);
@@ -6201,6 +6294,7 @@ function RealtimeProvider({
       });
     }
     lastConfigBaseRef.current = configPayload;
+    requestedMockupIdsRef.current = mockupIds;
     sendConfigRaw(
       croppedActiveRef.current ? { ...configPayload, overlayCrop: "auto" } : configPayload
     );
@@ -6260,6 +6354,7 @@ function RealtimeProvider({
       if (croppedActiveRef.current && mockupIds.some((id) => !backgroundsRef.current.has(id))) {
         unflipCrop();
       }
+      requestedMockupIdsRef.current = [...mockupIds];
       return updateMockupIdsRaw(mockupIds);
     },
     [updateMockupIdsRaw, unflipCrop]
@@ -6516,6 +6611,12 @@ function RealtimeProvider({
     },
     []
   );
+  const getLastSentVersionRef = useRef12(getLastSentVersion);
+  getLastSentVersionRef.current = getLastSentVersion;
+  const getCanvasVersion = useCallback10(() => getLastSentVersionRef.current?.() ?? 0, []);
+  const getLatestSentVersionsRef = useRef12(getLatestSentVersions);
+  getLatestSentVersionsRef.current = getLatestSentVersions;
+  const getLatestSentVersionsStable = useCallback10(() => getLatestSentVersionsRef.current?.() ?? {}, []);
   const stableSubscribePipelineSettled = useCallback10(
     (callback) => {
       return subscribePipelineSettledRef.current(callback);
@@ -6564,6 +6665,8 @@ function RealtimeProvider({
       // Centralized URL management
       getMockupUrl: getMockupUrl3,
       getMockupUrls,
+      getCanvasVersion,
+      getLatestSentVersions: getLatestSentVersionsStable,
       isMockupLoading,
       registerBlobUrl,
       // WebRTC streaming
@@ -6595,6 +6698,8 @@ function RealtimeProvider({
       hasPendingBlobs,
       getMockupUrl3,
       getMockupUrls,
+      getCanvasVersion,
+      getLatestSentVersionsStable,
       isMockupLoading,
       registerBlobUrl
     ]
@@ -7471,17 +7576,33 @@ function MockupPriorityProvider({ children }) {
     if (!realtimeContext?.updateMockupIds) {
       return;
     }
+    const mobile = mobileCarouselRef.current;
+    const universe = mobile && mobile.mockupIds.length > 0 ? mobile.mockupIds : registrationOrderRef.current;
+    const inView = [];
+    if (level1MockupRef.current) {
+      inView.push(level1MockupRef.current);
+      if (!mobile || mobile.mockupIds.length === 0) {
+        visibilityMapRef.current.forEach((info, id) => {
+          if (info.visibleArea > 0 && !inView.includes(id)) inView.push(id);
+        });
+      }
+    }
     let mockupIds;
     switch (level) {
       case 1:
-        mockupIds = level1MockupRef.current ? [level1MockupRef.current] : [];
+        mockupIds = inView;
         break;
       case 2:
-        mockupIds = [...level2MockupsRef.current];
+        mockupIds = level2MockupsRef.current.filter((id) => !inView.includes(id));
         break;
-      case 3:
-        mockupIds = [...level3QueueRef.current];
+      case 3: {
+        const earlier = /* @__PURE__ */ new Set([...inView, ...level2MockupsRef.current]);
+        mockupIds = [
+          ...level3QueueRef.current.filter((id) => !earlier.has(id)),
+          ...universe.filter((id) => !earlier.has(id) && !level3QueueRef.current.includes(id))
+        ];
         break;
+      }
       default:
         mockupIds = [];
     }
@@ -7506,6 +7627,16 @@ function MockupPriorityProvider({ children }) {
       const isStillDragging = timeSinceLastPendingBlob < DRAG_STOP_DEBOUNCE_MS;
       if (currentLevel === 1 && isStillDragging) {
         currentRenderingLevelRef.current = null;
+        if (levelAdvanceTimeoutRef.current) {
+          clearTimeout(levelAdvanceTimeoutRef.current);
+        }
+        levelAdvanceTimeoutRef.current = setTimeout(() => {
+          levelAdvanceTimeoutRef.current = null;
+          const quiet = Date.now() - lastPendingBlobTimeRef.current >= DRAG_STOP_DEBOUNCE_MS;
+          if (quiet && currentRenderingLevelRef.current === null && pendingMockupsRef.current.size === 0) {
+            requestMockupsForLevel(2);
+          }
+        }, DRAG_STOP_DEBOUNCE_MS - timeSinceLastPendingBlob + 10);
         return;
       }
       if (isStillDragging) {
@@ -10363,6 +10494,57 @@ var HeroProductImage = memo3(function HeroProductImage2({
       unsubscribe?.();
     };
   }, [mode, realtimeContext?.subscribePendingBlob, placement]);
+  const renderVersionRef = useRef23(0);
+  const renderVersionsRef = useRef23(null);
+  const getLatestSentVersions = realtimeContext?.getLatestSentVersions;
+  const refusalCodeRef = useRef23(null);
+  refusalCodeRef.current = unavailable?.code ?? null;
+  const sessionErrorCodeRef = useRef23(null);
+  sessionErrorCodeRef.current = realtimeContext?.renderError?.code ?? null;
+  const getCanvasVersion = realtimeContext?.getCanvasVersion;
+  const applyRenderStamp = useCallback18(() => {
+    const node = containerRef.current;
+    if (!node) return;
+    const canvas = getCanvasVersion?.() ?? 0;
+    if (canvas <= 0) {
+      delete node.dataset.canvasVersion;
+      delete node.dataset.renderVersion;
+      delete node.dataset.renderState;
+      return;
+    }
+    const rendered = renderVersionRef.current;
+    const versions = renderVersionsRef.current;
+    const sent = versions ? getLatestSentVersions?.() : void 0;
+    const behind = versions && sent ? Object.entries(sent).some(([placement2, v]) => (versions[placement2] ?? -1) < v) : rendered < canvas;
+    node.dataset.canvasVersion = String(canvas);
+    node.dataset.renderVersion = String(rendered);
+    node.dataset.renderState = refusalCodeRef.current || behind && sessionErrorCodeRef.current ? "refused" : behind ? "stale" : "current";
+  }, [getCanvasVersion, getLatestSentVersions]);
+  useEffect32(() => {
+    applyRenderStamp();
+  });
+  useEffect32(() => {
+    const subscribeSent = realtimeContext?.subscribeBlobSent;
+    const subscribeResult = realtimeContext?.subscribeMockupResultById;
+    if (!actualMockupId || !subscribeSent || !subscribeResult) return;
+    const offSent = subscribeSent(() => applyRenderStamp());
+    const offResult = subscribeResult(actualMockupId, (result) => {
+      if (typeof result?.requestVersion === "number" && result.requestVersion >= renderVersionRef.current) {
+        renderVersionRef.current = result.requestVersion;
+        renderVersionsRef.current = result.versions ?? null;
+      }
+      applyRenderStamp();
+    });
+    return () => {
+      offSent?.();
+      offResult?.();
+    };
+  }, [
+    actualMockupId,
+    realtimeContext?.subscribeBlobSent,
+    realtimeContext?.subscribeMockupResultById,
+    applyRenderStamp
+  ]);
   useEffect32(() => {
     if (!priorityContext || !actualMockupId || !placement) return;
     priorityContext.registerMockup(actualMockupId, placement, initialPriority);