@decocms/blocks-admin 7.6.0 → 7.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/blocks-admin",
-  "version": "7.6.0",
+  "version": "7.7.0",
   "type": "module",
   "description": "Deco admin protocol: /live/_meta, /.decofile, /deco/invoke, /deco/render, plus admin-facing site setup and commerce-app auto-configuration",
   "repository": {
@@ -25,7 +25,7 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.6.0"
+    "@decocms/blocks": "7.7.0"
   },
   "peerDependencies": {
     "react": "^19.0.0",

package/src/admin/decofile.test.ts

@@ -1,7 +1,17 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { KV_KEYS, type KVNamespace, getRevision, loadBlocks, setBlocks } from "@decocms/blocks/cms";
+import {
+  getRevision,
+  type KVNamespace,
+  loadBlocks,
+  revisionKey,
+  setBlocks,
+  snapshotKey,
+} from "@decocms/blocks/cms";
 import { handleDecofileReload, setFastDeployKVGetter } from "./decofile";
 
+/** Deployment id the write-through keys its snapshot under. */
+const ID = "sha-cafebabe";
+
 // handleDecofileReload's dev-bypass keys off NODE_ENV === "development" (see
 // decofile.ts), not import.meta.env.DEV. Vitest itself runs with
 // NODE_ENV=test (not "development"), so force it here to preserve this
@@ -95,18 +105,18 @@ describe("handleDecofileReload — delta payloads", () => {
 });
 
 describe("handleDecofileReload — KV write-through", () => {
-  it("writes the snapshot + revision to KV when DECO_KV is bound", async () => {
+  it("writes the snapshot + revision to this deployment's keyed entry", async () => {
     const { kv, store } = makeKV();
     const res = await reload(
       { blocks: { "pages-x": { path: "/x" } } },
-      { DECO_KV: kv, DECO_FAST_DEPLOY: "1" },
+      { DECO_KV: kv, DECO_FAST_DEPLOY: "1", DECO_DEPLOYMENT_ID: ID },
     );
     const json = (await res.json()) as { kvWritten: boolean; revision: string };
 
     expect(json.kvWritten).toBe(true);
-    expect(store.get(KV_KEYS.SNAPSHOT)).toBe(JSON.stringify(loadBlocks()));
-    expect(store.get(KV_KEYS.REVISION)).toBe(getRevision());
-    expect(store.get(KV_KEYS.REVISION)).toBe(json.revision);
+    expect(store.get(snapshotKey(ID))).toBe(JSON.stringify(loadBlocks()));
+    expect(store.get(revisionKey(ID))).toBe(getRevision());
+    expect(store.get(revisionKey(ID))).toBe(json.revision);
   });
 
   it("reports kvWritten=false when no KV binding is present", async () => {
@@ -123,9 +133,21 @@ describe("handleDecofileReload — KV write-through", () => {
     expect(store.size).toBe(0); // nothing written to KV
   });
 
+  it("reports kvWritten=false when no deployment id resolves", async () => {
+    const { kv, store } = makeKV();
+    const res = await reload(
+      { blocks: { "pages-x": { path: "/x" } } },
+      { DECO_KV: kv, DECO_FAST_DEPLOY: "1" }, // no DECO_DEPLOYMENT_ID
+    );
+    const json = (await res.json()) as { kvWritten: boolean };
+    expect(json.kvWritten).toBe(false);
+    expect(store.size).toBe(0);
+  });
+
   it("does not fail the request when the KV write throws", async () => {
     const env = {
       DECO_FAST_DEPLOY: "1",
+      DECO_DEPLOYMENT_ID: ID,
       DECO_KV: {
         get: () => Promise.resolve(null),
         put: () => Promise.reject(new Error("KV down")),

package/src/admin/decofile.ts

@@ -1,4 +1,11 @@
-import { KV_KEYS, getRevision, loadBlocks, setBlocks } from "@decocms/blocks/cms";
+import {
+  getDeploymentId,
+  getRevision,
+  loadBlocks,
+  revisionKey,
+  setBlocks,
+  snapshotKey,
+} from "@decocms/blocks/cms";
 import { clearLoaderCache } from "@decocms/blocks/sdk/cachedLoader";
 import { getRuntimeEnv } from "@decocms/blocks/sdk/otelAdapters";
 import { invalidateMetaCache } from "./meta";
@@ -80,19 +87,24 @@ function applyDelta(
 }
 
 /**
- * Write the current in-memory decofile snapshot to KV so other isolates pick
- * it up on their next revision poll. No-op (returns false) when fast-deploy is
- * disabled. The revision stored MUST equal the runtime's `getRevision()` so
- * pollers don't see a permanent mismatch.
+ * Write the current in-memory decofile snapshot to KV so other isolates of the
+ * SAME deployment pick it up on their next revision poll. No-op (returns false)
+ * when fast-deploy is disabled or no deployment id resolves. Writes this
+ * worker's OWN keyed entry (`decofile:<id>`) — it is the live version, so no
+ * `index:live` lookup is needed. The revision stored MUST equal the runtime's
+ * `getRevision()` so pollers don't see a permanent mismatch.
  */
 async function writeSnapshotToKV(env: Record<string, unknown> | undefined): Promise<boolean> {
   const kv = env ? getFastDeployKV(env) : null;
-  if (!kv) return false;
+  if (!kv || !env) return false;
+
+  const deploymentId = getDeploymentId(env);
+  if (!deploymentId) return false;
 
   const blocks = loadBlocks();
   const revision = getRevision();
-  await kv.put(KV_KEYS.SNAPSHOT, JSON.stringify(blocks));
-  if (revision) await kv.put(KV_KEYS.REVISION, revision);
+  await kv.put(snapshotKey(deploymentId), JSON.stringify(blocks));
+  if (revision) await kv.put(revisionKey(deploymentId), revision);
   return true;
 }