From 332220957859f5521b58e952d5c740bf28a02cbd Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Fri, 12 Jun 2026 17:04:36 +0800 Subject: [PATCH] fix(saved-sql): dedupe concurrent folder creates --- apps/desktop/src/stores/savedSqlStore.ts | 50 +++++++++++++++++------- packages/app-tests/savedSqlStore.test.ts | 44 +++++++++++++++++++++ 2 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 packages/app-tests/savedSqlStore.test.ts diff --git a/apps/desktop/src/stores/savedSqlStore.ts b/apps/desktop/src/stores/savedSqlStore.ts index d6c5721fea..07e97cd039 100644 --- a/apps/desktop/src/stores/savedSqlStore.ts +++ b/apps/desktop/src/stores/savedSqlStore.ts @@ -81,6 +81,7 @@ export const useSavedSqlStore = defineStore("savedSql", () => { const files = ref([]); const isLoaded = ref(false); let pendingSync: Promise | null = null; + const pendingFolderCreates = new Map>(); const version = ref(0); function bumpVersion() { @@ -125,26 +126,45 @@ export const useSavedSqlStore = defineStore("savedSql", () => { return sortFilesByOrder(files.value.filter((file) => file.connectionId === connectionId && (file.folderId || "") === (folderId || ""))); } + function folderCreateKey(connectionId: string, name: string, parentFolderId?: string) { + return JSON.stringify([connectionId, parentFolderId || "", name]); + } + function getFile(id: string) { return files.value.find((file) => file.id === id); } async function createFolder(connectionId: string, name: string, parentFolderId?: string) { - const timestamp = nowIso(); - const folder: SavedSqlFolder = { - id: uuid(), - connectionId, - parentFolderId: parentFolderId || undefined, - name, - orderIndex: maxOrderIndex(folders.value.filter((item) => item.connectionId === connectionId && (item.parentFolderId || "") === (parentFolderId || ""))) + 1, - createdAt: timestamp, - updatedAt: timestamp, - }; - const saved = await api.saveSavedSqlFolder(folder); - folders.value = [...folders.value.filter((item) => item.id !== saved.id), saved]; - bumpVersion(); - await syncToLocalDirectory(); - return saved; + const key = folderCreateKey(connectionId, name, parentFolderId); + const pending = pendingFolderCreates.get(key); + if (pending) return pending; + + const createPromise = (async () => { + const timestamp = nowIso(); + const folder: SavedSqlFolder = { + id: uuid(), + connectionId, + parentFolderId: parentFolderId || undefined, + name, + orderIndex: maxOrderIndex(folders.value.filter((item) => item.connectionId === connectionId && (item.parentFolderId || "") === (parentFolderId || ""))) + 1, + createdAt: timestamp, + updatedAt: timestamp, + }; + const saved = await api.saveSavedSqlFolder(folder); + folders.value = [...folders.value.filter((item) => item.id !== saved.id), saved]; + bumpVersion(); + await syncToLocalDirectory(); + return saved; + })(); + + pendingFolderCreates.set(key, createPromise); + try { + return await createPromise; + } finally { + if (pendingFolderCreates.get(key) === createPromise) { + pendingFolderCreates.delete(key); + } + } } async function renameFolder(id: string, name: string) { diff --git a/packages/app-tests/savedSqlStore.test.ts b/packages/app-tests/savedSqlStore.test.ts new file mode 100644 index 0000000000..338d14cc2c --- /dev/null +++ b/packages/app-tests/savedSqlStore.test.ts @@ -0,0 +1,44 @@ +import assert from "node:assert/strict"; +import { createPinia, setActivePinia } from "pinia"; +import { beforeEach, test, vi } from "vitest"; +import type { SavedSqlFolder, SavedSqlLibrary } from "../../apps/desktop/src/types/database.ts"; +import { useSavedSqlStore } from "../../apps/desktop/src/stores/savedSqlStore.ts"; + +const apiMock = vi.hoisted(() => ({ + loadSavedSqlLibrary: vi.fn<() => Promise>(), + saveSavedSqlFolder: vi.fn<(folder: SavedSqlFolder) => Promise>(), + syncSavedSqlDirectory: vi.fn<() => Promise>(), +})); + +vi.mock("@/lib/api", () => apiMock); + +beforeEach(() => { + setActivePinia(createPinia()); + apiMock.loadSavedSqlLibrary.mockResolvedValue({ folders: [], files: [] }); + apiMock.saveSavedSqlFolder.mockImplementation(async (folder) => folder); + apiMock.syncSavedSqlDirectory.mockResolvedValue(); + vi.clearAllMocks(); +}); + +test("concurrent saved SQL folder creates reuse the same pending folder", async () => { + let resolveSave: ((folder: SavedSqlFolder) => void) | undefined; + apiMock.saveSavedSqlFolder.mockImplementation( + (folder) => + new Promise((resolve) => { + resolveSave = () => resolve(folder); + }), + ); + + const store = useSavedSqlStore(); + const first = store.createFolder("conn-1", "新建文件夹"); + const second = store.createFolder("conn-1", "新建文件夹"); + + assert.equal(apiMock.saveSavedSqlFolder.mock.calls.length, 1); + resolveSave?.(apiMock.saveSavedSqlFolder.mock.calls[0]![0]); + + const [firstFolder, secondFolder] = await Promise.all([first, second]); + + assert.equal(firstFolder.id, secondFolder.id); + assert.equal(store.folders.length, 1); + assert.equal(store.folders[0]?.id, firstFolder.id); +});