@wix/himalaya-cli 0.1387.0 → 0.1389.0

package/templates/branded-lite/tier5-src/_shared/collection-contract.ts

@@ -98,7 +98,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedBadges: { rows: 'badges', title: 'name', subtitle: 'description', view: 'grid' },
   himiBrandedDonations: { rows: 'campaigns', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Donate' } },
   himiBrandedGiftCards: { rows: 'cards', title: 'name', subtitle: 'description', view: 'grid' },
-  himiBrandedVideos: { rows: 'channels', title: 'title', subtitle: 'description', view: 'grid' },
+  himiBrandedVideos: { rows: 'channels', title: 'title', subtitle: 'subtitle', image: 'coverUrl', view: 'grid', searchPlaceholder: 'Search channels', countNoun: ['channel', 'channels'] },
   himiBrandedPodcasts: { rows: 'episodes', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['progressLabel'], view: 'list' },
   himiBrandedForms: { rows: 'forms', title: 'name', subtitle: 'description', view: 'list' },
   himiBrandedGalleries: { rows: 'galleries', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },

package/templates/branded-lite/tier5-src/_shared/iap-worker.ts

@@ -2,9 +2,9 @@
 // `@himalaya/iap-checkout` → createIapCommerce), shared by every screen that shows or sells an
 // IAP-backed item. Mapping, Apple prices, payment guards, the host scope and the sale live in the
 // SDK; this only supplies the copy and the hydration reset.
-import type { IapPriceCopy } from "@himalaya/iap";
-import type { IapPurchaseCopy } from "@himalaya/iap-checkout";
-import { copyParam } from "./himi-copy.js";
+import { hostSessionFromGlobal, type IapPriceCopy } from "@himalaya/iap";
+import type { IapCommerce, IapPurchaseCopy, IapRestoreResult } from "@himalaya/iap-checkout";
+import { copyParam, copyTemplate } from "./himi-copy.js";
 
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
 export function iapPriceCopy(prefix: string): IapPriceCopy {
@@ -31,6 +31,87 @@ export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
   };
 }
 
+/** The Restore purchases control (App Review 3.1.1) a screen binds. */
+export interface IapRestoreFields {
+  restoreHidden: boolean;
+  restoreLabel: string;
+  restoreDisabled: boolean;
+  restoreMessage: string;
+}
+
+/** Keep these out of hydration: a restore's answer belongs to the run that got it. */
+export const IAP_RESTORE_KEYS = ["restoreHidden", "restoreLabel", "restoreDisabled", "restoreMessage"] as const;
+
+/** The control before the screen knows it sells through Apple. */
+export const NO_IAP_RESTORE: IapRestoreFields = { restoreHidden: true, restoreLabel: "", restoreDisabled: false, restoreMessage: "" };
+
+export interface IapRestoreControl {
+  /** `sellsThroughApple` is the screen's own signal: its item's App Store route, or Account's
+   *  purchase readiness. */
+  fields(sellsThroughApple: boolean): IapRestoreFields;
+  /** Runs the shared `commerce.restore()`, repainting as it starts and when it answers. A tap while
+   *  one runs is ignored. */
+  run(): Promise<void>;
+}
+
+/** Copy from the screen's pack (`<prefix>.restorePurchasesCta`, …). The restore itself, and the access
+ *  re-read after it, are the shared commerce's. */
+export function createIapRestore(
+  commerce: Pick<IapCommerce, "restore">,
+  options: { prefix: string; repaint(): void; /** The session generation; defaults to the host's. */ generation?: () => number },
+): IapRestoreControl {
+  const generation = options.generation ?? (() => hostSessionFromGlobal().current().generation);
+  let running = false;
+  let message = "";
+  let messageGeneration = -1;
+
+  function say(text: string, forGeneration: number): void {
+    message = text;
+    messageGeneration = forGeneration;
+  }
+
+  async function run(): Promise<void> {
+    if (running) return;
+    running = true;
+    const startedFor = generation();
+    say(copyParam(`${options.prefix}.restoringText`, "Restoring…"), startedFor);
+    options.repaint();
+    // Stamped with the session the tap was for: an answer landing after a sign-out is never shown.
+    say(restoreMessage(await restored(commerce), options.prefix), startedFor);
+    running = false;
+    options.repaint();
+  }
+
+  return {
+    fields: (sellsThroughApple) => ({
+      restoreHidden: !sellsThroughApple,
+      restoreLabel: copyParam(`${options.prefix}.restorePurchasesCta`, "Restore purchases"),
+      restoreDisabled: running,
+      // The answer was for the person signed in when it ran; another session never inherits it.
+      restoreMessage: sellsThroughApple && messageGeneration === generation() ? message : "",
+    }),
+    run,
+  };
+}
+
+function restored(commerce: Pick<IapCommerce, "restore">): Promise<IapRestoreResult> {
+  return commerce.restore().catch(() => ({ status: "failed", code: "storeUnavailable" }) as const);
+}
+
+function restoreMessage(result: IapRestoreResult, prefix: string): string {
+  if (result.status === "needsSignIn") return copyParam(`${prefix}.restoreSignInText`, "Sign in to restore your purchases.");
+  if (result.status === "failed") return result.code === "sessionChanged" ? "" : copyParam(`${prefix}.restoreFailedText`, "Couldn't reach the App Store. Try again.");
+  // Every part that happened is said: a recovery never hides a refusal or a purchase still pending.
+  const parts = [
+    result.recovered === 1 ? copyParam(`${prefix}.restoredOneText`, "Restored 1 purchase.") : "",
+    result.recovered > 1 ? copyTemplate(`${prefix}.restoredManyText`, "Restored {count} purchases.", { count: result.recovered }) : "",
+    // Held unfinished because Wix refused it (another member's purchase, say).
+    result.refused > 0 ? copyParam(`${prefix}.restoreRefusedText`, "A purchase on this Apple ID couldn't be added to this account. Contact support.") : "",
+    result.pending > 0 ? copyParam(`${prefix}.restorePendingText`, "A purchase is still being confirmed. Try again in a moment.") : "",
+  ].filter(Boolean);
+  return parts.length ? parts.join(" ") : copyParam(`${prefix}.restoreUpToDateText`, "Your purchases are up to date.");
+}
+
 /** What `notHydrated` does, for a runtime that ignores the option (a binary older than it, still
  *  served new bundles): put the listed keys back to their declared values before any action runs,
  *  so a persisted price or an enabled purchase action never paints as this run's. */

package/templates/branded-lite/tier5-src/_shared/video-caption.ts

@@ -0,0 +1,21 @@
+// The video carousel's two looks: the caption ON the cover (a brand label chip over the
+// image) or UNDER it. Every slide carries both placements; the descriptor's
+// `videoCaption` appear param picks one, and these flags hide the other
+// (`hiddenWhen` hides on TRUE). So a screen switches look by changing ONE param,
+// with no second carousel and no change to the slide tree.
+export type VideoCaption = "overlay" | "below";
+
+/** The placement a param asks for. Anything but "below" is the default, "overlay". */
+export function videoCaptionOf(value: unknown): VideoCaption {
+  return value === "below" ? "below" : "overlay";
+}
+
+export interface CaptionFlags {
+  captionOnImage: boolean;
+  captionBelow: boolean;
+}
+
+/** Stamp each card with the gates its slide reads (`$item.captionOnImage` / `$item.captionBelow`). */
+export function withCaption<T extends object>(cards: T[], caption: VideoCaption): (T & CaptionFlags)[] {
+  return cards.map((card) => ({ ...card, captionOnImage: caption === "overlay", captionBelow: caption === "below" }));
+}

package/templates/branded-lite/tier5-src/himi-branded-lite-home/index.ts

@@ -22,12 +22,18 @@ import { formatDateMedium } from "../_shared/engine-intl.js";
 import { readSavedProducts, type SavedProduct } from "../_shared/himi-store-saved.js";
 import { readSavedIds } from "../_shared/himi-blog-saved.js";
 import { wixMediaUrl } from "@himalaya/wix-media";
+import { isWixVideoWebRefusal, listLatestVideos, videoCard, type WixVideoCard } from "@himalaya/wix-video";
+import { videoCaptionOf, withCaption, type CaptionFlags } from "../_shared/video-caption.js";
 
 /** Latched once the member feed is refused because of WHERE the app is running rather
  *  than because of the request — see the catch in `loadExtras`. Module scope, so it
  *  survives every refresh of this worker and is reset only by a fresh boot. */
 let feedSurfaceRefused = false;
 
+/** The same latch for Wix Video: its gateway is reachable from the native apps only, so a
+ *  web bridge's refusal is permanent for this boot and the rail stays collapsed. */
+let videoSurfaceRefused = false;
+
 /** True for the one refusal that can never change while the app keeps running: the web
  *  bridge reporting that this host is not reachable from a browser at all. Deliberately
  *  narrower than `isBridgeUnavailable` — a 502/503 is an outage worth retrying, and only
@@ -292,6 +298,10 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: boolean;
+  /** The videos module's carousel — the newest ready Wix Video videos, the channels
+   *  taking turns. Guarded on `videos`; same silent-fail contract. */
+  homeVideos: (WixVideoCard & CaptionFlags)[];
+  noHomeVideos: boolean;
   feedHighlights: FeedHighlight[];
   noFeedHighlights: boolean;
   /** communityPulse member strip — the author directory of the SAME feed read
@@ -529,6 +539,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
   groupCards: GroupCard[];
@@ -539,7 +550,7 @@ interface ExtrasSignal {
 }
 
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -679,6 +690,18 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
   }
 }
 
+/** ONE Wix Video read for the videos module. A failure collapses the module; the web
+ *  bridges' refusal of the gateway also latches it off for the rest of this boot. */
+async function fetchHomeVideos(): Promise<WixVideoCard[]> {
+  try {
+    const untitled = copyParam("home.videoFallbackTitle", "Video");
+    return (await listLatestVideos({ limit: 8 })).map((entry) => videoCard(entry, untitled));
+  } catch (error) {
+    if (isWixVideoWebRefusal(error)) videoSurfaceRefused = true;
+    return [];
+  }
+}
+
 function homeFeedText(item: WixFeedItem): string {
   const blocks = item.content?.blocks;
   if (Array.isArray(blocks)) {
@@ -731,6 +754,10 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
   if (verticals.includes("programs")) {
     jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
   }
+  if (verticals.includes("videos") && !videoSurfaceRefused) {
+    const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
+    jobs.push(fetchHomeVideos().then((cards) => { extras.homeVideos = withCaption(cards, caption); }));
+  }
   if (verticals.includes("blog")) {
     // ONE limit-8 posts query feeds BOTH the communityPulse announcement
     // (posts[0].title — the frozen contract) and the showcaseFirst/episodeFirst
@@ -847,6 +874,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
     noGroupCards: state.groupCards.length === 0,
@@ -938,6 +966,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    homeVideos: [],
+    noHomeVideos: true,
     feedHighlights: [],
     noFeedHighlights: true,
     memberAvatars: [],

package/templates/branded-lite/tier5-src/himi-branded-lite-video/index.ts

@@ -1,12 +1,15 @@
 import { defineService } from "@himalaya/state";
 import { LOADING, loaded, loadFailed, needsSignIn, type LoadFlags } from "../_shared/branded-load-state.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
-import { CHANNEL_ACCESS_FIELDS, VIDEO_FIELDS, vodError, vodQuery, vodPages, videoAccess, youtubeId, type VodChannel, type VodVideo } from "../_shared/vod.js";
+import {
+  canWatchVideo, getVideo, getVideoStreamUrl, isHostedVideo, isVideoProcessing, listChannelVideos, videoCard, youtubeVideoId,
+} from "@himalaya/wix-video";
 import type { MediaItem } from "@himalaya/core";
 
+interface VideoRow { id: string; channelId: string; title: string; subtitle: string; meta: string; coverUrl: string; hasCover: boolean; noCover: boolean }
 interface S extends LoadFlags {
   id: string; channelId: string;
-  title: string; description: string; videos: { id: string; channelId: string; title: string; subtitle: string }[];
+  title: string; description: string; videos: VideoRow[];
   items: MediaItem[]; hidePlayer: boolean; hideNotFound: boolean; noEntity: boolean; hideRefresh: boolean; emptyText: string; message: string;
   playbackState: "loading" | "ready" | "processing" | "denied" | "unavailable" | "error";
 }
@@ -15,17 +18,6 @@ function input(key: string): string {
   const value = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.[key];
   return typeof value === "string" ? value : "";
 }
-const CHANNEL_QUERY = `query VodChannelVideos($channelId: ID!, $cursor: String) {
-  channel(filter: {id: $channelId}) { ${CHANNEL_ACCESS_FIELDS}
-    videos(sort: CUSTOM_DESC, cursor: $cursor) { cursor entities { ${VIDEO_FIELDS} } }
-  }
-}`;
-const VIDEO_QUERY = `query VodVideo($channelId: ID!, $videoId: ID!) {
-  channel(filter: {id: $channelId}) { ${CHANNEL_ACCESS_FIELDS} video(filter: {id: $videoId}) { ${VIDEO_FIELDS} } }
-}`;
-const PLAY_QUERY = `query VodVideoPlay($channelId: ID!, $videoId: ID!) {
-  channel(filter: {id: $channelId}) { video(filter: {id: $videoId}) { play(type: CONTENT) { entity { hls } } } }
-}`;
 let generation = 0;
 const initial: S = { ...LOADING, id: "", channelId: "", title: "", description: "", videos: [], items: [], hidePlayer: true, hideNotFound: true, noEntity: false, hideRefresh: false, emptyText: "", message: "", playbackState: "loading" };
 function unavailable(s: S, kind: S["playbackState"], message: string): S {
@@ -47,35 +39,34 @@ const svc = defineService<S, { reset: (s: S) => S; load: (s: S, arg?: unknown) =
         const channelScreen = input("screenId") === "himi_video_channel";
         if (!id || (!channelScreen && !channelId)) next = unavailable(next, "unavailable", copyParam("video.unavailableText", "This video or channel is unavailable."));
         else if (channelScreen) {
-          const videos = await vodPages(async cursor => {
-            const data = await vodQuery<{ channel: (VodChannel & { videos: { cursor?: string; entities: VodVideo[] } }) | null }>(CHANNEL_QUERY, { channelId: id, cursor });
-            if (!data.channel) throw Object.assign(vodError("Channel unavailable"), { notFound: true });
-            next.title = data.channel.title ?? "";
-            return data.channel.videos;
-          });
-          next = { ...next, ...loaded("videos", videos.map(v => ({ id: v.id, channelId: id, title: v.title?.trim() || copyParam("video.untitled", "Video"), subtitle:
-            v.content?.status !== "READY" ? copyParam("video.processingText", "Video is processing.") : "" })), COPY), playbackState: "ready" };
+          const { channel, videos } = await listChannelVideos(id);
+          next.title = channel.title ?? "";
+          const untitled = copyParam("video.untitled", "Video");
+          next = { ...next, ...loaded("videos", videos.map(v => {
+            const card = videoCard({ channel, video: v }, untitled);
+            return { id: v.id, channelId: id, title: card.title, meta: card.duration, coverUrl: card.coverUrl, hasCover: card.hasCover, noCover: card.noCover, subtitle:
+              v.content?.status !== "READY" ? copyParam("video.processingText", "Video is processing.") : "" };
+          }), COPY), playbackState: "ready" };
         } else {
-          const data = await vodQuery<{ channel: (VodChannel & { video: VodVideo | null }) | null }>(VIDEO_QUERY, { channelId, videoId: id });
-          const channel = data.channel;
-          const video = channel?.video;
-          if (!video || video.status !== "VISIBLE") next = unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));
+          const data = await getVideo(channelId, id);
+          const channel = data?.channel;
+          const video = data?.video;
+          if (!channel || !video || video.status !== "VISIBLE") next = unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));
           else {
             next.title = video.title ?? "";
             next.description = video.description ?? "";
-            if (video.content?.status !== "READY") next = /PROCESS|PENDING|TRANSCOD|UPLOAD|CONVERT/.test(video.content?.status ?? "") ?
+            if (video.content?.status !== "READY") next = isVideoProcessing(video) ?
               unavailable(next, "processing", copyParam("video.processingText", "Video is processing. Try again later.")) :
               unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));
-            else if (!videoAccess(channel!, video)) next = unavailable(next, "denied", copyParam("video.deniedText", "Your current membership or purchase does not allow this video."));
+            else if (!canWatchVideo(channel, video)) next = unavailable(next, "denied", copyParam("video.deniedText", "Your current membership or purchase does not allow this video."));
             else {
               let item: MediaItem | undefined;
               if (video.source === "YOUTUBE") {
-                const providerId = youtubeId(video);
+                const providerId = youtubeVideoId(video);
                 if (providerId) item = { id, kind: "video", provider: "youtube", providerId, title: next.title };
-              } else if (["COMPUTER", "GOOGLE_DRIVE", "DROPBOX"].includes(video.source ?? "")) {
-                const play = await vodQuery<{ channel: { video: { play?: { entity?: { hls?: string } } } } }>(PLAY_QUERY, { channelId, videoId: id });
-                const url = play.channel?.video?.play?.entity?.hls;
-                if (typeof url === "string" && /^https:\/\//.test(url)) item = { id, kind: "video", provider: "direct", url, streamType: "hls", title: next.title };
+              } else if (isHostedVideo(video)) {
+                const url = await getVideoStreamUrl(channelId, id);
+                if (url) item = { id, kind: "video", provider: "direct", url, streamType: "hls", title: next.title };
               }
               next = item ? { ...next, ...loaded("videos", [], { ...COPY, empty: "" }), emptyText: "", items: [item], hidePlayer: false, playbackState: "ready" } :
                 unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));

package/templates/branded-lite/tier5-src/himi-branded-lite-videos/index.ts

@@ -1,34 +1,27 @@
-// himi-branded-lite-videos — branded-lite "Videos" worker (Wix Video / VOD).
+// himi-branded-lite-videos — branded-lite "Videos" worker (Wix Video).
 //
-// UNLIKE the other B4 verticals, Wix Video has NO platformized REST @wix/auto_sdk_*
-// domain to codegen — the real consumer app (wix-private/wix-one-app-vod) fetches it
-// from a bespoke GraphQL gateway. So this worker mirrors that real app: it POSTs the
-// same ChannelListQuery to the VOD public GraphQL endpoint through the raw
-// `globalThis.himalaya.wixApi.call` bridge (which accepts absolute URLs + rides the
-// app's WixApiCapability auth — same chokepoint wix-spaces-dashboard uses for
-// manage.wix.com). a failed query is an error with Retry (or Sign in), an
+// Wix Video has NO platformized REST @wix/auto_sdk_* domain to codegen, so the data
+// comes through the hand-written `@himalaya/wix-video` client, which reads the same
+// Wix Video GraphQL gateway Wix's own mobile app reads, through the raw wixApi bridge
+// (visitor/member auth). ONE paged channel query feeds both sections of the screen:
+// the channels list, and the video carousel (the first videos of each channel, the
+// channels taking turns). A failed query is an error with Retry (or Sign in), an
 // empty one a real empty state; sample channels appear only in the host's explicit
 // sample preview (_shared/branded-load-state.ts).
-//
-// Endpoint + query verbatim from wix-one-app-vod/src/api/v3 (env.ts + ChannelFetch.ts).
 import { defineService } from "../_shared/collection-service.js";
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
-import { vodQuery, vodPages } from "../_shared/vod.js";
-
-const CHANNEL_LIST_QUERY = `
-  query VodChannelList($cursor: String) {
-    channels(sort: CUSTOM_ASC, cursor: $cursor) {
-      total
-      cursor
-      entities { id title description videos { total } hasPaidVideos }
-    }
-  }
-`;
+import { copyParam } from "../_shared/himi-copy.js";
+import { videoCaptionOf, withCaption, type CaptionFlags, type VideoCaption } from "../_shared/video-caption.js";
+import { channelCoverUrl, latestVideos, listChannels, videoCard, type WixVideoCard, type WixVideoChannel } from "@himalaya/wix-video";
 
-interface VodChannel { id?: string; title?: string; description?: string; videos?: { total?: number }; hasPaidVideos?: boolean }
-interface Row { id: string; title: string; subtitle: string }
+interface Row { id: string; title: string; subtitle: string; coverUrl: string; hasCover: boolean; noCover: boolean }
 interface S extends LoadFlags {
   channels: Row[]; emptyText: string;
+  /** Hides the channels section header when there is no row under it. */
+  noChannels: boolean;
+  /** The carousel section: up to CAROUSEL_SIZE ready videos across the channels, each
+   *  stamped with the caption placement the descriptor asked for (`videoCaption`). */
+  latestVideos: (WixVideoCard & CaptionFlags)[]; noLatestVideos: boolean;
   isMock: boolean; notMock: boolean; /** #2849 — hiddenWhen() hides on TRUE, so these are inverted: the empty-state banner
    *  shows only when the site really has none, and the unavailable one only when the
    *  query failed. A failed query must never render the sentence that claims the
@@ -36,17 +29,22 @@ interface S extends LoadFlags {
   notMockEmpty: boolean; notMockUnavailable: boolean;
 }
 
-function norm(c: VodChannel): Row {
+/** Videos read per channel for the carousel, and the carousel's length. */
+const PER_CHANNEL = 4;
+const CAROUSEL_SIZE = 10;
+
+function norm(c: WixVideoChannel): Row {
   const title = (c.title || "Channel").trim() || "Channel";
   const count = c.videos?.total ?? 0;
   const parts = [count === 1 ? "1 video" : `${count} videos`, c.hasPaidVideos ? "Premium" : ""].filter(Boolean);
-  return { id: c.id || "channel", title, subtitle: parts.join(" · ") };
+  const coverUrl = channelCoverUrl(c);
+  return { id: c.id || "channel", title, subtitle: parts.join(" · "), coverUrl, hasCover: !!coverUrl, noCover: !coverUrl };
 }
 
 const MOCK: Row[] = [
-  { id: "sample-tutorials", title: "Tutorials",       subtitle: "12 videos" },
-  { id: "sample-behind",    title: "Behind the Scenes", subtitle: "6 videos" },
-  { id: "sample-masterclass", title: "Masterclass",    subtitle: "8 videos · Premium" },
+  { id: "sample-tutorials", title: "Tutorials",       subtitle: "12 videos", coverUrl: "", hasCover: false, noCover: true },
+  { id: "sample-behind",    title: "Behind the Scenes", subtitle: "6 videos", coverUrl: "", hasCover: false, noCover: true },
+  { id: "sample-masterclass", title: "Masterclass",    subtitle: "8 videos · Premium", coverUrl: "", hasCover: false, noCover: true },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;
@@ -60,20 +58,28 @@ const COPY: LoadCopy<Row> = {
 };
 
 let generation = 0;
-const svc = defineService<S, { load: (s: S) => Promise<S | undefined> }>("himiBrandedVideos", {
-  state: { ...LOADING, channels: [], emptyText: "" },
+/** The latest placement an appear asked for; a param-less reload keeps it. */
+let caption: VideoCaption = "overlay";
+const svc = defineService<S, { load: (s: S, arg?: unknown) => Promise<S | undefined> }>("himiBrandedVideos", {
+  state: { ...LOADING, channels: [], emptyText: "", noChannels: true, latestVideos: [], noLatestVideos: true },
   actions: {
-    load: async (s) => {
+    load: async (s, arg) => {
       const request = ++generation;
+      const asked = (arg as { videoCaption?: unknown } | undefined)?.videoCaption;
+      if (asked !== undefined) caption = videoCaptionOf(asked);
       try {
-        const entities = await vodPages(async cursor => {
-          const data = await vodQuery<{ channels: { entities: (VodChannel & { id: string })[]; cursor?: string } }>(CHANNEL_LIST_QUERY, { cursor });
-          return data.channels;
-        });
-        const channels = entities.map(norm);
-        if (request === generation) return { ...s, ...loaded("channels", channels, COPY) };
+        const entities = await listChannels({ videosPerChannel: PER_CHANNEL });
+        const untitled = copyParam("videos.untitledVideo", "Video");
+        const cards = withCaption(latestVideos(entities, CAROUSEL_SIZE).map((entry) => videoCard(entry, untitled)), caption);
+        if (request === generation) {
+          const rows = loaded("channels", entities.map(norm), COPY);
+          return { ...s, ...rows, noChannels: rows.channels.length === 0, latestVideos: cards, noLatestVideos: cards.length === 0 };
+        }
       } catch (err) {
-        if (request === generation) return { ...s, ...loadFailed("channels", err, COPY) };
+        if (request === generation) {
+          const rows = loadFailed("channels", err, COPY);
+          return { ...s, ...rows, noChannels: rows.channels.length === 0, latestVideos: [], noLatestVideos: true };
+        }
       }
       return undefined;
     },

package/templates/branded-lite/tier5-src/himi-store-account/index.ts

@@ -14,6 +14,8 @@ import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
+import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
+import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
 
 interface AuthRouteInput {
   intent?: string;
@@ -152,7 +154,7 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
   }
 }
 
-interface S {
+interface S extends IapRestoreFields {
   status: "loading" | "ready";
   isMember: boolean;
   notMember: boolean;
@@ -214,6 +216,27 @@ interface S {
   noMemberAddresses: boolean;
   /** Hides My Wallet where this runtime cannot reach saved cards. */
   noMemberWallet: boolean;
+  /** Set once a descriptor asks for the Restore purchases row (appear param
+   *  `restorePurchases: "1"`). Only then does the worker reach the App Store layer, so a
+   *  descriptor that renders no such row need not declare `iap`. */
+  restorePurchases: boolean;
+}
+
+// Restore purchases (App Review 3.1.1) for every vertical the app sells through the App Store. The
+// row shows once purchasing is ready on this host (a bound iOS binary with managed StoreKit), to a
+// guest too: the restore itself asks them to sign in.
+const commerce = createIapCommerce({
+  adapters: [onlineProgramOrders, pricingPlanOrders, ...(storesAppleSalesEnabled() ? [storesProductOrders] : [])],
+  onChange: () => { void svc.restorePublish(); },
+});
+const restore = createIapRestore(commerce, { prefix: "storeAccount", repaint: () => { void svc.restorePublish(); } });
+let commerceEntered = false;
+
+/** The first entry reads readiness and recovers held purchases; later ones reconcile, as on any
+ *  screen that sells. */
+function enterCommerce(): void {
+  void (commerceEntered ? commerce.reconcile() : commerce.start());
+  commerceEntered = true;
 }
 
 function derive(s: S): S {
@@ -234,6 +257,7 @@ function derive(s: S): S {
     hideSignInChoices: isRegistering || isRecovering,
     hasActivity,
     noActivity: !hasActivity,
+    ...restore.fields(s.restorePurchases && commerce.readiness().status === "ready"),
     authTitle: headline.authTitle,
     authBody: headline.authBody,
     hasReturnPath,
@@ -288,6 +312,8 @@ async function probe(s: S, arg?: unknown): Promise<S> {
   const intent = authIntentFromArg(arg, s);
   const profile = await loadMemberProfile(copyParam("storeAccount.guestDetail", "Sign in to keep your cart and orders connected."));
   const memberAccountLinks = s.memberAccountLinks || strField(arg, "memberAccountLinks") === "1";
+  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
+  if (restorePurchases) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -313,6 +339,7 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
+    restorePurchases,
     noMemberAddresses: !routes.addresses,
     noMemberWallet: !routes.wallet,
     activityRows,
@@ -365,7 +392,10 @@ const svc = defineService<S, {
   signIn: (s: S) => Promise<S | undefined>;
   register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
+  restorePublish: (s: S) => S;
+  iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
+  notHydrated: [...IAP_RESTORE_KEYS],
   state: derive({
     status: "loading",
     isMember: false,
@@ -411,6 +441,8 @@ const svc = defineService<S, {
     memberAccountLinks: false,
     noMemberAddresses: true,
     noMemberWallet: true,
+    restorePurchases: false,
+    ...NO_IAP_RESTORE,
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },
@@ -503,8 +535,11 @@ const svc = defineService<S, {
       };
       return derive(cleared);
     },
+    restorePublish: (s) => derive(s),
+    iapRestore: async () => { await restore.run(); return undefined; },
   },
 });
 
+resetUnhydratedKeysOnOlderRuntime(svc, { ...svc.getState(), ...NO_IAP_RESTORE }, IAP_RESTORE_KEYS);
 svc.load();
 export { svc };