@wix/himalaya-cli 0.988.0 → 0.989.0

package/dist/cli.mjs

@@ -5330,6 +5330,7 @@ function resolveTranslation(value, catalog, sourceCatalog) {
 var BINDING_SIGILS, BINDING_SIGIL_RE, TRANSLATION_PREFIX, TRANSLATION_KEY_RE;
 var init_bindings = __esm({
   "../../core/ts/src/bindings.ts"() {
+    "use strict";
     BINDING_SIGILS = ["service", "flag", "item", "t"];
     BINDING_SIGIL_RE = new RegExp(
       `^\\$(?:${BINDING_SIGILS.filter((s) => s !== "t").join("|")})\\b|^\\$t:`
@@ -15931,7 +15932,7 @@ function wixClientIdOf(appConfigJson) {
   if (typeof clientId !== "string" || !clientId) return { error: "no_client_id" };
   return { clientId };
 }
-var WIX_API, ONE_APP_SESSION, OWNER_SCOPED_WIX_HOST, VisitorTokenCache, OwnerInstanceCache, OWNER_SITES_QUERY_PATH, OWNER_SITES_COUNT_PATH, OwnerSitesCache;
+var WIX_API, ONE_APP_SESSION, OWNER_SCOPED_WIX_HOST, VisitorTokenCache, OWNER_REFRESH_MARGIN_MS, OwnerInstanceCache, OWNER_SITES_QUERY_PATH, OWNER_SITES_COUNT_PATH, OwnerSitesCache;
 var init_wix_bridge = __esm({
   "../../core/serve-runtime/src/wix-bridge.ts"() {
     init_sha256();
@@ -15968,20 +15969,29 @@ var init_wix_bridge = __esm({
         this.cache.delete(clientId);
       }
     };
+    OWNER_REFRESH_MARGIN_MS = 6e4;
     OwnerInstanceCache = class {
       constructor(fetchImpl = fetch, ttlMs = 5 * 6e4) {
         this.fetchImpl = fetchImpl;
         this.ttlMs = ttlMs;
       }
       cache = /* @__PURE__ */ new Map();
+      /** Keyed on the SESSION (`wixSession2`), not the whole cookie header: manage.wix.com's jar churns
+       *  (analytics, experiments), and keying on all of it re-minted on nearly every call (#3044). A
+       *  header with no session cookie falls back to itself — callers refuse that case before here. */
       key(msid, cookieHeader) {
+        const session = /(?:^|;\s*)wixSession2=([^;]*)/.exec(cookieHeader)?.[1] ?? cookieHeader;
         return sha256Hex2(`${msid}
-${cookieHeader}`);
+${session}`);
       }
       async instance(msid, cookieHeader, now = Date.now()) {
+        return (await this.entry(msid, cookieHeader, now)).instance;
+      }
+      /** The instance and the time this cache stops trusting it (#3044: the web host caches until then). */
+      async entry(msid, cookieHeader, now = Date.now()) {
         const key2 = this.key(msid, cookieHeader);
         const hit = this.cache.get(key2);
-        if (hit && hit.expiresAt > now) return hit.instance;
+        if (hit && hit.expiresAt - OWNER_REFRESH_MARGIN_MS > now) return { instance: hit.instance, expiresAt: hit.expiresAt };
         const res = await this.fetchImpl(`${ONE_APP_SESSION}/${msid}/signed-instance?signed_instance_type=User`, {
           method: "GET",
           headers: { Cookie: cookieHeader }
@@ -15994,8 +16004,9 @@ ${cookieHeader}`);
         }
         if (res.status < 200 || res.status >= 300 || !j.signedInstance)
           throw new Error(`owner mint failed (${res.status})`);
-        this.cache.set(key2, { instance: j.signedInstance, expiresAt: now + this.ttlMs });
-        return j.signedInstance;
+        const entry = { instance: j.signedInstance, expiresAt: now + this.ttlMs };
+        this.cache.set(key2, entry);
+        return { ...entry };
       }
       /** Drop a cached instance (e.g. after a 401 from wixapis) so the next call re-mints. */
       invalidate(msid, cookieHeader) {
@@ -43028,6 +43039,22 @@ ${releaseId}`;
           }
         });
       }
+      if (path === "/v1/owner/instance") {
+        if (opts.webwixBridge === false) return json3(503, { error: "webwix_bridge_disabled" });
+        if (!webwixOwnerRungOn()) return json3(503, { error: "webwix_owner_disabled" });
+        const msid = url.searchParams.get("msid") ?? "";
+        if (!isSafeMsid(msid)) return json3(400, { error: "webwix_owner_bad_msid" });
+        const cookie = request.headers.get("cookie") ?? "";
+        if (!/wixSession2=/.test(cookie)) return json3(401, { error: "webwix_owner_no_session" });
+        try {
+          const entry = await webwixOwnerInstances.entry(msid, cookie);
+          return json3(200, { ...entry, expiresInMs: Math.max(0, entry.expiresAt - Date.now()) }, { "cache-control": "no-store" });
+        } catch (e) {
+          const msg = String(e?.message ?? e);
+          if (/owner mint failed \(5\d\d\)/.test(msg) || !msg.includes("owner mint failed")) return json3(502, { error: "webwix_bridge_upstream_failed" });
+          return json3(403, { error: "webwix_owner_mint_failed" });
+        }
+      }
       if (path === "/v1/owner/sites") {
         if (!webwixOwnerRungOn()) return json3(503, { error: "webwix_owner_disabled" });
         const cookie = request.headers.get("cookie") ?? "";
@@ -43792,19 +43819,19 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-BHbI7Cmq.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 994462, sha256: "f4589e2d3922fada826a38cbf29c40cfbd124903a29c07c32b93f7019e417e05" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 994470, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1085394, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1176378, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1267358, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1358230, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1449210, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1557846, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1666930, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1775978, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1883678, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1971786, length: 4448, sha256: "246aa990caa5f3d2b93be16c284909d3cd339608304a0378eb838ea6eb21d21c" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 1976234, length: 13784, sha256: "cfb9465254fab84f0e084bb4542c282758ea29774b5f172840cc0b9e4194ef89" }
+      { key: "assets/index-DKlP06hp.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 997374, sha256: "9dd7ca28e467c7715af80eb404682bcd75804fee6941c8ae30cacdb542385854" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 997382, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1088306, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1179290, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1270270, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1361142, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 1452122, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 1560758, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 1669842, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 1778890, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 1886590, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 1974698, length: 4448, sha256: "a21d7d8d7acdce79ccd442b4137814a17739998360e5b11fc74958c55b77ce30" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 1979146, length: 13784, sha256: "cfb9465254fab84f0e084bb4542c282758ea29774b5f172840cc0b9e4194ef89" }
     ];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.988.0",
+  "version": "0.989.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": "c2103681d4e81b57ca6cb6c383be4713d6962b36a34881a75524df88"
+  "falconPackageHash": "67a573e97c057c3bf277ed30655a7855e28d5c899c59b41eac1f3c85"
 }