@hyperframes/studio-server 0.8.180 → 0.8.183

package/dist/{chunk-7L3DUCM3.js → chunk-436CO7P5.js}

@@ -1,7 +1,7 @@
 import {
   PROXY_PARAMS_VERSION,
   resolveProxy
-} from "./chunk-QFJR3NIL.js";
+} from "./chunk-D5RQMNZQ.js";
 import {
   createMediaCodecProbeCache,
   proxyVariantFor,

package/dist/{chunk-QFJR3NIL.js → chunk-D5RQMNZQ.js}

@@ -555,7 +555,8 @@ async function resolveProxy(projectDir, absoluteSourcePath, variant = "h264", bo
   if (options.priority) prioritize(entry.job);
   return joinJob(entry.promise, entry.job, options.signal);
 }
-async function resolveProxies(projectDir, sources) {
+async function resolveProxies(projectDir, sources, onSettled = () => {
+}) {
   const results = [];
   let next = 0;
   const worker = async () => {
@@ -568,6 +569,7 @@ async function resolveProxies(projectDir, sources) {
         (value) => ({ status: "fulfilled", value }),
         (reason) => ({ status: "rejected", reason })
       );
+      onSettled();
     }
   };
   const workers = Math.min(MAX_CONCURRENT_TRANSCODES, sources.length);

package/dist/{chunk-6PE5OD32.js → chunk-XM2TJIF5.js}

@@ -119,6 +119,10 @@ var HistoryBusyError = class extends Error {
   pid;
   url;
 };
+var WINDOWS_BUSY = /* @__PURE__ */ new Set(["EPERM", "EBUSY", "EACCES"]);
+function busyOnWindows(error) {
+  return process.platform === "win32" && WINDOWS_BUSY.has(error.code ?? "");
+}
 function alive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -183,27 +187,36 @@ function servedBy(file, urlFile, pid) {
     return void 0;
   }
 }
+function attemptClaim(file, urlFile, deadline) {
+  if (claim(file)) return "claimed";
+  const pid = ownerOf(file);
+  if (pid === null) return "retry";
+  if (!alive(pid) && evictDeadOwner(file)) return "retry";
+  if (Date.now() >= deadline) throw new HistoryBusyError(pid, servedBy(file, urlFile, pid));
+  return "wait";
+}
 async function takeHistoryOwnership(home, waitMs, url) {
   const file = join(home, "owner.pid");
   const urlFile = join(home, "owner-url.json");
   const deadline = Date.now() + waitMs;
   mkdirSync(home, { recursive: true });
   for (; ; ) {
-    if (claim(file)) {
-      advertise(urlFile, url);
-      let held = true;
-      return () => {
-        if (held && servedBy(file, urlFile, process.pid)) rmSync(urlFile, { force: true });
-        if (held) releaseOwn(file);
-        held = false;
-      };
+    let next = "wait";
+    try {
+      next = attemptClaim(file, urlFile, deadline);
+    } catch (error) {
+      if (!busyOnWindows(error) || Date.now() >= deadline) throw error;
     }
-    const pid = ownerOf(file);
-    if (pid === null) continue;
-    if (!alive(pid) && evictDeadOwner(file)) continue;
-    if (Date.now() >= deadline) throw new HistoryBusyError(pid, servedBy(file, urlFile, pid));
-    await new Promise((settle) => setTimeout(settle, 50));
-  }
+    if (next === "claimed") break;
+    if (next === "wait") await new Promise((settle) => setTimeout(settle, 50));
+  }
+  advertise(urlFile, url);
+  let held = true;
+  return () => {
+    if (held && servedBy(file, urlFile, process.pid)) rmSync(urlFile, { force: true });
+    if (held) releaseOwn(file);
+    held = false;
+  };
 }
 
 // src/helpers/renderOutputs.ts

package/dist/helpers/mediaProxyPreview.d.ts

@@ -1,6 +1,7 @@
 import '@hyperframes/core';
-export { a as PreviewApiAdapter, P as PreviewDocumentStore, i as injectMediaCodecMap, f as injectMediaCodecMapIntoHtml, g as isAutoProxyEnabled, p as proxyEtagSalt, r as resolvePreviewMediaCodecProbeCache } from '../mediaProxyPreview-DIAid9-k.js';
+export { a as PreviewApiAdapter, P as PreviewDocumentStore, i as injectMediaCodecMap, f as injectMediaCodecMapIntoHtml, g as isAutoProxyEnabled, p as proxyEtagSalt, r as resolvePreviewMediaCodecProbeCache } from '../mediaProxyPreview-GMF-_zBh.js';
 import './mediaCodecMap.js';
+import 'sharp';
 import '@hyperframes/parsers';
 import '@hyperframes/core/compiler';
 import '../projectHistory-ByC9sa3X.js';

package/dist/helpers/mediaProxyPreview.js

@@ -4,8 +4,8 @@ import {
   isAutoProxyEnabled,
   proxyEtagSalt,
   resolvePreviewMediaCodecProbeCache
-} from "../chunk-7L3DUCM3.js";
-import "../chunk-QFJR3NIL.js";
+} from "../chunk-436CO7P5.js";
+import "../chunk-D5RQMNZQ.js";
 import "../chunk-E3VGIAMJ.js";
 import "../chunk-QF7MFJJU.js";
 import "../chunk-SVQFE44C.js";

package/dist/helpers/proxyTranscoder.d.ts

@@ -71,7 +71,7 @@ declare function resolveProxy(projectDir: string, absoluteSourcePath: string, va
 declare function resolveProxies(projectDir: string, sources: ReadonlyArray<{
     sourcePath: string;
     variant: ProxyVariant;
-}>): Promise<PromiseSettledResult<string>[]>;
+}>, onSettled?: () => void): Promise<PromiseSettledResult<string>[]>;
 interface ResolveProxyOptions {
     priority?: boolean;
     signal?: AbortSignal;

package/dist/helpers/proxyTranscoder.js

@@ -16,7 +16,7 @@ import {
   resolveProxies,
   resolveProxy,
   waitForProxy
-} from "../chunk-QFJR3NIL.js";
+} from "../chunk-D5RQMNZQ.js";
 import "../chunk-E3VGIAMJ.js";
 import "../chunk-QF7MFJJU.js";
 import "../chunk-SVQFE44C.js";

package/dist/history/index.js

@@ -20,7 +20,7 @@ import {
   recordRenderSuccess,
   registerRenderOutput,
   retainSnapshotOutput
-} from "../chunk-6PE5OD32.js";
+} from "../chunk-XM2TJIF5.js";
 import "../chunk-QF7MFJJU.js";
 import "../chunk-SVQFE44C.js";
 import "../chunk-L3HJVTQE.js";

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { Hono } from 'hono';
-import { S as StudioApiAdapter, P as PreviewDocumentStore, M as MediaProcessingJobState } from './mediaProxyPreview-DIAid9-k.js';
-export { L as LintResult, a as PreviewApiAdapter, R as RenderJobState, b as ResolvedProject, c as StudioSelectionResponse, d as StudioSelectionSnapshot, e as StudioSelectionTextField } from './mediaProxyPreview-DIAid9-k.js';
+import { S as StudioApiAdapter, P as PreviewDocumentStore, M as MediaProcessingJobState } from './mediaProxyPreview-GMF-_zBh.js';
+export { L as LintResult, a as PreviewApiAdapter, R as RenderJobState, b as ResolvedProject, c as StudioSelectionResponse, d as StudioSelectionSnapshot, e as StudioSelectionTextField } from './mediaProxyPreview-GMF-_zBh.js';
 export { C as ClosedWindow, D as DEFAULT_HISTORY_ROOT, S as HISTORY_START, H as HistoryClosedError, a as HistoryEntry, b as HistoryEntrySide, c as HistoryFileChange, d as HistoryListItem, e as HistoryResult, f as HistoryTarget, g as HistoryWho, h as HistoryWindow, M as MAX_WINDOW_IDLE_MS, P as ProjectHistory, i as ProjectHistoryOptions, j as ProjectHistoryView, U as UNDO_MODES, k as UndoMode, o as openProjectHistory, r as readProjectHistory } from './projectHistory-ByC9sa3X.js';
 export { ArtifactCapture, ArtifactInput, ArtifactRecord, HistoryBusyError, HistoryIdError, ProjectHistoryRecord, PrunedHistory, RenderRecord, VideoState, artifactDirectory, beginArtifactCapture, finishSnapshotRun, forgetRecordedArtifacts, historyCache, listProjectHistories, pruneGoneProjectHistories, recordArtifact, recordArtifacts, recordRenderSuccess, registerRenderOutput, retainSnapshotOutput } from './history/index.js';
 export { CACHE_DIR_NAME as PROXY_CACHE_DIR_NAME } from './helpers/proxyTranscoder.js';
@@ -14,6 +14,7 @@ export { STUDIO_MOTION_PATH, StudioMotionRenderScriptOptions, createStudioMotion
 export { decodeWellFormedEscapes } from '@hyperframes/parsers/asset-paths';
 export { isSafePath } from '@hyperframes/core/safe-path';
 import '@hyperframes/core';
+import 'sharp';
 import '@hyperframes/parsers';
 import '@hyperframes/core/compiler';
 import './helpers/mediaCodecMap.js';

package/dist/index.js

@@ -60,7 +60,7 @@ import {
   resolveProjectSignature,
   retainSnapshotOutput,
   settledFileTag
-} from "./chunk-6PE5OD32.js";
+} from "./chunk-XM2TJIF5.js";
 import {
   clearElementScreenshotIsolation,
   getElementScreenshotClip
@@ -80,7 +80,7 @@ import {
   isAutoProxyEnabled,
   proxyEtagSalt,
   resolvePreviewMediaCodecProbeCache
-} from "./chunk-7L3DUCM3.js";
+} from "./chunk-436CO7P5.js";
 import {
   CACHE_DIR_NAME,
   PROXY_PENDING_RETRY_AFTER_SECONDS,
@@ -91,7 +91,7 @@ import {
   proxyActivityMark,
   resolveProxy,
   waitForProxy
-} from "./chunk-QFJR3NIL.js";
+} from "./chunk-D5RQMNZQ.js";
 import {
   PROXY_VARIANT_CONFIG,
   decideMediaProxyEligibility,
@@ -200,11 +200,11 @@ import { resolve as resolve2, dirname as dirname3, join as join6, sep as sep2 }
 
 // src/helpers/mime.ts
 var MIME_TYPES = {
-  ".html": "text/html",
-  ".css": "text/css",
-  ".js": "text/javascript",
-  ".mjs": "text/javascript",
-  ".json": "application/json",
+  ".html": "text/html; charset=utf-8",
+  ".css": "text/css; charset=utf-8",
+  ".js": "text/javascript; charset=utf-8",
+  ".mjs": "text/javascript; charset=utf-8",
+  ".json": "application/json; charset=utf-8",
   ".svg": "image/svg+xml",
   ".png": "image/png",
   ".jpg": "image/jpeg",
@@ -4948,18 +4948,18 @@ var thumbnailGenerationCoordinator = new ThumbnailGenerationCoordinator(1);
 // src/routes/imageThumbnail.ts
 var MAX_SOURCE_BYTES = 64 * 1024 * 1024;
 var MAX_CACHE_BYTES = 8 * 1024 * 1024;
-var sharpLoad;
-function loadSharp() {
-  sharpLoad ??= import("sharp").then(
-    (module) => module.default,
-    (error) => {
-      console.warn("[Studio] JPEG thumbnails are off: sharp could not load:", error);
-      throw error;
-    }
-  );
-  return sharpLoad;
+function retryingSharpLoader(adapter) {
+  let loaded;
+  let warned = false;
+  const load = () => adapter.loadSharp?.() ?? import("sharp").then((module) => module.default);
+  return () => loaded ??= load().catch((error) => {
+    loaded = void 0;
+    if (!warned) console.warn("[Studio] JPEG thumbnails are off: sharp could not load:", error);
+    warned = true;
+    throw error;
+  });
 }
-async function generateThumbnail(path, signal) {
+async function generateThumbnail(loadSharp, path, signal) {
   const sharp = await loadSharp();
   const file = await open(path, "r");
   try {
@@ -5000,6 +5000,7 @@ async function resolveSource(adapter, id, url) {
 }
 function registerImageThumbnailRoutes(api, adapter) {
   const coordinator = new ThumbnailGenerationCoordinator(2);
+  const loadSharp = retryingSharpLoader(adapter);
   const cache = /* @__PURE__ */ new Map();
   let cacheBytes = 0;
   const remember = (key, image) => {
@@ -5028,7 +5029,7 @@ function registerImageThumbnailRoutes(api, adapter) {
       else {
         if (coordinator.protectedKeys().size >= 32) return c.text("thumbnail queue full", 429);
         result = await coordinator.acquire(key, c.req.raw.signal, async (signal) => {
-          const image = await generateThumbnail(path, signal);
+          const image = await generateThumbnail(loadSharp, path, signal);
           remember(key, image);
           return image;
         }) ?? void 0;

package/dist/{mediaProxyPreview-DIAid9-k.d.ts → mediaProxyPreview-GMF-_zBh.d.ts}

@@ -1,5 +1,6 @@
 import * as _hyperframes_core from '@hyperframes/core';
 import { RegistryItem, PreviewProxyBox } from '@hyperframes/core';
+import * as sharp from 'sharp';
 import { CanvasResolution } from '@hyperframes/parsers';
 import { BundleOptions } from '@hyperframes/core/compiler';
 import { P as ProjectHistory } from './projectHistory-ByC9sa3X.js';
@@ -119,6 +120,7 @@ interface StudioApiAdapter {
     /** Optional: a cached `createProjectSignature(dir)`; preview caching checks builds against it. */
     getProjectSignature?: (projectDir: string) => string;
     invalidateProjectSignature?: (projectDir: string) => void;
+    loadSharp?: () => Promise<typeof sharp.default>;
     /** Lint a single HTML string. */
     lint(html: string, opts?: {
         filePath?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/studio-server",
-  "version": "0.8.180",
+  "version": "0.8.183",
   "repository": {
     "type": "git",
     "url": "https://github.com/heygen-com/hyperframes",
@@ -84,9 +84,8 @@
     "linkedom": "^0.18.12",
     "postcss": "^8.5.8",
     "postcss-selector-parser": "^7.1.2",
-    "sharp": "^0.35.0",
-    "@hyperframes/core": "0.8.180",
-    "@hyperframes/parsers": "0.8.180"
+    "@hyperframes/core": "0.8.183",
+    "@hyperframes/parsers": "0.8.183"
   },
   "devDependencies": {
     "@types/node": "^25.0.10",
@@ -95,6 +94,9 @@
     "typescript": "^5.0.0",
     "vitest": "^4.1.11"
   },
+  "optionalDependencies": {
+    "sharp": "^0.35.0"
+  },
   "scripts": {
     "build": "tsup",
     "test": "vitest run",