@wix/himalaya-cli 0.966.0 → 0.967.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/dev-server/src/wix-gateway.d.ts

@@ -4,6 +4,14 @@ export * from "./wix-gateway.rules.js";
 export interface WixGatewayState {
     mode: WixGatewayMode;
     rules: WixMockRule[];
+    /** An OPERATOR replaced the rules or the mode through `/__dev/{wix,net}/*`.
+     *
+     *  Read by the date-rollover re-seed (net-mocks-rollover.ts), which must not
+     *  regenerate what a person pushed: seeding from the app's scenario reassigns
+     *  `rules` wholesale AND forces `mode` back to the declared one, so an operator
+     *  watching real traffic in `record` mode would have both silently reverted at
+     *  midnight with only a "re-seeded N rule(s)" line on stderr. */
+    operatorOverride?: boolean;
     traffic: WixTrafficEvent[];
     clients: Set<ServerResponse>;
     seq: number;

package/dist/cli.mjs

@@ -5261,6 +5261,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:`
@@ -15336,7 +15337,10 @@ data: ${JSON.stringify({ mode: gw.mode })}
   if (suffix === "mode" && method === "POST") {
     try {
       const { mode } = JSON.parse(await readBody(req));
-      if (mode === "record" || mode === "mock") gw.mode = mode;
+      if (mode === "record" || mode === "mock") {
+        gw.mode = mode;
+        gw.operatorOverride = true;
+      }
     } catch {
     }
     return json(res, 200, { ok: true, mode: gw.mode }), true;
@@ -15348,6 +15352,7 @@ data: ${JSON.stringify({ mode: gw.mode })}
     try {
       const { rules } = JSON.parse(await readBody(req));
       gw.rules = Array.isArray(rules) ? rules.map((r) => ({ ...r, id: r.id || ++gw.ruleSeq })) : [];
+      gw.operatorOverride = true;
     } catch {
       return json(res, 400, { error: "invalid_json" }), true;
     }
@@ -17041,6 +17046,59 @@ var init_tier4_verifier = __esm({
   }
 });
 
+// ../../core/dev-server/src/net-mocks-rollover.ts
+function todayYmd(now = /* @__PURE__ */ new Date()) {
+  const utc = now.toISOString().slice(0, 10);
+  let local = utc;
+  try {
+    const parts = new Intl.DateTimeFormat("en-CA", { year: "numeric", month: "2-digit", day: "2-digit" }).formatToParts(now);
+    const get = (t) => parts.find((x) => x.type === t)?.value ?? "";
+    const assembled = `${get("year")}-${get("month")}-${get("day")}`;
+    if (/^\d{4}-\d{2}-\d{2}$/.test(assembled)) local = assembled;
+  } catch {
+  }
+  return local > utc ? local : utc;
+}
+async function reseedIfDayChanged(host, today = todayYmd()) {
+  if (!host.seededFromApp) return { reseeded: false, reason: "not-from-app" };
+  if (host.wix.operatorOverride) return { reseeded: false, reason: "operator-override" };
+  const from = host.seededOn;
+  if (!from || from === today) return { reseeded: false, reason: "same-day" };
+  const reload = await host.reloadAppModule("net-mocks date rollover");
+  if (!reload.ok) return { reseeded: false, reason: "reload-failed" };
+  if (host.wix.operatorOverride) return { reseeded: false, reason: "operator-override" };
+  const declared = host.declaredRules();
+  if (!declared?.rules?.length) {
+    const before = { mode: host.wix.mode, rules: [...host.wix.rules] };
+    host.seed({ mode: declared ? declared.mode : "record", rules: [] });
+    if (scenarioChanged(before, { mode: host.wix.mode, rules: host.wix.rules })) {
+      host.publishConfigInvalidated("net-mocks scenario removed");
+    }
+    host.seededOn = today;
+    return { reseeded: false, reason: "no-rules" };
+  }
+  host.seed({ mode: declared.mode, rules: declared.rules });
+  host.seededOn = today;
+  host.publishConfigInvalidated("net-mocks date rollover");
+  return { reseeded: true, rules: declared.rules.length, from, to: today };
+}
+function scenarioChanged(before, after) {
+  if (before.mode !== after.mode) return true;
+  if (before.rules.length !== after.rules.length) return true;
+  return serialise(before.rules) !== serialise(after.rules);
+}
+function serialise(rules) {
+  return JSON.stringify(rules.map((r) => {
+    if (!r || typeof r !== "object") return r;
+    const { id: _id, ...rest } = r;
+    return rest;
+  }));
+}
+var init_net_mocks_rollover = __esm({
+  "../../core/dev-server/src/net-mocks-rollover.ts"() {
+  }
+});
+
 // ../../core/dev-server/src/player-proxy.ts
 function isPlayerHost(appName) {
   return appName === PLAYER_APP_ID || process.env.HIMALAYA_DEV_MULTI_APP === "1";
@@ -18546,7 +18604,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]+$/;
@@ -21971,7 +22028,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,
@@ -30891,7 +30947,66 @@ function applyTopBarDefault(descriptor, config) {
   if (!fallback || own2) return descriptor;
   return { ...descriptor, topBar: fallback };
 }
-async function reloadAppModule(state, opts) {
+function syncNetMocksWithApp(state) {
+  if (!state.wixSeededFromApp || state.wix.operatorOverride) return;
+  const declared = state.app?.meta.devGateway;
+  const next = declared?.rules ?? [];
+  const before = { mode: state.wix.mode, rules: state.wix.rules };
+  const beforeSnapshot = { mode: before.mode, rules: JSON.parse(JSON.stringify(before.rules)) };
+  applyNetMocks(state.wix, { mode: declared?.mode, rules: next });
+  state.wixSeededOn = todayYmd();
+  state.wixReseedBackoffUntil = 0;
+  if (scenarioChanged(beforeSnapshot, { mode: state.wix.mode, rules: state.wix.rules })) {
+    publishSSE(state, "config.invalidated", { reason: "net-mocks scenario changed", at: Date.now() });
+    console.error(`[himalaya-dev] net-mocks: re-synced ${next.length} rule(s) after an app reload`);
+  }
+}
+async function maybeReseedNetMocks(state) {
+  if (state.wixReseedInFlight) return state.wixReseedInFlight;
+  if (!state.wixSeededFromApp || !state.wixSeededOn || state.wixSeededOn === todayYmd()) return;
+  if (Date.now() < (state.wixReseedBackoffUntil ?? 0)) return;
+  const run2 = reseedNetMocksNow(state).finally(() => {
+    state.wixReseedInFlight = void 0;
+  });
+  state.wixReseedInFlight = run2;
+  return run2;
+}
+async function reseedNetMocksNow(state) {
+  const outcome = await reseedIfDayChanged({
+    wix: state.wix,
+    declaredRules: () => state.app?.meta.devGateway,
+    reloadAppModule: (reason) => reloadAppModule(state, { reason }),
+    seed: (mocks) => {
+      applyNetMocks(state.wix, mocks);
+    },
+    publishConfigInvalidated: (reason) => publishSSE(state, "config.invalidated", { reason, at: Date.now() }),
+    get seededOn() {
+      return state.wixSeededOn;
+    },
+    set seededOn(day) {
+      state.wixSeededOn = day;
+    },
+    seededFromApp: state.wixSeededFromApp
+  });
+  if (outcome.reseeded) {
+    console.error(`[himalaya-dev] net-mocks: re-seeded ${outcome.rules} rule(s) \u2014 the date turned (${outcome.from} \u2192 ${outcome.to})`);
+    return;
+  }
+  if (outcome.reason === "reload-failed" || outcome.reason === "no-rules") {
+    state.wixReseedBackoffUntil = Date.now() + 6e4;
+    console.error(outcome.reason === "reload-failed" ? "[himalaya-dev] net-mocks: the date turned but the app module would not reload \u2014 keeping yesterday's rules, retrying in a minute" : "[himalaya-dev] net-mocks: the date turned and the app now declares no scenario \u2014 cleared the stale rules, re-checking in a minute");
+  }
+}
+function reloadAppModule(state, opts) {
+  const run2 = appReloadChain.then(
+    () => reloadAppModuleNow(state, opts),
+    () => reloadAppModuleNow(state, opts)
+    // a previous failure must not block the queue
+  );
+  appReloadChain = run2.catch(() => void 0);
+  return run2;
+}
+async function reloadAppModuleNow(state, opts) {
   const current = state.app;
   if (!current) return { ok: false, error: "no_app" };
   const entry = resolve30(current.dir, "dev/index.ts");
@@ -30913,6 +31028,7 @@ async function reloadAppModule(state, opts) {
       meta: deriveAppMeta(current.name, next, readPlatformsJson(current.dir)),
       dir: current.dir
     };
+    syncNetMocksWithApp(state);
     if (opts.recreateStore) {
       try {
         state.moduleStore?.close?.();
@@ -32351,12 +32467,16 @@ function createDevServer(opts = {}) {
   );
   if (resolved2) {
     const seeded = applyNetMocks(state.wix, resolved2.mocks);
+    state.wixSeededOn = todayYmd();
+    state.wixSeededFromApp = resolved2.source !== "file";
     const from = resolved2.source === "file" ? netMocksPath : `${state.appName} devGateway.rules`;
     console.error(`[himalaya-dev] net-mocks: seeded ${seeded.rules} rule(s), mode=${seeded.mode} from ${from}`);
   }
   const appScenario = state.app?.meta.devGateway;
   if (!netMocksDisabled && appScenario?.rules?.length && state.wix.rules.length === 0) {
     const seeded = applyNetMocks(state.wix, { mode: appScenario.mode, rules: appScenario.rules });
+    state.wixSeededOn = todayYmd();
+    state.wixSeededFromApp = true;
     console.error(`[himalaya-dev] net-mocks: seeded ${seeded.rules} rule(s), mode=${seeded.mode} from the app's devGateway scenario`);
   }
   if (state.hotReloadEnabled) {
@@ -32388,6 +32508,7 @@ function createDevServer(opts = {}) {
     if (req.method === "HEAD") req.method = "GET";
     void (async () => {
       try {
+        await maybeReseedNetMocks(state);
         if (url.startsWith("/__dev/")) return await handleDev(req, res, state);
         if (url.split("?")[0] === "/v1/app-icon" && req.method === "GET") {
           const iconApp = new URLSearchParams(url.split("?")[1] ?? "").get("app") ?? "";
@@ -32752,7 +32873,7 @@ ${err.message}`);
   });
   return httpServer;
 }
-var ROOT6, TIER3_ROOT, TIER4_ROOT, tier4Verifier, TIER5_ROOT2, ACTION_HANDLERS_ROOT, SAMPLES_ROOT, TELEMETRY_BUFFER_CAP, overrideHistorySeq, CACHE_CONTROL, TIER5_SRC_ROOT, HMR_TMP_DIR, appReloadSeq, WEBWIX_CLIENT_ID, WEBWIX_REDIRECT, WEBWIX_COOKIE, webOwnerPreviewInstances, MIME, widgetOverrides;
+var ROOT6, TIER3_ROOT, TIER4_ROOT, tier4Verifier, TIER5_ROOT2, ACTION_HANDLERS_ROOT, SAMPLES_ROOT, TELEMETRY_BUFFER_CAP, overrideHistorySeq, CACHE_CONTROL, TIER5_SRC_ROOT, HMR_TMP_DIR, appReloadSeq, appReloadChain, WEBWIX_CLIENT_ID, WEBWIX_REDIRECT, WEBWIX_COOKIE, webOwnerPreviewInstances, MIME, widgetOverrides;
 var init_src6 = __esm({
   "../../core/dev-server/src/index.ts"() {
     init_inject();
@@ -32772,6 +32893,7 @@ var init_src6 = __esm({
     init_preview();
     init_tier4_verifier();
     init_loader();
+    init_net_mocks_rollover();
     init_tier5_dir();
     init_contained_dev_module();
     init_player_proxy();
@@ -32802,6 +32924,7 @@ var init_src6 = __esm({
     TIER5_SRC_ROOT = resolve30(ROOT6, "core/dev-server/tier5-bundles-src");
     HMR_TMP_DIR = resolve30(ROOT6, "node_modules/.cache/himalaya-hmr");
     appReloadSeq = 0;
+    appReloadChain = Promise.resolve();
     WEBWIX_CLIENT_ID = process.env.DEMO_APP_WIX_CLIENT_ID ?? "4f58d461-c1f5-4a5d-a467-62cc2329e4dd";
     WEBWIX_REDIRECT = "himalaya-demo-app://oauth/callback";
     WEBWIX_COOKIE = "himi_webwix_session";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.966.0",
+  "version": "0.967.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": [
@@ -64,5 +64,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "c12a59fbdcd27a2233673aa22facc9ca266f627e049c8c4ece035da8"
+  "falconPackageHash": "21a64fc457cad496774edeab407735299722e76708687a0a3a6dcaaf"
 }