overlay-factory-worker 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overlay-factory-worker",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "The Goose Tools Overlay Factory worker — your computer renders reel overlays for goosetools.com with Remotion and ffmpeg.",
   "repository": {
     "type": "git",

package/scripts/overlay-worker.ts

@@ -180,8 +180,17 @@ type Job = {
 const ROOT = join(__dirname, "..");
 const PUBLIC = join(ROOT, "public");
 
-/** A one-off's directory name — the same for its preview and its burn. */
-const singleSlug = (id: string) => `single-${id.slice(0, 8)}`;
+/**
+ * A one-off's directory name — the same for its preview and its burn.
+ *
+ * The id comes from the server, and the result is a folder the worker later
+ * deletes, so anything that isn't a plain job id is refused rather than
+ * trusted to stay inside series/.
+ */
+const singleSlug = (id: string) => {
+  if (!/^[0-9a-f]{8}-[0-9a-f-]{4,}$/i.test(id)) throw new Error("Bad one-off id");
+  return `single-${id.slice(0, 8).toLowerCase()}`;
+};
 
 /**
  * Run a script, and on failure raise the part a human wrote.

package/scripts/series.ts

@@ -450,6 +450,8 @@ const draftFiles = async (
 };
 
 const NOTES_FILE = "notes.md";
+/** Marks a one-off's folder, so the sweep never touches a real series. */
+const ONE_OFF_MARKER = ".one-off";
 const HISTORY_DIR = join(SERIES_DIR, ".history");
 const KEEP_VERSIONS = 5;
 
@@ -474,7 +476,7 @@ const writeSeries = (
   const out = join(SERIES_DIR, slug);
   const notes = readNotes(slug);
 
-  if (existsSync(join(out, "series.json")) && !slug.startsWith("single-")) {
+  if (existsSync(join(out, "series.json")) && !existsSync(join(out, ONE_OFF_MARKER))) {
     const hist = join(HISTORY_DIR, slug);
     mkdirSync(hist, { recursive: true });
     cpSync(out, join(hist, new Date().toISOString().replace(/[:.]/g, "-")), {
@@ -925,6 +927,10 @@ export const sweepSingles = (maxAgeMs = 24 * 60 * 60 * 1000) => {
   for (const d of readdirSync(SERIES_DIR, { withFileTypes: true })) {
     if (!d.isDirectory() || !d.name.startsWith("single-")) continue;
     const p = join(SERIES_DIR, d.name);
+    // Only folders generateSingle marked. A real series can have a single-
+    // slug (the site now refuses new ones, but older ones may exist), and
+    // this deletes without a backup.
+    if (!existsSync(join(p, ONE_OFF_MARKER))) continue;
     try {
       if (Date.now() - statSync(p).mtimeMs > maxAgeMs) {
         rmSync(p, { recursive: true, force: true });
@@ -974,6 +980,7 @@ export const generateSingle = async (input: {
       }),
       "Overlay generation",
     );
+    writeFileSync(join(SERIES_DIR, input.slug, ONE_OFF_MARKER), "");
     return {
       layers: seriesLayers(input.slug, {}, input.durationSec, input.brand ?? null),
       cleanup,