@hyperframes/studio-server 0.8.63 → 0.8.65

package/dist/index.d.ts

@@ -41,8 +41,15 @@ declare function createStudioApi(adapter: StudioApiAdapter): Hono;
 declare function affectsProjectSignature(projectDir: string, changedPath: string): boolean;
 /**
  * Creates a stable preview cache-busting signature for project source plus Studio manifests.
+ * `excluding` (project-relative paths) leaves those files out.
  */
-declare function createProjectSignature(projectDir: string): string;
+declare function createProjectSignature(projectDir: string, excluding?: ReadonlySet<string>): string;
+
+/**
+ * Compositions whose rendered frames a write at `changedPath` can change, or `null` for all
+ * of them: the root, assets and any file the root does not mount reach every composition.
+ */
+declare function compositionsAffectedBy(projectDir: string, changedPath: string): string[] | null;
 
 /** Recursively walk a directory and return relative file paths. */
 declare function walkDir(dir: string, prefix?: string): string[];
@@ -160,4 +167,4 @@ type BackgroundRemovalRender = (options: {
 }>;
 declare function createBackgroundRemovalJob(opts: BackgroundRemovalJobOptions, render: BackgroundRemovalRender): MediaProcessingJobState;
 
-export { type AppliedFileMutation, type BackgroundRemovalRender, type DuplicateElementResult, type FileMutationInput, type FileWriteReceipt, MIME_TYPES, MediaProcessingJobState, SourceMutationTarget, StudioApiAdapter, type ThumbnailOutputDimensions, affectsProjectSignature, applyFileMutations, buildSubCompositionHtml, consumeFileWriteReceipt, createBackgroundRemovalJob, createProjectSignature, createStudioApi, duplicateElementInHtml, fileContentVersion, getMimeType, identifyFileWrite, thumbnailDeviceScaleFactor, walkDir };
+export { type AppliedFileMutation, type BackgroundRemovalRender, type DuplicateElementResult, type FileMutationInput, type FileWriteReceipt, MIME_TYPES, MediaProcessingJobState, SourceMutationTarget, StudioApiAdapter, type ThumbnailOutputDimensions, affectsProjectSignature, applyFileMutations, buildSubCompositionHtml, compositionsAffectedBy, consumeFileWriteReceipt, createBackgroundRemovalJob, createProjectSignature, createStudioApi, duplicateElementInHtml, fileContentVersion, getMimeType, identifyFileWrite, thumbnailDeviceScaleFactor, walkDir };

package/dist/index.js

@@ -217,14 +217,18 @@ async function resolveProjectAndSignature(adapter, projectId) {
   if (!project) return null;
   return { project, signature: resolveProjectSignature(adapter, project.dir) };
 }
-function createProjectSignature(projectDir) {
+function createProjectSignature(projectDir, excluding = /* @__PURE__ */ new Set()) {
   const normalizedProjectDir = resolve(projectDir);
-  const files = [];
-  collectProjectSignatureFiles(normalizedProjectDir, normalizedProjectDir, files);
-  collectProjectSignatureManifestFiles(normalizedProjectDir, files);
+  const collected = [];
+  collectProjectSignatureFiles(normalizedProjectDir, normalizedProjectDir, collected);
+  collectProjectSignatureManifestFiles(normalizedProjectDir, collected);
+  const files = collected.filter(
+    (entry) => !excluding.has(relative(normalizedProjectDir, entry.file).split(sep).join("/"))
+  );
   files.sort((a, b) => a.file.localeCompare(b.file));
   const fingerprint = createProjectFingerprint(normalizedProjectDir, files);
-  const cached = projectSignatureCache.get(normalizedProjectDir);
+  const cacheKey = excluding.size ? `${normalizedProjectDir}\0${createHash("sha256").update([...excluding].sort().join("\0")).digest("hex")}` : normalizedProjectDir;
+  const cached = projectSignatureCache.get(cacheKey);
   if (cached?.fingerprint === fingerprint) return cached.signature;
   const hash = createHash("sha256");
   for (const entry of files) {
@@ -245,7 +249,7 @@ function createProjectSignature(projectDir) {
     hash.update("\0");
   }
   const signature = hash.digest("hex").slice(0, 24);
-  projectSignatureCache.set(normalizedProjectDir, { fingerprint, signature });
+  projectSignatureCache.set(cacheKey, { fingerprint, signature });
   return signature;
 }
 
@@ -2404,14 +2408,19 @@ function registerFileRoutes(api, adapter) {
     if ("error" in res) return res.error;
     if (!existsSync3(res.absPath)) {
       if (c.req.query("optional") === "1") {
-        return c.json({ filename: res.filePath, content: "" });
+        return c.json({ filename: res.filePath, content: "", missing: true });
       }
       return c.json({ error: "not found" }, 404);
     }
     const content = readFileSync5(res.absPath);
     const version = fileContentVersion(content);
     c.header("ETag", version);
-    return c.json({ filename: res.filePath, content: content.toString("utf-8"), version });
+    return c.json({
+      filename: res.filePath,
+      content: content.toString("utf-8"),
+      version,
+      missing: false
+    });
   });
   api.put("/projects/:id/files/*", async (c) => {
     const res = await resolveProjectFile(c, adapter);
@@ -4149,7 +4158,7 @@ function registerRenderRoutes(api, adapter) {
 import {
   existsSync as existsSync7,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync11,
+  readFileSync as readFileSync12,
   readdirSync as readdirSync6,
   renameSync as renameSync3,
   rmSync as rmSync4,
@@ -4160,6 +4169,63 @@ import {
 import { join as join11 } from "path";
 import { createHash as createHash4, randomUUID as randomUUID4 } from "crypto";
 
+// src/helpers/compositionInputs.ts
+import { readFileSync as readFileSync11 } from "fs";
+var ROOT_COMPOSITION = "index.html";
+var COMPOSITION_SRC = /\bdata-composition-src\s*=\s*(["'])(.*?)\1/g;
+function projectReader(projectDir) {
+  const sources = /* @__PURE__ */ new Map();
+  return (compPath) => {
+    if (!sources.has(compPath)) {
+      const file = resolveWithinProject(projectDir, compPath);
+      let source = null;
+      try {
+        source = file ? readFileSync11(file, "utf-8") : null;
+      } catch {
+      }
+      sources.set(compPath, source);
+    }
+    return sources.get(compPath) ?? null;
+  };
+}
+function normalizeSource(src) {
+  if (/^[a-z][a-z0-9+.-]*:/i.test(src) || src.startsWith("//")) return null;
+  const path = src.split(/[?#]/)[0]?.replace(/^\.?\//, "") ?? "";
+  return path || null;
+}
+function closureOf(read, compPath) {
+  const closure = /* @__PURE__ */ new Set();
+  const visit = (path) => {
+    if (closure.has(path)) return;
+    closure.add(path);
+    for (const match of (read(path) ?? "").matchAll(COMPOSITION_SRC)) {
+      const mounted = normalizeSource(match[2] ?? "");
+      if (mounted) visit(mounted);
+    }
+  };
+  visit(compPath);
+  return closure;
+}
+var inputSignatures = /* @__PURE__ */ new Map();
+function compositionInputSignature(projectDir, compPath, projectSignature) {
+  const key = `${projectDir}\0${compPath}`;
+  const known = inputSignatures.get(key);
+  if (known?.projectSignature === projectSignature) return known.inputSignature;
+  const read = projectReader(projectDir);
+  const inputs = closureOf(read, normalizeSource(compPath) ?? compPath).add(ROOT_COMPOSITION);
+  const siblings = [...closureOf(read, ROOT_COMPOSITION)].filter((path) => !inputs.has(path));
+  const inputSignature = createProjectSignature(projectDir, new Set(siblings));
+  inputSignatures.set(key, { projectSignature, inputSignature });
+  return inputSignature;
+}
+function compositionsAffectedBy(projectDir, changedPath) {
+  const changed = changedPath.replace(/\\/g, "/");
+  const read = projectReader(projectDir);
+  const mounted = closureOf(read, ROOT_COMPOSITION);
+  if (changed === ROOT_COMPOSITION || !mounted.has(changed)) return null;
+  return [...mounted].filter((path) => closureOf(read, path).has(changed));
+}
+
 // src/routes/thumbnailGenerationCoordinator.ts
 var ThumbnailGenerationCoordinator = class {
   constructor(concurrency = 1) {
@@ -4322,6 +4388,7 @@ function registerThumbnailRoutes(api, adapter) {
       c.req.path.replace(`/projects/${project.id}/thumbnail/`, "").split("?")[0] ?? ""
     );
     if (compPath && !compPath.includes(".")) compPath += ".html";
+    const inputSignature = compositionInputSignature(project.dir, compPath, projectSignature);
     const url = new URL(c.req.url, `http://${c.req.header("host") || "localhost"}`);
     const rawSeekTime = url.searchParams.get("t");
     const parsedSeekTime = rawSeekTime == null ? Number.NaN : parseFloat(rawSeekTime);
@@ -4342,7 +4409,7 @@ function registerThumbnailRoutes(api, adapter) {
     let sourceKey = "";
     const htmlFile = join11(project.dir, compPath);
     if (existsSync7(htmlFile)) {
-      const html = readFileSync11(htmlFile, "utf-8");
+      const html = readFileSync12(htmlFile, "utf-8");
       sourceKey = `_${createHash4("sha1").update(html).digest("hex").slice(0, 16)}`;
       sourceMtime = Math.round(statSync7(htmlFile).mtimeMs);
       if (!vpWidth) {
@@ -4355,14 +4422,14 @@ function registerThumbnailRoutes(api, adapter) {
     const manualEditsFile = join11(project.dir, STUDIO_MANUAL_EDITS_PATH);
     let manualEditsKey = "";
     if (existsSync7(manualEditsFile)) {
-      const manualEditsContent = readFileSync11(manualEditsFile, "utf-8");
+      const manualEditsContent = readFileSync12(manualEditsFile, "utf-8");
       manualEditsKey = `_${createHash4("sha1").update(manualEditsContent).digest("hex").slice(0, 16)}`;
       sourceMtime = Math.max(sourceMtime, Math.round(statSync7(manualEditsFile).mtimeMs));
     }
     const motionFile = join11(project.dir, STUDIO_MOTION_PATH);
     let motionKey = "";
     if (existsSync7(motionFile)) {
-      const motionContent = readFileSync11(motionFile, "utf-8");
+      const motionContent = readFileSync12(motionFile, "utf-8");
       motionKey = `_${createHash4("sha1").update(motionContent).digest("hex").slice(0, 16)}`;
       sourceMtime = Math.max(sourceMtime, Math.round(statSync7(motionFile).mtimeMs));
     }
@@ -4370,11 +4437,11 @@ function registerThumbnailRoutes(api, adapter) {
     const cacheDir = join11(project.dir, ".thumbnails");
     const selectorKey = selector ? `_${selector.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 80)}_${selectorIndex ?? 0}` : "";
     const urlVersionKey = urlVersion ? `_${urlVersion.replace(/[^a-zA-Z0-9_-]+/g, "_").slice(0, 32)}` : "";
-    const projectSignatureKey = `_${createHash4("sha1").update(projectSignature).digest("hex").slice(0, 16)}`;
+    const inputSignatureKey = `_${createHash4("sha1").update(inputSignature).digest("hex").slice(0, 16)}`;
     const outputScale = outputMode === "source" ? 1 : Math.min(1, THUMBNAIL_MAX_OUTPUT_WIDTH / compW, THUMBNAIL_MAX_OUTPUT_HEIGHT / compH);
     const outputWidth = Math.max(1, Math.round(compW * outputScale));
     const outputHeight = Math.max(1, Math.round(compH * outputScale));
-    const cacheKey = `${THUMBNAIL_CACHE_VERSION}${urlVersionKey}${projectSignatureKey}${manualEditsKey}${motionKey}${sourceKey}_${format}_${outputMode}_${compPath.replace(/\//g, "_")}_${compW}x${compH}_${outputWidth}x${outputHeight}_${sourceMtime}_${seekTime.toFixed(2)}${selectorKey}.${format === "png" ? "png" : "jpg"}`;
+    const cacheKey = `${THUMBNAIL_CACHE_VERSION}${urlVersionKey}${inputSignatureKey}${manualEditsKey}${motionKey}${sourceKey}_${format}_${outputMode}_${compPath.replace(/\//g, "_")}_${compW}x${compH}_${outputWidth}x${outputHeight}_${sourceMtime}_${seekTime.toFixed(2)}${selectorKey}.${format === "png" ? "png" : "jpg"}`;
     const cachePath = join11(cacheDir, cacheKey);
     if (!prunedCacheDirs.has(cacheDir)) {
       prunedCacheDirs.add(cacheDir);
@@ -4384,7 +4451,7 @@ function registerThumbnailRoutes(api, adapter) {
       );
     }
     if (existsSync7(cachePath)) {
-      return new Response(new Uint8Array(readFileSync11(cachePath)), {
+      return new Response(new Uint8Array(readFileSync12(cachePath)), {
         headers: { "Content-Type": contentType, "Cache-Control": "no-cache" }
       });
     }
@@ -4409,8 +4476,8 @@ function registerThumbnailRoutes(api, adapter) {
           });
           if (!generated) return null;
           const afterGeneration = await resolveProjectAndSignature(adapter, project.id);
-          const freshSignature = createProjectSignature(project.dir);
-          if (!afterGeneration || afterGeneration.project.dir !== project.dir || afterGeneration.signature !== projectSignature || freshSignature !== projectSignature) {
+          const inputsUnchanged = (signature) => compositionInputSignature(project.dir, compPath, signature) === inputSignature;
+          if (afterGeneration?.project.dir !== project.dir || !inputsUnchanged(afterGeneration.signature) || !inputsUnchanged(createProjectSignature(project.dir))) {
             return generated;
           }
           if (!existsSync7(cacheDir)) mkdirSync5(cacheDir, { recursive: true });
@@ -4439,7 +4506,7 @@ function registerThumbnailRoutes(api, adapter) {
 }
 
 // src/routes/waveform.ts
-import { existsSync as existsSync8, readFileSync as readFileSync12, statSync as statSync8 } from "fs";
+import { existsSync as existsSync8, readFileSync as readFileSync13, statSync as statSync8 } from "fs";
 import { join as join12 } from "path";
 function registerWaveformRoutes(api, adapter) {
   api.get("/projects/:id/waveform/*", async (c) => {
@@ -4455,7 +4522,7 @@ function registerWaveformRoutes(api, adapter) {
     const cachePath = join12(cacheDir, buildWaveformCacheKey(assetPath, stats));
     try {
       if (isWaveformCacheDirectory(cacheDir) && existsSync8(cachePath)) {
-        const peaks2 = JSON.parse(readFileSync12(cachePath, "utf-8"));
+        const peaks2 = JSON.parse(readFileSync13(cachePath, "utf-8"));
         return c.json({ peaks: peaks2 });
       }
     } catch {
@@ -4941,14 +5008,14 @@ function registerMediaRoutes(api, adapter, options = {}) {
 }
 
 // src/routes/globalAssets.ts
-import { existsSync as existsSync10, readFileSync as readFileSync13 } from "fs";
+import { existsSync as existsSync10, readFileSync as readFileSync14 } from "fs";
 import { homedir } from "os";
 import { join as join14 } from "path";
 function readGlobalAssets(home = homedir()) {
   const manifestPath = join14(home, ".media", "manifest.jsonl");
   if (!existsSync10(manifestPath)) return [];
   const out = [];
-  for (const line of readFileSync13(manifestPath, "utf8").split("\n")) {
+  for (const line of readFileSync14(manifestPath, "utf8").split("\n")) {
     if (!line.trim()) continue;
     try {
       const rec = JSON.parse(line);
@@ -5108,6 +5175,7 @@ export {
   affectsProjectSignature,
   applyFileMutations,
   buildSubCompositionHtml,
+  compositionsAffectedBy,
   consumeFileWriteReceipt,
   createBackgroundRemovalJob,
   createProjectSignature,