collabmd 0.1.55 → 0.1.56

package/src/server/domain/collaboration/collaboration-room.js

@@ -4,6 +4,7 @@ import * as syncProtocol from 'y-protocols/sync';
 import * as encoding from 'lib0/encoding';
 import * as decoding from 'lib0/decoding';
 import { setTimeout as delay } from 'node:timers/promises';
+import { isDeepStrictEqual } from 'node:util';
 
 import {
   MSG_AGENT_FLUSH,
@@ -36,6 +37,7 @@ import {
   EXCALIDRAW_FILES_KEY,
   isExcalidrawRoomDocStructured,
   migrateLegacyExcalidrawRoomData,
+  normalizeExcalidrawRoomScene,
   readLegacyExcalidrawRoomScene,
   replaceExcalidrawRoomScene,
   serializeExcalidrawRoomScene,
@@ -287,7 +289,6 @@ export class CollaborationRoom {
         const startedAt = Date.now();
         let hydrateSource = 'empty';
         let snapshotExists = false;
-        let snapshotNeedsReplacement = false;
         let snapshotValid = false;
         let commentThreadCount = 0;
         let snapshotReadDurationMs = 0;
@@ -305,53 +306,74 @@ export class CollaborationRoom {
             snapshotReadDurationMs = Date.now() - snapshotReadStartedAt;
             if (snapshot) {
               snapshotExists = true;
+              // Disk is authoritative. Keep read failures outside snapshot validation
+              // so a retry cannot reuse stale state or a partially hydrated document.
+              const content = await this.documentStore.readContent();
+              if (content === null) {
+                throw new Error('Vault file is unavailable');
+              }
+              const externalScene = isExcalidrawRoom(this.name)
+                ? tryParseExcalidrawSceneJson(content)
+                : null;
+              if (isExcalidrawRoom(this.name) && !externalScene) {
+                throw new Error('Invalid Excalidraw file content');
+              }
+              const validationDoc = new Y.Doc({ gc: true });
+              let validatedSnapshot = null;
               try {
+                Y.applyUpdate(validationDoc, snapshot, 'hydrate');
                 if (isCanvasFilePath(this.name)) {
-                  const validationDoc = new Y.Doc({ gc: true });
-                  try {
-                    Y.applyUpdate(validationDoc, snapshot, 'hydrate');
-                    const stored = serializeCanvasRoomDocument(validationDoc);
-                    const content = await this.documentStore.readContent();
-                    const meta = validationDoc.getMap(CANVAS_META_KEY);
-                    if (meta.has('externalConflict')) {
-                      let invalid = false;
-                      try { parseCanvasJson(content); } catch { invalid = true; }
-                      meta.set('externalConflict', { content, invalid });
-                    } else {
-                      const external = parseCanvasJson(content);
-                      if (stored !== serializeCanvasDocument(external)) {
-                        replaceCanvasRoomDocument(validationDoc, external);
-                      }
+                  const stored = serializeCanvasRoomDocument(validationDoc);
+                  const meta = validationDoc.getMap(CANVAS_META_KEY);
+                  if (meta.has('externalConflict')) {
+                    let invalid = false;
+                    try { parseCanvasJson(content); } catch { invalid = true; }
+                    meta.set('externalConflict', { content, invalid });
+                  } else {
+                    const external = parseCanvasJson(content);
+                    if (stored !== serializeCanvasDocument(external)) {
+                      replaceCanvasRoomDocument(validationDoc, external);
                     }
-                    Y.applyUpdate(this.doc, Y.encodeStateAsUpdate(validationDoc), 'hydrate');
-                  } finally {
-                    validationDoc.destroy();
                   }
                 } else if (isExcalidrawRoom(this.name)) {
-                  const validationDoc = new Y.Doc({ gc: true });
-                  try {
-                    Y.applyUpdate(validationDoc, snapshot, 'hydrate');
-                    if (!this.ensureStructuredExcalidrawState(validationDoc)) {
-                      throw new Error('snapshot did not contain a valid structured Excalidraw scene');
-                    }
-
-                    Y.applyUpdate(this.doc, Y.encodeStateAsUpdate(validationDoc), 'hydrate');
-                  } finally {
-                    validationDoc.destroy();
+                  if (!this.ensureStructuredExcalidrawState(validationDoc)) {
+                    throw new Error('snapshot did not contain a valid structured Excalidraw scene');
+                  }
+                  const storedScene = tryParseExcalidrawSceneJson(serializeExcalidrawRoomScene(validationDoc));
+                  if (!isDeepStrictEqual(storedScene, normalizeExcalidrawRoomScene(externalScene, { includeDeleted: false }))) {
+                    replaceExcalidrawRoomScene(validationDoc, externalScene);
                   }
                 } else {
-                  Y.applyUpdate(this.doc, snapshot, 'hydrate');
+                  const ytext = validationDoc.getText('codemirror');
+                  const replacement = computeTextReplacement(ytext.toString(), normalizeEditableText(content));
+                  validationDoc.transact(() => {
+                    if (replacement?.deleteCount) {
+                      ytext.delete(replacement.start, replacement.deleteCount);
+                    }
+                    if (replacement?.insertText) {
+                      ytext.insert(replacement.start, replacement.insertText);
+                    }
+                  }, 'hydrate');
                 }
 
-                snapshotValid = true;
-                hydrateSource = 'snapshot';
-                this.hydrated = true;
-                return;
+                validatedSnapshot = Y.encodeStateAsUpdate(validationDoc);
               } catch (error) {
                 console.warn(
                   `[room:${this.name}] Ignoring invalid collaboration snapshot until durable content is rehydrated: ${error.message}`,
                 );
-                snapshotNeedsReplacement = true;
+              } finally {
+                validationDoc.destroy();
+              }
+              if (validatedSnapshot) {
+                // Persist new Yjs operation IDs before clients can retain them across restarts.
+                if (!isDeepStrictEqual(snapshot, validatedSnapshot)) {
+                  await this.documentStore.writeSnapshot(validatedSnapshot);
+                }
+                Y.applyUpdate(this.doc, validatedSnapshot, 'hydrate');
+                snapshotValid = true;
+                hydrateSource = 'snapshot';
+                this.hydrated = true;
+                return;
               }
             }
 
@@ -364,35 +386,44 @@ export class CollaborationRoom {
             commentThreadCount = commentThreads.length;
             if (content !== null || commentThreads.length > 0) {
               hydrateSource = 'content';
-              const ytext = this.doc.getText('codemirror');
-              const comments = this.doc.getArray('comments');
-              this.doc.transact(() => {
-                if (isCanvasFilePath(this.name)) {
-                  try {
-                    replaceCanvasRoomDocument(this.doc, parseCanvasJson(content));
-                  } catch {
-                    this.doc.getMap(CANVAS_META_KEY).set('invalidContent', true);
-                  }
-                } else if (isExcalidrawRoom(this.name)) {
-                  const parsedScene = tryParseExcalidrawSceneJson(content);
-                  if (parsedScene) {
-                    migrateLegacyExcalidrawRoomData(this.doc, parsedScene);
+              const contentDoc = new Y.Doc({ gc: true });
+              try {
+                const ytext = contentDoc.getText('codemirror');
+                const comments = contentDoc.getArray('comments');
+                contentDoc.transact(() => {
+                  if (isCanvasFilePath(this.name)) {
+                    try {
+                      replaceCanvasRoomDocument(contentDoc, parseCanvasJson(content));
+                    } catch {
+                      contentDoc.getMap(CANVAS_META_KEY).set('invalidContent', true);
+                    }
+                  } else if (isExcalidrawRoom(this.name)) {
+                    const parsedScene = tryParseExcalidrawSceneJson(content);
+                    if (parsedScene) {
+                      migrateLegacyExcalidrawRoomData(contentDoc, parsedScene);
+                    } else if (content !== null) {
+                      ytext.insert(0, content);
+                    }
                   } else if (content !== null) {
-                    ytext.insert(0, content);
+                    ytext.insert(0, normalizeEditableText(content));
+                  }
+                  populateCommentThreads(comments, commentThreads);
+                }, 'hydrate');
+
+                const replacementSnapshot = Y.encodeStateAsUpdate(contentDoc);
+                // Clients must only see operation IDs that survive a server restart.
+                for (let attempt = 0; attempt < 3; attempt += 1) {
+                  try {
+                    await this.documentStore.writeSnapshot(replacementSnapshot);
+                    break;
+                  } catch (error) {
+                    if (attempt === 2) throw error;
+                    await delay(100 * (attempt + 1));
                   }
-                } else if (content !== null) {
-                  ytext.insert(0, normalizeEditableText(content));
                 }
-                populateCommentThreads(comments, commentThreads);
-              }, 'hydrate');
-
-              const replacementSnapshot = Y.encodeStateAsUpdate(this.doc);
-              if (snapshotNeedsReplacement || isCanvasFilePath(this.name)) {
-                await this.documentStore.writeSnapshot(replacementSnapshot);
-              } else {
-                void this.documentStore.writeSnapshot(replacementSnapshot).catch((error) => {
-                  console.error(`[room:${this.name}] Failed to prime collaboration snapshot: ${error.message}`);
-                });
+                Y.applyUpdate(this.doc, replacementSnapshot, 'hydrate');
+              } finally {
+                contentDoc.destroy();
               }
             }
           }

package/src/server/infrastructure/persistence/sidecar-store.js

@@ -1,5 +1,6 @@
 import { dirname, join } from 'path';
 import { mkdir, readFile, readdir, rename, rm, stat, writeFile } from 'fs/promises';
+import { randomUUID } from 'node:crypto';
 
 import { resolveVaultFilePath, sanitizeVaultPath, toVaultRelativePath } from './path-utils.js';
 import { mapWithConcurrency } from '../../shared/async-utils.js';
@@ -176,11 +177,14 @@ export class SidecarStore {
       return { ok: false, error: 'Invalid file path' };
     }
 
+    const tempPath = `${absolute}.collabmd-tmp-${randomUUID()}`;
     try {
       await mkdir(dirname(absolute), { recursive: true });
-      await writeFile(absolute, Buffer.from(snapshot));
+      await writeFile(tempPath, Buffer.from(snapshot), { flag: 'wx' });
+      await rename(tempPath, absolute);
       return { ok: true };
     } catch (error) {
+      await rm(tempPath, { force: true }).catch(() => {});
       return { ok: false, error: error.message };
     }
   }

package/dist/client/assets/api-client-utils-C5ESDKMG.js

@@ -1 +0,0 @@
-function e(){return typeof window>`u`?globalThis:window}function t({accept:t=``,multiple:n=!1}={}){return new Promise(r=>{let i=document.createElement(`input`),a=e();i.type=`file`,i.accept=t,i.multiple=n,i.style.position=`fixed`,i.style.left=`-9999px`,document.body.appendChild(i);let o=!1,s=null,c=(e=[])=>{o||(o=!0,s&&a.clearTimeout(s),a.removeEventListener(`focus`,l),i.remove(),r(Array.from(e??[])))},l=()=>{s=a.setTimeout(()=>{o||i.files?.length||c()},250)};i.addEventListener(`change`,()=>c(i.files),{once:!0}),i.addEventListener(`cancel`,()=>c(),{once:!0}),a.addEventListener(`focus`,l,{once:!0}),i.click()})}function n(t,n){let r=e();return typeof r.requestIdleCallback==`function`?r.requestIdleCallback(t,{timeout:n}):r.setTimeout(()=>t({didTimeout:!1,timeRemaining:()=>0}),1)}function r(t){if(t===null)return;let n=e();if(typeof n.cancelIdleCallback==`function`){n.cancelIdleCallback(t);return}n.clearTimeout(t)}function i(e,t,n){if(!e||!t)return!1;let r=t.getBoundingClientRect(),i=e.getBoundingClientRect();return i.bottom>=r.top-n&&i.top<=r.bottom+n}function a(t,n,{removeDelayMs:r=1e3,revokeDelayMs:i=r}={}){let a=e(),o=URL.createObjectURL(t),s=document.createElement(`a`);s.href=o,s.download=n,s.style&&(s.style.display=`none`),document.body.appendChild(s),s.click(),r>0?a.setTimeout(()=>s.remove(),r):s.remove(),a.setTimeout(()=>URL.revokeObjectURL(o),i)}function o(e=``,t=`download`){let n=String(e).match(/filename\*=UTF-8''([^;]+)/iu);if(n)try{return decodeURIComponent(n[1])}catch{return t}return String(e).match(/filename="([^"]+)"/iu)?.[1]||t}async function s(e){if(navigator.clipboard?.writeText){await navigator.clipboard.writeText(e);return}let t=document.activeElement,n=document.createElement(`textarea`);n.value=e,n.className=`clipboard-fallback`,document.body.appendChild(n),n.select();try{if(!document.execCommand(`copy`))throw Error(`Copy failed`)}finally{n.remove(),t?.focus()}}function c(e,t={}){let n={...t};return e&&(n[`X-CollabMD-Request-Id`]=String(e)),n}async function l(e,t){let n=await e.json().catch(()=>({}));if(!e.ok||n.ok===!1){let r=Error(n.error||t);throw r.status=e.status,r.body=n,typeof n?.code==`string`&&(r.code=n.code),r}return n}export{a,t as c,s as i,n as l,l as n,i as o,r,o as s,c as t};

package/dist/client/assets/architecture-7GRP2DOG-BBwRXFv3.js

@@ -1 +0,0 @@
-import"./chunk-FOHPRMQF-DzxwRta7.js";import{n as e}from"./chunk-6AZGARVD-CnZDr4Cj.js";export{e as createArchitectureServices};

package/dist/client/assets/architecture-WOLXFQ4H-C0NxYiG7.js

@@ -1 +0,0 @@
-import"./chunk-NGNAAXSQ-DqoPQk1a.js";import{n as e}from"./chunk-24IY7LWP-flnn6SWX.js";export{e as createArchitectureServices};