@gentbajko/slopify 2.5.0 → 3.0.0

package/dist/web/index.html

@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="color-scheme" content="dark light" />
     <title>Slopify</title>
-    <script type="module" crossorigin src="/assets/index-CktpxlJd.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DB-vOnGU.css">
+    <script type="module" crossorigin src="/assets/index-CX590kE-.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CUA2sUxU.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@gentbajko/slopify",
-  "version": "2.5.0",
+  "version": "3.0.0",
   "description": "Turn a prompt into a finished video, locally, with your own provider keys",
-  "license": "MIT",
+  "license": "Apache-2.0",
   "author": "Gent Bajko",
   "repository": {
     "type": "git",
@@ -18,15 +18,15 @@
   },
   "files": [
     "dist",
+    "NOTICE",
     "SUBTITLES.md",
-    "scripts/docker-run.sh",
     "!dist/**/*.d.ts"
   ],
   "scripts": {
     "build": "tsc -p tsconfig.build.json && node scripts/copy-migrations.mjs && node scripts/copy-assets.mjs && node scripts/copy-web.mjs",
     "build:types": "tsc -p tsconfig.build.json --declaration --emitDeclarationOnly",
     "typecheck": "tsc --noEmit",
-    "smoke:docker-projects": "node scripts/docker-projects-smoke.mjs"
+    "smoke:docker-install": "node scripts/docker-install-smoke.mjs"
   },
   "dependencies": {
     "@fastify/busboy": "^3.2.2",

package/dist/edge/docker-launch.js

@@ -1,81 +0,0 @@
-#!/usr/bin/env node
-import { spawn } from "node:child_process";
-import { constants } from "node:fs";
-import { open } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { fileURLToPath } from "node:url";
-import { nodeHostSetupRunner } from "../host-cli/install.js";
-import { assertManagedDockerHost } from "./docker.js";
-import { dockerEngine } from "./docker-projects/engine.js";
-import { installProjects } from "./docker-projects/install.js";
-import { dockerConfig, privateDirectory } from "./docker-projects/state.js";
-async function main() {
-    const uid = process.getuid?.();
-    const gid = process.getgid?.();
-    assertManagedDockerHost(process.platform, uid, gid);
-    if (gid === undefined)
-        throw new Error("Could not read your user's group. Run the --docker launcher as your normal logged-in user.");
-    const c = dockerConfig(process.env, homedir(), process.cwd(), uid, gid);
-    await privateDirectory(c.root, uid);
-    if (process.argv[2] !== "--locked") {
-        const path = join(c.root, "setup.lock");
-        const fd = await open(path, constants.O_CREAT | constants.O_RDWR | constants.O_NOFOLLOW, 0o600);
-        try {
-            const s = await fd.stat();
-            if (!s.isFile() || s.nlink !== 1 || s.uid !== uid || (s.mode & 0o077) !== 0)
-                throw new Error(`The launcher's lock file ${path} has the wrong owner or permissions. Delete it and run the launcher again.`);
-            const child = spawn("flock", [
-                "--nonblock",
-                "--no-fork",
-                "--conflict-exit-code",
-                "73",
-                path,
-                process.execPath,
-                fileURLToPath(import.meta.url),
-                "--locked",
-            ], { stdio: "inherit" });
-            const code = await new Promise((resolve, reject) => {
-                child.once("error", () => reject(new Error("The --docker launcher needs the flock command, which isn't installed. Install util-linux (for example sudo apt install util-linux, or sudo pacman -S util-linux) and try again.")));
-                child.once("exit", (status, signal) => signal
-                    ? reject(new Error("Docker setup was interrupted before it finished. Run the same command again; Slopify will finish or undo the half-done step."))
-                    : resolve(status ?? 1));
-            });
-            if (code === 73)
-                throw new Error("Another Slopify --docker launcher is already running and changing your installation. Wait for it to finish, then run the command again.");
-            process.exitCode = code;
-            return;
-        }
-        finally {
-            await fd.close();
-        }
-    }
-    const controller = new AbortController();
-    const abort = () => controller.abort(new Error("Docker setup was stopped before it finished. Run the same command again; Slopify will finish or undo the half-done step."));
-    process.once("SIGINT", abort);
-    process.once("SIGTERM", abort);
-    try {
-        const e = dockerEngine(nodeHostSetupRunner, controller.signal, process.env);
-        const recovery = () => dockerEngine(nodeHostSetupRunner, AbortSignal.timeout(5 * 60_000), process.env);
-        const result = await installProjects(c, e, recovery);
-        console.log(`Slopify is running at ${result.url}`);
-        console.log(`Project files on this machine: ${result.projects}`);
-        if (result.recovery)
-            console.log(`Recovery volume retained: ${result.recovery}. Previous containers remain stopped.`);
-        for (const name of result.pruned.removed)
-            console.log(`Removed older recovery volume: ${name}`);
-        for (const problem of result.pruned.problems)
-            console.warn(problem);
-    }
-    finally {
-        process.off("SIGINT", abort);
-        process.off("SIGTERM", abort);
-    }
-}
-try {
-    await main();
-}
-catch (error) {
-    console.error(error instanceof Error ? error.message : "Docker setup failed.");
-    process.exitCode = 1;
-}

package/dist/edge/docker-projects/activation.js

@@ -1,35 +0,0 @@
-import { timingSafeEqual } from "node:crypto";
-import { lstat, readFile } from "node:fs/promises";
-import { isAbsolute, resolve } from "node:path";
-import { z } from "zod";
-import { readState } from "./state.js";
-const activationSchema = z
-    .object({
-    version: z.literal(1),
-    token: z.string().regex(/^[a-f0-9]{64}$/),
-    committed: z.boolean(),
-})
-    .strict();
-export async function dockerActivationCommitted(path, token) {
-    if (!/^[a-f0-9]{64}$/.test(token))
-        return false;
-    const marker = await readState(path, activationSchema, process.getuid?.() ?? -1);
-    return (marker?.committed === true && timingSafeEqual(Buffer.from(marker.token), Buffer.from(token)));
-}
-export async function dockerFolderConfiguration(env, projectsRoot) {
-    if (env.SLOPIFY_CONTAINER !== "1")
-        return { container: false, hostProjects: null };
-    const host = env.SLOPIFY_DOCKER_PROJECTS_DIR;
-    if (!host || env.SLOPIFY_DOCKER_INSTALL_STATE !== "/opt/slopify-install/activation.json")
-        return { container: true, hostProjects: null };
-    if (!isAbsolute(host) || resolve(host) !== host || /[\p{Cc},]/u.test(host))
-        throw new Error("Invalid Docker host project path.");
-    const root = await lstat(projectsRoot);
-    const mounts = await readFile("/proc/self/mountinfo", "utf8");
-    if (projectsRoot !== "/data/projects" ||
-        !root.isDirectory() ||
-        root.isSymbolicLink() ||
-        !mounts.split("\n").some((line) => line.split(" ")[4] === "/data/projects"))
-        throw new Error("Managed Docker project bind is missing.");
-    return { container: true, hostProjects: host };
-}

package/dist/edge/docker-projects/claims.js

@@ -1,85 +0,0 @@
-import { lstat, readdir } from "node:fs/promises";
-import { join } from "node:path";
-import { journalSchema, readState } from "./state.js";
-export async function assertVolumeClaims(c, e, daemon, volumeIdentity, current) {
-    const permitted = new Set(current ? [current.id] : []);
-    for (const entry of await readdir(c.directory)) {
-        if (!/^[a-f0-9-]{36}$/.test(entry))
-            continue;
-        const directory = join(c.directory, entry);
-        const s = await lstat(directory);
-        if (!s.isDirectory() || s.isSymbolicLink() || s.uid !== c.uid || (s.mode & 0o077) !== 0)
-            throw new Error("Unsafe recovery transaction directory.");
-        const j = await readState(join(directory, "journal.json"), journalSchema, c.uid);
-        if (!j ||
-            j.id !== entry ||
-            j.name !== c.name ||
-            j.daemon !== daemon ||
-            j.volume !== c.volume ||
-            j.volumeIdentity !== volumeIdentity)
-            continue;
-        const readerName = `slopify-reader-${j.id}`;
-        const reader = await e.inspect(readerName);
-        if (reader) {
-            const transaction = await e.command([
-                "inspect",
-                "--format",
-                '{{index .Config.Labels "io.slopify.reader"}}',
-                reader.id,
-            ]);
-            const source = reader.mounts.find((m) => m.destination === "/source");
-            const bind = reader.mounts.find((m) => m.destination === "/source/projects");
-            if (reader.name !== readerName ||
-                transaction !== j.id ||
-                reader.image !== j.image ||
-                reader.running ||
-                source?.type !== "volume" ||
-                source.name !== j.volume ||
-                source.rw ||
-                (j.sourceBind !== null &&
-                    (bind?.type !== "bind" || bind.source !== j.sourceBind || bind.rw)) ||
-                reader.mounts.some((m) => m !== source &&
-                    !(j.sourceBind !== null && m === bind) &&
-                    !(m.type === "tmpfs" && m.destination === "/data")))
-                throw new Error("Copy reader identity or mounts conflict; recovery material is retained.");
-            await e.command(["rm", reader.id]);
-        }
-        if (j.previous) {
-            const prior = await e.inspect(j.previous.id);
-            if (prior &&
-                [j.previous.name, `${c.name}-previous-${j.id}`].includes(prior.name) &&
-                prior.image === j.previous.image &&
-                prior.user === j.previous.user &&
-                sameMounts(prior.mounts, j.previous.mounts))
-                permitted.add(prior.id);
-        }
-        if (j.candidate) {
-            const candidate = await e.inspect(j.candidate);
-            if (candidate &&
-                [c.name, `${c.name}-failed-${j.id}`].includes(candidate.name) &&
-                candidate.installation === j.installation &&
-                candidate.signature === j.signature)
-                permitted.add(candidate.id);
-        }
-    }
-    await e.claims(c.volume, [...permitted], (container) => legacyRollback(container, c.name));
-}
-// Docker reports a container's mounts in no fixed order, so the recorded shape is compared as
-// a set; comparing the JSON as listed refused this installation's own retained container on
-// some runs.
-function sameMounts(a, b) {
-    const shape = (mounts) => JSON.stringify([...mounts].sort((x, y) => `${x.destination}\0${x.type}\0${x.name}\0${x.source}`.localeCompare(`${y.destination}\0${y.type}\0${y.name}\0${y.source}`)));
-    return shape(a) === shape(b);
-}
-// Launchers before project folders kept each replaced container stopped as a rollback, named
-// `<name>-previous-<YYYYmmddHHMMSS>` with the launcher's label and restart off. Such a container
-// never writes unless someone starts it by hand, which is equally true of the rollbacks this
-// launcher keeps itself, so it does not block an upgrade. Anything running, restartable,
-// unlabelled or otherwise named still does.
-function legacyRollback(container, name) {
-    const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return (!container.running &&
-        container.restart.Name === "no" &&
-        container.signature !== null &&
-        new RegExp(`^${escaped}-previous-\\d{14}$`).test(container.name));
-}

package/dist/edge/docker-projects/committed.js

@@ -1,40 +0,0 @@
-import { join } from "node:path";
-import { journalSchema, readState, } from "./state.js";
-export async function readCommittedJournal(c, receipt, current) {
-    const j = await readState(join(c.directory, receipt.transaction, "journal.json"), journalSchema, c.uid);
-    if (!j ||
-        j.id !== receipt.transaction ||
-        j.name !== receipt.name ||
-        j.installation !== receipt.installation ||
-        j.daemon !== receipt.daemon ||
-        j.volume !== receipt.volume ||
-        j.volumeIdentity !== receipt.volumeIdentity ||
-        j.destination !== receipt.projects ||
-        j.signature !== receipt.signature ||
-        j.image !== receipt.image ||
-        j.user !== receipt.user ||
-        j.publishedIdentity?.dev !== receipt.directoryIdentity.dev ||
-        j.publishedIdentity.ino !== receipt.directoryIdentity.ino)
-        throw new Error("Committed activation journal is missing or inconsistent.");
-    if (current) {
-        const data = current.mounts.find((m) => m.destination === "/data");
-        const projects = current.mounts.find((m) => m.destination === "/data/projects");
-        const activation = current.mounts.find((m) => m.destination === "/opt/slopify-install");
-        if (current.id !== j.candidate ||
-            current.image !== receipt.image ||
-            current.user !== receipt.user ||
-            current.signature !== receipt.signature ||
-            current.installation !== receipt.installation ||
-            data?.type !== "volume" ||
-            data.name !== receipt.volume ||
-            !data.rw ||
-            projects?.type !== "bind" ||
-            projects.source !== receipt.projects ||
-            !projects.rw ||
-            activation?.type !== "bind" ||
-            activation.source !== join(c.directory, receipt.transaction) ||
-            activation.rw)
-            throw new Error("Committed container identity or mounts differ from its receipt.");
-    }
-    return j;
-}