collabmd 0.1.51 → 0.1.52

package/src/server/infrastructure/structurizr/structurizr-workspace-service.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { mkdir, readFile, readdir, realpath, rm, stat, utimes, writeFile } from 'node:fs/promises';
-import { basename, dirname, join, resolve } from 'node:path';
+import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:path';
+import { setTimeout as delay } from 'node:timers/promises';
 
 import {
   isStructurizrFilePath,
@@ -21,6 +22,14 @@ function createServiceError(message, statusCode, code) {
   return error;
 }
 
+function resolveMirrorPath(mirrorDir, pathValue) {
+  const absolute = sanitizeVaultPath(mirrorDir, pathValue, { allowIgnored: true });
+  if (!absolute) {
+    throw createServiceError('Invalid Structurizr mirror path.', 400, 'STRUCTURIZR_MIRROR_INVALID');
+  }
+  return absolute;
+}
+
 function normalizeWorkspaceRootPath(pathValue) {
   const normalized = String(pathValue ?? '').trim().replace(/\\/g, '/');
   if (!normalized || normalized.startsWith('/') || normalized.split('/').some((segment) => !segment || segment === '.' || segment === '..')) {
@@ -117,7 +126,9 @@ async function collectMirrorPaths(directoryPath, prefix = '') {
 async function readManifest(manifestPath) {
   try {
     const parsed = JSON.parse(await readFile(manifestPath, 'utf8'));
-    return Array.isArray(parsed?.paths) ? parsed.paths : [];
+    return Array.isArray(parsed?.paths)
+      ? parsed.paths.filter((pathValue) => typeof pathValue === 'string' && sanitizeVaultPath(dirname(manifestPath), pathValue))
+      : [];
   } catch (error) {
     if (error.code === 'ENOENT' || error instanceof SyntaxError) {
       return [];
@@ -128,14 +139,14 @@ async function readManifest(manifestPath) {
 
 async function writeMirrorFiles(mirrorDir, files) {
   await Promise.all(Array.from(files, async ([relativePath, content]) => {
-    const targetPath = join(mirrorDir, relativePath);
+    const targetPath = resolveMirrorPath(mirrorDir, relativePath);
     await mkdir(dirname(targetPath), { recursive: true });
     await writeFile(targetPath, content);
   }));
 }
 
 async function removeMirrorPaths(mirrorDir, paths) {
-  await Promise.all(paths.map((relativePath) => rm(join(mirrorDir, relativePath), {
+  await Promise.all(paths.map((relativePath) => rm(resolveMirrorPath(mirrorDir, relativePath), {
     force: true,
     recursive: true,
   })));
@@ -145,7 +156,7 @@ async function snapshotMirror(mirrorDir) {
   const paths = await collectMirrorPaths(mirrorDir);
   const files = new Map();
   await Promise.all(paths.map(async (relativePath) => {
-    files.set(relativePath, await readFile(join(mirrorDir, relativePath)));
+    files.set(relativePath, await readFile(resolveMirrorPath(mirrorDir, relativePath)));
   }));
   return files;
 }
@@ -209,6 +220,10 @@ export class StructurizrWorkspaceService {
   }
 
   async syncWorkspace({ content, rootPath }) {
+    const mirrorRelativePath = relative(this.vaultDir, this.mirrorDir);
+    if (!isAbsolute(mirrorRelativePath) && !mirrorRelativePath.startsWith('..')) {
+      resolveMirrorPath(this.vaultDir, mirrorRelativePath);
+    }
     const normalizedRootPath = normalizeWorkspaceRootPath(rootPath);
     if (!isStructurizrFilePath(normalizedRootPath)) {
       throw createServiceError('Structurizr previews require a workspace.dsl root file.', 400, 'STRUCTURIZR_ROOT_REQUIRED');
@@ -262,7 +277,7 @@ export class StructurizrWorkspaceService {
 
     await mkdir(this.mirrorDir, { recursive: true });
     const snapshot = await snapshotMirror(this.mirrorDir);
-    const previousManifest = await readManifest(join(this.mirrorDir, MANIFEST_FILE_NAME));
+    const previousManifest = await readManifest(resolveMirrorPath(this.mirrorDir, MANIFEST_FILE_NAME));
     const sourcePaths = Array.from(files.keys());
     const stalePaths = previousManifest.filter((pathValue) => !files.has(pathValue));
 
@@ -270,7 +285,7 @@ export class StructurizrWorkspaceService {
       await removeMirrorPaths(this.mirrorDir, stalePaths);
       await writeMirrorFiles(this.mirrorDir, files);
       // Local caches workspace.json; an old mtime makes it parse the DSL without a delete race.
-      const workspaceJsonPath = join(this.mirrorDir, WORKSPACE_JSON_FILE_NAME);
+      const workspaceJsonPath = resolveMirrorPath(this.mirrorDir, WORKSPACE_JSON_FILE_NAME);
       try {
         await utimes(workspaceJsonPath, new Date(0), new Date(0));
       } catch (error) {
@@ -285,7 +300,7 @@ export class StructurizrWorkspaceService {
         ]));
       }
       await writeFile(
-        join(this.mirrorDir, MANIFEST_FILE_NAME),
+        resolveMirrorPath(this.mirrorDir, MANIFEST_FILE_NAME),
         `${JSON.stringify({ paths: sourcePaths }, null, 2)}\n`,
         'utf8',
       );
@@ -327,7 +342,7 @@ export class StructurizrWorkspaceService {
       const isTransientStartupFailure = response.status >= 500
         && /(?:No workspace|FileNotFoundException|workspace\.json)/iu.test(message);
       if (isTransientStartupFailure && attempt < 7) {
-        await new Promise((resolvePromise) => setTimeout(resolvePromise, 250));
+        await delay(250);
         continue;
       }
 
@@ -397,4 +412,3 @@ export class StructurizrWorkspaceService {
     };
   }
 }
-

package/src/server/infrastructure/websocket/attach-collaboration-gateway.js

@@ -56,7 +56,9 @@ export function attachCollaborationGateway({
   const websocketServer = new WebSocketServer({
     maxPayload,
     noServer: true,
-    perMessageDeflate: false,
+    // Compress large frames (initial sync, pastes); small Yjs updates fall
+    // under the default 1024-byte threshold and skip compression.
+    perMessageDeflate: true,
   });
   const socketSessions = new Map();
   let isShuttingDown = false;
@@ -112,14 +114,16 @@ export function attachCollaborationGateway({
     });
   }) ?? (() => {});
 
-  websocketServer.on('connection', (ws, req, requestUrl, user = null) => {
+  websocketServer.on('connection', (ws, req, requestUrl, user = null, expiresAt = null) => {
     const { roomName, vaultId } = extractVaultAndRoom(requestUrl.pathname, wsBasePath, vaultRegistry?.isKnownVaultId?.bind(vaultRegistry));
     const registryPromise = vaultId && vaultRegistry
       ? vaultRegistry.getOrCreateContextAsync(vaultId).then((context) => context.roomRegistry)
       : Promise.resolve(roomRegistry);
     registryPromise.then((targetRegistry) => {
+      if (ws.readyState !== ws.OPEN) return;
       const room = targetRegistry.getOrCreate(roomName);
       const session = new ClientSocketSession({
+        expiresAt,
         onDisconnected: (disconnectedRoomName) => {
           socketSessions.delete(ws);
           const remaining = targetRegistry.rooms.get(disconnectedRoomName)?.clients.size ?? 0;
@@ -187,7 +191,7 @@ export function attachCollaborationGateway({
       }
 
       websocketServer.handleUpgrade(req, socket, head, (ws) => {
-        websocketServer.emit('connection', ws, req, requestUrl, authenticatedUser);
+        websocketServer.emit('connection', ws, req, requestUrl, authenticatedUser, authResult.expiresAt);
       });
     }).catch((error) => {
       console.error('[ws] Hosted workspace authorization failed:', error.message);

package/src/server/infrastructure/websocket/client-socket-session.js

@@ -1,6 +1,6 @@
 import * as decoding from 'lib0/decoding';
 
-import { MSG_SYNC } from '../../domain/collaboration/protocol.js';
+import { MSG_SYNC } from '../../../domain/collaboration-protocol.js';
 
 function isSyncMessage(payload) {
   try {
@@ -14,12 +14,15 @@ function isSyncMessage(payload) {
 
 export class ClientSocketSession {
   constructor({
+    expiresAt = null,
     onDisconnected = null,
     onFailed = null,
     room,
     roomName,
     ws,
   }) {
+    this.expiresAt = expiresAt;
+    this.expiryTimer = null;
     this.onDisconnected = onDisconnected;
     this.onFailed = onFailed;
     this.room = room;
@@ -33,6 +36,7 @@ export class ClientSocketSession {
     this.initialSyncTimer = null;
 
     this.handleMessage = (payload) => {
+      if (this.expireAuthentication()) return;
       if (isSyncMessage(payload)) {
         this.hasReceivedClientSync = true;
         this.clearInitialSyncTimer();
@@ -46,6 +50,7 @@ export class ClientSocketSession {
       this.room.handleMessage(this.ws, payload);
     };
     this.handleClose = () => {
+      clearTimeout(this.expiryTimer);
       if (!this.initialized) {
         this.closedBeforeReady = true;
         this.clearInitialSyncTimer();
@@ -63,6 +68,21 @@ export class ClientSocketSession {
     };
   }
 
+  expireAuthentication() {
+    if (!Number.isFinite(this.expiresAt) || Date.now() < this.expiresAt) return false;
+    this.handleClose();
+    this.ws.close(4001, 'Authentication expired');
+    return true;
+  }
+
+  scheduleAuthenticationExpiry() {
+    if (!Number.isFinite(this.expiresAt) || this.expireAuthentication()) return;
+    this.expiryTimer = setTimeout(() => {
+      this.scheduleAuthenticationExpiry();
+    }, Math.min(this.expiresAt - Date.now(), 2 ** 31 - 1));
+    this.expiryTimer.unref?.();
+  }
+
   markAlive() {
     this.isAlive = true;
   }
@@ -93,6 +113,7 @@ export class ClientSocketSession {
     this.ws.off('error', this.handleError);
     this.ws.off('pong', this.handlePong);
     this.clearInitialSyncTimer();
+    clearTimeout(this.expiryTimer);
   }
 
   flushPendingMessages() {
@@ -126,6 +147,12 @@ export class ClientSocketSession {
 
   async initialize() {
     this.attach();
+    if (this.expireAuthentication()) {
+      this.detach();
+      this.onFailed?.(this.roomName);
+      return;
+    }
+    this.scheduleAuthenticationExpiry();
 
     try {
       await this.room.addClient(this.ws, { sendInitialSync: false });
@@ -138,14 +165,15 @@ export class ClientSocketSession {
     }
 
     this.initialized = true;
-    this.flushPendingMessages();
-    this.scheduleInitialSync();
-
+    if (this.expireAuthentication()) return;
     if (this.closedBeforeReady) {
       this.disconnect();
       return;
     }
 
+    this.flushPendingMessages();
+    this.scheduleInitialSync();
+
     console.log(`[ws] "${this.roomName}" connected (${this.room.clients.size} active client(s))`);
   }
 }

package/src/server/infrastructure/workspace/file-system-sync-service.js

@@ -11,7 +11,7 @@ import {
 import { isIgnoredVaultEntry } from '../persistence/path-utils.js';
 import { createWorkspaceStateFileSystemAdapter } from './workspace-state-file-system-adapter.js';
 
-const MAX_INCREMENTAL_PENDING_PATHS = 16;
+const MAX_INCREMENTAL_PENDING_PATHS = 64;
 
 function normalizeWatchedPath(filename) {
   if (typeof filename !== 'string' && !Buffer.isBuffer(filename)) {
@@ -193,7 +193,9 @@ export class FileSystemSyncService {
     let filteredChange = this.mutationCoordinator.filterManagedWorkspaceChange(workspaceChange);
     if (!filteredChange) {
       const authoritativeChange = detectWorkspaceStateChange(authoritativePreviousState, nextState);
-      if (hasWorkspaceMutation(authoritativeChange)) {
+      // A full scan already reflects current disk state (no awaits since),
+      // so only rebase when the first pass was incremental and may be stale.
+      if (incrementalResult && hasWorkspaceMutation(authoritativeChange)) {
         nextState = await this.vaultFileStore.scanWorkspaceState();
         workspaceChange = detectWorkspaceStateChange(authoritativePreviousState, nextState);
         this.lastState = nextState;

package/dist/client/assets/CodeMirrorEditor-UCMRAMCV-Crf9Y3Q6.js

@@ -1 +0,0 @@
-import{i as e}from"./rolldown-runtime-Dd_uD5pT.js";import{n as t,t as n}from"./jsx-runtime-BpzPEenQ.js";import"./chunk-SRAX5OIU-KFQikY-4.js";import{$ as r,B as i,L as a,N as o,Q as s,R as c,W as l,c as u,ft as d,mt as f,t as p,tt as m}from"./dist-kiD2GIsD.js";import{a as h,o as g,p as _,s as v}from"./dist-C5NkYKAa.js";var y=e(t(),1),b=n(),x=u.define({token(e){return e.match(/^%%.*$/)?`comment`:e.match(/^"(?:[^"\\]|\\.)*"/)?`string`:e.match(/^(flowchart|graph|sequenceDiagram|classDiagram|stateDiagram|erDiagram|gantt|pie|mindmap|journey|gitGraph|timeline|quadrantChart|sankey|xychart)\b/i)||e.match(/^(TB|TD|BT|RL|LR)\b/)||e.match(/^(subgraph|end|participant|actor|loop|alt|else|opt|par|critical|break|rect|note|over|activate|deactivate|title|section|class|style|linkStyle|classDef|click)\b/i)?`keyword`:e.match(/^[-.=<>|ox]+>/)||e.match(/^<[-.=<>|ox]+/)||e.match(/^--+|\.\.+|==+/)?`operator`:e.match(/^[[\](){}|<>]/)?`bracket`:e.match(/^[A-Za-z_][A-Za-z0-9_]*/)?`variableName`:e.match(/^\d+(\.\d+)?/)?`number`:e.match(/^[,:;]/)?`punctuation`:(e.eatSpace()||e.next(),null)}});function S(){return x}var C=i.theme({"&":{backgroundColor:`#1e1e1e`,color:`#d4d4d4`},".cm-content":{caretColor:`#fff`},".cm-cursor":{borderLeftColor:`#fff`},".cm-gutters":{backgroundColor:`#1e1e1e`,color:`#858585`,border:`none`},".cm-activeLineGutter":{backgroundColor:`#2a2a2a`},".cm-activeLine":{backgroundColor:`#2a2a2a`},".cm-errorLine":{backgroundColor:`rgba(255, 0, 0, 0.15)`}},{dark:!0}),w=p.define([{tag:a.keyword,color:`#569cd6`},{tag:a.string,color:`#ce9178`},{tag:a.comment,color:`#6a9955`},{tag:a.number,color:`#b5cea8`},{tag:a.operator,color:`#d4d4d4`},{tag:a.punctuation,color:`#d4d4d4`},{tag:a.variableName,color:`#9cdcfe`},{tag:a.bracket,color:`#ffd700`}]),T=i.theme({"&":{backgroundColor:`#ffffff`,color:`#1e1e1e`},".cm-content":{caretColor:`#000`},".cm-cursor":{borderLeftColor:`#000`},".cm-gutters":{backgroundColor:`#fff`,color:`#999`,border:`none`},".cm-activeLineGutter":{backgroundColor:`#e8e8e8`},".cm-activeLine":{backgroundColor:`#e8e8e8`},".cm-errorLine":{backgroundColor:`rgba(255, 0, 0, 0.1)`}}),E=p.define([{tag:a.keyword,color:`#0000ff`},{tag:a.string,color:`#a31515`},{tag:a.comment,color:`#008000`},{tag:a.number,color:`#098658`},{tag:a.operator,color:`#1e1e1e`},{tag:a.punctuation,color:`#1e1e1e`},{tag:a.variableName,color:`#001080`},{tag:a.bracket,color:`#af00db`}]),D=c.line({class:`cm-errorLine`}),O=(e,t)=>{if(!e||e<1||e>t.lines)return i.decorations.of(c.none);let n=t.line(e);return i.decorations.of(c.set([D.range(n.from)]))},k=e=>e===`dark`?[C,o(w)]:[T,o(E)],A=({value:e,onChange:t,onKeyboardSubmit:n,placeholder:a,theme:o,errorLine:c})=>{let u=(0,y.useRef)(null),p=(0,y.useRef)(null),x=(0,y.useRef)(t),C=(0,y.useRef)(n),w=(0,y.useRef)(new d),T=(0,y.useRef)(new d);return x.current=t,C.current=n,(0,y.useEffect)(()=>{if(!u.current)return;let t=w.current,n=new i({state:f.create({doc:e,extensions:[s.of([{key:`Mod-Enter`,run:()=>(C.current?.(),!0)},{key:`Mod-Shift-z`,run:_,preventDefault:!0}]),i.updateListener.of(e=>{e.docChanged&&x.current(e.state.doc.toString())}),g(),s.of([...h,...v]),r(),i.lineWrapping,t.of(k(o)),T.current.of([]),S(),l({drawRangeCursor:!0}),...a?[m(a)]:[]]}),parent:u.current});return p.current=n,n.focus(),()=>{n.destroy(),p.current=null}},[]),(0,y.useEffect)(()=>{let e=p.current;e&&e.dispatch({effects:w.current.reconfigure(k(o))})},[o]),(0,y.useEffect)(()=>{let e=p.current;e&&e.dispatch({effects:T.current.reconfigure(O(c,e.state.doc))})},[c]),(0,y.useEffect)(()=>{let t=p.current;if(!t)return;let n=t.state.doc.toString();e!==n&&t.dispatch({changes:{from:0,to:n.length,insert:e}})},[e]),(0,b.jsx)(`div`,{ref:u,className:`ttd-dialog-input ttd-dialog-input--codemirror`})};export{A as default};

package/dist/client/assets/abnfDiagram-VCTEODGH-PuinKbSQ.js

@@ -1 +0,0 @@
-import{n as e}from"./chunk-Y2CYZVJY-DsF7k-Jl.js";import{m as t}from"./src-oBChb5qS.js";import"./chunk-DU6HZSFF-C6d6PJfE.js";import"./chunk-CLGD4ZFX-Cmtx89ht.js";import{n}from"./chunk-XHIXRSVI-BFQ6B8BE.js";import{n as r,r as i,t as a}from"./chunk-SVP7TREG-XlsB_ZMZ.js";import{t as o}from"./chunk-JWPE2WC7-DVXcaiue.js";import{t as s}from"./mermaid-parser.core-DrdLA3p0.js";var c=n().RailroadAbnf.parser.LangiumParser,l=e(e=>{let t=e.alternatives.map(u);return t.length===1?t[0]:{type:`choice`,alternatives:t}},`transformAlternation`),u=e(e=>{let t=e.elements.map(f);return t.length===1?t[0]:{type:`sequence`,elements:t}},`transformConcatenation`),d=e(e=>{if(e.includes(`*`)){let[t,n]=e.split(`*`);return{min:t?parseInt(t,10):0,max:n?parseInt(n,10):1/0}}let t=parseInt(e,10);return{min:t,max:t}},`parseRepeat`),f=e(e=>{let t=p(e.primary);if(!e.repeat)return t;let{min:n,max:r}=d(e.repeat);return n===0&&r===1?{type:`optional`,element:t}:{type:`repetition`,element:t,min:n,max:r}},`transformElement`),p=e(e=>{switch(e.$type){case`AbnfStringLiteral`:return{type:`terminal`,value:e.value};case`AbnfNumVal`:return{type:`terminal`,value:e.value};case`AbnfRuleName`:return{type:`nonterminal`,name:e.name};case`AbnfGroup`:return l(e.element);case`AbnfOptionalGroup`:return{type:`optional`,element:l(e.element)};default:throw Error(`Unsupported ABNF primary node: ${e.$type}`)}},`transformPrimary`),m=e(e=>({name:e.name,definition:l(e.definition)}),`transformRule`),h=e(e=>{o(e,a),e.title&&a.setTitle(e.title),e.rules.map(e=>a.addRule(m(e)))},`populateDb`),g={parser:{parse:e(e=>{a.clear(),t.debug(`[ABNF Parser] Starting Langium parse`);let n=c.parse(e);if(n.lexerErrors.length>0||n.parserErrors.length>0)throw new s(n);let r=n.value;t.debug(`[ABNF Parser] Parsed rules:`,r.rules.length),h(r),t.debug(`[ABNF Parser] Parse complete`)},`parse`),parser:{yy:a}},db:a,renderer:i,styles:r};export{g as diagram};

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

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