@hyperframes/studio-server 0.7.103 → 0.7.105

package/dist/index.d.ts

@@ -34,8 +34,8 @@ interface FileWriteReceipt {
 }
 /** Strong content version used as both the JSON version and HTTP ETag. */
 declare function fileContentVersion(content: string): string;
-/** Attach one API write's identity to the corresponding filesystem-watch echo. */
-declare function consumeFileWriteReceipt(absPath: string): FileWriteReceipt | null;
+/** Attach one API write's identity to the watcher echo for its exact bytes. */
+declare function consumeFileWriteReceipt(absPath: string, expectedVersion: string): FileWriteReceipt | null;
 
 /**
  * Build a standalone HTML page for a sub-composition.

package/dist/index.js

@@ -624,12 +624,13 @@ function recordFileWriteReceipt(absPath, receipt) {
   current.push({ ...receipt, recordedAt: now });
   receipts.set(absPath, current);
 }
-function consumeFileWriteReceipt(absPath) {
+function consumeFileWriteReceipt(absPath, expectedVersion) {
   const now = Date.now();
   const current = (receipts.get(absPath) ?? []).filter(
     (entry) => now - entry.recordedAt < RECEIPT_TTL_MS
   );
-  const receipt = current.shift() ?? null;
+  const receiptIndex = current.findIndex((entry) => entry.version === expectedVersion);
+  const receipt = receiptIndex === -1 ? null : current.splice(receiptIndex, 1)[0] ?? null;
   if (current.length > 0) receipts.set(absPath, current);
   else receipts.delete(absPath);
   if (!receipt) return null;
@@ -1077,19 +1078,44 @@ function commitElementPatchBatches(projectDir, batches, writeFile = writeFileSyn
   }
   return { durable: true, files };
 }
+function commitElementPatchBatchesWithReceipts(c, projectDir, batches) {
+  const result = commitElementPatchBatches(projectDir, batches);
+  if ("error" in result || !result.durable) return result;
+  for (const file of result.files) {
+    if (!file.changed) continue;
+    const absPath = resolveWithinProject(projectDir, file.sourceFile);
+    if (!absPath) throw new Error(`Committed element patch escaped project: ${file.sourceFile}`);
+    recordMutationReceipt(c, file.sourceFile, absPath, file.after);
+  }
+  return result;
+}
+function recordMutationReceipt(c, filePath, absPath, html) {
+  const version = fileContentVersion(html);
+  const writeToken = createWriteToken(c.req.header("X-Hyperframes-Write-Token"));
+  recordFileWriteReceipt(absPath, { path: filePath, version, writeToken });
+  return { version, writeToken };
+}
+function writeFileWithReceipt(c, filePath, absPath, html) {
+  writeFileSync4(absPath, html, "utf-8");
+  return recordMutationReceipt(c, filePath, absPath, html);
+}
+function writeMutationResult(c, projectDir, filePath, absPath, html) {
+  const backup = snapshotBeforeWrite(projectDir, absPath);
+  if (backup.error) console.warn(`Failed to create backup for ${filePath}: ${backup.error}`);
+  const { version } = writeFileWithReceipt(c, filePath, absPath, html);
+  return { backupPath: backupPathForResponse(projectDir, backup.backupPath), version };
+}
 function writeIfChanged(c, projectDir, filePath, absPath, original, next) {
   if (next === original) {
     return c.json({ ok: true, changed: false, content: original, path: filePath });
   }
-  const backup = snapshotBeforeWrite(projectDir, absPath);
-  if (backup.error) console.warn(`Failed to create backup for ${filePath}: ${backup.error}`);
-  writeFileSync4(absPath, next, "utf-8");
+  const { backupPath } = writeMutationResult(c, projectDir, filePath, absPath, next);
   return c.json({
     ok: true,
     changed: true,
     content: next,
     path: filePath,
-    backupPath: backupPathForResponse(projectDir, backup.backupPath)
+    backupPath
   });
 }
 function rejectUnsafeMutationValues(c, unsafeFields) {
@@ -1488,10 +1514,13 @@ async function applyGsapMutations(c, res, mutations) {
     return c.json({ error: "file changed during GSAP mutation", conflict: true }, 409);
   }
   if (changed) {
-    const backup = snapshotBeforeWrite(res.project.dir, res.absPath);
-    if (backup.error) console.warn(`Failed to create backup for ${res.filePath}: ${backup.error}`);
-    backupPath = backupPathForResponse(res.project.dir, backup.backupPath);
-    writeFileSync4(res.absPath, newHtml, "utf-8");
+    backupPath = writeMutationResult(
+      c,
+      res.project.dir,
+      res.filePath,
+      res.absPath,
+      newHtml
+    ).backupPath;
   }
   const responsePayload = {
     ok: true,
@@ -2448,10 +2477,12 @@ function registerFileRoutes(api, adapter) {
     }
     const backup = snapshotBeforeWrite(ctx.project.dir, ctx.absPath);
     if (backup.error) return c.json({ error: `backup failed: ${backup.error}` }, 500);
-    writeFileSync4(ctx.absPath, insertion.html, "utf-8");
-    const version = fileContentVersion(insertion.html);
-    const writeToken = createWriteToken(c.req.header("X-Hyperframes-Write-Token"));
-    recordFileWriteReceipt(ctx.absPath, { path: ctx.filePath, version, writeToken });
+    const { version, writeToken } = writeFileWithReceipt(
+      c,
+      ctx.filePath,
+      ctx.absPath,
+      insertion.html
+    );
     c.header("ETag", version);
     return c.json({
       ok: true,
@@ -2649,10 +2680,13 @@ function registerFileRoutes(api, adapter) {
         version: version2
       });
     }
-    const backup = snapshotBeforeWrite(ctx.project.dir, ctx.absPath);
-    if (backup.error) console.warn(`Failed to create backup for ${ctx.filePath}: ${backup.error}`);
-    writeFileSync4(ctx.absPath, result.html, "utf-8");
-    const version = fileContentVersion(result.html);
+    const { version, backupPath } = writeMutationResult(
+      c,
+      ctx.project.dir,
+      ctx.filePath,
+      ctx.absPath,
+      result.html
+    );
     c.header("ETag", version);
     return c.json({
       ok: true,
@@ -2661,7 +2695,7 @@ function registerFileRoutes(api, adapter) {
       newId: result.newId,
       path: ctx.filePath,
       version,
-      backupPath: backupPathForResponse(ctx.project.dir, backup.backupPath)
+      backupPath
     });
   });
   api.post("/projects/:id/file-mutations/patch-element/*", async (c) => {
@@ -2696,16 +2730,20 @@ function registerFileRoutes(api, adapter) {
         path: ctx.filePath
       });
     }
-    const backup = snapshotBeforeWrite(ctx.project.dir, ctx.absPath);
-    if (backup.error) console.warn(`Failed to create backup for ${ctx.filePath}: ${backup.error}`);
-    writeFileSync4(ctx.absPath, patched, "utf-8");
+    const { backupPath } = writeMutationResult(
+      c,
+      ctx.project.dir,
+      ctx.filePath,
+      ctx.absPath,
+      patched
+    );
     return c.json({
       ok: true,
       changed: true,
       matched,
       content: patched,
       path: ctx.filePath,
-      backupPath: backupPathForResponse(ctx.project.dir, backup.backupPath)
+      backupPath
     });
   });
   api.post("/projects/:id/file-mutations/patch-element-batches", async (c) => {
@@ -2717,7 +2755,7 @@ function registerFileRoutes(api, adapter) {
     }
     const unsafeFields = findUnsafeElementPatchBatchValues(body.batches);
     if (unsafeFields.length > 0) return rejectUnsafeMutationValues(c, unsafeFields);
-    const result = commitElementPatchBatches(project.dir, body.batches);
+    const result = commitElementPatchBatchesWithReceipts(c, project.dir, body.batches);
     if ("error" in result) {
       return elementPatchBatchCommitErrorResponse(c, result.error, result.sourceFile);
     }
@@ -2735,7 +2773,7 @@ function registerFileRoutes(api, adapter) {
     if (unsafeFields.length > 0) {
       return rejectUnsafeMutationValues(c, unsafeFields);
     }
-    const result = commitElementPatchBatches(ctx.project.dir, [batch]);
+    const result = commitElementPatchBatchesWithReceipts(c, ctx.project.dir, [batch]);
     if ("error" in result) {
       return elementPatchBatchCommitErrorResponse(c, result.error, result.sourceFile);
     }
@@ -2791,16 +2829,20 @@ function registerFileRoutes(api, adapter) {
         result.error === "grouped elements must share a single parent" ? 422 : 400
       );
     }
-    const backup = snapshotBeforeWrite(ctx.project.dir, ctx.absPath);
-    if (backup.error) console.warn(`Failed to create backup for ${ctx.filePath}: ${backup.error}`);
-    writeFileSync4(ctx.absPath, result.html, "utf-8");
+    const { backupPath } = writeMutationResult(
+      c,
+      ctx.project.dir,
+      ctx.filePath,
+      ctx.absPath,
+      result.html
+    );
     return c.json({
       ok: true,
       changed: true,
       groupId: result.groupId,
       content: result.html,
       path: ctx.filePath,
-      backupPath: backupPathForResponse(ctx.project.dir, backup.backupPath)
+      backupPath
     });
   });
   api.post("/projects/:id/file-mutations/unwrap-elements/*", async (c) => {