hyperframes 0.6.37 → 0.6.39

package/dist/cli.js

@@ -54,7 +54,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.6.37" : "0.0.0-dev";
+    VERSION = true ? "0.6.39" : "0.0.0-dev";
   }
 });
 
@@ -13232,6 +13232,103 @@ var init_portUtils = __esm({
   }
 });
 
+// src/utils/orphanCleanup.ts
+import { execSync } from "child_process";
+function killOrphanedProcesses() {
+  if (process.platform === "win32") return 0;
+  let killed = 0;
+  for (const name of ["chrome-headless-shell", "chrome_headless_shell"]) {
+    killed += killOrphansByName(name);
+  }
+  killed += killOrphansByName("puppeteer_dev_chrome_profile");
+  return killed;
+}
+function killProcessTree(pid, signal = "SIGTERM") {
+  if (process.platform === "win32") return;
+  const descendants = getDescendants(pid);
+  const allPids = [...descendants.reverse(), pid];
+  for (const p2 of allPids) {
+    try {
+      process.kill(p2, signal);
+    } catch {
+    }
+  }
+  if (signal !== "SIGKILL") {
+    setTimeout(() => {
+      for (const p2 of allPids) {
+        try {
+          process.kill(p2, "SIGKILL");
+        } catch {
+        }
+      }
+    }, 500).unref();
+  }
+}
+function getDescendants(pid) {
+  let children;
+  try {
+    const raw = execSync(`pgrep -P ${pid}`, { encoding: "utf-8", timeout: 2e3 }).trim();
+    if (!raw) return [];
+    children = raw.split("\n").map((s2) => parseInt(s2, 10)).filter((n) => !isNaN(n) && n > 0);
+  } catch {
+    return [];
+  }
+  const all = [];
+  for (const child of children) {
+    all.push(child);
+    all.push(...getDescendants(child));
+  }
+  return all;
+}
+function killOrphansByName(processName) {
+  const uid = getUid();
+  const userFlag = uid !== null ? `-u ${uid} ` : "";
+  let pids;
+  try {
+    const raw = execSync(`pgrep ${userFlag}-f ${processName}`, {
+      encoding: "utf-8",
+      timeout: 3e3
+    }).trim();
+    if (!raw) return 0;
+    pids = raw.split("\n").map((s2) => parseInt(s2, 10)).filter((n) => !isNaN(n) && n > 0);
+  } catch {
+    return 0;
+  }
+  let killed = 0;
+  for (const pid of pids) {
+    if (!isOrphan(pid)) continue;
+    killProcessTree(pid);
+    killed++;
+  }
+  return killed;
+}
+function getUid() {
+  if (_cachedUid !== void 0) return _cachedUid;
+  try {
+    _cachedUid = execSync("id -u", { encoding: "utf-8", timeout: 1e3 }).trim();
+  } catch {
+    _cachedUid = null;
+  }
+  return _cachedUid;
+}
+function isOrphan(pid) {
+  try {
+    const ppid = execSync(`ps -p ${pid} -o ppid=`, {
+      encoding: "utf-8",
+      timeout: 2e3
+    }).trim();
+    return ppid === "1";
+  } catch {
+    return false;
+  }
+}
+var _cachedUid;
+var init_orphanCleanup = __esm({
+  "src/utils/orphanCleanup.ts"() {
+    "use strict";
+  }
+});
+
 // src/server/fileWatcher.ts
 import { watch } from "fs";
 function shouldWatchProjectFile(filename) {
@@ -29018,7 +29115,7 @@ __export(manager_exports2, {
   findBrowser: () => findBrowser,
   isLinuxArm: () => isLinuxArm
 });
-import { execSync, spawnSync as spawnSync2 } from "child_process";
+import { execSync as execSync2, spawnSync as spawnSync2 } from "child_process";
 import { existsSync as existsSync18, readdirSync as readdirSync8, rmSync as rmSync4 } from "fs";
 import { basename as basename2 } from "path";
 import { homedir as homedir5 } from "os";
@@ -29027,7 +29124,7 @@ import { Browser, detectBrowserPlatform, getInstalledBrowsers, install } from "@
 function whichBinary2(name) {
   try {
     const cmd = process.platform === "win32" ? `where ${name}` : `which ${name}`;
-    const output = execSync(cmd, {
+    const output = execSync2(cmd, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 5e3
@@ -30646,6 +30743,43 @@ var init_frameCapture = __esm({
   }
 });
 
+// ../engine/src/utils/processTracker.ts
+function trackChildProcess(proc) {
+  tracked.add(proc);
+  const remove2 = () => tracked.delete(proc);
+  proc.once("exit", remove2);
+  proc.once("error", remove2);
+}
+function killTrackedProcesses() {
+  const alive = [];
+  for (const proc of tracked) {
+    if (!proc.killed) {
+      try {
+        proc.kill("SIGTERM");
+        alive.push(proc);
+      } catch {
+      }
+    }
+  }
+  tracked.clear();
+  if (alive.length === 0) return;
+  setTimeout(() => {
+    for (const proc of alive) {
+      try {
+        proc.kill("SIGKILL");
+      } catch {
+      }
+    }
+  }, 500).unref();
+}
+var tracked;
+var init_processTracker = __esm({
+  "../engine/src/utils/processTracker.ts"() {
+    "use strict";
+    tracked = /* @__PURE__ */ new Set();
+  }
+});
+
 // ../engine/src/utils/gpuEncoder.ts
 import { spawn as spawn4 } from "child_process";
 async function detectGpuEncoder() {
@@ -30787,6 +30921,7 @@ async function runFfmpeg(args, opts) {
   const onStderr = opts?.onStderr;
   return new Promise((resolve46) => {
     const ffmpeg = spawn5("ffmpeg", args);
+    trackChildProcess(ffmpeg);
     let stderr = "";
     const onAbort = () => {
       ffmpeg.kill("SIGTERM");
@@ -30834,6 +30969,7 @@ var DEFAULT_TIMEOUT, DEFAULT_STDERR_TAIL_LINES;
 var init_runFfmpeg = __esm({
   "../engine/src/utils/runFfmpeg.ts"() {
     "use strict";
+    init_processTracker();
     DEFAULT_TIMEOUT = 3e5;
     DEFAULT_STDERR_TAIL_LINES = 15;
   }
@@ -31075,6 +31211,7 @@ async function encodeFramesFromDir(framesDir, framePattern, outputPath, options,
   const args = buildEncoderArgs(options, inputArgs, outputPath, gpuEncoder);
   return new Promise((resolve46) => {
     const ffmpeg = spawn6("ffmpeg", args);
+    trackChildProcess(ffmpeg);
     let stderr = "";
     const onAbort = () => {
       ffmpeg.kill("SIGTERM");
@@ -31185,6 +31322,7 @@ async function encodeFramesChunkedConcat(framesDir, framePattern, outputPath, op
     const args = buildEncoderArgs(options, inputArgs, chunkPath, gpuEncoder);
     const chunkResult = await new Promise((resolve46) => {
       const ffmpeg = spawn6("ffmpeg", args);
+      trackChildProcess(ffmpeg);
       let stderr = "";
       ffmpeg.stderr.on("data", (d2) => {
         stderr += d2.toString();
@@ -31226,6 +31364,7 @@ async function encodeFramesChunkedConcat(framesDir, framePattern, outputPath, op
   ];
   const concatResult = await new Promise((resolve46) => {
     const ffmpeg = spawn6("ffmpeg", concatArgs);
+    trackChildProcess(ffmpeg);
     let stderr = "";
     ffmpeg.stderr.on("data", (d2) => {
       stderr += d2.toString();
@@ -31257,7 +31396,7 @@ async function encodeFramesChunkedConcat(framesDir, framePattern, outputPath, op
     fileSize
   };
 }
-async function muxVideoWithAudio(videoPath, audioPath, outputPath, signal, config) {
+async function muxVideoWithAudio(videoPath, audioPath, outputPath, signal, config, fps) {
   const outputDir = dirname7(outputPath);
   if (!existsSync21(outputDir)) mkdirSync11(outputDir, { recursive: true });
   const isWebm = outputPath.endsWith(".webm");
@@ -31271,6 +31410,9 @@ async function muxVideoWithAudio(videoPath, audioPath, outputPath, signal, confi
     args.push("-c:a", "aac", "-b:a", "192k", "-movflags", "+faststart");
   }
   args.push("-avoid_negative_ts", "make_zero");
+  if (fps !== void 0) {
+    args.push("-r", fpsToFfmpegArg(fps));
+  }
   args.push("-shortest", "-y", outputPath);
   const processTimeout = config?.ffmpegProcessTimeout ?? DEFAULT_CONFIG2.ffmpegProcessTimeout;
   const result = await runFfmpeg(args, { signal, timeout: processTimeout });
@@ -31289,12 +31431,16 @@ async function muxVideoWithAudio(videoPath, audioPath, outputPath, signal, confi
     error: !result.success ? formatFfmpegError(result.exitCode, result.stderr) : void 0
   };
 }
-async function applyFaststart(inputPath, outputPath, signal, config) {
+async function applyFaststart(inputPath, outputPath, signal, config, fps) {
   if (outputPath.endsWith(".webm") || outputPath.endsWith(".mov")) {
     if (inputPath !== outputPath) copyFileSync(inputPath, outputPath);
     return { success: true, outputPath, durationMs: 0 };
   }
-  const args = ["-i", inputPath, "-c", "copy", "-movflags", "+faststart", "-y", outputPath];
+  const args = ["-i", inputPath, "-c", "copy", "-movflags", "+faststart"];
+  if (fps !== void 0) {
+    args.push("-r", fpsToFfmpegArg(fps));
+  }
+  args.push("-y", outputPath);
   const processTimeout = config?.ffmpegProcessTimeout ?? DEFAULT_CONFIG2.ffmpegProcessTimeout;
   const result = await runFfmpeg(args, { signal, timeout: processTimeout });
   if (signal?.aborted) {
@@ -31316,6 +31462,7 @@ var ENCODER_PRESETS;
 var init_chunkEncoder = __esm({
   "../engine/src/services/chunkEncoder.ts"() {
     "use strict";
+    init_processTracker();
     init_config2();
     init_gpuEncoder();
     init_hdr();
@@ -31544,6 +31691,7 @@ async function spawnStreamingEncoder(outputPath, options, signal, config) {
   const ffmpeg = spawn7("ffmpeg", args, {
     stdio: ["pipe", "pipe", "pipe"]
   });
+  trackChildProcess(ffmpeg);
   let exitStatus = "running";
   let stderr = "";
   let exitCode = null;
@@ -31640,6 +31788,7 @@ Process error: ${err.message}`;
 var init_streamingEncoder = __esm({
   "../engine/src/services/streamingEncoder.ts"() {
     "use strict";
+    init_processTracker();
     init_gpuEncoder();
     init_runFfmpeg();
     init_hdr();
@@ -33660,6 +33809,7 @@ async function extractVideoFramesRange(videoPath, videoId, startTime, duration,
   args.push("-y", outputPattern);
   return new Promise((resolve46, reject) => {
     const ffmpeg = spawn9("ffmpeg", args);
+    trackChildProcess(ffmpeg);
     let stderr = "";
     const onAbort = () => {
       ffmpeg.kill("SIGTERM");
@@ -34122,6 +34272,7 @@ var init_videoFrameExtractor = __esm({
   "../engine/src/services/videoFrameExtractor.ts"() {
     "use strict";
     init_esm10();
+    init_processTracker();
     init_ffprobe();
     init_hdr();
     init_urlDownloader();
@@ -36858,6 +37009,7 @@ __export(src_exports2, {
   injectVideoFramesBatch: () => injectVideoFramesBatch,
   isHdrColorSpace: () => isHdrColorSpace,
   isHttpUrl: () => isHttpUrl,
+  killTrackedProcesses: () => killTrackedProcesses,
   launchHdrBrowser: () => launchHdrBrowser,
   linearToHdr: () => linearToHdr,
   mergeWorkerFrames: () => mergeWorkerFrames,
@@ -36888,6 +37040,7 @@ __export(src_exports2, {
   showVideoElements: () => showVideoElements,
   spawnStreamingEncoder: () => spawnStreamingEncoder,
   syncVideoFrameVisibility: () => syncVideoFrameVisibility,
+  trackChildProcess: () => trackChildProcess,
   uploadAndReadbackHdrFrame: () => uploadAndReadbackHdrFrame
 });
 var init_src2 = __esm({
@@ -36910,6 +37063,7 @@ var init_src2 = __esm({
     init_ffprobe();
     init_urlDownloader();
     init_runFfmpeg();
+    init_processTracker();
     init_alphaBlit();
     init_layerCompositor();
     init_shaderTransitions();
@@ -41854,14 +42008,22 @@ async function runAssembleStage(input) {
       videoOnlyPath,
       audioOutputPath,
       outputPath,
-      abortSignal
+      abortSignal,
+      void 0,
+      job.config.fps
     );
     assertNotAborted();
     if (!muxResult.success) {
       throw new Error(`Audio muxing failed: ${muxResult.error}`);
     }
   } else {
-    const faststartResult = await applyFaststart(videoOnlyPath, outputPath, abortSignal);
+    const faststartResult = await applyFaststart(
+      videoOnlyPath,
+      outputPath,
+      abortSignal,
+      void 0,
+      job.config.fps
+    );
     assertNotAborted();
     if (!faststartResult.success) {
       throw new Error(`Faststart failed: ${faststartResult.error}`);
@@ -45202,7 +45364,13 @@ async function assemble(planDir, chunkPaths, audioPath, outputPath, options) {
     writeFileSync23(concatListPath, `${concatBody}
 `, "utf-8");
     const concatOutputPath = join56(workDir, `concat.${plan2.dimensions.format}`);
+    const fpsArg = fpsToFfmpegArg({
+      num: plan2.dimensions.fpsNum,
+      den: plan2.dimensions.fpsDen
+    });
     const concatArgs = [
+      "-r",
+      fpsArg,
       "-f",
       "concat",
       "-safe",
@@ -45244,13 +45412,24 @@ async function assemble(planDir, chunkPaths, audioPath, outputPath, options) {
         concatOutputPath,
         audioForMux,
         muxOutputPath,
-        abortSignal
+        abortSignal,
+        void 0,
+        { num: plan2.dimensions.fpsNum, den: plan2.dimensions.fpsDen }
       );
       if (!muxResult.success) {
         throw new Error(`[assemble] audio mux failed: ${muxResult.error}`);
       }
     }
-    const faststartResult = await applyFaststart(muxOutputPath, outputPath, abortSignal);
+    const faststartResult = await applyFaststart(
+      muxOutputPath,
+      outputPath,
+      abortSignal,
+      void 0,
+      {
+        num: plan2.dimensions.fpsNum,
+        den: plan2.dimensions.fpsDen
+      }
+    );
     if (!faststartResult.success) {
       throw new Error(`[assemble] faststart failed: ${faststartResult.error}`);
     }
@@ -45319,6 +45498,7 @@ var init_assemble = __esm({
   "../producer/src/services/distributed/assemble.ts"() {
     "use strict";
     init_src2();
+    init_src();
     init_logger();
     init_audioPadTrim();
   }
@@ -45385,6 +45565,7 @@ var init_src3 = __esm({
 // src/server/studioServer.ts
 var studioServer_exports = {};
 __export(studioServer_exports, {
+  closeThumbnailBrowser: () => closeThumbnailBrowser,
   createStudioServer: () => createStudioServer,
   resolveStudioBundle: () => resolveStudioBundle
 });
@@ -45480,16 +45661,6 @@ async function getThumbnailBrowser() {
         _thumbnailBrowser = null;
         _thumbnailBrowserInitializing = null;
       });
-      const onExit = async () => {
-        const { releaseBrowser: releaseBrowser2 } = await Promise.resolve().then(() => (init_src2(), src_exports2));
-        if (_thumbnailBrowser) {
-          await releaseBrowser2(_thumbnailBrowser).catch(() => {
-          });
-          _thumbnailBrowser = null;
-        }
-      };
-      process.once("SIGTERM", () => void onExit());
-      process.once("SIGINT", () => void onExit());
       return _thumbnailBrowser;
     } catch (err) {
       console.warn(
@@ -45502,6 +45673,15 @@ async function getThumbnailBrowser() {
   })();
   return _thumbnailBrowserInitializing;
 }
+async function closeThumbnailBrowser() {
+  if (!_thumbnailBrowser) return;
+  const browser = _thumbnailBrowser;
+  _thumbnailBrowser = null;
+  _thumbnailBrowserInitializing = null;
+  const { releaseBrowser: releaseBrowser2 } = await Promise.resolve().then(() => (init_src2(), src_exports2));
+  await releaseBrowser2(browser).catch(() => {
+  });
+}
 function createStudioServer(options) {
   const { projectDir, projectName } = options;
   const projectId = projectName || basename5(projectDir);
@@ -45949,6 +46129,11 @@ async function runDevMode(dir, options) {
       }
     });
   }
+  const shutdown = () => {
+    if (child.pid) killProcessTree(child.pid);
+  };
+  process.once("SIGINT", shutdown);
+  process.once("SIGTERM", shutdown);
   return new Promise((resolve46) => {
     child.on("close", () => resolve46());
   });
@@ -46024,6 +46209,11 @@ async function runLocalStudioMode(dir, options) {
       }
     });
   }
+  const shutdown = () => {
+    if (child.pid) killProcessTree(child.pid);
+  };
+  process.once("SIGINT", shutdown);
+  process.once("SIGTERM", shutdown);
   return new Promise((resolve46) => {
     child.on("close", () => resolve46());
   });
@@ -46118,11 +46308,29 @@ async function runEmbeddedMode(dir, startPort, options) {
       rl?.close();
       console.log();
       console.log(`  ${c2.dim("Shutting down studio...")}`);
-      result.server.close(() => resolveRun());
-      setTimeout(() => process.exit(0), 2e3).unref();
+      setTimeout(() => process.exit(0), 3e3).unref();
+      const cleanup = async () => {
+        const { closeThumbnailBrowser: closeThumbnailBrowser2 } = await Promise.resolve().then(() => (init_studioServer(), studioServer_exports));
+        const { drainBrowserPool: drainBrowserPool2, killTrackedProcesses: killTrackedProcesses2 } = await Promise.resolve().then(() => (init_src2(), src_exports2));
+        killTrackedProcesses2();
+        await closeThumbnailBrowser2().catch(() => {
+        });
+        await drainBrowserPool2().catch(() => {
+        });
+      };
+      cleanup().catch(() => {
+      }).finally(() => {
+        result.server.close(() => resolveRun());
+      });
     };
     process.once("SIGINT", shutdown);
     process.once("SIGTERM", shutdown);
+    Promise.resolve().then(() => (init_src2(), src_exports2)).then(({ killTrackedProcesses: killTrackedProcesses2 }) => {
+      process.once("exit", () => {
+        if (!shuttingDown) killTrackedProcesses2();
+      });
+    }).catch(() => {
+    });
   });
 }
 var examples, preview_default;
@@ -46137,6 +46345,7 @@ var init_preview2 = __esm({
     init_lintProject();
     init_lintFormat();
     init_portUtils();
+    init_orphanCleanup();
     examples = [
       ["Preview the current project", "hyperframes preview"],
       ["Preview a specific project directory", "hyperframes preview ./my-video"],
@@ -46215,6 +46424,12 @@ var init_preview2 = __esm({
 `);
           return;
         }
+        const orphansKilled = killOrphanedProcesses();
+        if (orphansKilled > 0) {
+          console.log(
+            `  ${c2.dim(`Cleaned up ${orphansKilled} orphaned process${orphansKilled === 1 ? "" : "es"} from a previous session.`)}`
+          );
+        }
         const rawArg = args.dir;
         const dir = resolve25(rawArg ?? ".");
         const isImplicitCwd = !rawArg || rawArg === "." || rawArg === "./";
@@ -48337,11 +48552,11 @@ __export(ffmpeg_exports, {
   findFFmpeg: () => findFFmpeg,
   getFFmpegInstallHint: () => getFFmpegInstallHint
 });
-import { execSync as execSync2 } from "child_process";
+import { execSync as execSync3 } from "child_process";
 function findFFmpeg() {
   try {
     const cmd = process.platform === "win32" ? "where ffmpeg" : "which ffmpeg";
-    const output = execSync2(cmd, {
+    const output = execSync3(cmd, {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 5e3
@@ -51959,13 +52174,13 @@ __export(doctor_exports, {
   examples: () => examples19,
   redactHome: () => redactHome
 });
-import { execSync as execSync3 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import { freemem as freemem5, platform as platform8 } from "os";
 function checkFFmpeg() {
   const path2 = findFFmpeg();
   if (path2) {
     try {
-      const version = execSync3("ffmpeg -version", { encoding: "utf-8", timeout: 5e3 }).split("\n")[0] ?? "";
+      const version = execSync4("ffmpeg -version", { encoding: "utf-8", timeout: 5e3 }).split("\n")[0] ?? "";
       return { ok: true, detail: version.trim() };
     } catch {
       return { ok: true, detail: path2 };
@@ -51979,7 +52194,7 @@ function checkFFmpeg() {
 }
 function checkFFprobe() {
   try {
-    const version = execSync3("ffprobe -version", { encoding: "utf-8", timeout: 5e3 }).split("\n")[0] ?? "";
+    const version = execSync4("ffprobe -version", { encoding: "utf-8", timeout: 5e3 }).split("\n")[0] ?? "";
     return { ok: true, detail: version.trim() };
   } catch {
     return {
@@ -52002,7 +52217,7 @@ async function checkChrome() {
 }
 function checkDocker() {
   try {
-    const version = execSync3("docker --version", { encoding: "utf-8", timeout: 5e3 }).trim();
+    const version = execSync4("docker --version", { encoding: "utf-8", timeout: 5e3 }).trim();
     return { ok: true, detail: version };
   } catch {
     return {
@@ -52014,7 +52229,7 @@ function checkDocker() {
 }
 function checkDockerRunning() {
   try {
-    execSync3("docker info", { stdio: "pipe", timeout: 5e3 });
+    execSync4("docker info", { stdio: "pipe", timeout: 5e3 });
     return { ok: true, detail: "Running" };
   } catch {
     return {