fix(news): persist publication requests and retry cache delivery
This commit is contained in:
1 parent
c977fe95ba
commit
52f6d1491f
40 files changed
+733
-134
No files matched your search
@@ -0,0 +1,46 @@
|
||||
import { beforeEach, expect, it } from "vitest";
|
||||
import { articleRequest } from "./article-request";
|
||||
|
||||
const values = new Map<string, string>();
|
||||
const storage = {
|
||||
getItem: (key: string) => values.get(key) ?? null,
|
||||
setItem: (key: string, value: string) => {
|
||||
values.set(key, value);
|
||||
},
|
||||
};
|
||||
function form(body = "Private article body") {
|
||||
const form = new FormData();
|
||||
form.set("fullStory", body);
|
||||
form.set("status", "published");
|
||||
return form;
|
||||
}
|
||||
beforeEach(() => values.clear());
|
||||
it("reuses the request after a lost response and an editor reload", async () => {
|
||||
const first = await articleRequest(form(), "staff:1:new", undefined, storage);
|
||||
const retry = await articleRequest(form(), "staff:1:new", undefined, storage);
|
||||
expect(retry.key).toBe(first.key);
|
||||
expect([...values.values()].join()).not.toContain("Private article body");
|
||||
});
|
||||
it("uses a new request for changed content or a different editor", async () => {
|
||||
const first = await articleRequest(form(), "staff:1:new", undefined, storage);
|
||||
expect(
|
||||
(await articleRequest(form("Changed"), "staff:1:new", first, storage)).key,
|
||||
).not.toBe(first.key);
|
||||
expect(
|
||||
(await articleRequest(form(), "staff:2:new", undefined, storage)).key,
|
||||
).not.toBe(first.key);
|
||||
});
|
||||
it("retains the in-memory request when browser storage is unavailable", async () => {
|
||||
const blocked = {
|
||||
getItem: () => {
|
||||
throw Error("blocked");
|
||||
},
|
||||
setItem: () => {
|
||||
throw Error("blocked");
|
||||
},
|
||||
};
|
||||
const first = await articleRequest(form(), "staff:1:new", undefined, blocked);
|
||||
expect(
|
||||
(await articleRequest(form(), "staff:1:new", first, blocked)).key,
|
||||
).toBe(first.key);
|
||||
});
|
||||
@@ -0,0 +1,45 @@
|
||||
export interface ArticleRequest {
|
||||
signature: string;
|
||||
key: string;
|
||||
}
|
||||
/** Retain only a fingerprint and request ID, never editorial content. */
|
||||
export async function articleRequest(
|
||||
form: FormData,
|
||||
scope: string,
|
||||
previous?: ArticleRequest,
|
||||
storage?: Pick<Storage, "getItem" | "setItem">,
|
||||
): Promise<ArticleRequest> {
|
||||
const entries = [...form.entries()]
|
||||
.filter(([key]) => key !== "requestKey")
|
||||
.sort(([a], [b]) => a.localeCompare(b));
|
||||
const digest = await crypto.subtle.digest(
|
||||
"SHA-256",
|
||||
new TextEncoder().encode(JSON.stringify([scope, entries])),
|
||||
);
|
||||
const signature = Array.from(new Uint8Array(digest), (byte) =>
|
||||
byte.toString(16).padStart(2, "0"),
|
||||
).join("");
|
||||
const storageKey = `cms:news:request:${scope}`;
|
||||
let saved = previous;
|
||||
if (!saved) {
|
||||
try {
|
||||
saved = JSON.parse(storage?.getItem(storageKey) ?? "null") ?? undefined;
|
||||
} catch {
|
||||
/* Storage may be disabled. */
|
||||
}
|
||||
}
|
||||
if (
|
||||
saved?.signature === signature &&
|
||||
/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i.test(
|
||||
saved.key,
|
||||
)
|
||||
)
|
||||
return saved;
|
||||
const next = { signature, key: crypto.randomUUID() };
|
||||
try {
|
||||
storage?.setItem(storageKey, JSON.stringify(next));
|
||||
} catch {
|
||||
/* The editor retains the key in memory. */
|
||||
}
|
||||
return next;
|
||||
}
|
||||
@@ -18,7 +18,11 @@ vi.mock("@/lib/cache", () => ({
|
||||
},
|
||||
}));
|
||||
|
||||
import { cacheNews, invalidateNewsCache } from "./news-cache";
|
||||
import {
|
||||
cacheNews,
|
||||
invalidateNewsCache,
|
||||
refreshNewsCacheForDelivery,
|
||||
} from "./news-cache";
|
||||
|
||||
beforeEach(() => {
|
||||
state.values.clear();
|
||||
@@ -65,3 +69,12 @@ it("reads fresh data when Redis is unavailable", async () => {
|
||||
"fresh",
|
||||
]);
|
||||
});
|
||||
|
||||
it("keeps failed durable cache invalidations retryable", async () => {
|
||||
state.set.mockRejectedValue(Error("offline"));
|
||||
await expect(refreshNewsCacheForDelivery()).rejects.toThrow("offline");
|
||||
});
|
||||
it("does not acknowledge an ended Redis connection as refreshed", async () => {
|
||||
state.status = "end";
|
||||
await expect(refreshNewsCacheForDelivery()).rejects.toThrow();
|
||||
});
|
||||
@@ -30,3 +30,11 @@ export async function invalidateNewsCache(): Promise<void> {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/** Worker delivery must fail visibly so the outbox can retry the invalidation. */
|
||||
export async function refreshNewsCacheForDelivery(): Promise<void> {
|
||||
if (!redis) return;
|
||||
if (redis.status === "end")
|
||||
throw new Error("News cache connection is closed");
|
||||
await redis.set(REVISION_KEY, randomUUID());
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,52 @@
|
||||
import "server-only";
|
||||
import { randomUUID } from "node:crypto";
|
||||
import { sql } from "drizzle-orm";
|
||||
import { operationHash } from "@/features/operations/model";
|
||||
import { enqueueEffect } from "@/features/operations/server";
|
||||
import { db } from "@/lib/db";
|
||||
import { logger } from "@/lib/logger";
|
||||
import { invalidateNewsCache } from "./news-cache";
|
||||
|
||||
/** Publish a bounded batch and persist its refresh work before committing. */
|
||||
export async function publishDueArticles(now = new Date()): Promise<number> {
|
||||
const published = await db.transaction(async (tx) => {
|
||||
const [rows] = await tx.execute(
|
||||
sql`SELECT CAST(id AS CHAR) AS id,user_id AS userId,publish_at AS publishAt FROM website_articles WHERE status='scheduled' AND publish_at<=${now} ORDER BY publish_at,id LIMIT 100 FOR UPDATE`,
|
||||
);
|
||||
let published = 0;
|
||||
for (const article of rows as unknown as Array<{
|
||||
id: string;
|
||||
userId: number | null;
|
||||
publishAt: Date | string;
|
||||
}>) {
|
||||
const [result] = await tx.execute(
|
||||
sql`UPDATE website_articles SET status='published',published_at=${now},updated_at=${now} WHERE id=${article.id} AND status='scheduled' AND publish_at<=${now}`,
|
||||
);
|
||||
if ((result as unknown as { affectedRows: number }).affectedRows !== 1)
|
||||
continue;
|
||||
const operationId = randomUUID();
|
||||
const hash = operationHash({
|
||||
articleId: article.id,
|
||||
publishAt: new Date(article.publishAt).toISOString(),
|
||||
});
|
||||
// Legacy articles without an author remain attributed to system (0).
|
||||
await tx.execute(
|
||||
sql`INSERT INTO cms_operations (id,actor_id,kind,request_key,request_hash,result_json) VALUES (${operationId},${article.userId ?? 0},${"news.schedule.publish"},${randomUUID()},${hash},${JSON.stringify({ articleId: article.id, published: true })})`,
|
||||
);
|
||||
await enqueueEffect(tx, operationId, "news.refresh");
|
||||
published++;
|
||||
}
|
||||
return published;
|
||||
});
|
||||
if (published > 0) {
|
||||
try {
|
||||
await invalidateNewsCache();
|
||||
} catch (error) {
|
||||
logger.error("Scheduled news published; cache refresh remains queued", {
|
||||
module: "news",
|
||||
error,
|
||||
});
|
||||
}
|
||||
}
|
||||
return published;
|
||||
}
|
||||
Reference in new issue
Block a user