@cardinali-studio/adminkit 2.2.13 → 2.2.14

package/dist/persistence.js

@@ -304,8 +304,10 @@ export class D1ContentRepository {
             .bind(input.releaseId, input.requestChecksum, input.manifestChecksum, input.schemaPackageVersion, input.materializerVersion, input.authorSubject, input.now, state.current_release_id, ...selected.flatMap((entry) => [entry.documentId, entry.revisionId]));
         const statements = [candidate];
         for (const [documentId, revisionId] of manifest)
-            statements.push(this.db.prepare("INSERT INTO content_release_entries (release_id, document_id, revision_id) SELECT ?, ?, ? WHERE EXISTS (SELECT 1 FROM content_revisions WHERE document_id = ? AND revision_id = ?)")
-                .bind(input.releaseId, documentId, revisionId, documentId, revisionId));
+            statements.push(this.db.prepare(`INSERT INTO content_release_entries (release_id, document_id, revision_id)
+      SELECT ?, ?, ? WHERE EXISTS (SELECT 1 FROM content_releases WHERE release_id = ? AND status = 'publishing')
+        AND EXISTS (SELECT 1 FROM content_revisions WHERE document_id = ? AND revision_id = ?)`)
+                .bind(input.releaseId, documentId, revisionId, input.releaseId, documentId, revisionId));
         const results = await this.db.batch(statements);
         if (results[0]?.meta?.changes !== 1)
             throw new Error("stale_revision");
@@ -362,14 +364,22 @@ export class D1ContentRepository {
         }
         const candidateIndex = statements.length;
         statements.push(candidate);
+        /* Every dependent write is guarded by the exact candidate. D1 batches are
+         * atomic on SQL errors, but a guarded INSERT that affects zero rows is not
+         * an error: without this predicate, a busy lane made these FK inserts
+         * reference a candidate that was never created and hid the intended
+         * deployment_lane_busy conflict behind a generic persistence failure. */
         for (const [documentId, revisionId] of manifest)
-            statements.push(this.db.prepare("INSERT INTO content_release_entries (release_id, document_id, revision_id) SELECT ?, ?, ? WHERE EXISTS (SELECT 1 FROM content_revisions WHERE document_id = ? AND revision_id = ?)")
-                .bind(input.releaseId, documentId, revisionId, documentId, revisionId));
+            statements.push(this.db.prepare(`INSERT INTO content_release_entries (release_id, document_id, revision_id)
+      SELECT ?, ?, ? WHERE EXISTS (SELECT 1 FROM content_releases WHERE release_id = ? AND status = 'publishing')
+        AND EXISTS (SELECT 1 FROM content_revisions WHERE document_id = ? AND revision_id = ?)`)
+                .bind(input.releaseId, documentId, revisionId, input.releaseId, documentId, revisionId));
         if (input.siteAccessVersionId)
             statements.push(this.db.prepare(`INSERT INTO content_release_site_access (release_id, version_id)
-      SELECT ?, ? WHERE EXISTS (SELECT 1 FROM site_access_versions version JOIN site_access_state access_state ON access_state.singleton = 1
-        WHERE version.version_id = ? AND version.state IN ('draft','active') AND version.version_id IN (access_state.draft_version_id, access_state.active_version_id))`)
-                .bind(input.releaseId, input.siteAccessVersionId, input.siteAccessVersionId));
+      SELECT ?, ? WHERE EXISTS (SELECT 1 FROM content_releases WHERE release_id = ? AND status = 'publishing')
+        AND EXISTS (SELECT 1 FROM site_access_versions version JOIN site_access_state access_state ON access_state.singleton = 1
+          WHERE version.version_id = ? AND version.state IN ('draft','active') AND version.version_id IN (access_state.draft_version_id, access_state.active_version_id))`)
+                .bind(input.releaseId, input.siteAccessVersionId, input.releaseId, input.siteAccessVersionId));
         for (const operationId of mediaOperationIds) {
             /* `instr` is intentionally evaluated against the frozen release entries,
              * not drafts or a mutable current pointer. A URL is JSON-escaped neither
@@ -384,8 +394,9 @@ export class D1ContentRepository {
               AND revision.payload_json IS NOT NULL AND instr(revision.payload_json, '/media/' || source.source_key) > 0)`)
                 .bind(input.now, operationId, input.releaseId));
             statements.push(this.db.prepare(`INSERT INTO content_release_media_operations (release_id, operation_id)
-        SELECT ?, ? WHERE EXISTS (SELECT 1 FROM media_operations WHERE operation_id = ? AND state = 'bound')`)
-                .bind(input.releaseId, operationId, operationId));
+        SELECT ?, ? WHERE EXISTS (SELECT 1 FROM content_releases WHERE release_id = ? AND status = 'publishing')
+          AND EXISTS (SELECT 1 FROM media_operations WHERE operation_id = ? AND state = 'bound')`)
+                .bind(input.releaseId, operationId, input.releaseId, operationId));
         }
         statements.push(this.db.prepare(`INSERT INTO production_deployment_attempts
       (attempt_id, intent_kind, requested_release_id, requested_code_sha, code_sha, release_id, expected_fingerprint, phase, active_slot, created_at, updated_at)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "type": "module",
   "description": "Motore riusabile di un pannello di amministrazione per siti Hugo su Cloudflare Pages: codec del front matter guidato dallo schema, form React, libreria media su R2. NIENTE di specifico di un sito qui dentro.",
   "license": "UNLICENSED",