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).
191 lines
6.8 KiB
JavaScript
191 lines
6.8 KiB
JavaScript
import { test } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import {
|
|
serializeDocmostMarkdown,
|
|
parseDocmostMarkdown,
|
|
} from "../../build/lib/markdown-document.js";
|
|
import { convertProseMirrorToMarkdown } from "../../build/lib/markdown-converter.js";
|
|
import { markdownToProseMirror } from "../../build/lib/collaboration.js";
|
|
|
|
/** Recursively find the first descendant node (or self) of the given type. */
|
|
function find(node, type) {
|
|
if (!node || typeof node !== "object") return null;
|
|
if (node.type === type) return node;
|
|
const kids = Array.isArray(node.content) ? node.content : [];
|
|
for (const k of kids) {
|
|
const r = find(k, type);
|
|
if (r) return r;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
/** Recursively collect every descendant node (and self) of the given type. */
|
|
function findAll(node, type, acc = []) {
|
|
if (!node || typeof node !== "object") return acc;
|
|
if (node.type === type) acc.push(node);
|
|
const kids = Array.isArray(node.content) ? node.content : [];
|
|
for (const k of kids) findAll(k, type, acc);
|
|
return acc;
|
|
}
|
|
|
|
/** Find the first text node carrying a mark of the given type. */
|
|
function findTextWithMark(node, markType) {
|
|
for (const t of findAll(node, "text")) {
|
|
if (Array.isArray(t.marks) && t.marks.some((m) => m.type === markType)) {
|
|
return t;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
test("serialize/parse: meta and comments survive a round-trip; body recovered", () => {
|
|
const meta = {
|
|
version: 1,
|
|
pageId: "p1",
|
|
slugId: "s1",
|
|
title: "Hello",
|
|
spaceId: "sp1",
|
|
parentPageId: null,
|
|
};
|
|
const body = "# Title\n\nSome **bold** body text.";
|
|
const comments = [
|
|
{ id: "c1", content: "a note", resolved: false },
|
|
{ id: "c2", content: "another", resolved: true },
|
|
];
|
|
|
|
const full = serializeDocmostMarkdown(meta, body, comments);
|
|
const parsed = parseDocmostMarkdown(full);
|
|
|
|
assert.deepEqual(parsed.meta, meta);
|
|
assert.deepEqual(parsed.comments, comments);
|
|
assert.equal(parsed.body, body);
|
|
});
|
|
|
|
test("serialize: a page with no comments still emits an empty comments block", () => {
|
|
const full = serializeDocmostMarkdown({ version: 1 }, "body", []);
|
|
assert.match(full, /<!--\s*docmost:comments\s*\n\[\]\n-->/);
|
|
const parsed = parseDocmostMarkdown(full);
|
|
assert.deepEqual(parsed.comments, []);
|
|
});
|
|
|
|
test("parse: plain markdown with no blocks -> meta=null, comments=null, body=input", () => {
|
|
const input = " # Just a heading\n\nplain body ";
|
|
const parsed = parseDocmostMarkdown(input);
|
|
assert.equal(parsed.meta, null);
|
|
assert.equal(parsed.comments, null);
|
|
assert.equal(parsed.body, input.trim());
|
|
});
|
|
|
|
test("parse: tolerant to CRLF line endings", () => {
|
|
const meta = { version: 1, pageId: "p9" };
|
|
const body = "line one\n\nline two";
|
|
const full = serializeDocmostMarkdown(meta, body, []).replace(/\n/g, "\r\n");
|
|
const parsed = parseDocmostMarkdown(full);
|
|
assert.deepEqual(parsed.meta, meta);
|
|
assert.deepEqual(parsed.comments, []);
|
|
assert.equal(parsed.body, body);
|
|
});
|
|
|
|
test("parse: a malformed present meta block throws a clear error", () => {
|
|
const bad = "<!-- docmost:meta\n{not valid json}\n-->\n\nbody\n";
|
|
assert.throws(() => parseDocmostMarkdown(bad), /docmost:meta JSON/);
|
|
});
|
|
|
|
test("parse: a literal comments-block in the body is left in the body when a real trailing block follows", () => {
|
|
// The body documents the format (e.g. inside a fenced code block) AND there is
|
|
// a real trailing comments block. Only the final, document-ending block is
|
|
// metadata; the literal stays in the body verbatim.
|
|
const meta = { version: 1, pageId: "p-literal" };
|
|
const literal = "```\n<!-- docmost:comments\n[1]\n-->\n```";
|
|
const body = `# Doc\n\nExample of the format:\n\n${literal}`;
|
|
const realComments = [{ id: "c1", content: "real" }];
|
|
|
|
const full = serializeDocmostMarkdown(meta, body, realComments);
|
|
const parsed = parseDocmostMarkdown(full);
|
|
|
|
// The REAL trailing comments are parsed.
|
|
assert.deepEqual(parsed.comments, realComments);
|
|
// The literal block text is still present in the recovered body.
|
|
assert.ok(
|
|
parsed.body.includes("<!-- docmost:comments\n[1]\n-->"),
|
|
"expected the literal comments block to remain in the body",
|
|
);
|
|
assert.equal(parsed.body, body.trim());
|
|
});
|
|
|
|
test("parse: a body-ending literal comments block (no real trailing block) is treated as the final block", () => {
|
|
// Hand-written file whose ONLY `docmost:comments` opener is a literal that
|
|
// also ends the document. Per the implementation, the final document-ending
|
|
// block IS treated as metadata, so it is parsed and stripped from the body.
|
|
const input = "# Doc\n\nsome text\n\n<!-- docmost:comments\n[1]\n-->\n";
|
|
const parsed = parseDocmostMarkdown(input);
|
|
assert.equal(parsed.meta, null);
|
|
assert.deepEqual(parsed.comments, [1]);
|
|
assert.equal(parsed.body, "# Doc\n\nsome text");
|
|
});
|
|
|
|
test("parse: a literal comments block NOT ending the document stays entirely in the body", () => {
|
|
// The literal opener/closer is followed by more body content, so it does not
|
|
// end the document and is therefore left untouched in the body.
|
|
const input =
|
|
"# Doc\n\n<!-- docmost:comments\n[1]\n-->\n\nmore body after it\n";
|
|
const parsed = parseDocmostMarkdown(input);
|
|
assert.equal(parsed.meta, null);
|
|
assert.equal(parsed.comments, null);
|
|
assert.equal(parsed.body, input.trim());
|
|
});
|
|
|
|
test("export emits comment anchors and they round-trip back to a comment mark", () => {
|
|
// A small ProseMirror doc with a text run carrying a `comment` mark.
|
|
const doc = {
|
|
type: "doc",
|
|
content: [
|
|
{
|
|
type: "paragraph",
|
|
content: [
|
|
{ type: "text", text: "before " },
|
|
{
|
|
type: "text",
|
|
text: "anchored",
|
|
marks: [{ type: "comment", attrs: { commentId: "cm-123" } }],
|
|
},
|
|
{ type: "text", text: " after" },
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
const body = convertProseMirrorToMarkdown(doc);
|
|
assert.match(body, /data-comment-id="cm-123"/);
|
|
|
|
return markdownToProseMirror(body).then((rebuilt) => {
|
|
const commented = findTextWithMark(rebuilt, "comment");
|
|
assert.ok(commented, "expected a text node with a comment mark");
|
|
const mark = commented.marks.find((m) => m.type === "comment");
|
|
assert.equal(mark.attrs.commentId, "cm-123");
|
|
});
|
|
});
|
|
|
|
test("drawio round-trips through export and import", () => {
|
|
const doc = {
|
|
type: "doc",
|
|
content: [
|
|
{
|
|
type: "drawio",
|
|
attrs: { src: "https://example/diagram.xml", attachmentId: "att-7" },
|
|
},
|
|
],
|
|
};
|
|
|
|
const body = convertProseMirrorToMarkdown(doc);
|
|
assert.match(body, /data-type="drawio"/);
|
|
assert.match(body, /data-src="https:\/\/example\/diagram\.xml"/);
|
|
|
|
return markdownToProseMirror(body).then((rebuilt) => {
|
|
const diagram = find(rebuilt, "drawio");
|
|
assert.ok(diagram, "expected a drawio node after import");
|
|
assert.equal(diagram.attrs.src, "https://example/diagram.xml");
|
|
});
|
|
});
|