@hyperframes/studio-server 0.8.77 → 0.8.78

package/dist/helpers/mediaProxyPreview.d.ts

@@ -1,4 +1,4 @@
-export { g as PreviewApiAdapter, P as PreviewDocumentStore, n as injectMediaCodecMap, p as injectMediaCodecMapIntoHtml, q as isAutoProxyEnabled, r as proxyEtagSalt, s as resolvePreviewMediaCodecProbeCache } from '../mediaProxyPreview-CIayJ4Y4.js';
+export { h as PreviewApiAdapter, P as PreviewDocumentStore, p as injectMediaCodecMap, q as injectMediaCodecMapIntoHtml, r as isAutoProxyEnabled, s as proxyEtagSalt, t as resolvePreviewMediaCodecProbeCache } from '../mediaProxyPreview-BmJ8AmLd.js';
 import './mediaCodecMap.js';
 import '@hyperframes/core';
 import '@hyperframes/parsers';

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-CIayJ4Y4.js';
-export { D as DEFAULT_HISTORY_ROOT, a as HISTORY_START, H as HistoryEntry, b as HistoryFileChange, c as HistoryListItem, d as HistoryResult, e as HistoryWho, f as HistoryWindow, L as LintResult, g as PreviewApiAdapter, h as ProjectHistory, i as ProjectHistoryOptions, R as RenderJobState, j as ResolvedProject, k as StudioSelectionResponse, l as StudioSelectionSnapshot, m as StudioSelectionTextField, o as openProjectHistory } from './mediaProxyPreview-CIayJ4Y4.js';
+import { S as StudioApiAdapter, P as PreviewDocumentStore, M as MediaProcessingJobState } from './mediaProxyPreview-BmJ8AmLd.js';
+export { C as ClosedWindow, D as DEFAULT_HISTORY_ROOT, a as HISTORY_START, H as HistoryEntry, b as HistoryFileChange, c as HistoryListItem, d as HistoryResult, e as HistoryWho, f as HistoryWindow, L as LintResult, g as MAX_WINDOW_IDLE_MS, h as PreviewApiAdapter, i as ProjectHistory, j as ProjectHistoryOptions, R as RenderJobState, k as ResolvedProject, l as StudioSelectionResponse, m as StudioSelectionSnapshot, n as StudioSelectionTextField, o as openProjectHistory } from './mediaProxyPreview-BmJ8AmLd.js';
 import { SourceMutationTarget } from './helpers/sourceMutation.js';
 export { PatchOperation, dedupeClonedCompositionId, findTargetElement, parseSourceDocument, patchElementInHtml, removeElementFromHtml, splitElementInHtml } from './helpers/sourceMutation.js';
 export { ScreenshotClip, getElementScreenshotClip } from './helpers/screenshotClip.js';
@@ -57,7 +57,8 @@ declare class HistoryBusyError extends Error {
     constructor(pid: number);
 }
 
-/** Recursively walk a directory and return relative file paths. */
+/** Recursively walk a directory and return relative file paths. A subfolder that is unreadable
+ * or removed mid-walk is skipped; any other failure, or an unreadable `dir` itself, throws. */
 declare function walkDir(dir: string, prefix?: string): string[];
 
 /** Pins hf-ids into every composition in the project. A host runs it once before it serves or

package/dist/index.js

@@ -72,9 +72,18 @@ function isInHiddenOrVendorDir(relPath) {
   const segments = relPath.split("/");
   return segments.slice(0, -1).some((seg) => seg.startsWith(".") || seg === "node_modules");
 }
+var UNREADABLE_DIR_CODES = /* @__PURE__ */ new Set(["EACCES", "EPERM", "ENOENT", "ENOTDIR"]);
 function walkDir(dir, prefix = "") {
+  let entries;
+  try {
+    entries = readdirSync(dir, { withFileTypes: true });
+  } catch (err) {
+    const code = err.code;
+    if (!prefix || !code || !UNREADABLE_DIR_CODES.has(code)) throw err;
+    return [];
+  }
   const files = [];
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of entries) {
     const rel = prefix ? `${prefix}/${entry.name}` : entry.name;
     if (IGNORE_DIRS.has(entry.name) || shouldIgnoreDir(rel)) continue;
     if (entry.isDirectory()) {
@@ -161,6 +170,15 @@ function openNoFollow(filePath, flags) {
     return null;
   }
 }
+function isUnchanged(filePath, expected) {
+  const fd = openNoFollow(filePath, constants.O_RDONLY);
+  if (fd === null) return false;
+  try {
+    return readFileSync(fd, "utf-8") === expected;
+  } finally {
+    closeSync(fd);
+  }
+}
 function stampFileHfIds(filePath) {
   let fd = openNoFollow(filePath, constants.O_RDWR);
   let writable = true;
@@ -179,7 +197,7 @@ function stampFileHfIds(filePath) {
       const mode = fstatSync(fd).mode;
       closeSync(fd);
       fd = null;
-      replaceFileAtomically(filePath, normalized, mode);
+      if (isUnchanged(filePath, html)) replaceFileAtomically(filePath, normalized, mode);
     }
     return normalized;
   } catch (err) {
@@ -776,6 +794,8 @@ function applyFileMutations(projectDir, mutations, requestToken, writeFile = (pa
   }));
   const results = [];
   const attempted = [];
+  for (const mutation of prepared)
+    assertExpectedVersion(mutation.expectedVersion, readFileSync4(mutation.absPath, "utf-8"));
   try {
     for (const mutation of prepared) {
       results.push(applyOneMutation(projectDir, mutation, requestToken, writeFile, attempted));
@@ -785,7 +805,8 @@ function applyFileMutations(projectDir, mutations, requestToken, writeFile = (pa
     const rollbackErrors = [];
     for (const mutation of attempted.reverse()) {
       try {
-        writeFile(mutation.absPath, mutation.before, "utf-8");
+        if (!mutation.written || readFileSync4(mutation.absPath, "utf-8") === mutation.after)
+          writeFile(mutation.absPath, mutation.before, "utf-8");
         clearFileWriteReceipt(mutation.absPath, mutation.version, mutation.writeToken);
       } catch (rollbackError) {
         rollbackErrors.push(rollbackError);
@@ -818,8 +839,10 @@ function applyOneMutation(projectDir, mutation, requestToken, writeFile, attempt
   const before = current;
   const version = fileContentVersion(mutation.after);
   const writeToken = createWriteToken(requestToken);
-  attempted.push({ ...mutation, before, version, writeToken });
+  const attempt = { ...mutation, before, version, writeToken, written: false };
+  attempted.push(attempt);
   writeFile(mutation.absPath, mutation.after, "utf-8");
+  attempt.written = true;
   recordFileWriteReceipt(mutation.absPath, {
     path: mutation.sourceFile,
     version,
@@ -5174,151 +5197,6 @@ function registerGlobalAssetRoutes(api) {
   api.get("/assets/global", (c) => c.json({ assets: readGlobalAssets().map(toPublicAsset) }));
 }
 
-// src/routes/history.ts
-var YOU = { kind: "person", name: "You" };
-var MAX_WINDOW_IDLE_MS = 10 * 6e4;
-async function historyOf(adapter, c) {
-  const project = await adapter.resolveProject(c.req.param("id") ?? "");
-  return project ? await adapter.history?.(project) ?? null : null;
-}
-async function bodyOf(c) {
-  const body = await c.req.json().catch(() => null);
-  return body && typeof body === "object" ? body : {};
-}
-var text = (value) => typeof value === "string" && value ? value : null;
-function writing(c) {
-  const header = c.req.header("X-Hyperframes-Write-Token");
-  return header ? { writeToken: createWriteToken(header) } : {};
-}
-function idleOf(body) {
-  const idleMs = body.idleMs;
-  return typeof idleMs === "number" && idleMs > 0 ? Math.min(idleMs, MAX_WINDOW_IDLE_MS) : void 0;
-}
-function versionsOf(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const pairs = Object.entries(value).filter(
-    (pair) => typeof pair[1] === "string"
-  );
-  return pairs.length ? Object.fromEntries(pairs) : void 0;
-}
-function nextStep(history, direction) {
-  const target = history.next(direction);
-  if (!target) return null;
-  const paths = target.files.map((file) => file.path);
-  return { id: target.id, label: target.label, endedAt: target.endedAt, paths };
-}
-async function withHistory(adapter, c, task) {
-  const history = await historyOf(adapter, c);
-  if (!history) return c.json({ error: "This project has no history here." }, 404);
-  try {
-    return c.json(await task(history, await bodyOf(c)) ?? null);
-  } catch (error) {
-    return c.json({ error: error instanceof Error ? error.message : String(error) }, 409);
-  }
-}
-function registerHistoryRoutes(api, adapter) {
-  const windows = /* @__PURE__ */ new Map();
-  const base = "/projects/:id/history";
-  api.get(
-    base,
-    (c) => withHistory(adapter, c, (history) => {
-      const entries = history.list();
-      return { entries, back: nextStep(history, "back"), forward: nextStep(history, "forward") };
-    })
-  );
-  api.post(
-    `${base}/step`,
-    (c) => withHistory(
-      adapter,
-      c,
-      (history, body) => history.step(body.direction === "forward" ? "forward" : "back", YOU, writing(c))
-    )
-  );
-  api.post(
-    `${base}/undo`,
-    (c) => withHistory(adapter, c, (history, body) => {
-      const mode = body.mode === "just-this" || body.mode === "back-to-before" ? body.mode : void 0;
-      return history.undo(text(body.entryId) ?? "", { who: YOU, mode, ...writing(c) });
-    })
-  );
-  api.post(
-    `${base}/restore`,
-    (c) => withHistory(
-      adapter,
-      c,
-      (history, body) => history.restore(text(body.point) ?? "", YOU, writing(c))
-    )
-  );
-  api.get(
-    `${base}/peek/:point`,
-    (c) => withHistory(adapter, c, (history) => ({ files: history.peek(c.req.param("point")) }))
-  );
-  api.post(
-    `${base}/pin`,
-    (c) => withHistory(adapter, c, (history, body) => {
-      history.pin(text(body.entryId) ?? "", body.pinned === true);
-      return { ok: true };
-    })
-  );
-  api.post(
-    `${base}/claim`,
-    (c) => withHistory(adapter, c, async (history, body) => {
-      const paths = Array.isArray(body.paths) ? body.paths.filter((path) => text(path)) : [];
-      const coalesceKey = text(body.coalesceKey) ?? void 0;
-      const idleMs = idleOf(body);
-      const overwrote = versionsOf(body.overwrote);
-      const claimed = await history.claim(YOU, text(body.label) ?? "Edited in Studio", paths, {
-        ...coalesceKey && { coalesceKey },
-        ...idleMs && { idleMs },
-        ...overwrote && { overwrote }
-      });
-      return { claimed };
-    })
-  );
-  api.post(
-    `${base}/window`,
-    (c) => withHistory(adapter, c, async (history, body) => {
-      const idleMs = idleOf(body);
-      const window = await history.beginWindow(
-        YOU,
-        text(body.label) ?? "Edited in Studio",
-        idleMs ? { idleMs } : void 0
-      );
-      windows.set(window.id, { history, window });
-      return { windowId: window.id };
-    })
-  );
-  api.post(
-    `${base}/window/:windowId/close`,
-    (c) => withHistory(adapter, c, async (history) => {
-      const id = c.req.param("windowId") ?? "";
-      const held = windows.get(id);
-      if (held?.history !== history) throw new Error("That window is not open in this project.");
-      windows.delete(id);
-      return { entry: await held.window.close() };
-    })
-  );
-}
-
-// src/createStudioApi.ts
-function createStudioApi(adapter) {
-  const api = new Hono();
-  registerProjectRoutes(api, adapter);
-  registerFileRoutes(api, adapter);
-  registerPreviewRoutes(api, adapter);
-  registerLintRoutes(api, adapter);
-  registerRenderRoutes(api, adapter);
-  registerThumbnailRoutes(api, adapter);
-  registerSelectionRoutes(api, adapter);
-  registerMediaRoutes(api, adapter);
-  registerWaveformRoutes(api, adapter);
-  registerFontRoutes(api);
-  registerRegistryRoutes(api, adapter);
-  registerGlobalAssetRoutes(api);
-  registerHistoryRoutes(api, adapter);
-  return api;
-}
-
 // src/history/projectHistory.ts
 import { randomUUID as randomUUID8 } from "crypto";
 import { rm as rm2 } from "fs/promises";
@@ -5622,6 +5500,7 @@ function referencedHashes(log, current) {
 
 // src/history/projectHistory.ts
 var DEFAULT_HISTORY_ROOT = join19(homedir2(), ".cache", "hyperframes", "history");
+var MAX_WINDOW_IDLE_MS = 10 * 6e4;
 var OUTSIDE = { kind: "outside", name: "Outside" };
 var OUTSIDE_LABEL = "Changed outside the app";
 var RACY_MS = 2e3;
@@ -5635,6 +5514,7 @@ function splitAt(change, at, kept) {
     { ...change, before: at }
   ];
 }
+var takesWrite = (window, at) => window.idleMs === void 0 || at - (window.lastWriteAt ?? at) <= window.idleMs;
 function addChange(group, path, before, after) {
   const earlier = group.changes.get(path);
   const from = earlier ? earlier.before : before;
@@ -5693,9 +5573,17 @@ var Engine = class {
       const cached = cache.get(path);
       this.tracked.set(path, { hash, stat: cached?.hash === hash ? cached.stat : "" });
     }
+    this.reopenClosedWindow();
     await this.sweep();
+    for (const window of [...this.windows]) await this.endWindow(window);
     await this.commitOutside();
   }
+  reopenClosedWindow() {
+    const closed = this.options.closedWindow;
+    if (!closed || this.log.entries.some((entry) => entry.id === closed.id)) return;
+    const { id, who, label, startedAt, lastWriteAt, idleMs } = closed;
+    this.windows.push({ id, who, label, startedAt, lastWriteAt, idleMs, changes: /* @__PURE__ */ new Map() });
+  }
   async firstOpen() {
     const sweptAt = Date.now();
     for (const file of listProjectFiles(this.dir))
@@ -5730,15 +5618,17 @@ var Engine = class {
   async sweep() {
     if (!existsSync12(this.dir)) return;
     const sweptAt = Date.now();
-    const seen = listProjectFiles(this.dir);
+    const changedAt = (file) => Math.min(sweptAt, Math.max(file.mtimeMs, file.ctimeMs));
+    const seen = listProjectFiles(this.dir).sort((a, b) => changedAt(a) - changedAt(b));
     let changed = false;
     for (const file of seen)
-      changed = await this.observe(file.path, statKey(file, sweptAt)) || changed;
+      changed = await this.observe(file.path, statKey(file, sweptAt), changedAt(file)) || changed;
     const present = new Set(seen.map((file) => file.path));
     for (const [path, known] of this.tracked) {
       if (present.has(path)) continue;
       this.tracked.delete(path);
-      this.record(path, known.hash, null);
+      const removedAt = sweptAt;
+      await this.record(path, known.hash, null, removedAt);
       changed = true;
     }
     if (changed) this.saveStatCache();
@@ -5752,18 +5642,21 @@ var Engine = class {
       throw error;
     }
   }
-  async observe(path, stat2) {
+  async observe(path, stat2, at) {
     const known = this.tracked.get(path) ?? { hash: null, stat: null };
     if (stat2 && known.stat === stat2) return false;
     const hash = await this.storeIfPresent(path);
     if (hash === null) return false;
     this.tracked.set(path, { hash, stat: stat2 });
-    if (known.hash !== hash) this.record(path, known.hash, hash);
+    if (known.hash !== hash) await this.record(path, known.hash, hash, at);
     return known.hash !== hash || known.stat !== stat2;
   }
-  record(path, before, after) {
+  async record(path, before, after, at) {
+    const endedBeforeThisWrite = this.windows.filter((open) => !takesWrite(open, at));
+    if (endedBeforeThisWrite.length) await this.commitOutside();
+    for (const window2 of endedBeforeThisWrite) await this.endWindow(window2);
     const window = this.windows.at(-1);
-    if (window) this.touch(window);
+    if (window) this.touch(window, at);
     addChange(window ?? this.outsideGroup(), path, before, after);
   }
   /** ponytail: another's write between Studio's write and its sweep folds into Studio's entry (per-write tokens). */
@@ -5882,9 +5775,11 @@ var Engine = class {
   }
   async commit(group, extra = {}) {
     if (!group.changes.size) return null;
-    const { id, who, label, startedAt, changes } = group;
+    const { id, who, label, startedAt, lastWriteAt, changes } = group;
     const files = [...changes.values()].sort((a, b) => a.path.localeCompare(b.path));
-    const entry = { id, who, label, startedAt, endedAt: this.now(), files, ...extra };
+    const previousEnd = this.log.entries.at(-1)?.endedAt ?? 0;
+    const endedAt = Math.max(lastWriteAt ?? this.now(), previousEnd);
+    const entry = { id, who, label, startedAt, endedAt, files, ...extra };
     this.log.entries.push(entry);
     try {
       saveRecord(this.logFile, this.log, { type: "entry", entry });
@@ -5935,12 +5830,14 @@ var Engine = class {
       await this.sweep();
       const window = { ...this.newGroup(who, label), idleMs };
       this.windows.push(window);
-      this.touch(window);
-      return { id: window.id, close: () => this.queue(() => this.sweepAndEnd(window)) };
+      this.touch(window, Date.now());
+      const close = () => this.queue(() => this.sweepAndEnd(window));
+      return { id: window.id, startedAt: window.startedAt, close };
     });
   }
   /** A window with no write for its idleMs ends, so a close that never comes cannot hold every later write. */
-  touch(window) {
+  touch(window, at) {
+    window.lastWriteAt = Math.max(window.lastWriteAt ?? at, at);
     clearTimeout(window.idleTimer);
     if (window.idleMs === void 0 || !Number.isFinite(window.idleMs)) return;
     window.idleTimer = setTimeout(
@@ -6133,6 +6030,163 @@ async function openProjectHistory(options) {
   }
 }
 
+// src/routes/history.ts
+var YOU = { kind: "person", name: "You" };
+async function historyOf(adapter, c) {
+  const project = await adapter.resolveProject(c.req.param("id") ?? "");
+  return project ? await adapter.history?.(project) ?? null : null;
+}
+async function bodyOf(c) {
+  const body = await c.req.json().catch(() => null);
+  return body && typeof body === "object" ? body : {};
+}
+var text = (value) => typeof value === "string" && value ? value : null;
+function writing(c) {
+  const header = c.req.header("X-Hyperframes-Write-Token");
+  return header ? { writeToken: createWriteToken(header) } : {};
+}
+function whoOf(body) {
+  const who = body.who;
+  const name = text(who?.name);
+  return who?.kind === "agent" && name ? { kind: "agent", name } : YOU;
+}
+function idleOf(body) {
+  const idleMs = body.idleMs;
+  return typeof idleMs === "number" && idleMs > 0 ? Math.min(idleMs, MAX_WINDOW_IDLE_MS) : void 0;
+}
+function versionsOf(value) {
+  if (!value || typeof value !== "object") return void 0;
+  const pairs = Object.entries(value).filter(
+    (pair) => typeof pair[1] === "string"
+  );
+  return pairs.length ? Object.fromEntries(pairs) : void 0;
+}
+function nextStep(history, direction) {
+  const target = history.next(direction);
+  if (!target) return null;
+  const paths = target.files.map((file) => file.path);
+  return { id: target.id, label: target.label, endedAt: target.endedAt, paths };
+}
+async function withHistory(adapter, c, task) {
+  const history = await historyOf(adapter, c);
+  if (!history) return c.json({ error: "This project has no history here." }, 404);
+  try {
+    return c.json(await task(history, await bodyOf(c)) ?? null);
+  } catch (error) {
+    return c.json({ error: error instanceof Error ? error.message : String(error) }, 409);
+  }
+}
+function registerHistoryRoutes(api, adapter) {
+  const windows = /* @__PURE__ */ new Map();
+  const base = "/projects/:id/history";
+  api.get(
+    base,
+    (c) => withHistory(adapter, c, (history) => {
+      const entries = history.list();
+      return { entries, back: nextStep(history, "back"), forward: nextStep(history, "forward") };
+    })
+  );
+  api.post(
+    `${base}/step`,
+    (c) => withHistory(
+      adapter,
+      c,
+      (history, body) => history.step(body.direction === "forward" ? "forward" : "back", YOU, writing(c))
+    )
+  );
+  api.post(
+    `${base}/undo`,
+    (c) => withHistory(adapter, c, (history, body) => {
+      const mode = body.mode === "just-this" || body.mode === "back-to-before" ? body.mode : void 0;
+      return history.undo(text(body.entryId) ?? "", { who: whoOf(body), mode, ...writing(c) });
+    })
+  );
+  api.post(
+    `${base}/restore`,
+    (c) => withHistory(
+      adapter,
+      c,
+      (history, body) => history.restore(text(body.point) ?? "", whoOf(body), writing(c))
+    )
+  );
+  api.get(
+    `${base}/peek/:point`,
+    (c) => withHistory(adapter, c, (history) => ({ files: history.peek(c.req.param("point")) }))
+  );
+  api.post(
+    `${base}/pin`,
+    (c) => withHistory(adapter, c, (history, body) => {
+      history.pin(text(body.entryId) ?? "", body.pinned === true);
+      return { ok: true };
+    })
+  );
+  api.get(`${base}/blob/:hash`, async (c) => {
+    const history = await historyOf(adapter, c);
+    const hash = c.req.param("hash") ?? "";
+    const missing = () => c.json({ error: "That file is not kept in this project's history." }, 404);
+    if (!history || !/^[0-9a-f]{64}$/.test(hash)) return missing();
+    const bytes = await history.readBlob(hash).catch(() => null);
+    return bytes ? c.body(new Uint8Array(bytes)) : missing();
+  });
+  api.post(
+    `${base}/claim`,
+    (c) => withHistory(adapter, c, async (history, body) => {
+      const paths = Array.isArray(body.paths) ? body.paths.filter((path) => text(path)) : [];
+      const coalesceKey = text(body.coalesceKey) ?? void 0;
+      const idleMs = idleOf(body);
+      const overwrote = versionsOf(body.overwrote);
+      const claimed = await history.claim(YOU, text(body.label) ?? "Edited in Studio", paths, {
+        ...coalesceKey && { coalesceKey },
+        ...idleMs && { idleMs },
+        ...overwrote && { overwrote }
+      });
+      return { claimed };
+    })
+  );
+  api.post(
+    `${base}/window`,
+    (c) => withHistory(adapter, c, async (history, body) => {
+      const idleMs = idleOf(body);
+      const window = await history.beginWindow(
+        whoOf(body),
+        text(body.label) ?? "Edited in Studio",
+        idleMs ? { idleMs } : void 0
+      );
+      windows.set(window.id, { history, window });
+      return { windowId: window.id, startedAt: window.startedAt };
+    })
+  );
+  api.post(
+    `${base}/window/:windowId/close`,
+    (c) => withHistory(adapter, c, async (history) => {
+      const id = c.req.param("windowId") ?? "";
+      const held = windows.get(id);
+      if (held?.history !== history) throw new Error("That window is not open in this project.");
+      windows.delete(id);
+      return { entry: await held.window.close() };
+    })
+  );
+}
+
+// src/createStudioApi.ts
+function createStudioApi(adapter) {
+  const api = new Hono();
+  registerProjectRoutes(api, adapter);
+  registerFileRoutes(api, adapter);
+  registerPreviewRoutes(api, adapter);
+  registerLintRoutes(api, adapter);
+  registerRenderRoutes(api, adapter);
+  registerThumbnailRoutes(api, adapter);
+  registerSelectionRoutes(api, adapter);
+  registerMediaRoutes(api, adapter);
+  registerWaveformRoutes(api, adapter);
+  registerFontRoutes(api);
+  registerRegistryRoutes(api, adapter);
+  registerGlobalAssetRoutes(api);
+  registerHistoryRoutes(api, adapter);
+  return api;
+}
+
 // src/helpers/duplicateElement.ts
 import { ensureHfIds as ensureHfIds4 } from "@hyperframes/parsers/hf-ids";
 function duplicateElementInHtml(source, target, newId, at) {
@@ -6285,6 +6339,7 @@ export {
   DELETED_VERSION,
   START as HISTORY_START,
   HistoryBusyError,
+  MAX_WINDOW_IDLE_MS,
   MIME_TYPES,
   PREVIEW_BUNDLE_OPTIONS,
   STUDIO_MANUAL_EDITS_PATH,