@gentbajko/slopify 3.25.9 → 4.1.0

package/dist/edge/http/staging.js

@@ -5,7 +5,7 @@ import { uploadableStageKinds } from "../../slices/storage/model.js";
 import { stagedFiles } from "../../slices/storage/repo.js";
 import { discardStagedFile, stageUpload } from "../../slices/storage/staging.js";
 import { readMultipart } from "./multipart.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
+import { onInvalid, problem } from "./problem.js";
 const kindParam = z.object({ kind: z.enum(uploadableStageKinds) });
 const idParam = z.object({ id: z.string().min(1).max(64) });
 // The return type is inferred on purpose: annotating it would erase the route types the
@@ -33,12 +33,11 @@ export function stagingRoutes(deps) {
         if (result === undefined) {
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: "No file arrived with the upload. Choose the file again and retry.",
             });
         }
         if (!result.ok) {
-            return problem(c, { status: 400, title: titleOf(400), detail: detailOf(result.reason) });
+            return problem(c, { status: 400, detail: detailOf(result.reason) });
         }
         return c.json(result.file, 201);
     })
@@ -47,9 +46,8 @@ export function stagingRoutes(deps) {
         if (!result.ok) {
             return problem(c, {
                 status: result.reason === "in-use" ? 409 : 404,
-                title: titleOf(result.reason === "in-use" ? 409 : 404),
                 detail: result.reason === "in-use"
-                    ? "This file is still attached to a draft in Play. Remove it from the draft first."
+                    ? "This file is still attached to a draft on Create. Remove it from the draft first."
                     : "This uploaded file no longer exists; it may have been removed already. Reload the page.",
             });
         }

package/dist/edge/http/storage-files.js

@@ -2,7 +2,9 @@ import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
 import { HTTPException } from "hono/http-exception";
 import { z } from "zod";
-import { onInvalid, problem, titleOf } from "./problem.js";
+import { onInvalid, problem } from "./problem.js";
+import { fromSlopifyPage } from "./same-page.js";
+export const moveFilesBody = z.object({ target: z.string().min(1).max(4096) }).strict();
 // Settings → Backup & storage → Your files: where projects and backups are, Open folder, and
 // moving them. A move copies and checks every file, so it answers at once and the screen polls.
 export function filesRoutes(deps) {
@@ -16,23 +18,20 @@ export function filesRoutes(deps) {
         c.header("Cache-Control", "no-store");
         return c.json(await files().view());
     })
-        .post("/move", zValidator("json", z.object({ target: z.string().min(1).max(4096) }).strict(), onInvalid), async (c) => {
+        .post("/move", zValidator("json", moveFilesBody, onInvalid), async (c) => {
         const started = await files().move(c.req.valid("json").target);
         if (!started.ok)
             return problem(c, {
                 status: started.status,
-                title: titleOf(started.status),
                 detail: started.detail,
                 extensions: { field: "target" },
             });
         return c.json(await files().view(), 202);
     })
         .post("/open", async (c) => {
-        const origin = c.req.header("origin");
-        if (origin !== undefined && origin !== new URL(c.req.url).origin)
+        if (!fromSlopifyPage(c, deps.remoteAccess?.remoteHost))
             return problem(c, {
                 status: 403,
-                title: titleOf(403),
                 detail: "For your safety, folders can only be opened from the Slopify page itself. Open Slopify and try again there.",
             });
         try {
@@ -42,7 +41,6 @@ export function filesRoutes(deps) {
             deps.log.write("warn", "storage.open-files", { detail: String(error) });
             return problem(c, {
                 status: 503,
-                title: titleOf(503),
                 detail: "Slopify could not open a file manager window on the computer it runs on. Make sure you are signed in to that computer's desktop, or open the folder shown in Settings → Backup & storage yourself.",
             });
         }

package/dist/edge/http/storage.js

@@ -1,20 +1,15 @@
 import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
-import { z } from "zod";
 import { projectExists } from "../../slices/admission/repo.js";
+import { isSampleProject } from "../../slices/onboarding/sample.js";
 import { BackupBusyError, planBackup, streamBackup, } from "../../slices/storage/backup-export.js";
 import { BackupImportRefused, importBackup } from "../../slices/storage/backup-import.js";
 import { importPortable, portableMaxArchiveBytes, storageUsage, } from "../../slices/storage/portable.js";
 import { reconcileStorage } from "../../slices/storage/reconcile.js";
 import { cleanUpAll, deleteAllOldVersions, deleteOldVersions, keepOutputsOnly, projectStorage, } from "../../slices/storage/trim.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
-const idParam = z.object({
-    id: z
-        .string()
-        .min(1)
-        .max(64)
-        .regex(/^[0-9A-Za-z_-]+$/),
-});
+import { sampleOwner } from "../../slices/template-studio/repo.js";
+import { idParam } from "./ids.js";
+import { onInvalid, problem } from "./problem.js";
 const exportFailed = "Slopify could not create the backup. Check there is free disk space and try again; if it keeps failing, use Download diagnostics in Settings and report it.";
 export function storageRoutes(deps) {
     const backup = () => ({
@@ -25,6 +20,24 @@ export function storageRoutes(deps) {
         appVersion: deps.version,
         hasInflight: deps.runner.hasInflight,
     });
+    // A template's studio sample keeps its files for the studio's bake-offs and resamples, and a
+    // bundled sample is read-only.
+    const studioSample = (id) => {
+        if (isSampleProject(deps.db, id))
+            return {
+                status: 409,
+                detail: "This is a sample project, which is read-only and keeps all its files. To free its space, delete it in Projects; Restore samples in Settings → Backup & storage brings it back.",
+                extensions: { reason: "sample-read-only" },
+            };
+        const owner = sampleOwner(deps.db, id);
+        return owner === undefined
+            ? undefined
+            : {
+                status: 409,
+                detail: `This is the sample project of the template ${owner.name}, kept with its files so Edit template can make its samples again without paying twice. Change it in Edit template instead: Templates → ${owner.name} → Edit template.`,
+                extensions: { reason: "template-sample" },
+            };
+    };
     return (new Hono()
         .get("/", (c) => c.json(storageUsage({ db: deps.db, paths: deps.paths, hasInflight: deps.runner.hasInflight })))
         // One project's split between outputs and working files, and what Keep outputs only
@@ -34,7 +47,6 @@ export function storageRoutes(deps) {
         if (!projectExists(deps.db, id))
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This project no longer exists. Go back to Projects to pick another.",
             });
         c.header("Cache-Control", "no-store");
@@ -42,35 +54,37 @@ export function storageRoutes(deps) {
     })
         // Keep outputs only: a finished project drops its working files (`slices/storage/trim.ts`).
         .post("/projects/:id/keep-outputs", zValidator("param", idParam, onInvalid), (c) => {
+        const refused = studioSample(c.req.valid("param").id);
+        if (refused !== undefined)
+            return problem(c, refused);
         const result = keepOutputsOnly({ db: deps.db, paths: deps.paths, hasInflight: deps.runner.hasInflight }, c.req.valid("param").id);
         if (result.ok)
             return c.json(result);
         return result.reason === "no-project"
             ? problem(c, {
                 status: 404,
-                title: titleOf(404),
-                detail: "This project no longer exists. Reload Settings → Storage to see the current list.",
+                detail: "This project no longer exists. Reload Settings → Backup & storage to see the current list.",
             })
             : problem(c, {
                 status: 409,
-                title: titleOf(409),
-                detail: "Only a finished project can drop its working files, and this one is running, waiting or has unfinished steps. Let it finish (or cancel it on its project page), then drop the working files again from the project page or Settings → Storage.",
+                detail: "Only a finished project can drop its working files, and this one is running, waiting or has unfinished steps. Let it finish (or cancel it on its project page), then drop the working files again from the project page or Settings → Backup & storage.",
             });
     })
         // Delete old versions: one project's History files (`slices/storage/trim.ts`).
         .post("/projects/:id/old-versions/delete", zValidator("param", idParam, onInvalid), (c) => {
+        const refused = studioSample(c.req.valid("param").id);
+        if (refused !== undefined)
+            return problem(c, refused);
         const result = deleteOldVersions({ db: deps.db, paths: deps.paths, hasInflight: deps.runner.hasInflight }, c.req.valid("param").id);
         if (result.ok)
             return c.json(result);
         return result.reason === "no-project"
             ? problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This project no longer exists. Reload Settings → Backup & storage to see the current list.",
             })
             : problem(c, {
                 status: 409,
-                title: titleOf(409),
                 detail: "This project is running or has steps waiting to run, and its files stay where they are until then. Let it finish, or cancel its run on its project page, then press Delete old versions again.",
             });
     })
@@ -98,7 +112,7 @@ export function storageRoutes(deps) {
             if (error instanceof BackupBusyError)
                 return c.json({ ready: false, detail: error.message, busy: error.projects });
             deps.log.write("error", "storage.export", { detail: String(error) });
-            return problem(c, { status: 500, title: titleOf(500), detail: exportFailed });
+            return problem(c, { status: 500, detail: exportFailed });
         }
     })
         .get("/export", (c) => {
@@ -108,9 +122,9 @@ export function storageRoutes(deps) {
         }
         catch (error) {
             if (error instanceof BackupBusyError)
-                return problem(c, { status: 409, title: titleOf(409), detail: error.message });
+                return problem(c, { status: 409, detail: error.message });
             deps.log.write("error", "storage.export", { detail: String(error) });
-            return problem(c, { status: 500, title: titleOf(500), detail: exportFailed });
+            return problem(c, { status: 500, detail: exportFailed });
         }
         // Pulled one chunk at a time, so a slow download reads files no faster than it sends.
         const chunks = streamBackup(plan);
@@ -145,14 +159,12 @@ export function storageRoutes(deps) {
         if (!contentType.includes("application/zip"))
             return problem(c, {
                 status: 415,
-                title: titleOf(415),
                 detail: "Choose a Slopify backup file: a .tar made with Export everything, or an older .zip made with Export backup, both in Settings → Backup & storage.",
             });
         const upload = await readPortableUpload(c.req.raw);
         if (!upload.ok)
             return problem(c, {
                 status: 413,
-                title: titleOf(413),
                 detail: "This backup file is empty or larger than 100 MB. Choose a Slopify backup file under 100 MB.",
             });
         try {
@@ -167,7 +179,6 @@ export function storageRoutes(deps) {
         catch {
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: "This file is not a complete Slopify backup; it may be damaged or a different kind of ZIP. Choose a backup made with Backup & storage in Settings.",
             });
         }
@@ -175,7 +186,6 @@ export function storageRoutes(deps) {
             if (request.body === null)
                 return problem(c, {
                     status: 400,
-                    title: titleOf(400),
                     detail: "The backup file arrived empty. Choose the .tar made with Export everything and import it again.",
                 });
             const reader = request.body.getReader();
@@ -186,13 +196,11 @@ export function storageRoutes(deps) {
                 if (error instanceof BackupImportRefused)
                     return problem(c, {
                         status: error.status,
-                        title: titleOf(error.status),
                         detail: error.message,
                     });
                 deps.log.write("error", "storage.import", { detail: String(error) });
                 return problem(c, {
                     status: 500,
-                    title: titleOf(500),
                     detail: "The backup wasn't imported and nothing in this install changed. Try again; if it keeps failing, use Download diagnostics in Settings and report it.",
                 });
             }