fix(catalog): keep the live catalog truthful after every import path
Gitea Actions Runner Test / test-job (push) Successful in 0s
CI / check (push) Successful in 29s
CI / tests-integration (push) Failing after 1m43s
CI / tests-unit (push) Successful in 1m47s
CI / tests-ui (push) Successful in 2m33s
CI / preflight (push) Skipped
CI / deploy (push) Skipped

The live catalog store only covered part of the import surface. A durable
job settled, a sync queue drained, a .nitro upload or a clone run left the
Studio rail and the stats bar showing pre-import numbers until the page was
reloaded, and the Catalog Manager kept a second tree that never saw writes
made elsewhere in the session.

Every one of those paths now pulls the tree again, and the refresh carries
the totals with it: importing writes catalog rows server-side, so the counts
the store holds were stale for the rest of the session.

- refreshCatalogTree shares one request between concurrent callers and queues
  a single follow-up read when a write lands mid-flight, so a burst of edits
  costs at most one extra read.
- useFurnitureJobs treats its first payload as a baseline, so a page load no
  longer replays every past import as "just settled", and hands the settled
  jobs to the callback.
- The Catalog Manager pushes its own mutations into the store and re-reads its
  active tab when the store changes.
- The 30s unstable_cache on the admin totals is now tagged and invalidated from
  every catalog write, including the import worker, so it no longer survives an
  import even across a hard reload.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
This commit is contained in:
openhandsandClaude Opus 4.8 committed 2026-09-30 14:45:26 +02:00
1 parent d73baf1458
commit 28ce0f911c
22 files changed
+445 -70

No files matched your search

@@ -0,0 +1,67 @@
import "server-only";
import { count, eq } from "drizzle-orm";
import { revalidateTag, unstable_cache } from "next/cache";
// Type-only import: the client merge module owns this shape, so the server
// keeps exactly one definition of it.
import type { CatalogTotals } from "@/features/catalog/client/live-catalog-merge";
import {
CatalogItems,
CatalogItemsBc,
CatalogPages,
CatalogPagesBc,
db,
} from "@/lib/db";
export type { CatalogTotals };
/**
* Cache tag for the admin catalog totals. Any path that writes catalog pages or
* offers must invalidate it, otherwise the stats bar keeps serving the
* pre-import numbers for the length of the TTL — including after a hard reload.
*/
export const CATALOG_TOTALS_TAG = "admin-catalog-totals";
export async function loadCatalogTotals(
catalogType: "normal" | "bc",
): Promise<CatalogTotals> {
const pagesTable = catalogType === "bc" ? CatalogPagesBc : CatalogPages;
const itemsTable = catalogType === "bc" ? CatalogItemsBc : CatalogItems;
const [pages, items, enabled] = await Promise.all([
db.select({ total: count() }).from(pagesTable),
db.select({ total: count() }).from(itemsTable),
db
.select({ total: count() })
.from(pagesTable)
.where(eq(pagesTable.enabled, "1")),
]);
return {
totalPages: Number(pages[0]?.total ?? 0),
totalItems: Number(items[0]?.total ?? 0),
enabledPages: Number(enabled[0]?.total ?? 0),
};
}
const getCachedTotals = unstable_cache(
(catalogType: "normal" | "bc") => loadCatalogTotals(catalogType),
[CATALOG_TOTALS_TAG],
{ tags: [CATALOG_TOTALS_TAG], revalidate: 30 },
);
export function getCachedCatalogTotals(
catalogType: "normal" | "bc",
): Promise<CatalogTotals> {
return getCachedTotals(catalogType);
}
/**
* Best-effort invalidation for import workers and API routes, which run outside
* a render. A failure here must never abort an import: the cache expires on its
* own after 30 seconds.
*/
export function invalidateCatalogTotals(): void {
try {
revalidateTag(CATALOG_TOTALS_TAG, { expire: 0 });
} catch {
// Ignore — see above.
}
}
@@ -5,6 +5,7 @@ import path from "node:path";
import { logger } from "@/lib/logger";
import { catalogStateRoot } from "@/lib/services/catalog-git-config";
import { rcon } from "@/lib/services/rcon";
import { invalidateCatalogTotals } from "./catalog-totals";
export interface CatalogHotelStatus {
sent: boolean;
checkedAt: string;
@@ -40,6 +41,9 @@ export async function sendCatalogUpdate(): Promise<CatalogHotelStatus> {
error,
});
}
// Callers reach here only after writing catalog rows, so the admin stats
// totals must not keep serving the pre-write numbers from their 30s cache.
invalidateCatalogTotals();
const status = { sent, checkedAt: new Date().toISOString(), reference };
const root = catalogStateRoot();
const temp = path.join(root, `hotel-${randomUUID()}.tmp`);