@hyperframes/studio-server 0.8.193 → 0.8.194

package/dist/{chunk-JPKAFJIJ.js → chunk-4HP26XV4.js}

@@ -512,14 +512,41 @@ async function cloneOrCopy(from, to, beforeReplace) {
     throw error;
   }
 }
+var listDir = (path) => readdir(path, { withFileTypes: true }).catch((error) => {
+  if (error.code === "ENOENT") return [];
+  throw error;
+});
 async function openBlobStore(dir) {
   const sizes = /* @__PURE__ */ new Map();
+  const asideDir = join2(dirname(dir), "aside");
+  const asideSizes = /* @__PURE__ */ new Map();
+  const holds = /* @__PURE__ */ new Map();
   await mkdir(dir, { recursive: true });
-  for (const shard of await readdir(dir))
-    for (const hash of await readdir(join2(dir, shard)).catch(() => []))
-      sizes.set(hash, (await stat(join2(dir, shard, hash))).size);
-  const pathOf = (hash) => blobPath(dir, hash);
+  for (const [root, found] of [
+    [dir, sizes],
+    [asideDir, asideSizes]
+  ])
+    for (const shard of await listDir(root)) {
+      if (!shard.isDirectory()) {
+        if (shard.name.startsWith("incoming-")) await rm(join2(root, shard.name), { force: true });
+        continue;
+      }
+      for (const hash of await listDir(join2(root, shard.name)))
+        found.set(hash.name, (await stat(join2(root, shard.name, hash.name))).size);
+    }
+  for (const hash of asideSizes.keys()) holds.set(hash, /* @__PURE__ */ new Set(["*"]));
+  const pathOf = (hash) => blobPath(sizes.has(hash) ? dir : asideDir, hash);
   let total = [...sizes.values()].reduce((sum, size) => sum + size, 0);
+  const forget = async (hash) => {
+    await rm(blobPath(dir, hash), { force: true });
+    total -= sizes.get(hash) ?? 0;
+    sizes.delete(hash);
+  };
+  const forgetAside = async (hash) => {
+    await rm(blobPath(asideDir, hash), { force: true });
+    asideSizes.delete(hash);
+    holds.delete(hash);
+  };
   return {
     async put(absPath) {
       const temp = join2(dir, `incoming-${randomUUID3()}`);
@@ -533,35 +560,55 @@ async function openBlobStore(dir) {
         await rm(temp, { force: true });
         return hash;
       }
-      await mkdir(dirname(pathOf(hash)), { recursive: true });
+      await mkdir(dirname(blobPath(dir, hash)), { recursive: true });
       const size = (await stat(temp)).size;
-      await rename(temp, pathOf(hash));
+      await rename(temp, blobPath(dir, hash));
       sizes.set(hash, size);
       total += size;
       return hash;
     },
     reference: (absPath) => hashFile(absPath),
-    has: (hash) => sizes.has(hash),
-    read: async (hash) => readBlob(dir, hash),
+    has: (hash) => sizes.has(hash) || asideSizes.has(hash),
+    read: (hash) => readFile(pathOf(hash)),
     writeTo: async (hash, absPath, beforeReplace) => cloneOrCopy(pathOf(hash), absPath, beforeReplace),
+    async release(held) {
+      for (const [hash, path] of held) {
+        holds.get(hash)?.delete(path);
+        if (holds.get(hash)?.size === 0) await forgetAside(hash);
+      }
+    },
+    async keep(path, absPath, remove) {
+      const hash = await hashFile(absPath);
+      if (sizes.has(hash)) return;
+      if (asideSizes.has(hash)) {
+        holds.get(hash).add(path);
+        return;
+      }
+      const to = blobPath(asideDir, hash);
+      await mkdir(dirname(to), { recursive: true });
+      const moved = remove && await rename(absPath, to).then(
+        () => true,
+        () => false
+      );
+      if (!moved) {
+        const temp = join2(asideDir, `incoming-${randomUUID3()}`);
+        await cloneOrStream(absPath, temp).catch(async (error) => {
+          await rm(temp, { force: true });
+          throw error;
+        });
+        await rename(temp, to);
+      }
+      asideSizes.set(hash, (await stat(to)).size);
+      holds.set(hash, /* @__PURE__ */ new Set([path]));
+    },
     bytes: () => total,
     size: (hash) => sizes.get(hash) ?? 0,
     async drop(hashes) {
-      for (const hash of hashes) {
-        const size = sizes.get(hash);
-        if (size === void 0) continue;
-        await rm(pathOf(hash), { force: true });
-        sizes.delete(hash);
-        total -= size;
-      }
+      for (const hash of hashes) if (sizes.has(hash)) await forget(hash);
     },
     async prune(keep) {
-      for (const [hash, size] of sizes) {
-        if (keep.has(hash)) continue;
-        await rm(pathOf(hash), { force: true });
-        sizes.delete(hash);
-        total -= size;
-      }
+      for (const hash of [...sizes.keys()]) if (!keep.has(hash)) await forget(hash);
+      for (const hash of [...asideSizes.keys()]) if (!keep.has(hash)) await forgetAside(hash);
     }
   };
 }
@@ -2309,6 +2356,9 @@ var Engine = class {
     this.windows.push(group);
     try {
       for (const [path, hash] of changes) await this.writeProjectFile(path, hash);
+      await this.blobs.release(
+        changes.flatMap(([path, hash]) => hash ? [[hash, path]] : [])
+      );
       await this.sweep();
     } finally {
       this.windows = this.windows.filter((open) => open !== group);
@@ -2324,6 +2374,9 @@ var Engine = class {
       const version = hash === null ? DELETED_VERSION : hashVersion(hash);
       recordFileWriteReceipt(absPath, { path, version, writeToken });
     }
+    const standing = lstatSync4(absPath, { throwIfNoEntry: false });
+    if (standing?.isFile() && isUncopied(path, standing.size))
+      await this.blobs.keep(path, absPath, hash === null);
     if (hash === null) {
       this.assertWritable();
       rmSync3(absPath, { force: true });

package/dist/history/index.js

@@ -22,7 +22,7 @@ import {
   recordRenderSuccess,
   registerRenderOutput,
   retainSnapshotOutput
-} from "../chunk-JPKAFJIJ.js";
+} from "../chunk-4HP26XV4.js";
 import "../chunk-QF7MFJJU.js";
 import "../chunk-SVQFE44C.js";
 import "../chunk-L3HJVTQE.js";

package/dist/index.d.ts

@@ -188,7 +188,7 @@ declare const consumeFileWriteReceipt: typeof identifyFileWrite;
  * by last-write-wins script execution order — this is intentional so the
  * composition can pin a specific version.
  */
-declare function buildSubCompositionHtml(projectDir: string, compPath: string, runtimeUrl: string, baseHref?: string, rawOverride?: string): string | null;
+declare function buildSubCompositionHtml(projectDir: string, compPath: string, runtimeUrl: string, baseHref?: string, rawOverride?: string, gsapBaseUrl?: string): string | null;
 
 interface ThumbnailOutputDimensions {
     width: number;

package/dist/index.js

@@ -62,7 +62,7 @@ import {
   resolveProjectSignature,
   retainSnapshotOutput,
   settledFileTag
-} from "./chunk-JPKAFJIJ.js";
+} from "./chunk-4HP26XV4.js";
 import {
   clearElementScreenshotIsolation,
   getElementScreenshotClip
@@ -367,7 +367,7 @@ function tagRootCompositionFile(bodyHtml, compPath) {
 function rootHeadContent(rootHtml) {
   return rootHtml.match(/<head[^>]*>([\s\S]*?)<\/head>/i)?.[1] ?? "";
 }
-function buildSubCompositionHtml(projectDir, compPath, runtimeUrl, baseHref, rawOverride) {
+function buildSubCompositionHtml(projectDir, compPath, runtimeUrl, baseHref, rawOverride, gsapBaseUrl) {
   const compFile = join2(projectDir, compPath);
   if (!existsSync(compFile)) return null;
   const rawComp = rawOverride ?? readFileSync(compFile, "utf-8");
@@ -419,7 +419,7 @@ ${compHeadContent}`;
 <script ${RUNTIME_BOOTSTRAP_ATTR}="1" src="${runtimeUrl}"></script>`;
   if (!headContent.includes("gsap")) {
     headContent += `
-<script src="${gsapCdnDist()}gsap.min.js"></script>`;
+<script src="${gsapCdnDist(void 0, gsapBaseUrl).replace(/&/g, "&amp;")}gsap.min.js"></script>`;
   }
   const htmlOpen = htmlAttrs ? `<html ${htmlAttrs}>` : "<html>";
   const bodyOpen = bodyAttrs ? `<body ${bodyAttrs}>` : "<body>";
@@ -3838,7 +3838,12 @@ import {
   STUDIO_PREVIEW_ERRORS
 } from "@hyperframes/core/studio-preview-mark";
 import { PREVIEW_PROXY_BOX_PARAM, parsePreviewProxyBox } from "@hyperframes/core";
-import { gsapCdnDist as gsapCdnDist2, motionPathPluginUrl } from "@hyperframes/core/gsap-cdn";
+import {
+  GSAP_BASE_URL_META,
+  gsapCdnDist as gsapCdnDist2,
+  motionPathPluginUrl,
+  normalizeGsapBaseUrl
+} from "@hyperframes/core/gsap-cdn";
 import { findStartTags as findStartTags2, injectTagsAtHeadStart } from "@hyperframes/core/compiler/html-document";
 import { isWithinProjectRoot } from "@hyperframes/parsers/asset-resolution";
 import { ensureHfIds as ensureHfIds2 } from "@hyperframes/parsers/hf-ids";
@@ -4003,9 +4008,12 @@ function lazyPreviewImages(html) {
 
 // src/routes/preview.ts
 var PROJECT_SIGNATURE_META = "hyperframes-project-signature";
-var GSAP_CDN_SCRIPT = `<script src="${gsapCdnDist2()}gsap.min.js"></script>`;
-var GSAP_CUSTOM_EASE_CDN_SCRIPT = `<script src="${gsapCdnDist2()}CustomEase.min.js"></script>`;
-var GSAP_MOTION_PATH_CDN_SCRIPT = `<script src="${motionPathPluginUrl()}"></script>`;
+function escapeGsapUrl(url) {
+  return url.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
+}
+function gsapScriptTag(file, baseUrl) {
+  return `<script src="${escapeGsapUrl(gsapCdnDist2(void 0, baseUrl) + file)}"></script>`;
+}
 function injectProjectSignature(html, signature) {
   const tag = `<meta name="${PROJECT_SIGNATURE_META}" content="${signature}">`;
   if (html.includes(`name="${PROJECT_SIGNATURE_META}"`)) {
@@ -4061,16 +4069,16 @@ function htmlUsesMotionPath(html) {
 function htmlHasMotionPathPlugin(html) {
   return /<script\b[^>]*src=["'][^"']*MotionPathPlugin/i.test(html) || /\bwindow\.MotionPathPlugin\b/.test(html) || /\bMotionPathPlugin\s*=\s*/.test(html);
 }
-function injectMotionPathPluginIfNeeded(html) {
+function injectMotionPathPluginIfNeeded(html, baseUrl) {
   if (!htmlUsesMotionPath(html) || htmlHasMotionPathPlugin(html)) return html;
   const gsap = findGsapCoreScript(html);
   if (gsap) {
     const version = gsap.src.match(/gsap@([\d.]+)/)?.[1];
     const ordering = `${gsap.type ? ` type="${gsap.type}"` : ""}${gsap.defer ? " defer" : ""}`;
-    const pluginTag = `<script${ordering} src="${motionPathPluginUrl(version)}"></script>`;
+    const pluginTag = `<script${ordering} src="${escapeGsapUrl(motionPathPluginUrl(version, baseUrl))}"></script>`;
     return html.slice(0, gsap.end) + "\n" + pluginTag + html.slice(gsap.end);
   }
-  return injectScriptTagIntoHead(html, GSAP_MOTION_PATH_CDN_SCRIPT);
+  return injectScriptTagIntoHead(html, gsapScriptTag("MotionPathPlugin.min.js", baseUrl));
 }
 function isGsapCoreUrl(src) {
   const base = "http://localhost/";
@@ -4103,30 +4111,32 @@ function scriptCloseEnd(html, start) {
   const closeAt = close.exec(html)?.index;
   return closeAt === void 0 ? 0 : html.indexOf(">", closeAt) + 1;
 }
-function injectStudioMotionDependencies(html, manifestContent) {
+function injectStudioMotionDependencies(html, manifestContent, baseUrl) {
   const manifest = parseStudioMotionManifestContent(manifestContent);
   if (!manifest.hasMotion) return html;
   let next = html;
-  if (!htmlHasGsap(next)) next = injectScriptTagIntoHead(next, GSAP_CDN_SCRIPT);
+  if (!htmlHasGsap(next))
+    next = injectScriptTagIntoHead(next, gsapScriptTag("gsap.min.js", baseUrl));
   if (manifest.hasCustomEase && !htmlHasCustomEase(next)) {
-    next = injectScriptTagIntoHead(next, GSAP_CUSTOM_EASE_CDN_SCRIPT);
+    next = injectScriptTagIntoHead(next, gsapScriptTag("CustomEase.min.js", baseUrl));
   }
   return next;
 }
-function injectStudioMotionScript(html, projectDir, activeCompositionPath) {
+function injectStudioMotionScript(html, projectDir, activeCompositionPath, baseUrl) {
   const manifestContent = readStudioMotionManifestContent(projectDir);
   const script = createStudioMotionRenderBodyScript(manifestContent, {
     activeCompositionPath
   });
   if (!script) return html;
-  const withDependencies = injectStudioMotionDependencies(html, manifestContent);
+  const withDependencies = injectStudioMotionDependencies(html, manifestContent, baseUrl);
   const tag = `<script type="${AFTER_FONTS_SCRIPT_TYPE}">${script.replace(/<\/script/gi, "<\\/script")}</script>`;
   return insertBeforeCloseTag2(withDependencies, "body", tag) ?? `${withDependencies}${tag}`;
 }
 var GSAP_FALLBACK_ATTR = "data-hf-gsap-fallback";
-var GSAP_CDN_FALLBACK_SCRIPT = `<script ${GSAP_FALLBACK_ATTR}>
+function gsapCdnFallbackScript(baseUrl) {
+  return `<script ${GSAP_FALLBACK_ATTR}>
 (function(){
-  var cdnBase="${gsapCdnDist2()}";
+  var cdnBase=${JSON.stringify(gsapCdnDist2(void 0, baseUrl)).replace(/</g, "\\u003c")};
   var loaded={};
   function loadFallback(file){
     if(loaded[file])return loaded[file];
@@ -4146,10 +4156,12 @@ var GSAP_CDN_FALLBACK_SCRIPT = `<script ${GSAP_FALLBACK_ATTR}>
   },true);
 })();
 </script>`;
-function injectGsapCdnFallback(html) {
+}
+function injectGsapCdnFallback(html, baseUrl) {
   if (html.includes(GSAP_FALLBACK_ATTR)) return html;
-  if (html.includes("<head>")) return html.replace("<head>", "<head>" + GSAP_CDN_FALLBACK_SCRIPT);
-  return GSAP_CDN_FALLBACK_SCRIPT + html;
+  if (html.includes("<head>"))
+    return html.replace("<head>", "<head>" + gsapCdnFallbackScript(baseUrl));
+  return gsapCdnFallbackScript(baseUrl) + html;
 }
 function parsePreviewVariablesParam(raw) {
   if (raw === void 0 || raw === "") return { ok: true, values: null };
@@ -4176,8 +4188,8 @@ function previewVariablesFromRequest(rawVariables) {
 var PREVIEW_CAPTURE_PARAM = "hf-capture";
 var EARLY_ERRORS_SCRIPT = `<script>(function(){var seen=window.${STUDIO_PREVIEW_ERRORS}=[];
 addEventListener("error",function(e){seen.push(e.message||String(e))});})();</script>`;
-function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompositionPath, capture) {
-  const marked = capture ? injectTagsAtHeadStart(
+function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompositionPath, options) {
+  const marked = options.capture ? injectTagsAtHeadStart(
     html,
     `<meta name="${STUDIO_PREVIEW_MARK_META}" content="${STUDIO_PREVIEW_CAPTURE_MODE}">`
   ) : injectTagsAtHeadStart(
@@ -4187,11 +4199,20 @@ function injectStudioPreviewAugmentations(html, adapter, projectDir, activeCompo
   return injectStudioMotionScript(
     injectMotionPathPluginIfNeeded(
       injectGsapCdnFallback(
-        injectProjectSignature(marked, resolveProjectSignature(adapter, projectDir))
-      )
+        injectProjectSignature(
+          injectTagsAtHeadStart(
+            marked,
+            `<meta name="${GSAP_BASE_URL_META}" content="${escapeGsapUrl(options.gsapBaseUrl)}">`
+          ),
+          resolveProjectSignature(adapter, projectDir)
+        ),
+        options.gsapBaseUrl
+      ),
+      options.gsapBaseUrl
     ),
     projectDir,
-    activeCompositionPath
+    activeCompositionPath,
+    options.gsapBaseUrl
   );
 }
 async function transformPreviewHtml(html, adapter, project, activeCompositionPath) {
@@ -4235,6 +4256,16 @@ var PREVIEW_BUNDLE_OPTIONS = {
 var previewBaseHref = (projectId) => `/api/projects/${encodeURIComponent(projectId)}/preview/`;
 var withPreviewBase = (html, projectId) => hasBaseElement(html) ? html : injectTagsAtHeadStart(html, `<base href="${previewBaseHref(projectId)}">`);
 function registerPreviewRoutes(api, adapter) {
+  let gsapBaseUrl;
+  try {
+    gsapBaseUrl = normalizeGsapBaseUrl(process.env.HYPERFRAMES_GSAP_BASE_URL);
+  } catch (cause) {
+    throw new Error(
+      "Invalid HYPERFRAMES_GSAP_BASE_URL: use an absolute HTTP(S) npm mirror root without credentials, query, or fragment",
+      { cause }
+    );
+  }
+  const gsapEtagSalt = `:gsap:${createHash2("sha1").update(gsapBaseUrl).digest("hex").slice(0, 12)}`;
   const previewCacheHeaders = (etag) => ({
     "Cache-Control": "private, no-cache",
     ETag: etag
@@ -4269,7 +4300,7 @@ function registerPreviewRoutes(api, adapter) {
         adapter,
         project.dir,
         mainCompositionPath,
-        capture
+        { capture, gsapBaseUrl }
       );
       if (previewVariables) bundled = injectPreviewVariables(bundled, previewVariables);
       bundled = await injectMediaCodecMap(
@@ -4297,7 +4328,7 @@ function registerPreviewRoutes(api, adapter) {
           adapter,
           project.dir,
           fallback.compositionPath,
-          capture
+          { capture, gsapBaseUrl }
         );
         if (previewVariables) {
           fallbackAugmented = injectPreviewVariables(fallbackAugmented, previewVariables);
@@ -4322,7 +4353,7 @@ function registerPreviewRoutes(api, adapter) {
     if (vars.error !== void 0) return c.json({ error: vars.error }, 400);
     const previewVariables = vars.values;
     const capture = c.req.query(PREVIEW_CAPTURE_PARAM) !== void 0;
-    const etag = `"preview:${signature}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
+    const etag = `"preview:${signature}${gsapEtagSalt}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
     const ifNoneMatch = c.req.header("If-None-Match");
     if (ifNoneMatch === etag) {
       return new Response(null, {
@@ -4372,7 +4403,7 @@ ${etag}`;
     }
     const compPathHash = createHash2("sha1").update(compPath).digest("hex");
     const capture = c.req.query(PREVIEW_CAPTURE_PARAM) !== void 0;
-    const etag = `"comp:v2:${compPathHash}:${signature}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
+    const etag = `"comp:v2:${compPathHash}:${signature}${gsapEtagSalt}${variablesEtagSalt(vars.raw)}${capture ? ":capture" : ""}"`;
     const ifNoneMatch = c.req.header("If-None-Match");
     if (ifNoneMatch === etag) {
       return new Response(null, {
@@ -4388,12 +4419,16 @@ ${etag}`;
       compPath,
       adapter.runtimeUrl,
       baseHref,
-      stamped
+      stamped,
+      gsapBaseUrl
     );
     if (!html) return c.text("not found", 404);
     recordPreviewReferences(project.dir, html);
     html = ensureHfIds2(await transformPreviewHtml(html, adapter, project, compPath));
-    html = injectStudioPreviewAugmentations(html, adapter, project.dir, compPath, capture);
+    html = injectStudioPreviewAugmentations(html, adapter, project.dir, compPath, {
+      capture,
+      gsapBaseUrl
+    });
     if (previewVariables) html = injectPreviewVariables(html, previewVariables);
     html = await injectMediaCodecMap(html, adapter, project.dir, compPath, mediaCodecProbeCache);
     return c.html(html, 200, previewCacheHeaders(etag));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/studio-server",
-  "version": "0.8.193",
+  "version": "0.8.194",
   "repository": {
     "type": "git",
     "url": "https://github.com/heygen-com/hyperframes",
@@ -84,8 +84,8 @@
     "linkedom": "^0.18.12",
     "postcss": "^8.5.8",
     "postcss-selector-parser": "^7.1.2",
-    "@hyperframes/core": "0.8.193",
-    "@hyperframes/parsers": "0.8.193"
+    "@hyperframes/core": "0.8.194",
+    "@hyperframes/parsers": "0.8.194"
   },
   "devDependencies": {
     "@types/node": "^25.0.10",