lix/mnote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix local folder resource lifecycle and workspace switch

Browse Source
This commit is contained in:
lix-2026
2026-05-24 02:23:48 +08:00
parent 97953101a2
commit 6d9d8ce9cd
9 changed files with 374 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/task164-desktop-hot-local-folder-main-entry-smoke.js
+3 -4
View File
@@ -200,16 +200,15 @@ async function main() {
await page.locator('[data-testid="mnote-switch-cloud-workspace"]').click({ timeout: UI_TIMEOUT_MS });
await page.waitForURL((url) => {
return url.pathname === "/" &&
url.searchParams.get("sourceKind") === "convex_workspace" &&
url.searchParams.get("mnoteHome") === "1" &&
!url.searchParams.has("sourceKind") &&
!url.searchParams.has("rootUri");
}, { timeout: UI_TIMEOUT_MS });
await page.goto(BASE_URL, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS });
await page.waitForURL((url) => {
return url.pathname === "/" &&
url.searchParams.get("sourceKind") === "local_folder" &&
url.searchParams.get("rootUri") === fileUrl(otherRoot) &&
url.searchParams.get("treeView") === "filetree";
(!url.searchParams.has("rootUri") || url.searchParams.get("rootUri") !== fileUrl(otherRoot));
}, { timeout: UI_TIMEOUT_MS });
console.log("task164 desktop hot local folder main entry smoke passed");
scripts/task441-local-folder-cloud-switch-smoke.js
+47 -39
View File
@@ -4,7 +4,6 @@
const assert = require("node:assert");
const fs = require("node:fs");
const fsp = require("node:fs/promises");
const os = require("node:os");
const path = require("node:path");
const { chromium } = require("playwright");
@@ -12,6 +11,7 @@ const ROOT = path.resolve(__dirname, "..");
const BASE_URL = (process.env.MNOTE_UI_BASE_URL || process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, "");
const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000);
const OUT_DIR = path.join(ROOT, "tmp", "task441-local-folder-cloud-switch-smoke");
const MANAGED_MY_SPACE_ROOT = "/mnt/Data1T/Mnote_data/users/mnote-e2e/workspaces/my-space";
function fileUrl(filePath) {
return `file://${filePath.split(path.sep).map((part, index) => (index === 0 ? "" : encodeURIComponent(part))).join("/")}`;
@@ -42,42 +42,53 @@ async function readCloudState(page) {
return page.evaluate(() => {
const workspaceNode = document.querySelector("#sidebar-file-tree-root[data-workspace-id], #sidebar-tree-root[data-workspace-id], [data-workspace-id]");
const workspaceId = workspaceNode instanceof HTMLElement ? workspaceNode.getAttribute("data-workspace-id") || "" : "";
const url = new URL(window.location.href);
const sourceKind = document.body?.getAttribute("data-mnote-source-kind") || url.searchParams.get("sourceKind") || "";
const rootUri = document.body?.getAttribute("data-mnote-root-uri") || url.searchParams.get("rootUri") || "";
const docRows = Array.from(document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-row-id^='doc:']")).map((row) => ({
rowId: row.getAttribute("data-row-id") || "",
title: row.querySelector(".tree-link-title")?.textContent?.trim() || "",
}));
return {
url: window.location.href,
sourceKind,
rootUri,
workspaceId,
storageValue: window.localStorage.getItem("mnote.workspace.lastCloudWorkspaceId") || "",
docRows,
localMarkdownRows: Array.from(document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-row-id^='local:markdown:']")).map((row) => ({
rowId: row.getAttribute("data-row-id") || "",
title: row.querySelector(".tree-link-title")?.textContent?.trim() || "",
})),
localRows: document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-row-id^='local:']").length,
rootText: document.querySelector("#sidebar-file-tree-root")?.textContent?.slice(0, 500) || "",
};
});
}
async function ensureCloudDocument(page) {
function isHomeWorkspaceState(state) {
return state.sourceKind === "local_folder" && state.workspaceId.startsWith("local-ws:");
}
async function ensureHomeWorkspace(page) {
await openFileTree(page);
let state = await readCloudState(page);
if (state.workspaceId && state.workspaceId !== "default" && state.docRows.length > 0) {
return { workspaceId: state.workspaceId, rowId: state.docRows[0].rowId };
}
if (isHomeWorkspaceState(state)) return state;
const previousPathname = new URL(page.url()).pathname;
await page.getByRole("button", { name: "新建页面" }).click({ timeout: UI_TIMEOUT_MS });
await page.waitForURL((url) => url.pathname.startsWith("/documents/") && url.pathname !== previousPathname, { timeout: UI_TIMEOUT_MS });
const documentId = new URL(page.url()).pathname.split("/").filter(Boolean).pop();
assert(documentId, "新建云空间页面后 URL 缺少 documentId");
await switchCloud(page);
await openFileTree(page);
await page.waitForFunction(
(id) => Boolean(document.querySelector(`#sidebar-file-tree-root .tree-row[data-row-id="doc:${CSS.escape(id)}"]`)),
documentId,
{ timeout: UI_TIMEOUT_MS },
);
state = await readCloudState(page);
assert(state.workspaceId && state.workspaceId !== "default", `云空间 workspaceId 不应为空或 default: ${JSON.stringify(state)}`);
return { workspaceId: state.workspaceId, rowId: `doc:${documentId}` };
assert(isHomeWorkspaceState(state), `切回我的空间后应进入默认本地 workspace: ${JSON.stringify(state)}`);
return state;
}
async function ensureHomeWorkspaceTarget(page) {
const state = await ensureHomeWorkspace(page);
return {
workspaceId: state.workspaceId,
rootUri: state.rootUri,
rowId: state.localMarkdownRows[0]?.rowId || "",
};
}
async function openLocalFolder(page, root) {
@@ -102,55 +113,52 @@ async function switchCloud(page) {
await page.locator('[data-testid="mnote-workspace-source-menu"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS });
await page.locator('[data-testid="mnote-switch-cloud-workspace"]').click({ timeout: UI_TIMEOUT_MS });
await page.waitForURL(
(url) => url.pathname === "/" && url.searchParams.get("sourceKind") === "convex_workspace" && !url.searchParams.has("rootUri"),
(url) => url.pathname === "/" && url.searchParams.get("mnoteHome") === "1" && !url.searchParams.has("sourceKind") && !url.searchParams.has("rootUri"),
{ timeout: UI_TIMEOUT_MS },
);
}
async function main() {
await fsp.mkdir(OUT_DIR, { recursive: true });
const localRoot = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-cloud-switch-local-"));
fs.writeFileSync(path.join(localRoot, "README.md"), "# Local README\n", "utf8");
fs.mkdirSync(MANAGED_MY_SPACE_ROOT, { recursive: true });
let localRoot = "";
const browser = await chromium.launch({ headless: process.env.HEADFUL !== "1" });
const context = await browser.newContext({ viewport: { width: 1440, height: 960 } });
const page = await context.newPage();
const result = { ok: false, baseUrl: BASE_URL, localRoot, cloudTarget: null, localState: null, returnedState: null };
const result = { ok: false, baseUrl: BASE_URL, localRoot, homeTarget: null, localState: null, returnedState: null };
try {
await quickLogin(page);
await page.goto(BASE_URL, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS });
result.cloudTarget = await ensureCloudDocument(page);
result.homeTarget = await ensureHomeWorkspaceTarget(page);
localRoot = fs.mkdtempSync(path.join(MANAGED_MY_SPACE_ROOT, "task441-local-"));
result.localRoot = localRoot;
fs.writeFileSync(path.join(localRoot, "README.md"), "# Local README\n", "utf8");
await openLocalFolder(page, localRoot);
result.localState = await readCloudState(page);
assert(result.localState.storageValue === result.cloudTarget.workspaceId, `进入本地文件夹前应记住真实云空间 workspaceId: ${JSON.stringify(result)}`);
assert(
!result.localState.storageValue || !result.localState.storageValue.startsWith("local-ws:"),
`进入普通本地文件夹不应把我的空间 local-ws 写成云 workspace: ${JSON.stringify(result)}`,
);
await switchCloud(page);
await page.waitForURL((url) => url.searchParams.get("workspaceId") === result.cloudTarget.workspaceId, {
timeout: UI_TIMEOUT_MS,
});
await openFileTree(page);
await page.waitForFunction(
(rowId) => Boolean(document.querySelector(`#sidebar-file-tree-root .tree-row[data-row-id="${CSS.escape(rowId)}"]`)),
result.cloudTarget.rowId,
{ timeout: UI_TIMEOUT_MS },
);
result.returnedState = await readCloudState(page);
assert.equal(result.returnedState.workspaceId, result.cloudTarget.workspaceId, "切回云空间后应恢复原 workspaceId");
assert.equal(result.returnedState.storageValue, result.cloudTarget.workspaceId, "lastCloudWorkspaceId 不应被 default 污染");
assert.equal(result.returnedState.workspaceId, result.homeTarget.workspaceId, "切回我的空间后应恢复默认本地 workspaceId");
assert.equal(result.returnedState.sourceKind, "local_folder", "切回我的空间后仍应走 local_folder 主链");
assert.equal(result.returnedState.rootUri, result.homeTarget.rootUri, "切回我的空间后应恢复默认 my-space rootUri");
assert.notEqual(result.returnedState.rootUri, fileUrl(localRoot), "切回我的空间后不能继续停留在刚打开的普通本地文件夹");
assert.notEqual(result.returnedState.storageValue, "default", "lastCloudWorkspaceId 不能是 synthetic default");
assert.equal(result.returnedState.localRows, 0, "切回云空间后不应保留本地文件夹 row");
assert(
result.returnedState.docRows.some((row) => row.rowId === result.cloudTarget.rowId),
`切回云空间后原云空间页面 row 应恢复: ${JSON.stringify(result.returnedState)}`,
);
assert(!result.returnedState.storageValue.startsWith("local-ws:"), "lastCloudWorkspaceId 不能是 local-ws:*");
assert(result.returnedState.localRows > 0, `切回我的空间后 File Tree 应恢复本地 row: ${JSON.stringify(result.returnedState)}`);
result.ok = true;
} finally {
await fsp.writeFile(path.join(OUT_DIR, "result.json"), `${JSON.stringify(result, null, 2)}\n`, "utf8");
await browser.close().catch(() => {});
fs.rmSync(localRoot, { recursive: true, force: true });
if (localRoot) fs.rmSync(localRoot, { recursive: true, force: true });
}
console.log(JSON.stringify(result, null, 2));
scripts/task479-local-folder-markdown-resource-lifecycle-smoke.js
+187
View File
@@ -109,6 +109,96 @@ async function waitForFileExists(filePath, timeoutMs) {
return fs.existsSync(filePath);
}
async function waitForFileContent(filePath, predicate, timeoutMs) {
const startedAt = Date.now();
let lastContent = "";
while (Date.now() - startedAt < timeoutMs) {
if (fs.existsSync(filePath)) {
lastContent = fs.readFileSync(filePath, "utf8");
if (predicate(lastContent)) return { ok: true, content: lastContent };
}
await new Promise((resolve) => setTimeout(resolve, 150));
}
return { ok: false, content: lastContent };
}
async function waitForPrimaryAttachment(page, fileName) {
const link = page
.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"]', {
hasText: fileName,
})
.first();
await link.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS });
await page.waitForFunction(
(name) => {
const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror');
const link = Array.from(editor?.querySelectorAll('a[href*="/api/local-folder/files/open"]') || [])
.find((node) => node instanceof HTMLAnchorElement && (node.textContent || "").includes(name));
return link instanceof HTMLAnchorElement
&& (link.classList.contains("mnote-uploaded-attachment-row") || getComputedStyle(link).display === "inline-flex");
},
fileName,
{ timeout: UI_TIMEOUT_MS },
);
return link;
}
async function selectPrimaryAttachmentLink(page, fileName) {
await page.evaluate((name) => {
const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror');
if (!(editor instanceof HTMLElement)) throw new Error("editor_missing");
const link = Array.from(editor.querySelectorAll("a")).find((node) => (
node instanceof HTMLAnchorElement && (node.textContent || "").includes(name)
));
if (!(link instanceof HTMLAnchorElement)) throw new Error(`attachment_link_missing:${name}`);
const range = document.createRange();
range.selectNode(link);
const selection = window.getSelection();
if (!selection) throw new Error("selection_missing");
selection.removeAllRanges();
selection.addRange(range);
editor.focus();
}, fileName);
}
async function deleteAttachmentByKeyboard(page, fileName) {
await waitForPrimaryAttachment(page, fileName);
await selectPrimaryAttachmentLink(page, fileName);
await page.keyboard.press("Backspace");
}
async function deleteAttachmentByBlockHandle(page, fileName) {
const link = await waitForPrimaryAttachment(page, fileName);
const box = await link.boundingBox();
assert(box, `附件 ${fileName} 缺少可点击区域`);
await page.mouse.move(box.x + Math.min(12, box.width / 2), box.y + box.height / 2, { steps: 8 });
const trigger = page.locator('[data-testid="block-drag-handle-trigger"]').first();
await trigger.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS });
await trigger.click({ timeout: UI_TIMEOUT_MS });
const menu = page.locator('[data-testid="block-drag-menu"]').first();
await menu.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS });
await page.locator('[data-testid="block-drag-menu-item-delete"]').first().click({ timeout: UI_TIMEOUT_MS });
}
function writeTwoAttachmentPage(root, relativePath, resourceDirName, heading) {
const resourceDir = path.join(root, resourceDirName);
fs.mkdirSync(resourceDir, { recursive: true });
fs.writeFileSync(path.join(resourceDir, "first.md"), "# First\n\n第一个附件\n", "utf8");
fs.writeFileSync(path.join(resourceDir, "second.md"), "# Second\n\n第二个附件\n", "utf8");
fs.writeFileSync(
path.join(root, relativePath),
[
`# ${heading}`,
"",
`[first.md](${resourceDirName}/first.md)`,
"",
`[second.md](${resourceDirName}/second.md)`,
"",
].join("\n"),
"utf8",
);
}
// ─── main ────────────────────────────────────────────────────────────────────
async function main() {
@@ -141,6 +231,10 @@ async function main() {
// 为 Check 6 准备一个带 H1 的文件（文件名不含空格，避免空格编码干扰测试）
fs.writeFileSync(path.join(root, "MyNotes.md"), "# Body Heading\n\n正文内容\n", "utf8");
// 为 Check 7 准备两个删除附件引用的独立页面，避免不同删除路径互相污染。
writeTwoAttachmentPage(root, "DeleteKeyboard.md", "DeleteKeyboard", "Delete Keyboard");
writeTwoAttachmentPage(root, "DeleteHandle.md", "DeleteHandle", "Delete Handle");
// 为 Check 5 准备足够的文件树条目来产生可滚动区域
fs.mkdirSync(path.join(root, "docs"), { recursive: true });
for (let i = 0; i < 30; i++) {
@@ -586,6 +680,99 @@ async function main() {
}
}
// ──────────────────────────────────────────────────────────────────────────
// Check 7: 主编辑区删除一个附件引用时，只删除正文链接，不级联删除真实文件；
// 相邻附件仍保持可点击附件块，手柄删除刷新后不回来。
// ──────────────────────────────────────────────────────────────────────────
{
const checkId = "editor-delete-one-attachment-preserves-adjacent";
try {
const keyboardPath = "DeleteKeyboard.md";
const keyboardFile = path.join(root, keyboardPath);
await page.goto(documentUrl(root, keyboardPath), {
waitUntil: "domcontentloaded",
timeout: UI_TIMEOUT_MS,
});
await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({
state: "visible",
timeout: UI_TIMEOUT_MS,
});
await waitForPrimaryAttachment(page, "first.md");
await waitForPrimaryAttachment(page, "second.md");
await deleteAttachmentByKeyboard(page, "second.md");
const keyboardPersisted = await waitForFileContent(
keyboardFile,
(content) => content.includes("[first.md](DeleteKeyboard/first.md)") && !content.includes("second.md"),
UI_TIMEOUT_MS,
);
assert(
keyboardPersisted.ok,
`Backspace 删除第二个附件后，Markdown 应保留 first 链接且移除 second。实际内容:\n${keyboardPersisted.content}`,
);
assert(fs.existsSync(path.join(root, "DeleteKeyboard", "first.md")), "Backspace 删除引用不应删除 first.md 真实文件");
assert(fs.existsSync(path.join(root, "DeleteKeyboard", "second.md")), "Backspace 删除引用不应删除 second.md 真实文件");
await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS });
await waitForPrimaryAttachment(page, "first.md");
const keyboardSecondVisible = await page
.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a', { hasText: "second.md" })
.first()
.isVisible()
.catch(() => false);
assert(!keyboardSecondVisible, "Backspace 删除后刷新，second.md 引用不应回来");
const handlePath = "DeleteHandle.md";
const handleFile = path.join(root, handlePath);
await page.goto(documentUrl(root, handlePath), {
waitUntil: "domcontentloaded",
timeout: UI_TIMEOUT_MS,
});
await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({
state: "visible",
timeout: UI_TIMEOUT_MS,
});
await waitForPrimaryAttachment(page, "first.md");
await waitForPrimaryAttachment(page, "second.md");
await deleteAttachmentByBlockHandle(page, "second.md");
const handlePersisted = await waitForFileContent(
handleFile,
(content) => content.includes("[first.md](DeleteHandle/first.md)") && !content.includes("second.md"),
UI_TIMEOUT_MS,
);
assert(
handlePersisted.ok,
`手柄删除第二个附件后，Markdown 应保留 first 链接且移除 second。实际内容:\n${handlePersisted.content}`,
);
assert(fs.existsSync(path.join(root, "DeleteHandle", "first.md")), "手柄删除引用不应删除 first.md 真实文件");
assert(fs.existsSync(path.join(root, "DeleteHandle", "second.md")), "手柄删除引用不应删除 second.md 真实文件");
await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS });
await waitForPrimaryAttachment(page, "first.md");
const handleSecondVisible = await page
.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a', { hasText: "second.md" })
.first()
.isVisible()
.catch(() => false);
assert(!handleSecondVisible, "手柄删除后刷新，second.md 引用不应回来");
checks[checkId] = {
ok: true,
message: "Backspace 与手柄删除单个附件引用后，相邻附件仍是可点击附件块，真实文件保留，刷新后被删引用不回来",
keyboardContent: keyboardPersisted.content,
handleContent: handlePersisted.content,
};
} catch (err) {
overallOk = false;
checks[checkId] = {
ok: false,
message: `删除单个附件引用检查失败: ${err.message}`,
error: err.stack,
};
}
}
// ── 截图 ──
{
const shotTimestamp = Date.now();