@cardinali-studio/adminkit 2.2.5 → 2.2.7

package/dist/app/lib/home.js

@@ -60,7 +60,11 @@ export function useHome(active) {
             const mapped = site().homeDocument;
             if (contentPersistenceMode() === "d1" && mapped && revision) {
                 const revisionId = crypto.randomUUID();
-                await api.saveContent({ revisionId, documentId: mapped.documentId, baseRevisionId: revision.base, expectedDraftRevisionId: revision.expected, kind: mapped.kind, locale: mapped.locale, schemaVersion: mapped.schemaVersion, payload: data, tombstone: false });
+                /* The Worker validates and may normalize a document before checking its signed
+                 * representation. Sign the site-owned canonical payload here too, otherwise an
+                 * obsolete/unknown client field becomes a misleading "documento non valido". */
+                const payload = mapped.toPayload ? mapped.toPayload(data) : data;
+                await api.saveContent({ revisionId, documentId: mapped.documentId, baseRevisionId: revision.base, expectedDraftRevisionId: revision.expected, kind: mapped.kind, locale: mapped.locale, schemaVersion: mapped.schemaVersion, payload: payload, tombstone: false });
                 setRevision({ base: revisionId, expected: revisionId });
                 setNotice("Bozza D1 salvata");
                 setDirty(false);

package/dist/app/site.d.ts

@@ -61,12 +61,15 @@ export interface SiteAdminConfig {
     modules?: Record<string, boolean>;
     /** Git remains the compatibility default. D1 is an explicit, later site cutover. */
     contentPersistence?: "github" | "d1";
-    /** Lossless D1 identity for the singleton home; required before its editor may leave Git. */
+    /** Lossless D1 identity for the singleton home; required before its editor may leave Git.
+     * A site can canonicalize its editor value before the client signs it: this keeps the
+     * checksum aligned with the same schema normalization performed by the Worker. */
     homeDocument?: {
         documentId: string;
         kind: string;
         locale: string;
         schemaVersion: number;
+        toPayload?: (home: Record<string, unknown>) => unknown;
     };
     /** Identity plus the deliberately site-owned conversion between the generic
      * settings form and an immutable D1 document payload. A site may persist the

package/dist/functions/api/content.js

@@ -16,6 +16,12 @@ function diagnosticId() {
   return `diag_${crypto.randomUUID().replaceAll("-", "").slice(0, 12)}`;
 }
 
+function invalid(code, reason) {
+  const error = new Error(code);
+  error.reason = reason;
+  return error;
+}
+
 function repository(env) {
   if (!env.CONTENT_DB) throw new Error("content_unavailable");
   return new D1ContentRepository(env.CONTENT_DB);
@@ -28,12 +34,20 @@ function safeError(error, stage) {
   const status = safeCode === "unauthenticated" ? 401
     : safeCode === "stale_revision" || safeCode === "duplicate_request" ? 409
       : safeCode === "invalid_request" || safeCode === "invalid_document" ? 400 : 503;
+  const invalidMessages = {
+    request_shape: "La richiesta di salvataggio ha una forma non valida.",
+    schema_validation: "Il contenuto non rispetta lo schema del sito.",
+    document_identity: "Il documento validato non conserva la propria identità.",
+    payload_checksum: "Il checksum del contenuto non coincide con il documento validato.",
+    request_checksum: "Il checksum del comando non coincide con il salvataggio validato.",
+  };
+  const reason = typeof error?.reason === "string" && invalidMessages[error.reason] ? error.reason : undefined;
   const message = safeCode === "unauthenticated" ? "Sessione non valida: ricarica la pagina per rientrare."
     : safeCode === "stale_revision" ? "Questo contenuto è stato modificato altrove: ricarica e risolvi il conflitto."
     : code === "duplicate_request" ? "Questo identificatore di salvataggio è già associato a dati diversi."
-      : safeCode === "invalid_request" || safeCode === "invalid_document" ? "Il documento non è valido."
+      : safeCode === "invalid_request" || safeCode === "invalid_document" ? (invalidMessages[reason] || "Il documento non è valido.")
         : "La persistenza contenuti non è disponibile.";
-  return response({ ok: false, code: safeCode, stage, error: message, diagnosticId: diagnosticId(), retryable: status >= 500 }, status);
+  return response({ ok: false, code: safeCode, stage, ...(reason ? { reason } : {}), error: message, diagnosticId: diagnosticId(), retryable: status >= 500 }, status);
 }
 
 function author(data) {
@@ -117,14 +131,20 @@ export async function onRequestPost({ request, env, data }) {
     }
     if (!new URL(request.url).pathname.endsWith("/save")) return response({ ok: false, code: "invalid_request", stage: "validation", error: "Metodo non ammesso.", diagnosticId: diagnosticId(), retryable: false }, 405);
     const editor = author(data);
-    if (!id.test(body.revisionId) || !id.test(body.documentId) || (body.baseRevisionId !== null && !id.test(body.baseRevisionId)) || (body.expectedDraftRevisionId !== undefined && body.expectedDraftRevisionId !== null && !id.test(body.expectedDraftRevisionId)) || (body.translationGroupId !== null && body.translationGroupId !== undefined && !id.test(body.translationGroupId)) || !checksum.test(body.requestChecksum || "") || !Number.isInteger(body.schemaVersion) || body.schemaVersion < 1 || typeof body.kind !== "string" || body.kind.length > 120 || typeof body.locale !== "string" || body.locale.length > 35 || (body.payload !== null && (typeof body.payload !== "object" || Array.isArray(body.payload)))) throw new Error("invalid_request");
-    const document = validateContentDocument({ documentId: body.documentId, kind: body.kind, locale: body.locale, translationGroupId: body.translationGroupId ?? null, payload: body.payload, tombstone: body.tombstone === true, schemaVersion: body.schemaVersion });
-    if (document.documentId !== body.documentId || document.kind !== body.kind || document.locale !== body.locale || document.schemaVersion !== body.schemaVersion || document.tombstone !== (body.tombstone === true)) throw new Error("invalid_document");
+    if (!id.test(body.revisionId) || !id.test(body.documentId) || (body.baseRevisionId !== null && !id.test(body.baseRevisionId)) || (body.expectedDraftRevisionId !== undefined && body.expectedDraftRevisionId !== null && !id.test(body.expectedDraftRevisionId)) || (body.translationGroupId !== null && body.translationGroupId !== undefined && !id.test(body.translationGroupId)) || !checksum.test(body.requestChecksum || "") || !Number.isInteger(body.schemaVersion) || body.schemaVersion < 1 || typeof body.kind !== "string" || body.kind.length > 120 || typeof body.locale !== "string" || body.locale.length > 35 || (body.payload !== null && (typeof body.payload !== "object" || Array.isArray(body.payload)))) throw invalid("invalid_request", "request_shape");
+    let document;
+    try {
+      document = validateContentDocument({ documentId: body.documentId, kind: body.kind, locale: body.locale, translationGroupId: body.translationGroupId ?? null, payload: body.payload, tombstone: body.tombstone === true, schemaVersion: body.schemaVersion });
+    } catch (error) {
+      if (error?.message === "invalid_document") throw invalid("invalid_document", "schema_validation");
+      throw error;
+    }
+    if (document.documentId !== body.documentId || document.kind !== body.kind || document.locale !== body.locale || document.schemaVersion !== body.schemaVersion || document.tombstone !== (body.tombstone === true)) throw invalid("invalid_document", "document_identity");
     const expectedPayloadChecksum = await canonicalChecksum(document.tombstone ? null : document.payload);
-    if (body.payloadChecksum !== expectedPayloadChecksum) throw new Error("invalid_document");
+    if (body.payloadChecksum !== expectedPayloadChecksum) throw invalid("invalid_document", "payload_checksum");
     const normalized = { ...body, ...document, expectedDraftRevisionId: body.expectedDraftRevisionId === undefined ? body.baseRevisionId : body.expectedDraftRevisionId, payloadChecksum: expectedPayloadChecksum };
     const expectedRequestChecksum = await contentSaveRequestChecksum(normalized);
-    if (body.requestChecksum !== expectedRequestChecksum) throw new Error("invalid_document");
+    if (body.requestChecksum !== expectedRequestChecksum) throw invalid("invalid_document", "request_checksum");
     const repo = repository(env);
     try {
       const outcome = await repo.save({ ...normalized, now, authorSubject: editor.subject, authorLabel: editor.label });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.5",
+  "version": "2.2.7",
   "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",