openhandsandClaude Opus 4.8
28ce0f911c
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]>
64 lines
2.0 KiB
TypeScript
64 lines
2.0 KiB
TypeScript
import "server-only";
|
|
import { randomUUID } from "node:crypto";
|
|
import fs from "node:fs/promises";
|
|
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;
|
|
reference?: string;
|
|
}
|
|
export async function readCatalogHotelStatus(): Promise<CatalogHotelStatus | null> {
|
|
try {
|
|
return JSON.parse(
|
|
await fs.readFile(
|
|
path.join(catalogStateRoot(), "hotel-status.json"),
|
|
"utf8",
|
|
),
|
|
);
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
|
|
throw error;
|
|
}
|
|
}
|
|
/** An acknowledged socket write is an update request, not proof of client application. */
|
|
export async function sendCatalogUpdate(): Promise<CatalogHotelStatus> {
|
|
let sent = false;
|
|
let reference: string | undefined;
|
|
try {
|
|
sent = await rcon.updateCatalog();
|
|
if (!sent)
|
|
reference = logger.error(
|
|
"Catalog saved; hotel update was not delivered",
|
|
{ module: "catalog" },
|
|
);
|
|
} catch (error) {
|
|
reference = logger.error("Catalog saved; hotel update failed", {
|
|
module: "catalog",
|
|
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`);
|
|
try {
|
|
await fs.mkdir(root, { recursive: true });
|
|
await fs.writeFile(temp, JSON.stringify(status), { flag: "wx" });
|
|
await fs.rename(temp, path.join(root, "hotel-status.json"));
|
|
} catch (error) {
|
|
logger.error("Cannot persist catalog hotel update status", {
|
|
module: "catalog",
|
|
error,
|
|
});
|
|
} finally {
|
|
await fs.rm(temp, { force: true }).catch(() => {});
|
|
}
|
|
return status;
|
|
}
|