From 4e5ed876c370855b3c81699bfbbe22379031a10d Mon Sep 17 00:00:00 2001
From: sunlei <yemu2333@outlook.com>
Date: Tue, 16 Jun 2026 06:59:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=99=8D=E4=BD=8EBangDream=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E7=9B=AE=E5=BD=95=E5=8A=A0=E8=BD=BD=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E5=B3=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../catalog/bangdream-catalog-cache.ts        |  3 +-
 .../bangdream/catalog/catalog-cache.spec.ts   | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 test/qqbot/plugins/bangdream/catalog/catalog-cache.spec.ts

diff --git a/src/modules/qqbot/plugins/bangdream/src/application/catalog/bangdream-catalog-cache.ts b/src/modules/qqbot/plugins/bangdream/src/application/catalog/bangdream-catalog-cache.ts
index aec0230..be4e66c 100644
--- a/src/modules/qqbot/plugins/bangdream/src/application/catalog/bangdream-catalog-cache.ts
+++ b/src/modules/qqbot/plugins/bangdream/src/application/catalog/bangdream-catalog-cache.ts
@@ -111,9 +111,8 @@ let initialLoadPromise: Promise<void> | undefined;
 function ensureCatalogInitialLoad() {
   if (!initialLoadPromise) {
     logger('catalog', 'initializing...');
-    initialLoadPromise = loadCatalogData(true).then(async () => {
+    initialLoadPromise = loadCatalogData(true).then(() => {
       logger('catalog', 'initializing done');
-      await loadCatalogData();
     });
   }
   return initialLoadPromise;
diff --git a/test/qqbot/plugins/bangdream/catalog/catalog-cache.spec.ts b/test/qqbot/plugins/bangdream/catalog/catalog-cache.spec.ts
new file mode 100644
index 0000000..cd0aac0
--- /dev/null
+++ b/test/qqbot/plugins/bangdream/catalog/catalog-cache.spec.ts
@@ -0,0 +1,69 @@
+const mockGetJson = jest.fn<
+  Promise<Record<string, { path: string }>>,
+  [string, { cacheTime?: number }?]
+>(async (path) => ({
+  1: { path },
+}));
+const mockReadJson = jest.fn(async () => ({}));
+const mockReadExcelRows = jest.fn(async () => []);
+const mockLog = jest.fn();
+
+jest.mock(
+  '@/modules/qqbot/plugins/bangdream/src/infrastructure/integration/bestdori.provider',
+  () => ({
+    bangdreamBestdoriProvider: {
+      getJson: mockGetJson,
+    },
+  }),
+);
+jest.mock(
+  '@/modules/qqbot/plugins/bangdream/src/infrastructure/storage/static-patch.provider',
+  () => ({
+    bangdreamStaticPatchProvider: {
+      readExcelRows: mockReadExcelRows,
+      readJson: mockReadJson,
+    },
+  }),
+);
+jest.mock(
+  '@/modules/qqbot/plugins/bangdream/src/application/bangdream-logger',
+  () => ({
+    logger: mockLog,
+  }),
+);
+jest.mock(
+  '@/modules/qqbot/plugins/bangdream/src/infrastructure/integration/runtime-io',
+  () => ({
+    readBangDreamRuntimeConfig: jest.fn(() => undefined),
+    sleepBangDreamRuntime: jest.fn(() => new Promise(() => undefined)),
+  }),
+);
+
+import { waitForBangDreamCatalogReady } from '@/modules/qqbot/plugins/bangdream/src/application/catalog/bangdream-catalog-cache';
+import { BANGDREAM_BESTDORI_API_PATHS } from '@/modules/qqbot/plugins/bangdream/src/domain/common/bangdream-protocol';
+
+describe('BangDream catalog cache', () => {
+  beforeEach(() => {
+    mockGetJson.mockClear();
+    mockReadJson.mockClear();
+    mockReadExcelRows.mockClear();
+    mockLog.mockClear();
+  });
+
+  it('loads each Bestdori catalog path only once during the initial ready wait', async () => {
+    await waitForBangDreamCatalogReady!();
+
+    const catalogPaths = Object.values(BANGDREAM_BESTDORI_API_PATHS);
+    expect(mockGetJson).toHaveBeenCalledTimes(catalogPaths.length);
+    expect(mockGetJson.mock.calls.map(([path]) => path).sort()).toEqual(
+      [...catalogPaths].sort(),
+    );
+    expect(
+      mockGetJson.mock.calls.every(
+        ([, options]) => options?.cacheTime === 1 / 0,
+      ),
+    ).toBe(true);
+    expect(mockReadJson).toHaveBeenCalledTimes(3);
+    expect(mockReadExcelRows).toHaveBeenCalledTimes(1);
+  });
+});