@gentbajko/slopify 3.25.9 → 4.0.0

package/dist/edge/http/studio.js

@@ -19,17 +19,16 @@ import { writeUploadPick } from "../../slices/studio/pick.js";
 import { postingPlanSchema, readPlan, readStoredPlan, weekdayIn, writePlan, } from "../../slices/studio/plan.js";
 import { leadHoursMax, seriesOf } from "../../slices/studio/plan-model.js";
 import { enqueueFill, fillOnly, readFillQueue, removeFill, } from "../../slices/studio/queue.js";
-import { allReleases, freeSlots, planReleases, readLeadHours, releasesOf, setRelease, swapReleases, writeLeadHours, } from "../../slices/studio/releases.js";
-import { autoCommentKey, bearerToken, isExtensionOrigin, pairStudioExtension, readChannelPlaylists, readStudioPlaylists, resetStudioPairing, saveProjectPlaylists, saveRealFootage, saveStudioPlaylists, studioPairing, studioPlaylistsMax, studioPlaylistsProblem, studioRequestAllowed, } from "../../slices/studio/settings.js";
+import { allReleases, freeSlots, lineZone, planReleases, readLeadHours, releasesOf, setRelease, swapReleases, writeLeadHours, } from "../../slices/studio/releases.js";
+import { autoCommentKey, bearerToken, pairStudioExtension, readChannelPlaylists, readStudioPlaylists, resetStudioPairing, saveProjectPlaylists, saveRealFootage, saveStudioPlaylists, studioPairing, studioPlaylistsMax, studioPlaylistsProblem, } from "../../slices/studio/settings.js";
 import { abResults, abVariantSchema, saveAbResult } from "../../slices/studio/stats.js";
-import { confirmUpload, doneVideos, forgetVideo, projectVideos, recordedVideos, recordVideo, setChecks, setTaskState, videoIdOf, videoIdPattern, videoOf, waitingTasks, } from "../../slices/studio/videos.js";
+import { confirmUpload, doneVideos, forgetVideo, projectVideos, recordedVideos, recordVideo, setAbState, setChecks, setTaskState, videoIdOf, videoIdPattern, videoOf, waitingTasks, } from "../../slices/studio/videos.js";
 import { setAsideProjects, uploadedProjects } from "../../slices/uploads/repo.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
-const id = z
-    .string()
-    .min(1)
-    .max(64)
-    .regex(/^[0-9A-Za-z_-]+$/);
+import { extensionAuth } from "./extension-auth.js";
+import { idString } from "./ids.js";
+import { onInvalid, problem } from "./problem.js";
+import { fromSlopifyPage } from "./same-page.js";
+const id = idString;
 const projectParam = z.object({ projectId: id });
 const fileParam = z.object({
     projectId: id,
@@ -80,8 +79,9 @@ const videoLinkBody = z.object({ short: shortField, link: z.string().max(500) })
 const slotBody = z.object({
     slot: z.object({ row: z.string().min(1).max(20), longAt: z.string().max(40) }).nullable(),
 });
+// "ab": the extension set up (or couldn't set up) A/B Testing on the video's Details page.
 const taskResultBody = z.object({
-    task: z.enum(["finish", "comment"]),
+    task: z.enum(["finish", "comment", "ab"]),
     projectId: id,
     short: shortField,
     ok: z.boolean(),
@@ -122,34 +122,14 @@ export function studioRoutes(deps) {
         return project === undefined ? [] : [{ ...entry, projectTitle: project.title }];
     });
     const samePage = (c) => {
-        const origin = c.req.header("origin");
-        if (origin === undefined || origin === new URL(c.req.url).origin)
+        if (fromSlopifyPage(c, deps.remoteAccess?.remoteHost))
             return undefined;
         return problem(c, {
             status: 403,
-            title: titleOf(403),
             detail: "For your safety, YouTube Studio settings can only be changed from the Slopify page itself. Open Slopify and try again there.",
         });
     };
-    // The CORS headers for the extension: its own origin, echoed only when it is allowed.
-    const allowOrigin = (c, pairing) => {
-        const origin = c.req.header("origin");
-        const paired = studioPairing(deps.db).origin;
-        c.header("Vary", "Origin");
-        if (!isExtensionOrigin(origin))
-            return;
-        if (origin === paired || pairing) {
-            c.header("Access-Control-Allow-Origin", origin);
-            c.header("Access-Control-Allow-Headers", "authorization, content-type");
-            c.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-            c.header("Access-Control-Max-Age", "600");
-        }
-    };
-    const refused = (c) => problem(c, {
-        status: 401,
-        title: "Unauthorized",
-        detail: "The Slopify Studio extension isn't paired with this Slopify. Copy the pairing token from Slopify's Settings → YouTube Studio into the extension's options and press Pair.",
-    });
+    const { allowOrigin, refused, allowed: extAllowed } = extensionAuth(deps.db);
     // A project's place in the plan: its series, and the schedule and run day that made it.
     const whoOf = (projectId, series) => {
         const run = scheduleRunOfProject(deps.db, projectId);
@@ -198,7 +178,6 @@ export function studioRoutes(deps) {
             return (state === "done" || state === "partial" || (state === "pending" && aside.has(project.id)));
         });
     };
-    const extAllowed = (c) => studioRequestAllowed(deps.db, bearerToken(c.req.header("authorization")), c.req.header("origin"));
     return (new Hono()
         .get("/settings", (c) => {
         // The token is read only by the Slopify page, never by another origin's.
@@ -269,6 +248,8 @@ export function studioRoutes(deps) {
         const releases = releasesOf(deps.db, projectId);
         return c.json({
             leadHours: readLeadHours(deps.db),
+            // The zone its times are read in: its line's schedule's, else the plan's.
+            timeZone: lineZone(readPlan(deps.db), releases.find((release) => release.short === 0)?.line ?? null),
             items: pack.pack.items
                 .filter((item) => item.video !== null || item.kind === "video")
                 .map((item) => {
@@ -296,7 +277,6 @@ export function studioRoutes(deps) {
         if (!swapped)
             return problem(c, {
                 status: 409,
-                title: titleOf(409),
                 detail: "Both videos need a release time to swap. Give this one a time first, or reload the page and pick another video.",
             });
         planned(projectId);
@@ -331,14 +311,12 @@ export function studioRoutes(deps) {
         if (channelId !== undefined && channelById(deps.db, channelId) === undefined)
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "The playlists weren't saved: that channel no longer exists. Reload Settings → YouTube Studio and pick the channel again.",
             });
         const invalid = studioPlaylistsProblem(raw);
         if (invalid !== undefined)
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: invalid,
                 extensions: { fields: [{ field: "playlists", message: invalid }] },
             });
@@ -378,7 +356,6 @@ export function studioRoutes(deps) {
             if (!free)
                 return problem(c, {
                     status: 409,
-                    title: titleOf(409),
                     detail: "That slot is taken or past. Reload Prepare upload and choose one of the slots it lists.",
                 });
             setRelease(deps.db, projectId, 0, wanted.longAt, wanted.row, deps.clock.now());
@@ -438,7 +415,6 @@ export function studioRoutes(deps) {
         if (packItem(result.pack, short) === undefined)
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: `This project has no short ${String(short)}. Reload the project page and press Prepare upload again.`,
             });
         const queue = enqueueFill(deps.db, projectId, short ?? null, deps.clock.now());
@@ -465,7 +441,6 @@ export function studioRoutes(deps) {
         if (videoId === undefined)
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: "That isn't a YouTube video link. Copy the video's link from YouTube Studio (Details → Video link, like https://youtu.be/…) and paste it again.",
             });
         recordVideo(deps.db, projectId, short ?? null, videoId, deps.clock.now().toISOString());
@@ -495,7 +470,6 @@ export function studioRoutes(deps) {
         if (path === undefined || stat === undefined || !stat.isFile())
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "The Slopify Studio extension isn't included in this copy of Slopify, so there is nothing to download. Update or reinstall Slopify; when running from the repository, run `npm run build` at its root, which builds the extension too.",
             });
         return c.body(Readable.toWeb(createReadStream(path)), 200, {
@@ -522,7 +496,6 @@ export function studioRoutes(deps) {
                 ? refused(c)
                 : problem(c, {
                     status: 403,
-                    title: titleOf(403),
                     detail: "Only the Slopify Studio browser extension can pair with Slopify. Install it (see Settings → YouTube Studio) and pair from its options page.",
                 });
         // The origin is paired now; the response carries its headers.
@@ -531,7 +504,7 @@ export function studioRoutes(deps) {
     })
         .get("/ext/pack", (c) => {
         allowOrigin(c, false);
-        if (!studioRequestAllowed(deps.db, bearerToken(c.req.header("authorization")), c.req.header("origin")))
+        if (!extAllowed(c))
             return refused(c);
         // The first waiting item that can still be filled; one whose project or short is gone
         // leaves the queue.
@@ -549,7 +522,6 @@ export function studioRoutes(deps) {
         }
         return problem(c, {
             status: 404,
-            title: titleOf(404),
             detail: gone > 0
                 ? "The project chosen to fill in is gone. In Slopify, open the project again, press Prepare upload, then Fill in YouTube Studio."
                 : "Nothing is waiting to be filled in. In Slopify, open the project, press Prepare upload, then Fill in YouTube Studio.",
@@ -559,7 +531,7 @@ export function studioRoutes(deps) {
         // next one.
         .post("/ext/filled", zValidator("json", queueItemBody, onInvalid), (c) => {
         allowOrigin(c, false);
-        if (!studioRequestAllowed(deps.db, bearerToken(c.req.header("authorization")), c.req.header("origin")))
+        if (!extAllowed(c))
             return refused(c);
         const { projectId, short } = c.req.valid("json");
         const left = removeFill(deps.db, projectId, short ?? null, deps.clock.now());
@@ -627,7 +599,6 @@ export function studioRoutes(deps) {
         if (!result.ok || packItem(result.pack, short ?? undefined) === undefined)
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "That upload isn't in the project any more. Open the popup again.",
             });
         planned(projectId);
@@ -692,10 +663,14 @@ export function studioRoutes(deps) {
         if (!extAllowed(c))
             return refused(c);
         const { task, projectId, short, ok, message } = c.req.valid("json");
-        setTaskState(deps.db, task, projectId, short ?? null, ok ? "done" : "failed", message);
+        if (task === "ab")
+            setAbState(deps.db, projectId, short ?? null, ok ? "started" : "failed", message, deps.clock.now().toISOString());
+        else
+            setTaskState(deps.db, task, projectId, short ?? null, ok ? "done" : "failed", message);
         return c.json({ ok: true });
     })
-        // The long videos whose A/B test is running, for the extension to read each result.
+        // The long videos whose A/B test is running (the extension reported setting it up), for
+        // the extension to read each result.
         .get("/ext/known-videos", (c) => {
         allowOrigin(c, false);
         if (!extAllowed(c))
@@ -795,7 +770,7 @@ export function studioRoutes(deps) {
     })
         .get("/ext/files/:projectId/:asset", zValidator("param", fileParam, onInvalid), (c) => {
         allowOrigin(c, false);
-        if (!studioRequestAllowed(deps.db, bearerToken(c.req.header("authorization")), c.req.header("origin")))
+        if (!extAllowed(c))
             return refused(c);
         const { projectId, asset } = c.req.valid("param");
         // Only a pack's own files, its videos, thumbnails and captions: the extension puts the
@@ -810,7 +785,6 @@ export function studioRoutes(deps) {
         if (found === undefined || !found.ok)
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "That file isn't in the project's upload pack any more. Reload the project in Slopify and press Fill in YouTube Studio again.",
             });
         return c.body(Readable.toWeb(createReadStream(found.download.path)), 200, {
@@ -843,7 +817,6 @@ function confirmVideoUpload(deps, projectId, short, videoId, captionsAdded = fal
 function unknownProject(c) {
     return problem(c, {
         status: 404,
-        title: titleOf(404),
         detail: "This project no longer exists. Go back to Projects and open it again.",
     });
 }

package/dist/edge/http/style-preview.js

@@ -4,7 +4,7 @@ import { z } from "zod";
 import { StylePreviewError } from "../../slices/style-preview/render.js";
 import { stylePreviewRequestSchema } from "../../slices/style-preview/schema.js";
 import { fileResponse } from "./byte-range.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
+import { onInvalid, problem } from "./problem.js";
 export { byteRange } from "./byte-range.js";
 // POST renders (or finds) the preview for a set of caption and Look settings and answers where
 // to play it; GET streams the mp4, with byte ranges so the browser's player can seek.
@@ -31,7 +31,6 @@ export function stylePreviewRoutes(deps) {
             const status = error.reason === "font-missing" ? 409 : error.reason === "ffmpeg-missing" ? 503 : 500;
             return problem(c, {
                 status,
-                title: titleOf(status),
                 detail: error.message,
                 extensions: { reason: error.reason },
             });
@@ -42,7 +41,6 @@ export function stylePreviewRoutes(deps) {
         if (saved === undefined)
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This style preview is no longer saved; Slopify keeps only the most recent ones. Press Render again to make it.",
             });
         return fileResponse(c, saved.path, saved.bytes, {
@@ -55,7 +53,6 @@ export function stylePreviewRoutes(deps) {
 function unavailable(c) {
     return problem(c, {
         status: 503,
-        title: titleOf(503),
         detail: "The style preview isn't available because this Slopify started without its video renderer. Restart Slopify, then press Render again.",
     });
 }

package/dist/edge/http/subtitles.js

@@ -1,22 +1,8 @@
 import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
-import { z } from "zod";
-import { onInvalid, problem, titleOf } from "./problem.js";
-const idParam = z.object({
-    id: z
-        .string()
-        .min(1)
-        .max(64)
-        .regex(/^[0-9A-Za-z_-]+$/),
-});
+import { idParam } from "./ids.js";
+import { onInvalid } from "./problem.js";
+import { revisionRequired } from "./refusal.js";
 export function subtitleRoutes(_deps) {
     return new Hono().patch("/:id/subtitles", zValidator("param", idParam, onInvalid), revisionRequired);
 }
-function revisionRequired(c) {
-    return problem(c, {
-        status: 409,
-        title: titleOf(409),
-        detail: "This change is now made from the Edit tab. Choose Edit project, save your change, then use Choose what to remake (in the project's More menu).",
-        extensions: { reason: "revision-required" },
-    });
-}