Replace the removed enterprise EE MCP (private apps/server/src/ee submodule,
license-gated /mcp route) with our docmost-mcp, vendored as an isolated ESM
workspace package and served by the server over HTTP — no enterprise license.
Backend:
- Add packages/mcp (@docmost/mcp): vendored docmost-mcp refactored into a
side-effect-free createDocmostMcpServer() factory (38 tools preserved),
stdio entry kept in stdio.ts, Streamable-HTTP session manager in http.ts.
- Add apps/server McpModule: @Post/@Get/@Delete('mcp') (served at /mcp via the
existing global-prefix exclude), @SkipTransform + reply.hijack to bridge raw
Fastify req/res into the SDK transport. The module dynamically imports the
ESM-only package from CommonJS via a Function-indirected import resolved with
require.resolve + file:// URL. Gated by the workspace ai.mcp toggle, a
service-account (MCP_DOCMOST_EMAIL/PASSWORD/API_URL) and optional MCP_TOKEN;
per-session idle eviction (MCP_SESSION_IDLE_MS).
- Drop the enterprise license check on mcpEnabled in workspace.service.
- Dockerfile: copy packages/mcp into the production image.
- .env.example: document MCP_DOCMOST_*, MCP_TOKEN, MCP_SESSION_IDLE_MS.
Frontend:
- Recreate the community "AI & MCP" workspace-settings panel (mcp-settings.tsx):
admin-only toggle on settings.ai.mcp with optimistic update, copyable
${APP_URL}/mcp URL; wired into workspace-settings page. Reuses existing i18n.
Fixes:
- Pin packages/mcp tiptap deps to 3.20.4 (matching the client) and inline
getStyleProperty, preventing a duplicate @tiptap/core@3.26.1 from leaking into
the client editor via pnpm shamefully-hoist (was breaking apps/client tsc).
32 lines
1.3 KiB
JavaScript
32 lines
1.3 KiB
JavaScript
/**
|
|
* Per-page async mutex.
|
|
*
|
|
* Content writes over the collaboration websocket must never overlap for the
|
|
* same page: two concurrent full-document replaces would race on the live Yjs
|
|
* fragment. We serialize them with a per-pageId promise chain — each new
|
|
* operation waits for the previous one on that page to settle (success or
|
|
* failure) before it runs. Different pages never block each other.
|
|
*/
|
|
const chains = new Map();
|
|
// The returned promise carries the real result/rejection of `fn` and MUST be
|
|
// awaited/handled by the caller; only the internal chaining tail swallows
|
|
// errors (purely to gate ordering).
|
|
export function withPageLock(pageId, fn) {
|
|
// Wait for the previous op on this page; swallow its error so a failure does
|
|
// not poison the queue for the next caller.
|
|
const prev = (chains.get(pageId) ?? Promise.resolve()).catch(() => { });
|
|
const run = prev.then(fn);
|
|
// The tail used for chaining must also swallow errors (it only gates order).
|
|
const tail = run.catch(() => { });
|
|
chains.set(pageId, tail);
|
|
// Drop the map entry once this op is the tail and has settled, to avoid an
|
|
// unbounded map of resolved promises.
|
|
tail.then(() => {
|
|
if (chains.get(pageId) === tail) {
|
|
chains.delete(pageId);
|
|
}
|
|
});
|
|
// Callers get the real result/rejection of fn.
|
|
return run;
|
|
}
|