@gentbajko/slopify 3.25.9 → 4.0.0

package/dist/edge/http/same-page.js

@@ -0,0 +1,80 @@
+// The address of what connected to this server: the browser, or a proxy in front of it.
+// Undefined for an in-process request, which has no socket.
+export function peerAddress(c) {
+    const env = c.env;
+    if (typeof env !== "object" || env === null || !("incoming" in env))
+        return undefined;
+    const incoming = env.incoming;
+    if (typeof incoming !== "object" || incoming === null || !("socket" in incoming))
+        return undefined;
+    const socket = incoming.socket;
+    if (typeof socket !== "object" || socket === null || !("remoteAddress" in socket))
+        return undefined;
+    return typeof socket.remoteAddress === "string" ? socket.remoteAddress : undefined;
+}
+const loopbackPeer = (address) => address !== undefined &&
+    (address === "::1" || /^(?:::ffff:)?127\.\d{1,3}\.\d{1,3}\.\d{1,3}$/u.test(address));
+// The name the browser used, as a proxy on this computer passes it on in X-Forwarded-Host
+// (its first value). Only trusted from a loopback peer: anyone else could write the header.
+export function forwardedHost(c) {
+    if (!loopbackPeer(peerAddress(c)))
+        return undefined;
+    const first = c.req.header("x-forwarded-host")?.split(",")[0]?.trim();
+    return first === undefined || first === "" ? undefined : first;
+}
+// host[:port] with the scheme's default port left out, as an Origin's own host has it.
+function hostOf(host, scheme) {
+    const lower = host.trim().toLowerCase();
+    const fallback = scheme === "https:" ? ":443" : scheme === "http:" ? ":80" : undefined;
+    return fallback !== undefined && lower.endsWith(fallback)
+        ? lower.slice(0, -fallback.length)
+        : lower;
+}
+// Standard same-origin protection: a browser's Origin names the page that sent the request,
+// and a page at the very host:port the browser addressed is Slopify's own, whatever proxy
+// (Slopify's remote access, a `tailscale serve` set up by hand, Caddy, nginx) stands in front.
+// A cross-site page names its own host, so it never matches; which names may reach Slopify at
+// all is `request-guard.ts`'s Host check.
+function sameHost(c, origin) {
+    let url;
+    try {
+        url = new URL(origin);
+    }
+    catch {
+        return false;
+    }
+    if (url.host === "")
+        return false;
+    const own = url.host.toLowerCase();
+    return [c.req.header("host"), forwardedHost(c)].some((host) => host !== undefined && hostOf(host, url.protocol) === own);
+}
+// Whether a request with an Origin comes from the Slopify page itself: the page this server
+// serves, the page at the address the browser used for this request (through any proxy), or
+// the same page at the exact https address Slopify set up in Tailscale.
+export function fromSlopifyPage(c, remoteHost) {
+    const origin = c.req.header("origin");
+    if (origin === undefined || origin === new URL(c.req.url).origin)
+        return true;
+    if (sameHost(c, origin))
+        return true;
+    const remote = remoteHost?.();
+    return (remote !== undefined &&
+        origin === `https://${remote}` &&
+        (c.req.header("x-forwarded-host") ?? c.req.header("host")) === remote);
+}
+// A request that reached Slopify through a forwarding proxy, Tailscale serve included: it sets
+// X-Forwarded-For on every request and keeps the ts.net Host. Agents' endpoints answer only
+// requests made on this computer.
+export function viaProxy(headers) {
+    if (headers.has("x-forwarded-for") || headers.has("x-forwarded-host"))
+        return true;
+    if (headers.has("tailscale-user-login") || headers.has("tailscale-funnel-request"))
+        return true;
+    const host = headers.get("host") ?? "";
+    const name = host.replace(/:\d+$/u, "").toLowerCase();
+    return name.endsWith(".ts.net");
+}
+// Tailscale marks every request that came through Funnel, from the public internet.
+export function viaFunnel(headers) {
+    return headers.has("tailscale-funnel-request");
+}

package/dist/edge/http/schedules.js

@@ -5,15 +5,22 @@ import { z } from "zod";
 import { calendarRange } from "../../slices/schedules/agenda.js";
 import { rejectHeldTopics, restoreRejectedTopics } from "../../slices/schedules/held-bulk.js";
 import { preparedTopics, prepareTopic } from "../../slices/schedules/prepare.js";
-import { calendarMaxDays, calendarSchema, heldTopicEditSchema, heldTopicSchema, queueMax, scheduleCreateSchema, scheduleRunSchema, scheduleSummarySchema, scheduleUpdateSchema, topicMoveSchema, topicQueueSchema, topicTransferSchema, } from "../../slices/schedules/schema.js";
+import { rescoreTopics } from "../../slices/schedules/rescore.js";
+import { calendarMaxDays, calendarSchema, heldTopicEditSchema, heldTopicSchema, queueMax, scheduleCreateSchema, scheduleRunSchema, scheduleSaveBodySchema, scheduleSummarySchema, scheduleVersionBodySchema, topicMoveSchema, topicQueueSchema, topicTransferSchema, } from "../../slices/schedules/schema.js";
 import { cancelSchedule, createSchedule, deleteSchedule, listScheduleRuns, listSchedules, pauseSchedule, resumeSchedule, updateSchedule, } from "../../slices/schedules/service.js";
+import { scoresFor } from "../../slices/schedules/topic-scores.js";
 import { approveHeldTopics, editHeldTopic, heldTopics, moveTopic, rejectHeldTopic, replaceTopics, transferTopic, } from "../../slices/schedules/topics.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
+import { onInvalid, problem } from "./problem.js";
+import { refusal } from "./refusal.js";
 const id = z.object({ id: z.uuid() });
 const topicParam = z.object({ id: z.uuid(), topicId: z.string().min(1).max(100) });
 const topicIds = z.array(z.string().min(1).max(100)).min(1).max(queueMax);
-const heldIds = z.object({ ids: topicIds }).strict();
-const heldRestore = z
+// Prepare one queued topic: its title as the queue lists it.
+export const prepareTopicBody = z.object({ topic: z.string().min(1).max(500) }).strict();
+// Approve one held topic, optionally under another title.
+export const approveHeldTopicBody = z.object({ title: z.string().optional() }).strict();
+export const heldIds = z.object({ ids: topicIds }).strict();
+export const heldRestore = z
     .object({
     topics: z
         .array(z
@@ -27,18 +34,6 @@ const heldRestore = z
 })
     .strict();
 function refused(c, result) {
-    const status = ["not-found", "missing-template", "topic-not-found"].includes(result.reason)
-        ? 404
-        : [
-            "conflict",
-            "cancel-required",
-            "spend-limit",
-            "unsupported-media",
-            "queue-full",
-            "busy",
-        ].includes(result.reason)
-            ? 409
-            : 400;
     const detail = {
         "invalid-input": "Some schedule settings are not valid. Check each field and save again.",
         "not-found": "This schedule no longer exists; it may have been deleted. Reload the page to see your schedules.",
@@ -52,13 +47,23 @@ function refused(c, result) {
         "queue-full": `A schedule's topic queue holds at most ${String(queueMax)} topics. Remove some under Schedules → Edit, then try again.`,
         "topic-not-found": "This topic was already approved, turned down or used. Reload the page to see the topics waiting now.",
         busy: "Slopify is already generating topics for this schedule. Wait for it to finish, then try again.",
+        "not-ready": "This schedule's template has no version marked ready. Open it in Library → Templates → Open studio and press Mark ready.",
         "invalid-topics": "Some topics name keywords this template does not use. Check each topic under Schedules → Edit and save again.",
     };
-    return problem(c, {
-        status,
-        title: titleOf(status),
+    return refusal(c, result.reason, {
+        statuses: {
+            "not-found": 404,
+            "missing-template": 404,
+            "topic-not-found": 404,
+            conflict: 409,
+            "cancel-required": 409,
+            "spend-limit": 409,
+            "unsupported-media": 409,
+            "queue-full": 409,
+            busy: 409,
+        },
+        otherwise: 400,
         detail: result.message ?? detail[result.reason],
-        extensions: { reason: result.reason },
     });
 }
 export function scheduleRoutes(deps) {
@@ -90,38 +95,44 @@ function routes(deps) {
             ? c.json({
                 schedule: scheduleSummarySchema.parse(schedule),
                 runs: runs.value.map((run) => scheduleRunSchema.parse(run)),
+                // Each queued and held topic's score and reasons, by `topicKey`, while ranking
+                // is on.
+                scores: scoresFor(service().db, schedule.id, [
+                    ...schedule.items.map((item) => item.title),
+                    ...heldTopics(service(), schedule.id).map((topic) => topic.title),
+                ]),
             })
             : refused(c, runs);
     })
-        .put("/:id", zValidator("param", id, onInvalid), zValidator("json", scheduleUpdateSchema.unwrap().omit({ id: true }), onInvalid), (c) => {
+        .put("/:id", zValidator("param", id, onInvalid), zValidator("json", scheduleSaveBodySchema, onInvalid), (c) => {
         const result = updateSchedule(service(), {
             ...c.req.valid("json"),
             id: c.req.valid("param").id,
         });
         return result.ok ? c.json(scheduleSummarySchema.parse(result.value)) : refused(c, result);
     })
-        .post("/:id/pause", zValidator("param", id, onInvalid), zValidator("json", z.object({ baseVersion: z.number().int().positive() }).strict(), onInvalid), (c) => {
+        .post("/:id/pause", zValidator("param", id, onInvalid), zValidator("json", scheduleVersionBodySchema, onInvalid), (c) => {
         const result = pauseSchedule(service(), {
             ...c.req.valid("json"),
             id: c.req.valid("param").id,
         });
         return result.ok ? c.json(scheduleSummarySchema.parse(result.value)) : refused(c, result);
     })
-        .post("/:id/resume", zValidator("param", id, onInvalid), zValidator("json", z.object({ baseVersion: z.number().int().positive() }).strict(), onInvalid), (c) => {
+        .post("/:id/resume", zValidator("param", id, onInvalid), zValidator("json", scheduleVersionBodySchema, onInvalid), (c) => {
         const result = resumeSchedule(service(), {
             ...c.req.valid("json"),
             id: c.req.valid("param").id,
         });
         return result.ok ? c.json(scheduleSummarySchema.parse(result.value)) : refused(c, result);
     })
-        .post("/:id/cancel", zValidator("param", id, onInvalid), zValidator("json", z.object({ baseVersion: z.number().int().positive() }).strict(), onInvalid), (c) => {
+        .post("/:id/cancel", zValidator("param", id, onInvalid), zValidator("json", scheduleVersionBodySchema, onInvalid), (c) => {
         const result = cancelSchedule(service(), {
             ...c.req.valid("json"),
             id: c.req.valid("param").id,
         });
         return result.ok ? c.json(scheduleSummarySchema.parse(result.value)) : refused(c, result);
     })
-        .delete("/:id", zValidator("param", id, onInvalid), zValidator("json", z.object({ baseVersion: z.number().int().positive() }).strict(), onInvalid), (c) => {
+        .delete("/:id", zValidator("param", id, onInvalid), zValidator("json", scheduleVersionBodySchema, onInvalid), (c) => {
         const result = deleteSchedule(service(), {
             ...c.req.valid("json"),
             id: c.req.valid("param").id,
@@ -132,14 +143,30 @@ function routes(deps) {
         const scheduleId = c.req.valid("param").id;
         if (listSchedules(service()).every((item) => item.id !== scheduleId))
             return refused(c, { ok: false, reason: "not-found" });
+        const topics = heldTopics(service(), scheduleId).map((topic) => heldTopicSchema.parse(topic));
         return c.json({
-            topics: heldTopics(service(), scheduleId).map((topic) => heldTopicSchema.parse(topic)),
+            topics,
+            scores: scoresFor(service().db, scheduleId, topics.map((topic) => topic.title)),
         });
+    })
+        // Rescore: every queued and held topic scored again, then put in score order. With search
+        // ranking it asks Google, DuckDuckGo and Wikipedia, up to 15 seconds.
+        .post("/:id/topics/score", zValidator("param", id, onInvalid), async (c) => {
+        const result = await rescoreTopics(service(), c.req.valid("param").id);
+        if (result.ok)
+            return c.json(scheduleSummarySchema.parse(result.value));
+        if (result.reason === "scoring-off")
+            return problem(c, {
+                status: 409,
+                detail: result.message,
+                extensions: { reason: result.reason },
+            });
+        return refused(c, result);
     })
         // Which queued topics are prepared ahead, and their projects.
         .get("/:id/prepared", zValidator("param", id, onInvalid), (c) => c.json({ prepared: preparedTopics(service(), c.req.valid("param").id) }))
         // Prepare one queued topic now: everything but the video, which its scheduled day renders.
-        .post("/:id/topics/prepare", zValidator("param", id, onInvalid), zValidator("json", z.object({ topic: z.string().min(1).max(500) }).strict(), onInvalid), async (c) => {
+        .post("/:id/topics/prepare", zValidator("param", id, onInvalid), zValidator("json", prepareTopicBody, onInvalid), async (c) => {
         const result = await prepareTopic(service(), {
             scheduleId: c.req.valid("param").id,
             title: c.req.valid("json").topic,
@@ -149,13 +176,15 @@ function routes(deps) {
         const detail = {
             "not-found": "This topic is no longer in the schedule's queue. Reload the page to see the queue as it is now.",
             "already-prepared": "This topic is already prepared: its project is in Projects under the same title.",
+            paused: "Its schedule is paused, so it makes nothing, ahead or on its day. Resume it under Calendar → Schedules, then press Prepare again.",
             "missing-template": "This schedule's template was deleted, so there is nothing to prepare from. Choose another template under Edit.",
             "spend-limit": "Preparing it would go over this schedule's spend limit. Raise the limit under Edit, or prepare it from Play instead.",
+            design: "A design schedule makes each piece on its day, so there is nothing to prepare ahead. To have a piece now, open the design template (Library → Designs → Templates) and press Make a piece; to have it sooner on a schedule, give its row an earlier date in the Schedule section.",
         };
         return problem(c, {
             status: result.reason === "not-found" ? 404 : 409,
-            title: titleOf(result.reason === "not-found" ? 404 : 409),
-            detail: detail[result.reason] ??
+            detail: (result.reason === "not-ready" ? result.detail : undefined) ??
+                detail[result.reason] ??
                 (result.detail === undefined
                     ? `This topic couldn't be prepared (${result.reason}). Open Play with the schedule's template to see what the setup needs, then try again.`
                     : `This topic couldn't be prepared: ${result.detail} Fix it in the schedule's template (Library → Templates), then try again.`),
@@ -181,7 +210,6 @@ function routes(deps) {
         if (refusal !== undefined)
             return problem(c, {
                 status: 409,
-                title: titleOf(409),
                 detail: refusal,
                 extensions: { reason: "busy" },
             });
@@ -206,7 +234,7 @@ function routes(deps) {
         const result = restoreRejectedTopics(service(), c.req.valid("param").id, c.req.valid("json").topics);
         return result.ok ? c.json(scheduleSummarySchema.parse(result.value)) : refused(c, result);
     })
-        .post("/:id/topics/held/:topicId/approve", zValidator("param", topicParam, onInvalid), zValidator("json", z.object({ title: z.string().optional() }).strict(), onInvalid), (c) => {
+        .post("/:id/topics/held/:topicId/approve", zValidator("param", topicParam, onInvalid), zValidator("json", approveHeldTopicBody, onInvalid), (c) => {
         const { id: scheduleId, topicId } = c.req.valid("param");
         const { title } = c.req.valid("json");
         const result = approveHeldTopics(service(), scheduleId, [topicId], title === undefined ? {} : { [topicId]: title });
@@ -257,7 +285,6 @@ export function calendarRoutes(deps) {
         if (!result.ok)
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: `Choose a range whose end is after its start and at most ${String(calendarMaxDays)} days long.`,
                 extensions: { reason: result.reason },
             });

package/dist/edge/http/settings.js

@@ -10,9 +10,10 @@ import { readNotificationUrl, saveNotificationUrl } from "../../slices/notificat
 import { appearances, providerIds } from "../../slices/settings/model.js";
 import { readSettings, saveSettings } from "../../slices/settings/playback.js";
 import { addVoice, removeVoice, setVoiceImitatesRealPerson, setVoiceLanguages, voiceIdMax, voiceNameMax, voices, } from "../../slices/settings/voices.js";
+import { clipEncodeSpeeds, noNvenc, renderPriorities, videoEncoders, } from "../../slices/video/encoding.js";
 import { readChannelLinks, writeChannelLinks } from "../../slices/youtube/edits-repo.js";
 import { channelLinkNameMax, channelLinksMax, channelLinksProblem, channelLinkUrlMax, } from "../../slices/youtube/placeholders.js";
-import { onInvalid, problem, titleOf } from "./problem.js";
+import { onInvalid, problem } from "./problem.js";
 const idParam = z.object({ id: z.string().min(1).max(64) });
 // Shape only. The rules - trimming, emptiness, length, the provider speaking at all -
 // are the slice's, so one set of messages reaches the form.
@@ -26,7 +27,7 @@ const voiceLanguagesBody = z.object({ languages: z.array(z.string().max(20)).max
 const voiceRealPersonBody = z.object({ imitatesRealPerson: z.boolean() });
 // Length and scheme are the slice's rules, so their sentences reach the field; this bound only
 // keeps a pasted novel off the parser.
-const notificationBody = z.object({ url: z.string().max(notificationUrlMax * 2) });
+export const notificationBody = z.object({ url: z.string().max(notificationUrlMax * 2) });
 // Shape and a generous bound only; `channelLinksProblem` says what is wrong in Settings' words.
 export const channelLinksBody = z.object({
     links: z
@@ -45,6 +46,10 @@ const playbackBody = z.object({
         .optional(),
     // Absent keeps what is saved, as with loudness.
     subtitleModel: z.enum(englishSubtitleModels).optional(),
+    // Absent keeps what is saved, as with loudness.
+    videoEncoder: z.enum(videoEncoders).optional(),
+    clipEncodeSpeed: z.enum(clipEncodeSpeeds).optional(),
+    renderPriority: z.enum(renderPriorities).optional(),
 });
 // The return type is inferred so Hono keeps the route types the SPA's client is
 // generated from; see stagingRoutes.
@@ -61,16 +66,30 @@ export function settingsRoutes(deps) {
             ...body,
             loudness: body.loudness ?? saved.loudness,
             subtitleModel: body.subtitleModel ?? saved.subtitleModel,
+            videoEncoder: body.videoEncoder ?? saved.videoEncoder,
+            clipEncodeSpeed: body.clipEncodeSpeed ?? saved.clipEncodeSpeed,
+            renderPriority: body.renderPriority ?? saved.renderPriority,
         });
         if (!result.ok) {
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: "These settings cannot be saved yet. Fix the highlighted fields and try again.",
                 extensions: { fields: result.fields },
             });
         }
         return c.json(result.settings);
+    })
+        // Settings → Production defaults → Video encoder offers the NVIDIA card only where its
+        // encoder works; the first ask runs a test encode, later ones answer from memory.
+        .get("/encoders", async (c) => {
+        const status = deps.nvenc === undefined
+            ? { available: false, reason: noNvenc }
+            : await deps.nvenc();
+        return c.json({
+            nvidia: status.available
+                ? { available: true }
+                : { available: false, reason: status.reason },
+        });
     })
         // The named links `{{Name}}` placeholders in YouTube descriptions fill from
         // (`slices/youtube/placeholders.ts`).
@@ -81,7 +100,6 @@ export function settingsRoutes(deps) {
         if (refused !== undefined)
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: `The channel links weren't saved: ${refused} Then press Save in Settings → Channel links.`,
             });
         writeChannelLinks(deps.db, links);
@@ -93,7 +111,6 @@ export function settingsRoutes(deps) {
         if (!result.ok) {
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: `The Notification URL wasn't saved: ${result.message} Fix it in Settings → Notifications → Notification URL, then press Save.`,
                 extensions: { fields: [{ field: "url", message: result.message }] },
             });
@@ -108,7 +125,6 @@ export function settingsRoutes(deps) {
         if (invalid !== undefined) {
             return problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: `The test notification wasn't sent: ${invalid}`,
                 extensions: { fields: [{ field: "url", message: invalid }] },
             });
@@ -118,7 +134,6 @@ export function settingsRoutes(deps) {
             deps.log.write("warn", "notification.test", { detail: sendFailureText(result) });
             return problem(c, {
                 status: 502,
-                title: titleOf(502),
                 detail: `The test notification wasn't delivered: ${sendFailureText(result)}. Check the address in Settings → Notifications → Notification URL (for ntfy, https://ntfy.sh/your-topic), then press Send test notification again.`,
             });
         }
@@ -147,12 +162,10 @@ export function settingsRoutes(deps) {
             return result.reason === "duplicate-voice-id"
                 ? problem(c, {
                     status: 409,
-                    title: titleOf(409),
                     detail: "This voice ID is already saved for this provider. Use the existing voice, or enter a different voice ID.",
                 })
                 : problem(c, {
                     status: 400,
-                    title: titleOf(400),
                     detail: "This voice cannot be added yet. Fix the highlighted field and try again.",
                     extensions: { fields: [fieldOf(result.reason)] },
                 });
@@ -166,12 +179,10 @@ export function settingsRoutes(deps) {
         return result.reason === "missing"
             ? problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This voice no longer exists; it may have been deleted. Reload Settings → Voices to see your voices.",
             })
             : problem(c, {
                 status: 400,
-                title: titleOf(400),
                 detail: "The languages weren't saved. Fix the highlighted field and try again.",
                 extensions: { fields: [fieldOf("unknown-language")] },
             });
@@ -183,7 +194,6 @@ export function settingsRoutes(deps) {
             ? c.body(null, 204)
             : problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This voice no longer exists; it may have been deleted. Reload Settings → Voices to see your voices.",
             });
     })
@@ -191,7 +201,6 @@ export function settingsRoutes(deps) {
         if (!removeVoice(voiceDeps, c.req.valid("param").id).ok) {
             return problem(c, {
                 status: 404,
-                title: titleOf(404),
                 detail: "This voice no longer exists; it may have been deleted already. Reload the page to see your voices.",
             });
         }