hyperframes 0.6.65 → 0.6.67

package/dist/cli.js

@@ -50,7 +50,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.6.65" : "0.0.0-dev";
+    VERSION = true ? "0.6.67" : "0.0.0-dev";
   }
 });
 
@@ -58212,7 +58212,7 @@ function isSafeAttributeValue(name, value) {
 function patchElementInHtml(source, target, operations) {
   const { document: document2, wrappedFragment } = parseSourceDocument(source);
   const el = findTargetElement(document2, target);
-  if (!el || !isHTMLElement(el)) return source;
+  if (!el || !isHTMLElement(el)) return { html: source, matched: false };
   const htmlEl = el;
   for (const op of operations) {
     switch (op.type) {
@@ -58247,7 +58247,10 @@ function patchElementInHtml(source, target, operations) {
         break;
     }
   }
-  return wrappedFragment ? document2.body.innerHTML || "" : document2.toString();
+  return {
+    html: wrappedFragment ? document2.body.innerHTML || "" : document2.toString(),
+    matched: true
+  };
 }
 function probeElementInSource(source, target) {
   if (!target.id && !target.selector) return false;
@@ -58531,12 +58534,16 @@ function registerFileRoutes(api, adapter2) {
     } catch {
       return c3.json({ error: "not found" }, 404);
     }
-    return writeIfChanged(
-      c3,
-      ctx.absPath,
+    const { html: patched, matched } = patchElementInHtml(
       originalContent,
-      patchElementInHtml(originalContent, parsed.target, parsed.body.operations)
+      parsed.target,
+      parsed.body.operations
     );
+    if (patched === originalContent) {
+      return c3.json({ ok: true, changed: false, matched, content: originalContent });
+    }
+    writeFileSync8(ctx.absPath, patched, "utf-8");
+    return c3.json({ ok: true, changed: true, matched, content: patched });
   });
   api.post("/projects/:id/file-mutations/probe-element/*", async (c3) => {
     const ctx = await resolveFileMutationContext(c3, adapter2, "probe-element");
@@ -73083,7 +73090,8 @@ async function runCaptureStreamingStage(input2) {
     streamingEncoder = await spawnStreamingEncoder(
       videoOnlyPath,
       streamingEncoderOptions,
-      abortSignal
+      abortSignal,
+      cfg
     );
     assertNotAborted();
   } catch (err) {
@@ -76202,9 +76210,72 @@ function parseRenderOptions(body) {
   const outputPath = typeof body.outputPath === "string" && body.outputPath.trim().length > 0 ? body.outputPath : typeof body.output === "string" && body.output.trim().length > 0 ? body.output : null;
   const entryFile = typeof body.entryFile === "string" && body.entryFile.trim().length > 0 ? body.entryFile.trim() : void 0;
   const format = ["mp4", "webm", "mov"].includes(body.format) ? body.format : void 0;
-  return { outputPath, fps, quality, workers, useGpu, debug, entryFile, format };
+  const { variables, outputResolution } = parseRenderOverrides(body);
+  return {
+    outputPath,
+    fps,
+    quality,
+    workers,
+    useGpu,
+    debug,
+    entryFile,
+    format,
+    variables,
+    outputResolution
+  };
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function parseRenderOverrides(body) {
+  const variables = isPlainObject(body.variables) ? body.variables : void 0;
+  const outputResolution = typeof body.outputResolution === "string" ? normalizeResolutionFlag(body.outputResolution) : void 0;
+  return { variables, outputResolution };
+}
+function buildRenderJobConfig(input2, log2) {
+  return {
+    fps: input2.fps,
+    quality: input2.quality,
+    format: input2.format,
+    workers: input2.workers,
+    useGpu: input2.useGpu,
+    debug: input2.debug,
+    entryFile: input2.entryFile,
+    variables: input2.variables,
+    outputResolution: input2.outputResolution,
+    logger: log2
+  };
+}
+function resolvePreparedRenderOutput(prepared, rendersDir, log2) {
+  const { input: input2, cleanupProjectDir } = prepared;
+  const absoluteOutputPath = resolveOutputPath(input2.projectDir, input2.outputPath, rendersDir, log2);
+  const outputDir = dirname16(absoluteOutputPath);
+  if (!existsSync42(outputDir)) mkdirSync25(outputDir, { recursive: true });
+  return { input: input2, cleanupProjectDir, absoluteOutputPath };
+}
+function validateRenderOverrides(body) {
+  if (body.variables !== void 0 && !isPlainObject(body.variables)) {
+    return 'variables must be a JSON object keyed by variable id (e.g. {"title":"Hello"})';
+  }
+  return validateOutputResolutionOverride(body);
+}
+function validateOutputResolutionOverride(body) {
+  if (body.outputResolution === void 0) return void 0;
+  if (typeof body.outputResolution !== "string") {
+    return 'outputResolution must be a string preset (e.g. "4k", "landscape-4k")';
+  }
+  const normalized = normalizeResolutionFlag(body.outputResolution);
+  if (body.outputResolution.trim().length > 0 && normalized === void 0) {
+    return `Invalid outputResolution "${body.outputResolution}". Must be one of: landscape, portrait, landscape-4k, portrait-4k, square, square-4k (aliases: 1080p, 4k, \u2026).`;
+  }
+  if (normalized !== void 0 && (body.format === "webm" || body.format === "mov")) {
+    return `outputResolution is not supported with format "${body.format}" \u2014 the alpha (webm/mov) capture path can't supersample. Use format "mp4", or omit outputResolution to render at the composition's native dimensions.`;
+  }
+  return void 0;
 }
 async function prepareRenderBody(body) {
+  const overrideError = validateRenderOverrides(body);
+  if (overrideError) return { error: overrideError };
   const options = parseRenderOptions(body);
   const projectDir = typeof body.projectDir === "string" ? body.projectDir : void 0;
   if (projectDir) {
@@ -76354,15 +76425,11 @@ function createRenderHandlers(options = {}) {
     if ("error" in preparedResult) {
       return c3.json({ success: false, requestId, error: preparedResult.error }, 400);
     }
-    const { input: input2, cleanupProjectDir } = preparedResult.prepared;
-    const absoluteOutputPath = resolveOutputPath(
-      input2.projectDir,
-      input2.outputPath,
+    const { input: input2, cleanupProjectDir, absoluteOutputPath } = resolvePreparedRenderOutput(
+      preparedResult.prepared,
       rendersDir,
       log2
     );
-    const outputDir = dirname16(absoluteOutputPath);
-    if (!existsSync42(outputDir)) mkdirSync25(outputDir, { recursive: true });
     const release4 = await renderSemaphore.acquire();
     log2.info("render started", {
       requestId,
@@ -76370,16 +76437,7 @@ function createRenderHandlers(options = {}) {
       fps: input2.fps,
       quality: input2.quality
     });
-    const job = createRenderJob({
-      fps: input2.fps,
-      quality: input2.quality,
-      format: input2.format,
-      workers: input2.workers,
-      useGpu: input2.useGpu,
-      debug: input2.debug,
-      entryFile: input2.entryFile,
-      logger: log2
-    });
+    const job = createRenderJob(buildRenderJobConfig(input2, log2));
     let lastLoggedPct = -10;
     try {
       await executeRenderJob(job, input2.projectDir, absoluteOutputPath, async (j3, message) => {
@@ -76465,26 +76523,13 @@ function createRenderHandlers(options = {}) {
         });
         return;
       }
-      const { input: input2, cleanupProjectDir } = preparedResult.prepared;
-      const absoluteOutputPath = resolveOutputPath(
-        input2.projectDir,
-        input2.outputPath,
+      const { input: input2, cleanupProjectDir, absoluteOutputPath } = resolvePreparedRenderOutput(
+        preparedResult.prepared,
         rendersDir,
         log2
       );
-      const outputDir = dirname16(absoluteOutputPath);
-      if (!existsSync42(outputDir)) mkdirSync25(outputDir, { recursive: true });
       log2.info("render-stream started", { requestId, projectDir: input2.projectDir });
-      const job = createRenderJob({
-        fps: input2.fps,
-        quality: input2.quality,
-        format: input2.format,
-        workers: input2.workers,
-        useGpu: input2.useGpu,
-        debug: input2.debug,
-        entryFile: input2.entryFile,
-        logger: log2
-      });
+      const job = createRenderJob(buildRenderJobConfig(input2, log2));
       const abortController = new AbortController();
       const onRequestAbort = () => abortController.abort(new RenderCancelledError("request_aborted"));
       c3.req.raw.signal.addEventListener("abort", onRequestAbort, { once: true });
@@ -78696,12 +78741,12 @@ function createStudioServer(options) {
     async installRegistryBlock(opts) {
       const { resolveItem: resolveItem2 } = await Promise.resolve().then(() => (init_resolver(), resolver_exports));
       const { installItem: installItem2 } = await Promise.resolve().then(() => (init_installer(), installer_exports));
-      const { readFileSync: readFileSync59, writeFileSync: writeFileSync40, existsSync: existsSync81 } = await import("fs");
+      const { readFileSync: readFileSync59, writeFileSync: writeFileSync40, existsSync: existsSync82 } = await import("fs");
       const { join: join92 } = await import("path");
       const item = await resolveItem2(opts.blockName);
       const { written } = await installItem2(item, { destDir: opts.project.dir });
       const indexPath = join92(opts.project.dir, "index.html");
-      if (existsSync81(indexPath)) {
+      if (existsSync82(indexPath)) {
         const indexHtml = readFileSync59(indexPath, "utf-8");
         const hostW = indexHtml.match(/data-width="(\d+)"/)?.[1];
         const hostH = indexHtml.match(/data-height="(\d+)"/)?.[1];
@@ -81784,6 +81829,14 @@ async function renderDocker(projectDir, outputPath, options) {
 }
 async function renderLocal(projectDir, outputPath, options) {
   const producer = await loadProducer();
+  if (!findFFmpeg()) {
+    errorBox(
+      "FFmpeg not found",
+      "FFmpeg is required to encode video. The render cannot proceed without it.",
+      getFFmpegInstallHint()
+    );
+    process.exit(1);
+  }
   const startTime = Date.now();
   if (options.browserPath && !process.env.PRODUCER_HEADLESS_SHELL_PATH) {
     process.env.PRODUCER_HEADLESS_SHELL_PATH = options.browserPath;
@@ -81810,7 +81863,14 @@ async function renderLocal(projectDir, outputPath, options) {
   try {
     await producer.executeRenderJob(job, projectDir, outputPath, onProgress);
   } catch (error) {
-    handleRenderError(error, options, startTime, false, "Try --docker for containerized rendering");
+    handleRenderError(
+      error,
+      options,
+      startTime,
+      false,
+      "Try --docker for containerized rendering",
+      job.failedStage
+    );
   }
   const elapsed = Date.now() - startTime;
   trackRenderMetrics(job, elapsed, options, false);
@@ -81834,7 +81894,7 @@ function getMemorySnapshot() {
     memoryFreeMb: bytesToMb(freemem4())
   };
 }
-function handleRenderError(error, options, startTime, docker, hint) {
+function handleRenderError(error, options, startTime, docker, hint, failedStage) {
   const message = normalizeErrorMessage2(error);
   trackRenderError({
     fps: fpsToNumber(options.fps),
@@ -81844,6 +81904,7 @@ function handleRenderError(error, options, startTime, docker, hint) {
     gpu: options.gpu,
     elapsedMs: Date.now() - startTime,
     errorMessage: message,
+    failedStage,
     ...getMemorySnapshot()
   });
   errorBox("Render failed", message, hint);
@@ -81934,6 +81995,7 @@ var init_render2 = __esm({
     init_env();
     init_dockerRunArgs();
     init_errorMessage2();
+    init_ffmpeg();
     init_src();
     examples7 = [
       ["Render to MP4", "hyperframes render --output output.mp4"],
@@ -82234,17 +82296,6 @@ var init_render2 = __esm({
           }
           console.log("");
         }
-        if (!useDocker) {
-          const { findFFmpeg: findFFmpeg2, getFFmpegInstallHint: getFFmpegInstallHint2 } = await Promise.resolve().then(() => (init_ffmpeg(), ffmpeg_exports));
-          if (!findFFmpeg2()) {
-            errorBox(
-              "FFmpeg not found",
-              "Rendering requires FFmpeg for video encoding.",
-              `Install: ${getFFmpegInstallHint2()}`
-            );
-            process.exit(1);
-          }
-        }
         let browserPath;
         if (!useDocker) {
           const { ensureBrowser: ensureBrowser2 } = await Promise.resolve().then(() => (init_manager2(), manager_exports2));
@@ -86542,7 +86593,7 @@ var require_extend = __commonJS({
       }
       return toStr.call(arr) === "[object Array]";
     };
-    var isPlainObject = function isPlainObject2(obj) {
+    var isPlainObject2 = function isPlainObject3(obj) {
       if (!obj || toStr.call(obj) !== "[object Object]") {
         return false;
       }
@@ -86599,12 +86650,12 @@ var require_extend = __commonJS({
             src = getProperty(target, name);
             copy = getProperty(options, name);
             if (target !== copy) {
-              if (deep && copy && (isPlainObject(copy) || (copyIsArray = isArray3(copy)))) {
+              if (deep && copy && (isPlainObject2(copy) || (copyIsArray = isArray3(copy)))) {
                 if (copyIsArray) {
                   copyIsArray = false;
                   clone2 = src && isArray3(src) ? src : [];
                 } else {
-                  clone2 = src && isPlainObject(src) ? src : {};
+                  clone2 = src && isPlainObject2(src) ? src : {};
                 }
                 setProperty(target, { name, newValue: extend(deep, clone2, copy) });
               } else if (typeof copy !== "undefined") {
@@ -133389,9 +133440,12 @@ var init_statusColor = __esm({
 var render_exports3 = {};
 __export(render_exports3, {
   default: () => render_default2,
-  examples: () => examples26
+  examples: () => examples26,
+  resolveAspectRatioForSubmit: () => resolveAspectRatioForSubmit,
+  validateResolutionFormatCombo: () => validateResolutionFormatCombo
 });
 import { isAbsolute as isAbsolute11, resolve as resolvePath4 } from "path";
+import { existsSync as existsSync80 } from "fs";
 function parsePollIntervalMs(raw) {
   const n = parseNumericFlag(raw, { flag: "--poll-interval", min: 1 });
   return n === void 0 ? DEFAULT_POLL_INTERVAL_MS : Math.round(n * 1e3);
@@ -133422,19 +133476,51 @@ function resolveProjectInput(opts) {
   if (explicit.url) return { kind: "url", url: opts.url };
   return { kind: "dir", dir: opts.dir ?? "." };
 }
-function maybeAutoDetectAspectRatio(project, compositionArg, asJson) {
+function resolveAspectRatioForSubmit(project, compositionArg, explicit, asJson) {
   if (project.kind !== "dir") {
-    const reason = project.kind === "asset_id" ? "--asset-id" : "--url";
-    logDetection(asJson, `Auto-detect skipped (project is ${reason})`);
-    return void 0;
+    if (!explicit) {
+      const reason = project.kind === "asset_id" ? "--asset-id" : "--url";
+      logDetection(asJson, `Auto-detect skipped (project is ${reason})`);
+    }
+    return explicit;
   }
   const dir = project.dir ?? ".";
   const entryRelative = compositionArg ?? "index.html";
   const entryPath = resolvePath4(dir, entryRelative);
+  if (!existsSync80(entryPath)) {
+    errorBox(
+      "Composition not found",
+      `Entry file "${entryRelative}" does not exist in ${dir}.`,
+      "Pass --composition with a path that exists inside the project, or omit it to use index.html."
+    );
+    process.exit(1);
+  }
   const detection = detectAspectRatioFromHtml(entryPath);
+  if (explicit) {
+    const conflictDetail = detection.kind === "matched" && detection.aspectRatio !== explicit ? `${detection.width}\xD7${detection.height} \u2192 ${detection.aspectRatio}` : detection.kind === "no-match" ? `${detection.width}\xD7${detection.height}, ratio ${detection.ratio.toFixed(2)} \u2014 not a supported ratio` : void 0;
+    if (conflictDetail) {
+      errorBox(
+        "Aspect ratio mismatch",
+        `--aspect-ratio ${explicit} doesn't match the composition (${conflictDetail}).`,
+        "The renderer matches the composition's authored aspect ratio \u2014 it can't reshape it. Drop --aspect-ratio (it's auto-detected) or re-author the composition at the target ratio."
+      );
+      process.exit(1);
+    }
+    return explicit;
+  }
   logDetection(asJson, summarizeDetection(detection, entryRelative));
   return detection.kind === "matched" ? detection.aspectRatio : void 0;
 }
+function validateResolutionFormatCombo(resolution, format) {
+  if (resolution === "4k" && (format === "webm" || format === "mov")) {
+    errorBox(
+      "Unsupported combination",
+      `--resolution 4k cannot be combined with --format ${format}.`,
+      "The alpha (webm/mov) capture path doesn't support 4k supersampling. Render 4k as mp4, or render alpha at composition resolution."
+    );
+    process.exit(1);
+  }
+}
 function logDetection(asJson, message) {
   if (asJson) return;
   const suffix = message.startsWith("Detected aspect ratio") ? "" : `; ${ASPECT_FALLBACK_HINT}`;
@@ -133771,7 +133857,13 @@ var init_render4 = __esm({
           assetId: args["asset-id"],
           url: args.url
         });
-        const aspectRatio = explicitAspectRatio ?? maybeAutoDetectAspectRatio(project, args.composition, asJson);
+        validateResolutionFormatCombo(resolution, format);
+        const aspectRatio = resolveAspectRatioForSubmit(
+          project,
+          args.composition,
+          explicitAspectRatio,
+          asJson
+        );
         const variables = resolveVariablesAndValidateIfLocal(
           args.variables,
           args["variables-file"],
@@ -135212,15 +135304,15 @@ init_version();
 init_dist();
 import { dirname as dirname34, join as join91 } from "path";
 import { fileURLToPath as fileURLToPath12 } from "url";
-import { existsSync as existsSync80 } from "fs";
+import { existsSync as existsSync81 } from "fs";
 (() => {
   const here = dirname34(fileURLToPath12(import.meta.url));
   const shader = join91(here, "shaderTransitionWorker.js");
   const png = join91(here, "pngDecodeBlitWorker.js");
-  if (!process.env.HF_SHADER_WORKER_ENTRY && existsSync80(shader)) {
+  if (!process.env.HF_SHADER_WORKER_ENTRY && existsSync81(shader)) {
     process.env.HF_SHADER_WORKER_ENTRY = shader;
   }
-  if (!process.env.HF_PNG_DECODE_BLIT_WORKER_ENTRY && existsSync80(png)) {
+  if (!process.env.HF_PNG_DECODE_BLIT_WORKER_ENTRY && existsSync81(png)) {
     process.env.HF_PNG_DECODE_BLIT_WORKER_ENTRY = png;
   }
 })();