@ampless/backend 1.0.0-alpha.58 → 1.0.0-alpha.60

package/dist/events/dispatcher.d.ts

@@ -1,15 +1,33 @@
 import { DynamoDBStreamHandler } from 'aws-lambda';
 
+interface CreateDispatcherHandlerOpts {
+    /**
+     * Days to retain each PostHistory revision before DynamoDB TTL deletes it.
+     * `0` (the default) means keep every revision forever — no `ttl` attribute
+     * is written. Supplied by the template shell from
+     * `cms.config.history?.retentionDays`.
+     */
+    historyRetentionDays?: number;
+}
 /**
- * DynamoDB-stream → SQS-fanout dispatcher. Wired to both the Post and
- * KvStore tables; routes content events to the trusted+untrusted
- * queues and site-settings updates likewise. trust_level isolation
- * is enforced by the downstream Lambdas' IAM roles, not by message
- * routing here.
+ * Build the DynamoDB-stream → SQS-fanout dispatcher. Wired to both the Post
+ * and KvStore tables; routes content events to the trusted+untrusted queues
+ * and site-settings updates likewise. trust_level isolation is enforced by
+ * the downstream Lambdas' IAM roles, not by message routing here.
  *
- * Re-exported by the template's thin shell
- * `amplify/events/dispatcher/handler.ts`.
+ * In addition, for each Post INSERT/MODIFY it writes one PostHistory revision
+ * snapshot (best-effort, never throws — see `writePostHistory`).
+ *
+ * The template's thin shell `amplify/events/dispatcher/handler.ts` calls this
+ * with `historyRetentionDays` from `cms.config`.
+ */
+declare function createDispatcherHandler(opts: CreateDispatcherHandlerOpts): DynamoDBStreamHandler;
+/**
+ * Backward-compatible default handler. Existing template shells re-export
+ * `{ handler }` from this subpath and un-upgraded projects keep working with
+ * `historyRetentionDays: 0` (revisions kept forever, no ttl). New shells call
+ * `createDispatcherHandler({ historyRetentionDays })` directly.
  */
 declare const handler: DynamoDBStreamHandler;
 
-export { handler };
+export { type CreateDispatcherHandlerOpts, createDispatcherHandler, handler };

package/dist/events/dispatcher.js

@@ -1,5 +1,7 @@
 // src/events/dispatcher.ts
 import { unmarshall } from "@aws-sdk/util-dynamodb";
+import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
+import { DynamoDBDocumentClient, PutCommand } from "@aws-sdk/lib-dynamodb";
 import {
   SQSClient,
   SendMessageBatchCommand
@@ -15,6 +17,9 @@ function requireEnv(name) {
 var sqs = new SQSClient({});
 var TRUSTED_QUEUE_URL = requireEnv("TRUSTED_QUEUE_URL");
 var UNTRUSTED_QUEUE_URL = requireEnv("UNTRUSTED_QUEUE_URL");
+var ddb = DynamoDBDocumentClient.from(new DynamoDBClient({}), {
+  marshallOptions: { removeUndefinedValues: true }
+});
 function tableNameFromArn(arn) {
   if (!arn) return null;
   const match = arn.match(/:table\/([^/]+)/);
@@ -84,27 +89,104 @@ async function sendBatch(queueUrl, entries) {
     await sqs.send(new SendMessageBatchCommand({ QueueUrl: queueUrl, Entries: chunk }));
   }
 }
-var handler = async (event) => {
-  const messages = [];
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-  for (const record of event.Records) {
-    const tableName = tableNameFromArn(record.eventSourceARN);
-    if (tableName && tableName.startsWith("Post-")) {
-      messages.push(...emitContentEvents(record, timestamp));
-    } else if (tableName && tableName.startsWith("KvStore-")) {
-      messages.push(...emitKvEvents(record, timestamp));
+function revisedAtForRecord(record, post) {
+  if (post.updatedAt) return post.updatedAt;
+  const approx = record.dynamodb?.ApproximateCreationDateTime;
+  if (typeof approx === "number") {
+    return new Date(approx * 1e3).toISOString();
+  }
+  return null;
+}
+async function writePostHistory(record, tableName, historyRetentionDays) {
+  try {
+    if (record.eventName !== "INSERT" && record.eventName !== "MODIFY") return;
+    if (!record.dynamodb?.NewImage) return;
+    const post = unmarshall(record.dynamodb.NewImage);
+    if (!post.postId) {
+      console.error("[event-dispatcher] PostHistory: new image has no postId; skipping snapshot");
+      return;
+    }
+    const revisedAt = revisedAtForRecord(record, post);
+    if (!revisedAt) {
+      console.error(
+        `[event-dispatcher] PostHistory: postId=${post.postId} has no updatedAt and no ApproximateCreationDateTime; skipping snapshot`
+      );
+      return;
+    }
+    const postHistoryId = `${post.postId}#${revisedAt}`;
+    const item = {
+      postHistoryId,
+      postId: post.postId,
+      revisedAt,
+      title: post.title,
+      slug: post.slug,
+      excerpt: post.excerpt,
+      format: post.format,
+      // body stays the AWSJSON string form, same as Post storage.
+      body: post.body,
+      status: post.status,
+      publishedAt: post.publishedAt,
+      tags: post.tags,
+      metadata: post.metadata,
+      createdAt: revisedAt,
+      updatedAt: revisedAt
+    };
+    if (historyRetentionDays > 0) {
+      item.ttl = Math.floor(new Date(revisedAt).getTime() / 1e3) + historyRetentionDays * 86400;
+    }
+    await ddb.send(
+      new PutCommand({
+        TableName: tableName,
+        Item: item,
+        ConditionExpression: "attribute_not_exists(postHistoryId)"
+      })
+    );
+  } catch (err) {
+    if (err?.name === "ConditionalCheckFailedException") {
+      console.debug(
+        "[event-dispatcher] PostHistory: snapshot already exists (re-delivery), skipping"
+      );
+      return;
     }
+    console.error("[event-dispatcher] PostHistory: snapshot write failed", err);
   }
-  if (messages.length === 0) return;
-  const entries = messages.map((m, i) => ({
-    Id: `msg-${i}`,
-    MessageBody: JSON.stringify(m)
-  }));
-  await Promise.all([
-    sendBatch(TRUSTED_QUEUE_URL, entries),
-    sendBatch(UNTRUSTED_QUEUE_URL, entries)
-  ]);
-};
+}
+function createDispatcherHandler(opts) {
+  const historyRetentionDays = opts.historyRetentionDays ?? 0;
+  return async (event) => {
+    const messages = [];
+    const timestamp = (/* @__PURE__ */ new Date()).toISOString();
+    const historyTable = process.env.AMPLESS_POST_HISTORY_TABLE;
+    let warnedNoHistoryTable = false;
+    for (const record of event.Records) {
+      const tableName = tableNameFromArn(record.eventSourceARN);
+      if (tableName && tableName.startsWith("Post-")) {
+        messages.push(...emitContentEvents(record, timestamp));
+        if (historyTable) {
+          await writePostHistory(record, historyTable, historyRetentionDays);
+        } else if (!warnedNoHistoryTable) {
+          console.log(
+            "[event-dispatcher] AMPLESS_POST_HISTORY_TABLE not set; skipping PostHistory snapshots"
+          );
+          warnedNoHistoryTable = true;
+        }
+      } else if (tableName && tableName.startsWith("KvStore-")) {
+        messages.push(...emitKvEvents(record, timestamp));
+      }
+    }
+    if (messages.length === 0) return;
+    const entries = messages.map((m, i) => ({
+      Id: `msg-${i}`,
+      MessageBody: JSON.stringify(m)
+    }));
+    await Promise.all([
+      sendBatch(TRUSTED_QUEUE_URL, entries),
+      sendBatch(UNTRUSTED_QUEUE_URL, entries)
+    ]);
+  };
+}
+var handler = createDispatcherHandler({ historyRetentionDays: 0 });
 export {
+  createDispatcherHandler,
   handler
 };

package/dist/index.d.ts

@@ -230,6 +230,7 @@ declare function amplessSchemaModels(a: any, opts?: AmplessSchemaModelsOpts): {
     McpToken: any;
     PluginSecret: any;
     PluginSecretIndicator: any;
+    PostHistory: any;
     PublicPost: any;
     PublicPostConnection: any;
     PublicMedia: any;

package/dist/index.js

@@ -89,6 +89,9 @@ function defineAmplessBackend(opts) {
   cfnKvTable.streamSpecification = { streamViewType: "NEW_AND_OLD_IMAGES" };
   cfnKvTable.timeToLiveSpecification = { attributeName: "ttl", enabled: true };
   const mcpTokenTable = backend.data.resources.tables["McpToken"];
+  const postHistoryTable = backend.data.resources.tables["PostHistory"];
+  const cfnPostHistoryTable = backend.data.resources.cfnResources.amplifyDynamoDbTables["PostHistory"];
+  cfnPostHistoryTable.timeToLiveSpecification = { attributeName: "ttl", enabled: true };
   const eventsStack = backend.createStack("amplessEvents");
   const eventsDlq = new Queue(eventsStack, "EventsDlq", {
     retentionPeriod: Duration.days(14)
@@ -122,6 +125,8 @@ function defineAmplessBackend(opts) {
   untrustedQueue.grantSendMessages(dispatcherFn);
   dispatcherFn.addEnvironment("TRUSTED_QUEUE_URL", trustedQueue.queueUrl);
   dispatcherFn.addEnvironment("UNTRUSTED_QUEUE_URL", untrustedQueue.queueUrl);
+  postHistoryTable.grantWriteData(dispatcherFn);
+  dispatcherFn.addEnvironment("AMPLESS_POST_HISTORY_TABLE", postHistoryTable.tableName);
   const trustedFn = backend.processorTrusted.resources.lambda;
   trustedFn.addEventSource(new SqsEventSource(trustedQueue, { batchSize: 5 }));
   postTable.grantReadData(trustedFn);
@@ -519,6 +524,35 @@ function amplessSchemaModels(a, opts = {}) {
       // admin side without redeploying.
       allow.groups(["ampless-admin", "ampless-editor"])
     ]),
+    // Per-post revision history (Phase A). Each Post INSERT/MODIFY on the
+    // DDB stream produces one snapshot row, written by the event-dispatcher
+    // Lambda via the DDB SDK under its own IAM role — admin/editor read it
+    // back through AppSync but never write it (same pattern as PluginSecret
+    // / PluginSecretIndicator).
+    PostHistory: a.model({
+      // 冪等な決定的 ID: `${postId}#${revisedAt}`. Stream at-least-once 再配信で
+      // 同じ保存が二度届いても同一 ID で上書きされ重複しない。
+      postHistoryId: a.id().required(),
+      postId: a.id().required(),
+      // スナップショットした版の updatedAt(=保存時刻)。byPost のソートキー。
+      revisedAt: a.datetime().required(),
+      title: a.string(),
+      slug: a.string(),
+      excerpt: a.string(),
+      format: a.enum(["tiptap", "markdown", "html", "static"]),
+      body: a.json(),
+      status: a.enum(["draft", "published"]),
+      publishedAt: a.datetime(),
+      tags: a.string().array(),
+      metadata: a.json(),
+      // Unix epoch 秒。retentionDays>0 のときだけ書く(0/未設定=無期限)。
+      ttl: a.integer()
+    }).identifier(["postHistoryId"]).secondaryIndexes((index) => [
+      // .name() は DynamoDB 物理 index 名、.queryField() は client query method 名。
+      index("postId").sortKeys(["revisedAt"]).queryField("listByPost").name("byPost")
+    ]).authorization((allow) => [
+      allow.groups(["ampless-admin", "ampless-editor"]).to(["read"])
+    ]),
     // Custom return type for public post reads. Decoupling from `Post` lets
     // AppSync skip the model-level (admin-only) auth check on fields.
     //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/backend",
-  "version": "1.0.0-alpha.58",
+  "version": "1.0.0-alpha.60",
   "description": "Amplify Gen 2 backend factories for ampless: auth, data, storage, event processors, API key renewer",
   "license": "MIT",
   "type": "module",
@@ -69,8 +69,8 @@
     "@smithy/protocol-http": "^5.4.4",
     "@smithy/signature-v4": "^5.4.4",
     "fflate": "^0.8.3",
-    "@ampless/mcp-server": "1.0.0-alpha.42",
-    "ampless": "1.0.0-alpha.36"
+    "@ampless/mcp-server": "1.0.0-alpha.44",
+    "ampless": "1.0.0-alpha.38"
   },
   "peerDependencies": {
     "@aws-amplify/backend": "^1",