@wix/himalaya-cli 0.1017.0 → 0.1019.0

package/dist/cli.mjs

@@ -46477,7 +46477,7 @@ var init_assets = __esm({
 async function checkPinnedRead(input) {
   const { secret, token, app, releaseId, screenId, authorizePreview } = input;
   if (!secret) return authorizePreview ? { status: 503, body: { error: "preview_token_unavailable" } } : null;
-  if (!token) return await input.isLive() ? null : { status: 401, body: { error: "preview_token_required", app, releaseId } };
+  if (!token) return await input.isPublic() ? null : { status: 401, body: { error: "preview_token_required", app, releaseId } };
   const verified = await verifyPreviewToken({ token, secret, app, releaseId, screenId });
   if (verified.ok) {
     if (authorizePreview ? !await authorizePreview(verified.claims) : !!verified.claims.siteLease) {
@@ -46759,9 +46759,30 @@ function makeServeHandler(opts) {
   function resolvePin(request, url) {
     return request.headers.get("x-himalaya-release") || url.searchParams.get("release") || null;
   }
+  const RELEASE_SOURCE_HEADER = "x-himalaya-release-source";
   function resolvePreviewToken(request, url) {
     return request.headers.get("x-himalaya-preview-token") || url.searchParams.get("pvt") || null;
   }
+  const RING_CACHE_CAP = 500;
+  const ringCache = /* @__PURE__ */ new Map();
+  async function isRingRelease(app, releaseId) {
+    if (!opts.ringReleases) return false;
+    const hit = ringCache.get(app);
+    let ids = hit && Date.now() - hit.at < manifestCacheTtlMs ? hit.ids : void 0;
+    if (!ids) {
+      try {
+        ids = new Set(await opts.ringReleases(app));
+      } catch {
+        ids = /* @__PURE__ */ new Set();
+      }
+      if (!ringCache.has(app) && ringCache.size >= RING_CACHE_CAP) {
+        const oldest = ringCache.keys().next().value;
+        if (oldest !== void 0) ringCache.delete(oldest);
+      }
+      ringCache.set(app, { ids, at: Date.now() });
+    }
+    return ids.has(releaseId);
+  }
   async function pinnedManifest(app, releaseId) {
     const key2 = `${app}
 ${releaseId}`;
@@ -46846,11 +46867,40 @@ ${releaseId}`;
       app,
       releaseId,
       screenId,
-      isLive: async () => (await manifest(app))?.releaseId === releaseId,
+      isPublic: async () => (await manifest(app))?.releaseId === releaseId || await isRingRelease(app, releaseId),
       authorizePreview: opts.authorizePreview
     });
     return denied && json3(denied.status, denied.body);
   }
+  async function honourRingPin(request) {
+    const kept = { request, dropped: false };
+    if (request.method !== "GET" && request.method !== "HEAD") return kept;
+    if (request.headers.get(RELEASE_SOURCE_HEADER) !== "ring") return kept;
+    const pin = request.headers.get("x-himalaya-release");
+    if (!pin) return kept;
+    const url = new URL(request.url);
+    const app = /^\/v1\/app-config\/([^/]+)$/.exec(url.pathname)?.[1] ?? resolveApp(request, url);
+    if (!app) return kept;
+    const drop = () => {
+      const headers2 = new Headers(request.headers);
+      headers2.delete("x-himalaya-release");
+      headers2.delete(RELEASE_SOURCE_HEADER);
+      return { request: new Request(request, { headers: headers2 }), dropped: true };
+    };
+    if (/^\/v1\/app-config\/[^/]+$/.test(url.pathname)) return drop();
+    let servable;
+    try {
+      const live2 = await manifest(app);
+      const eligible = live2?.releaseId === pin || await isRingRelease(app, pin);
+      const pinned = eligible ? await pinnedManifest(app, pin) : null;
+      servable = pinned !== null;
+      const screenId = /^\/v1\/screen\/([^/]+)$/.exec(url.pathname)?.[1];
+      if (servable && screenId && !pinned?.screens[screenId]) servable = false;
+    } catch {
+      return kept;
+    }
+    return servable ? kept : drop();
+  }
   const corsHeaders = (request) => {
     const origin = request.headers.get("origin");
     if (!origin) return {};
@@ -46859,7 +46909,7 @@ ${releaseId}`;
       "access-control-allow-origin": origin,
       vary: "Origin",
       "access-control-allow-methods": "GET, HEAD, POST, PUT, DELETE, OPTIONS",
-      "access-control-allow-headers": "Content-Type, If-None-Match, X-Himalaya-Schema-Versions, Accept-Language, X-Himalaya-Session, X-Himalaya-User, X-Himalaya-Platform, X-Himalaya-App-Version, X-Himalaya-App, X-Himalaya-Release, X-Himalaya-Preview-Token",
+      "access-control-allow-headers": "Content-Type, If-None-Match, X-Himalaya-Schema-Versions, Accept-Language, X-Himalaya-Session, X-Himalaya-User, X-Himalaya-Platform, X-Himalaya-App-Version, X-Himalaya-App, X-Himalaya-Release, X-Himalaya-Release-Source, X-Himalaya-Preview-Token",
       "access-control-expose-headers": "ETag, X-Himalaya-Bundle-Integrity, X-Himalaya-App",
       "access-control-allow-credentials": "true"
     };
@@ -47399,7 +47449,8 @@ ${releaseId}`;
         }
         const mm = m;
         const readDoc = (hash, live2) => pin ? hash ? pinnedBody(app, hash, live2) : Promise.resolve(null) : live2();
-        const cfgBytes = await readDoc(mm.appConfigHash, () => store.getAppConfig(app));
+        const ringPinned = pin !== null && request.headers.get(RELEASE_SOURCE_HEADER) === "ring";
+        const cfgBytes = ringPinned ? await store.getAppConfig(app) : await readDoc(mm.appConfigHash, () => store.getAppConfig(app));
         if (!cfgBytes) return json3(404, { error: "app_config_not_found", app });
         let appConfig;
         try {
@@ -47407,7 +47458,7 @@ ${releaseId}`;
         } catch {
           return json3(500, { error: "app_config_invalid", app });
         }
-        const bootOverlay = !pin && opts.devControl ? devControlOverlay.get(app) : void 0;
+        const bootOverlay = (!pin || ringPinned) && opts.devControl ? devControlOverlay.get(app) : void 0;
         if (bootOverlay) appConfig.control = { ...appConfig.control ?? {}, ...bootOverlay };
         const tokensBytes = await readDoc(mm.tokensHash, () => store.getTokens(app));
         let tokens = null;
@@ -47424,9 +47475,18 @@ ${releaseId}`;
         let screen = null;
         let screenHash = "";
         let homeBundle = null;
-        const homeMeta = homeScreenId ? mm.screens[homeScreenId] : void 0;
+        let homeFrom = mm;
+        let readHome = readDoc;
+        if (ringPinned && homeScreenId && !mm.screens[homeScreenId]) {
+          const live2 = await manifest(app);
+          if (live2?.screens[homeScreenId]) {
+            homeFrom = live2;
+            readHome = (_hash, liveSlot) => liveSlot();
+          }
+        }
+        const homeMeta = homeScreenId ? homeFrom.screens[homeScreenId] : void 0;
         if (homeScreenId && homeMeta) {
-          const body = await readDoc(homeMeta.descriptorHash, () => store.getScreen(app, homeScreenId));
+          const body = await readHome(homeMeta.descriptorHash, () => store.getScreen(app, homeScreenId));
           if (body) {
             try {
               screen = JSON.parse(utf8Decode(body));
@@ -47436,7 +47496,7 @@ ${releaseId}`;
             }
           }
           if (homeMeta.bundle) {
-            const entry = mm.bundles[homeMeta.bundle];
+            const entry = homeFrom.bundles[homeMeta.bundle];
             if (entry?.sha256 && entry?.sri) {
               homeBundle = {
                 sha256: entry.sha256,
@@ -47446,9 +47506,10 @@ ${releaseId}`;
             }
           }
         }
-        const etag = strongEtag(`${mm.releaseId}:${mm.appConfigHash ?? ""}:${mm.tokensHash ?? ""}:${screenHash}:${homeBundle?.sha256 ?? ""}`);
-        const cache = pin ? PINNED_CACHE_CONTROL : DOC_CACHE_CONTROL;
-        const vary = pin ? { vary: "x-himalaya-release" } : {};
+        const cfgTag = ringPinned ? sha256hex(JSON.stringify(appConfig)) : mm.appConfigHash ?? "";
+        const etag = strongEtag(`${mm.releaseId}:${cfgTag}:${mm.tokensHash ?? ""}:${screenHash}:${homeBundle?.sha256 ?? ""}`);
+        const cache = pin && !ringPinned ? PINNED_CACHE_CONTROL : DOC_CACHE_CONTROL;
+        const vary = pin ? { vary: ringPinned ? `x-himalaya-release, ${RELEASE_SOURCE_HEADER}` : "x-himalaya-release" } : {};
         if (request.headers.get("if-none-match") === etag) {
           return new Response(null, { status: 304, headers: { etag, "cache-control": cache, ...vary } });
         }
@@ -47629,7 +47690,14 @@ ${releaseId}`;
     if (request.method === "OPTIONS") {
       return new Response(null, { status: 204, headers: { ...corsHeaders(request), "content-length": "0" } });
     }
-    const response = await handle(request);
+    const ring = await honourRingPin(request);
+    const response = await handle(ring.request);
+    if (ring.dropped) {
+      const parts = new Set(
+        [...response.headers.get("vary")?.split(",") ?? [], "x-himalaya-release", RELEASE_SOURCE_HEADER].map((s) => s.trim()).filter(Boolean)
+      );
+      response.headers.set("vary", [...parts].join(", "));
+    }
     if (resolvePreviewToken(request, new URL(request.url))) {
       response.headers.set("cache-control", "private, no-store");
       response.headers.set("vary", "x-himalaya-preview-token, x-himalaya-release");
@@ -47999,19 +48067,19 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-DRerTUYc.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1016478, sha256: "42a5b901a0a58a495e5261f68782d28d12aa95cf64df33d9d8d14236e8ea6ead" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1016486, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1107410, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1198394, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1289374, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1380246, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1471226, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1579862, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1688946, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1797994, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1905694, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1993802, length: 4448, sha256: "98239860f1289aebffdb28d2b9f5ce15fbb95a657bb63d262c650ca21513dde3" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 1998250, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
+      { key: "assets/index-Bsi3iDy5.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1018562, sha256: "8487d8635f18c5a32f124ebc217f0570d5b8242ac964de661fa0644b80843116" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1018570, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1109494, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1200478, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1291458, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1382330, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1473310, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1581946, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1691030, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1800078, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1907778, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1995886, length: 4448, sha256: "60540583e7c95a5564940f1f05510886f0f59a6ec612af78881031a5e9c04b9a" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2000334, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
     ];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1017.0",
+  "version": "0.1019.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -65,5 +65,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "7241867426a013199afa47aedd31061192ba4c6d3bbc927e00e89b52"
+  "falconPackageHash": "1bc07d659f8a5254f7afe76b39faf5f6d53dff12518cfd6257039a78"
 }