@docyrus/animaguru 0.25.0 → 0.26.0

package/NOTICE.md

@@ -1575,6 +1575,105 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+## Instrument Sans (watermark font)
+
+The Latin variable-weight subset in templates/video/scripts/watermark/instrument-sans.woff2 draws the "Made with AnimaGuru" badge of `npm run export:mp4 -- --watermark`.
+
+Copyright 2022 The Instrument Sans Project Authors (https://github.com/Instrument/instrument-sans) InstrumentSans-Italic[wdth,wght].ttf: Copyright 2022 The Instrument Sans Project Authors (https://github.com/Instrument/instrument-sans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+
 ## Art Motion references
 
 English adaptations of Huashu Art Motion (https://github.com/alchaincyf/huashu-art-motion). Source revision and coverage are in skills/animaguru-art-motion/references/coverage.json.

package/README.md

@@ -47,6 +47,8 @@ CLI 0.24.0 adds eight documentary & broadcast styles, cut from real archive foot
 
 CLI 0.25.0 adds seven contemporary motion-design styles: Aurora & Glass, Liquid Motion, Bauhaus Geometry, Synthwave & Y2K, Sticker Explainer, Variety Captions and One-Line Art. Their signature techniques follow the MIT-licensed [mg-styles-15](https://github.com/Vincentwei1021/mg-styles-15) collection; the skills, studies and preview art are original. Each has a runnable study (`npm run example -- aurora-glass`).
 
+CLI 0.26.0 adds `npm run export:mp4 -- --watermark`: beside the clean MP4, the export saves `SLUG-LANGUAGE-watermarked.mp4` with AnimaGuru's "Made with AnimaGuru" badge, drawn with the font, logo and layout of the web app's watermark. AnimaGuru's lead pipeline uploads it as the film's preview, so a film no longer waits for a reviewer's browser to watermark it.
+
 CLI 0.16.2 also installs `animaguru-art-motion` for Codex and Claude Code: one skill with 36 English art-treatment references and nine explainer motion grammars, plus AnimaGuru generation, timing, camera and review guidance. Request it explicitly for a custom film treatment; its references are separate from the gallery presets. Source coverage and the upstream MIT notice are included in the skill.
 
 CLI 0.5.2 includes a complete local PixiJS video workspace, now with 55 visual styles:

package/dist/animaguru.js

@@ -19761,7 +19761,7 @@ var require_ignore2 = __commonJS({
 // cli/package.json
 var package_default = {
   name: "@docyrus/animaguru",
-  version: "0.25.0",
+  version: "0.26.0",
   description: "Agent-friendly AnimaGuru CLI built with CrustJS",
   type: "module",
   bin: {
@@ -45307,13 +45307,16 @@ var animation_styles_default = {
   description: "Explore the visual language of your next animation. Choose a style here, then tell your coding agent which one you like.",
   available: "AVAILABLE NOW",
   previewLabel: "{{name}} style preview",
+  playLabel: "Play the {{name}} preview",
+  previousStyle: "Previous style",
+  nextStyle: "Next style",
   previewError: "The preview could not load. Try reloading the page.",
   visualLabel: "THE LOOK",
   motionLabel: "THE MOVEMENT",
   categoryLabel: "WORKS WITH",
   copyChoice: "Copy this style choice",
   copied: "Style choice copied",
-  copyFailed: "Copy the style ID shown below and send it to your agent.",
+  copyFailed: "Copy the style ID and send it to your agent.",
   choiceMessage: "Use {{name}} ({{id}}) as the visual and animation style for my video.",
   idLabel: "Style ID",
   startEyebrow: "START WITH AN IDEA",
@@ -46292,7 +46295,7 @@ var animation_styles_default = {
   searchLabel: "Search visual styles",
   searchPlaceholder: "Try paper, product, typography\u2026",
   filterLabel: "Filter by visual family",
-  emptyResults: "No styles match. Try another word or visual family.",
+  emptyResults: "No styles match. Try another word.",
   resultsCount_one: "{{count}} style",
   resultsCount_other: "{{count}} styles",
   exampleLink: "Try the bundled example",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docyrus/animaguru",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "description": "Agent-friendly AnimaGuru CLI built with CrustJS",
   "type": "module",
   "bin": {

package/templates/video/README.md

@@ -67,11 +67,13 @@ npm run export:mp4
 npm run export:mp4 -- --port 5197
 # Captions drawn into the picture, e.g. for social feeds (saved as SLUG-LANGUAGE-captioned.mp4):
 npm run export:mp4 -- --burn-captions
+# Also save a copy with AnimaGuru's "Made with AnimaGuru" badge (SLUG-LANGUAGE-watermarked.mp4):
+npm run export:mp4 -- --watermark
 ```
 
 Open the local capture URL printed by the command and keep it open until complete. The script runs a separate loopback Vite server (default port 5196), streams high-quality JPEG frames from the Pixi canvas to the bundled FFmpeg binary, and mixes the configured soundtrack. The initial starter exports with a silent AAC track. Exporting local media does not call AnimaGuru or spend credits. FFmpeg/FFprobe binaries are supplied through platform-specific npm dependencies; installation needs a supported platform and network access.
 
-Completed H.264/AAC MP4s and JSON verification reports appear in `production/exports/`. Captions are not drawn into the MP4 picture: the film's `captions` resource track is saved beside it as `SLUG-LANGUAGE.srt` (for YouTube and desktop players, which load a same-named file automatically) and `SLUG-LANGUAGE.vtt` (for an HTML5 `<track>`). `--burn-captions` instead draws them into the picture and writes no subtitle files, so players cannot show them twice. `"poster"` in `film.config.json` (seconds) picks the frame saved as `SLUG-LANGUAGE.jpg`, a caption-free thumbnail 1280 pixels on its longer side and under YouTube's 2 MB limit; without it, no thumbnail is saved. The live player and HTML5 export keep their CC toggle. Existing files are preserved. Frame retries are deduplicated. Ctrl+C removes only this session's unfinished output. The verification checks duration, exact frame count, dimensions, pixel format, codecs and audio language tag. The exporter supports even dimensions up to 4096 pixels, 24/25/30/60 fps and films up to ten minutes. Set duration to an exact number of frames.
+Completed H.264/AAC MP4s and JSON verification reports appear in `production/exports/`. Captions are not drawn into the MP4 picture: the film's `captions` resource track is saved beside it as `SLUG-LANGUAGE.srt` (for YouTube and desktop players, which load a same-named file automatically) and `SLUG-LANGUAGE.vtt` (for an HTML5 `<track>`). `--burn-captions` instead draws them into the picture and writes no subtitle files, so players cannot show them twice. `"poster"` in `film.config.json` (seconds) picks the frame saved as `SLUG-LANGUAGE.jpg`, a caption-free thumbnail 1280 pixels on its longer side and under YouTube's 2 MB limit; without it, no thumbnail is saved. The live player and HTML5 export keep their CC toggle. `--watermark` also saves `SLUG-LANGUAGE-watermarked.mp4`, the same film with AnimaGuru's "Made with AnimaGuru" badge in its bottom-right corner, drawn with the font, logo and layout AnimaGuru's web app uses; it is the preview AnimaGuru's lead pipeline plays before a lead claims the clean film. The picture is encoded again with the badge and verified like the film; the sound is copied. Existing files are preserved. Frame retries are deduplicated. Ctrl+C removes only this session's unfinished output. The verification checks duration, exact frame count, dimensions, pixel format, codecs and audio language tag. The exporter supports even dimensions up to 4096 pixels, 24/25/30/60 fps and films up to ten minutes. Set duration to an exact number of frames.
 
 ## Capture API
 

package/templates/video/WORKSPACE-AGENTS.md

@@ -16,7 +16,7 @@ Run commands from the workspace root:
 - `npm run dev`: the workspace hub and separate `/animations/NAME/` players.
 - `npm run build -- --animation NAME`: typecheck and build that film.
 - `npm run export:html -- --animation NAME`: portable HTML5 ZIP with local media and common branding.
-- `npm run export:mp4 -- --animation NAME` (not for a branching story or a quiz film): verified MP4 without burned-in captions, plus `.srt`/`.vtt` subtitle files from the captions track (`--burn-captions` draws them into the picture instead, as `NAME-LANG-captioned.mp4`), and a `.jpg` thumbnail of the `poster` frame set in film.config.json. Add `--headless` to capture in local headless Chrome; otherwise open the printed capture page.
+- `npm run export:mp4 -- --animation NAME` (not for a branching story or a quiz film): verified MP4 without burned-in captions, plus `.srt`/`.vtt` subtitle files from the captions track (`--burn-captions` draws them into the picture instead, as `NAME-LANG-captioned.mp4`), and a `.jpg` thumbnail of the `poster` frame set in film.config.json. `--watermark` also saves `NAME-LANG-watermarked.mp4` with AnimaGuru's "Made with AnimaGuru" badge, for an AnimaGuru lead film's preview. Add `--headless` to capture in local headless Chrome; otherwise open the printed capture page.
 - `npm run review -- --animation NAME --headless`: frame, text, layout (overlap, safe area, text size), seeking and soundtrack checks, one line per finding.
 - `npm run frames -- --animation NAME --at 1.2,4.8`: labelled contact sheets in `production/review/frames/` plus layout notes for those times.
 - `npm run audio:vo|audio:music|audio:mix -- --animation NAME`: cut and place the voiceover (`timing.json`), fit the music bed, and master the soundtrack.

package/templates/video/scripts/export-mp4.mjs

@@ -23,10 +23,13 @@ const headless = takeHeadlessFlag(args);
 let port = 5196;
 // Captions become subtitle files beside the MP4 unless --burn-captions draws them into the picture, e.g. for social feeds.
 let burnCaptions = false;
+// --watermark also saves NAME-watermarked.mp4, the film with AnimaGuru's "Made with AnimaGuru" badge, e.g. a lead film's preview.
+let watermark = false;
 for (let index = 0; index < args.length; index++) {
   if (args[index] === "--burn-captions") burnCaptions = true;
+  else if (args[index] === "--watermark") watermark = true;
   else if (args[index] === "--port" && /^\d+$/.test(args[index + 1] ?? "")) port = Number(args[++index]);
-  else throw new Error("Usage: npm run export:mp4 -- [--animation NAME] [--headless] [--port 5196] [--burn-captions]");
+  else throw new Error("Usage: npm run export:mp4 -- [--animation NAME] [--headless] [--port 5196] [--burn-captions] [--watermark]");
 }
 if (!Number.isInteger(port) || port < 1024 || port > 65535) throw new Error("Export port must be 1024–65535.");
 const context = await projectContext(root, selection.animation);
@@ -47,11 +50,15 @@ if (config.audio !== null) {
 if (config.poster != null && (typeof config.poster !== "number" || !Number.isFinite(config.poster) || config.poster < 0 || config.poster >= duration)) throw new Error("Set poster in film.config.json to a time within the film, in seconds, or leave it out.");
 const thumbnailScale = Math.min(1, 1280 / Math.max(width, height));
 const thumbnail = config.poster == null ? null : { time: config.poster, width: Math.round(width * thumbnailScale), height: Math.round(height * thumbnailScale) };
+// The capture page draws the badge with the font and logo AnimaGuru's web app uses, so they are sent to it as base64.
+const watermarkFiles = watermark ? Object.fromEntries(await Promise.all([["font", "instrument-sans.woff2"], ["logo", "logo-mark-512.png"]]
+  .map(async ([key, file]) => [key, (await readFile(new URL(`./watermark/${file}`, import.meta.url))).toString("base64")]))) : null;
 const outputDirectory = context.output;
 await mkdir(outputDirectory, { recursive: true });
 const name = `${config.slug}-${language}${burnCaptions ? "-captioned" : ""}`;
 let destination = path.join(outputDirectory, `${name}.mp4`);
-for (const candidate of [destination, ...[".partial.mp4", ".srt", ".vtt", ".jpg"].map((extension) => destination.replace(/\.mp4$/, extension))]) {
+const watermarkedFiles = watermark ? ["-watermarked.mp4", "-watermarked.partial.mp4"] : [];
+for (const candidate of [destination, ...[".partial.mp4", ".srt", ".vtt", ".jpg", ...watermarkedFiles].map((extension) => destination.replace(/\.mp4$/, extension))]) {
   try {
     await access(candidate);
     destination = path.join(outputDirectory, `${name}-${randomUUID()}.mp4`);
@@ -59,6 +66,8 @@ for (const candidate of [destination, ...[".partial.mp4", ".srt", ".vtt", ".jpg"
   } catch (error) { if (error.code !== "ENOENT") throw error; }
 }
 const partial = destination.replace(/\.mp4$/, ".partial.mp4");
+const watermarked = destination.replace(/\.mp4$/, "-watermarked.mp4");
+const watermarkedPartial = destination.replace(/\.mp4$/, "-watermarked.partial.mp4");
 const token = randomUUID();
 let encoder;
 let encoderDone;
@@ -67,6 +76,9 @@ let encoderLog = "";
 let settings;
 let subtitles = [];
 let thumbnailImage;
+let badge;
+let watermarking;
+let ownsWatermarkedPartial = false;
 let received = 0;
 let lastFrameHash;
 let frameQueue = Promise.resolve();
@@ -103,10 +115,62 @@ function jpegDimensions(bytes) {
   return null;
 }
 
+function pngDimensions(bytes) {
+  const signature = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
+  if (bytes.length < 24 || signature.some((byte, index) => bytes[index] !== byte) || bytes.toString("latin1", 12, 16) !== "IHDR") return null;
+  return { width: bytes.readUInt32BE(16), height: bytes.readUInt32BE(20) };
+}
+
+/** Reads an encoded MP4 back and checks that it is the whole film: frames, duration, dimensions, codecs and language. */
+async function verify(file, what) {
+  const { stdout } = await run(ffprobe.path, ["-v", "error", "-count_frames", "-show_streams", "-show_format", "-of", "json", file], { maxBuffer: 1024 * 1024 });
+  const probe = JSON.parse(stdout);
+  const video = probe.streams.find((stream) => stream.codec_type === "video");
+  const audio = probe.streams.find((stream) => stream.codec_type === "audio");
+  if (!video || video.codec_name !== "h264" || video.width !== width || video.height !== height || Number(video.nb_read_frames) !== settings.frames || video.pix_fmt !== "yuv420p" || !audio || audio.codec_name !== "aac" || audio.tags?.language !== languageTag || Math.abs(Number(probe.format.duration) - settings.duration) > 0.15) throw new Error(`The encoded ${what} did not pass duration, frame count, dimensions, language, or codec verification.`);
+  return probe;
+}
+
+/**
+  Lays the badge over a copy of the encoded film. The picture is encoded again at the same quality and the sound is
+  copied. The badge is converted to the film's BT.709 limited-range colours before it is laid over, so it keeps the
+  colours of AnimaGuru's own watermarked copies.
+*/
+async function watermarkCopy() {
+  await writeFile(watermarkedPartial, "", { flag: "wx" });
+  ownsWatermarkedPartial = true;
+  // The badge arrives on stdin as a single PNG frame, which the overlay keeps over the whole film.
+  const child = spawn(ffmpeg.path, [
+    "-hide_banner", "-loglevel", "warning", "-y", "-i", partial, "-f", "png_pipe", "-i", "pipe:0",
+    "-filter_complex", `[1:v]scale=out_color_matrix=bt709:out_range=tv,format=yuva420p[mark];[0:v][mark]overlay=x=${badge.x}:y=${badge.y}:format=yuv420,format=yuv420p[film]`,
+    "-map", "[film]", "-map", "0:a:0",
+    "-c:v", "libx264", "-preset", "medium", "-crf", "18",
+    "-color_primaries", "bt709", "-color_trc", "bt709", "-colorspace", "bt709",
+    "-c:a", "copy", "-metadata:s:a:0", `language=${languageTag}`, "-metadata:s:v:0", `language=${languageTag}`,
+    "-movflags", "+faststart", watermarkedPartial,
+  ], { stdio: ["pipe", "ignore", "pipe"] });
+  let log = "";
+  child.stderr.on("data", (chunk) => { log = (log + chunk.toString()).slice(-8000); });
+  // An FFmpeg that fails early closes its input; its exit code reports why.
+  child.stdin.on("error", () => {});
+  child.stdin.end(badge.image);
+  const done = new Promise((resolve, reject) => {
+    child.once("error", reject);
+    child.once("close", (code, signal) => code === 0 ? resolve() : reject(new Error(`FFmpeg could not make the watermarked copy (${signal ?? `exit ${code}`}): ${log}`)));
+  });
+  watermarking = { child, done };
+  await done;
+}
+
 async function cleanup(error) {
   if (aborted || finished) return;
   aborted = true;
   console.error(`Export stopped: ${error.message ?? error}`);
+  // SIGKILL, because an FFmpeg stopped any other way finishes the MP4 and would write the partial copy again; and at
+  // once, because Playwright's own Ctrl+C handler exits as soon as the headless browser has closed.
+  const marker = watermarking?.child;
+  if (marker && marker.exitCode === null && marker.signalCode === null) marker.kill("SIGKILL");
+  if (ownsWatermarkedPartial) await rm(watermarkedPartial, { force: true });
   if (encoder && encoder.exitCode === null) {
     encoder.stdin.destroy();
     encoder.kill("SIGTERM");
@@ -156,8 +220,17 @@ async function route(request, response, url) {
       encoder.once("close", (code) => code === 0 ? resolve() : reject(new Error(`FFmpeg exited ${code}: ${encoderLog}`)));
     });
     encoderDone.catch((error) => { encoderError = error; });
-    console.log(`Rendering ${language.toUpperCase()}: ${settings.frames} frames (${settings.duration}s), ${width} × ${height} / ${fps} fps, ${subtitles.length ? `${subtitles.length} captions ${burnCaptions ? "drawn into the picture" : "as subtitle files"}` : "no captions"}.`);
-    send({ fps, frames: settings.frames, burnCaptions, thumbnail }); return;
+    console.log(`Rendering ${language.toUpperCase()}: ${settings.frames} frames (${settings.duration}s), ${width} × ${height} / ${fps} fps, ${subtitles.length ? `${subtitles.length} captions ${burnCaptions ? "drawn into the picture" : "as subtitle files"}` : "no captions"}${watermark ? ", plus a watermarked copy" : ""}.`);
+    send({ fps, frames: settings.frames, burnCaptions, thumbnail, watermark: watermarkFiles }); return;
+  }
+  if (url.pathname === "/__export/watermark") {
+    if (!watermark || !encoder || encoding || badge || received) throw new Error("Send the watermark once, before the first frame.");
+    const image = await readBody(request, 1024 * 1024);
+    const size = pngDimensions(image);
+    const x = Number(url.searchParams.get("x")), y = Number(url.searchParams.get("y"));
+    if (request.headers["content-type"] !== "image/png" || !size || !Number.isInteger(x) || !Number.isInteger(y) || x < 0 || y < 0 || x + size.width > width || y + size.height > height) throw new Error("Expected a PNG watermark inside the picture.");
+    badge = { image, x, y, ...size };
+    send({ bytes: image.length }); return;
   }
   if (url.pathname === "/__export/frame") {
     if (!encoder || encoding || finished || aborted) throw new Error("No active frame capture.");
@@ -196,30 +269,34 @@ async function route(request, response, url) {
   if (url.pathname === "/__export/finish") {
     if (!encoder || encoding || received !== settings.frames) throw new Error("The capture is incomplete.");
     if (thumbnail && !thumbnailImage) throw new Error("The thumbnail was not captured.");
+    if (watermark && !badge) throw new Error("The watermark was not drawn.");
     encoding = true;
     encoder.stdin.end();
     await encoderDone;
     console.log("Checking the encoded video and soundtrack…");
-    const { stdout } = await run(ffprobe.path, ["-v", "error", "-count_frames", "-show_streams", "-show_format", "-of", "json", partial], { maxBuffer: 1024 * 1024 });
-    const probe = JSON.parse(stdout);
-    const video = probe.streams.find((stream) => stream.codec_type === "video");
-    const audio = probe.streams.find((stream) => stream.codec_type === "audio");
-    if (!video || video.codec_name !== "h264" || video.width !== width || video.height !== height || Number(video.nb_read_frames) !== settings.frames || video.pix_fmt !== "yuv420p" || !audio || audio.codec_name !== "aac" || audio.tags?.language !== languageTag || Math.abs(Number(probe.format.duration) - settings.duration) > 0.15) throw new Error("The encoded file did not pass duration, frame count, dimensions, language, or codec verification.");
+    const probe = await verify(partial, "file");
+    if (watermark) {
+      console.log("Making the watermarked copy…");
+      await watermarkCopy();
+      await verify(watermarkedPartial, "watermarked copy");
+    }
     await rename(partial, destination);
+    if (watermark) await rename(watermarkedPartial, watermarked);
     // A player would show a same-named subtitle file on top of burned-in captions, so those exports get none.
     const subtitleFiles = subtitles.length && !burnCaptions ? [[".srt", toSrt(subtitles)], [".vtt", toVtt(subtitles, language)]].map(([extension, text]) => ({ path: destination.replace(/\.mp4$/, extension), text })) : [];
     for (const file of subtitleFiles) await writeFile(file.path, file.text);
     const thumbnailFile = thumbnailImage ? destination.replace(/\.mp4$/, ".jpg") : null;
     if (thumbnailFile) await writeFile(thumbnailFile, thumbnailImage);
-    await writeFile(destination.replace(/\.mp4$/, ".json"), JSON.stringify({ file: path.basename(destination), title: config.title, audio: config.audio, subtitles: subtitleFiles.map((file) => path.basename(file.path)), thumbnail: thumbnailFile && { file: path.basename(thumbnailFile), time: thumbnail.time }, settings, verification: probe }, null, 2) + "\n");
+    await writeFile(destination.replace(/\.mp4$/, ".json"), JSON.stringify({ file: path.basename(destination), title: config.title, audio: config.audio, subtitles: subtitleFiles.map((file) => path.basename(file.path)), thumbnail: thumbnailFile && { file: path.basename(thumbnailFile), time: thumbnail.time }, ...(watermark ? { watermarked: { file: path.basename(watermarked), badge: { x: badge.x, y: badge.y, width: badge.width, height: badge.height } } } : {}), settings, verification: probe }, null, 2) + "\n");
     const bytes = (await stat(destination)).size;
     finished = true;
     clearInterval(idleCheck);
     console.log(`Saved: ${destination}\nSize: ${(bytes / 1024 / 1024).toFixed(1)} MiB\nVerified: ${settings.frames} frames, ${settings.duration}s, H.264 video and AAC audio.`);
     if (subtitleFiles.length) console.log(`Subtitles (${subtitles.length} captions, ${language}): ${subtitleFiles.map((file) => file.path).join(", ")}`);
     console.log(thumbnailFile ? `Thumbnail (${thumbnail.time}s): ${thumbnailFile}` : 'No thumbnail: set "poster" in film.config.json to the seconds of the frame to save as one.');
+    if (watermark) console.log(`Watermarked copy ("Made with AnimaGuru"): ${watermarked}`);
     response.once("finish", () => { void server.close(); });
-    send({ path: destination, bytes, subtitles: subtitleFiles.map((file) => file.path), thumbnail: thumbnailFile }); return;
+    send({ path: destination, bytes, subtitles: subtitleFiles.map((file) => file.path), thumbnail: thumbnailFile, watermarked: watermark ? watermarked : null }); return;
   }
   if (url.pathname === "/__export/abort") {
     const message = JSON.parse((await readBody(request, 4096)).toString());
@@ -244,13 +321,14 @@ server = await createServer({
     });
   } }],
 });
+// Finishing, which for a long film with a watermarked copy can take minutes, waits for no capture request.
 const idleCheck = setInterval(() => {
-  if (Date.now() - lastActivity > 10 * 60 * 1000) void cleanup(new Error("No capture activity for ten minutes."));
+  if (!encoding && Date.now() - lastActivity > 10 * 60 * 1000) void cleanup(new Error("No capture activity for ten minutes."));
 }, 30000);
 process.once("SIGINT", () => { void cleanup(new Error("Cancelled.")); });
 process.once("SIGTERM", () => { void cleanup(new Error("Cancelled.")); });
 try { await server.listen(); } catch (error) { await cleanup(error); throw error; }
-console.log(`Open this local export page and keep it open until complete:\nhttp://127.0.0.1:${port}${context.route}?capture=1&export=${token}\nOutput: ${destination}\nThe preview can stay open. This capture runs locally without generation credits.`);
+console.log(`Open this local export page and keep it open until complete:\nhttp://127.0.0.1:${port}${context.route}?capture=1&export=${token}\nOutput: ${destination}${watermark ? `\nWatermarked copy: ${watermarked}` : ""}\nThe preview can stay open. This capture runs locally without generation credits.`);
 if (headless) {
   try { await captureHeadless(`http://127.0.0.1:${port}${context.route}?capture=1&export=${token}`, { endpoint: "/__export/finish" }); }
   catch (error) { await cleanup(error); }

package/templates/video/scripts/watermark/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2022 The Instrument Sans Project Authors (https://github.com/Instrument/instrument-sans) InstrumentSans-Italic[wdth,wght].ttf: Copyright 2022 The Instrument Sans Project Authors (https://github.com/Instrument/instrument-sans)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

package/templates/video/shared/locales/en/export.json

@@ -1,6 +1,7 @@
 {
   "preparing": "Preparing MP4 export…",
   "rendering": "Rendering MP4 · {percent}% · {frame} / {total} frames. Keep this tab open.",
+  "watermark": "Drawing the Made with AnimaGuru watermark…",
   "thumbnail": "Saving the thumbnail…",
   "finishing": "Finishing the MP4 and checking its video and audio…",
   "saved": "MP4 saved: {path}",

package/templates/video/src/exporter.ts

@@ -24,11 +24,13 @@ export async function exportMp4(api: CaptureApi, token: string) {
   status.style.cssText = "position:fixed;z-index:100;left:24px;bottom:24px;padding:16px 22px;border-radius:12px;background:#162224ed;color:white;font:15px Arial,sans-serif;box-shadow:0 8px 30px #0002;max-width:calc(100vw - 48px)";
   status.textContent = copy.preparing;
   document.body.append(status);
+  // With --watermark, finishing also encodes the watermarked copy, which takes longer.
+  let finishTimeout = 180000;
   const request = async (route: string, body?: BodyInit, type = "application/json") => {
     const attempts = route.startsWith("frame?") ? 3 : 1;
     for (let attempt = 0; attempt < attempts; attempt++) {
       try {
-        const response = await fetch(`/__export/${route}`, { method: "POST", headers: { "Content-Type": type, "X-AnimaGuru-Export": token }, body, signal: AbortSignal.timeout(route === "finish" ? 180000 : 45000) });
+        const response = await fetch(`/__export/${route}`, { method: "POST", headers: { "Content-Type": type, "X-AnimaGuru-Export": token }, body, signal: AbortSignal.timeout(route === "finish" ? finishTimeout : 45000) });
         if (!response.ok) throw new Error(await response.text());
         return await response.json();
       } catch (error) {
@@ -46,6 +48,14 @@ export async function exportMp4(api: CaptureApi, token: string) {
     const settings = await request("start", JSON.stringify({ width: api.width, height: api.height, duration: api.duration, fps: api.fps, language, subtitles }));
     // The export command decides: captions drawn into the picture, or saved as .srt/.vtt files beside a clean MP4.
     api.setCaptions(settings.burnCaptions === true);
+    if (settings.watermark) {
+      // --watermark: the badge is drawn here once, before any frame, and the export command lays it over a copy.
+      status.textContent = copy.watermark;
+      const { watermarkBadge } = await import("./watermark");
+      const badge = await watermarkBadge(api.width, api.height, settings.watermark);
+      await request(`watermark?x=${badge.x}&y=${badge.y}`, badge.image, "image/png");
+      finishTimeout = 15 * 60000;
+    }
     state.total = settings.frames;
     state.status = "rendering";
     for (let frame = 0; frame < settings.frames; frame++) {

package/templates/video/src/watermark.ts

@@ -0,0 +1,50 @@
+/*
+  The "Made with AnimaGuru" badge of an AnimaGuru lead film, drawn the way AnimaGuru's web app draws it in the viewer's
+  browser, with the same Instrument Sans and logo files, which the export command sends. `npm run export:mp4 --
+  --watermark` lays it over a copy of the film, so the copy matches one made on animaguru.com.
+*/
+const FAMILY = "AnimaGuru Watermark Sans";
+export const WATERMARK_LEAD = "Made with ";
+export const WATERMARK_NAME = "AnimaGuru";
+
+/** The badge's sizes for a width×height picture, from its shorter side so portrait and landscape videos match. */
+export function watermarkMetrics(width: number, height: number) {
+  const short = Math.min(width, height);
+  const font = Math.min(64, Math.max(12, Math.round(short * 0.028)));
+  const badge = Math.round(font * 2.1);
+  return { font, badge, logo: Math.round(font * 1.4), gap: Math.round(font * 0.45), padding: Math.round(font * 0.75), margin: Math.max(8, Math.round(short * 0.035)) };
+}
+/** Where a badge of `size` goes in the picture: the bottom-right corner, shrunk when it would cover too much of a small video. */
+export function watermarkPlacement(width: number, height: number, size: { width: number; height: number }, margin: number) {
+  const scale = Math.min(1, (width * 0.6) / size.width, (height * 0.2) / size.height);
+  const w = Math.round(size.width * scale), h = Math.round(size.height * scale);
+  return { x: Math.round(width - margin - w), y: Math.round(height - margin - h), width: w, height: h };
+}
+
+const bytes = (base64: string) => Uint8Array.from(atob(base64), (character) => character.charCodeAt(0));
+
+/** The badge for a width×height film as a PNG at its final size, and where it goes. `files` holds the font and logo as base64. */
+export async function watermarkBadge(width: number, height: number, files: { font: string; logo: string }) {
+  const size = watermarkMetrics(width, height);
+  document.fonts.add(await new FontFace(FAMILY, bytes(files.font), { weight: "400 700" }).load());
+  const lead = `500 ${size.font}px "${FAMILY}"`, name = `700 ${size.font}px "${FAMILY}"`;
+  const logo = await createImageBitmap(new Blob([bytes(files.logo)], { type: "image/png" }));
+  const measure = new OffscreenCanvas(1, 1).getContext("2d")!;
+  measure.font = lead; const leadWidth = measure.measureText(WATERMARK_LEAD).width;
+  measure.font = name; const nameWidth = measure.measureText(WATERMARK_NAME).width;
+  const inset = (size.badge - size.logo) / 2;
+  const canvas = new OffscreenCanvas(Math.ceil(inset + size.logo + size.gap + leadWidth + nameWidth + size.padding), size.badge);
+  const context = canvas.getContext("2d")!;
+  context.fillStyle = "rgba(12, 14, 18, 0.58)";
+  context.beginPath(); context.roundRect(0, 0, canvas.width, canvas.height, canvas.height / 2); context.fill();
+  context.drawImage(logo, inset, inset, size.logo, size.logo); logo.close();
+  context.textBaseline = "middle";
+  const x = inset + size.logo + size.gap, y = canvas.height / 2 + size.font * 0.04;
+  context.font = lead; context.fillStyle = "rgba(255, 255, 255, 0.82)"; context.fillText(WATERMARK_LEAD, x, y);
+  context.font = name; context.fillStyle = "#ffffff"; context.fillText(WATERMARK_NAME, x + leadWidth, y);
+  // The web app scales the badge as it draws it on each frame; here it is scaled once, so FFmpeg lays it over as it is.
+  const place = watermarkPlacement(width, height, canvas, size.margin);
+  const placed = new OffscreenCanvas(place.width, place.height);
+  placed.getContext("2d")!.drawImage(canvas, 0, 0, place.width, place.height);
+  return { image: await placed.convertToBlob({ type: "image/png" }), x: place.x, y: place.y, width: place.width, height: place.height };
+}