@wix/himalaya-cli 0.1008.0 → 0.1009.0

package/dist/cli.mjs

@@ -16874,7 +16874,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, OWNER_REFRESH_MARGIN_MS, 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, OWNER_RENEW_MIN_AGE_MS, OWNER_MINT_TIMEOUT_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();
@@ -16912,12 +16912,19 @@ var init_wix_bridge = __esm({
       }
     };
     OWNER_REFRESH_MARGIN_MS = 6e4;
+    OWNER_RENEW_MIN_AGE_MS = 5e3;
+    OWNER_MINT_TIMEOUT_MS = 8e3;
     OwnerInstanceCache = class {
-      constructor(fetchImpl = fetch, ttlMs = 5 * 6e4) {
+      constructor(fetchImpl = fetch, ttlMs = 5 * 6e4, mintTimeoutMs = OWNER_MINT_TIMEOUT_MS, elapsedClock = () => performance.now()) {
         this.fetchImpl = fetchImpl;
         this.ttlMs = ttlMs;
+        this.mintTimeoutMs = mintTimeoutMs;
+        this.elapsedClock = elapsedClock;
       }
       cache = /* @__PURE__ */ new Map();
+      /** The one mint on its way per (business, session). Every caller, plain or renewing, joins it:
+       *  it started after whatever is cached was minted, so it is the fresh instance. */
+      inflight = /* @__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. */
@@ -16929,28 +16936,62 @@ ${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()) {
+      /** The instance and the time this cache stops trusting it (#3044: the web host caches until then).
+       *  `renew`: Wix refused the instance this cache handed out (the route's `renew=1`, #3140) — mint a
+       *  new one, unless the cached one is younger than OWNER_RENEW_MIN_AGE_MS or a mint is already on
+       *  its way, in which case that IS the new one. */
+      async entry(msid, cookieHeader, now = Date.now(), opts = {}) {
         const key2 = this.key(msid, cookieHeader);
-        const hit = this.cache.get(key2);
+        const pending = this.inflight.get(key2);
+        if (pending) return { ...await pending };
+        let hit = this.cache.get(key2);
+        if (opts.renew && hit && now - hit.mintedAt >= OWNER_RENEW_MIN_AGE_MS) hit = void 0;
         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 }
+        const mint = this.mint(key2, msid, cookieHeader, now).finally(() => this.inflight.delete(key2));
+        this.inflight.set(key2, mint);
+        return { ...await mint };
+      }
+      async mint(key2, msid, cookieHeader, now) {
+        const startedAt = this.elapsedClock();
+        const abort = new AbortController();
+        let timer;
+        const timedOut = new Promise((_, reject) => {
+          timer = setTimeout(() => {
+            abort.abort();
+            reject(new Error(`owner mint timed out after ${this.mintTimeoutMs}ms`));
+          }, this.mintTimeoutMs);
         });
-        const text4 = await res.text();
-        let j = {};
         try {
-          j = text4 ? JSON.parse(text4) : {};
-        } catch {
+          const res = await Promise.race([
+            this.fetchImpl(`${ONE_APP_SESSION}/${msid}/signed-instance?signed_instance_type=User`, {
+              method: "GET",
+              headers: { Cookie: cookieHeader },
+              signal: abort.signal
+            }),
+            timedOut
+          ]);
+          const text4 = await Promise.race([res.text(), timedOut]);
+          let j = {};
+          try {
+            j = text4 ? JSON.parse(text4) : {};
+          } catch {
+          }
+          if (res.status < 200 || res.status >= 300 || !j.signedInstance)
+            throw new Error(`owner mint failed (${res.status})`);
+          const elapsed = Math.max(0, this.elapsedClock() - startedAt);
+          const mintedAt = now + elapsed;
+          const entry = { instance: j.signedInstance, expiresAt: now + Math.floor(elapsed / 1e3) * 1e3 + this.ttlMs };
+          this.cache.set(key2, { ...entry, mintedAt });
+          return entry;
+        } catch (e) {
+          this.cache.delete(key2);
+          throw e;
+        } finally {
+          clearTimeout(timer);
         }
-        if (res.status < 200 || res.status >= 300 || !j.signedInstance)
-          throw new Error(`owner mint failed (${res.status})`);
-        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. */
+      /** Drop a cached instance so the next call re-mints. The envelope owner branch's own 401 retry;
+       *  the route's `renew=1` goes through `entry(…, { renew: true })` instead. */
       invalidate(msid, cookieHeader) {
         this.cache.delete(this.key(msid, cookieHeader));
       }
@@ -19468,7 +19509,6 @@ function shouldRevealError(args) {
 var EMAIL_RE, URL_HOST_RE, INTEGER_RE, NUMBER_RE;
 var init_validation = __esm({
   "../../core/ts/src/validation.ts"() {
-    "use strict";
     EMAIL_RE = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/;
     URL_HOST_RE = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(:[0-9]+)?$/;
     INTEGER_RE = /^[+-]?[0-9]+$/;
@@ -22893,7 +22933,6 @@ function validateWorkerSubtree(raw, slotId, policy, actionCatalog) {
 var WORKER_SUBTREE_CEILINGS, ID_PART, ACTION_ID;
 var init_worker_subtree = __esm({
   "../../core/ts/src/worker-subtree.ts"() {
-    "use strict";
     init_worker_subtree_safe_types_generated();
     WORKER_SUBTREE_CEILINGS = Object.freeze({
       maxEncodedBytes: 65536,
@@ -45863,9 +45902,9 @@ ${releaseId}`;
         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" });
-        if (url.searchParams.get("renew") === "1") webwixOwnerInstances.invalidate(msid, cookie);
+        const renew = url.searchParams.get("renew") === "1";
         try {
-          const entry = await webwixOwnerInstances.entry(msid, cookie);
+          const entry = await webwixOwnerInstances.entry(msid, cookie, Date.now(), { renew });
           return json3(200, { ...entry, expiresInMs: Math.max(0, entry.expiresAt - Date.now()) }, { "cache-control": "no-store" });
         } catch (e) {
           const msg = String(e?.message ?? e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1008.0",
+  "version": "0.1009.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": "6e55785cc22d09405bcfbeb88665d72ea523bdea1bd2bcc60ea1a435"
+  "falconPackageHash": "91d6d29413a928844d1207a733cba17640e15e3263898ac967ba4b95"
 }