Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

src/components/rpg-entry/RpgEntryFlowShell.agent.interaction.test.tsx

@@ -56,13 +56,7 @@ import {
   streamCreativeDraftEdit,
 } from '../../services/creative-agent';
 import { match3dCreationClient } from '../../services/match3d-creation';
-import {
-  clickMatch3DItem,
-  finishMatch3DTimeUp,
-  restartMatch3DRun,
-  startMatch3DRun,
-  stopMatch3DRun,
-} from '../../services/match3d-runtime';
+import { createServerMatch3DRuntimeAdapter } from '../../services/match3d-runtime';
 import {
   deleteMatch3DWork,
   getMatch3DWorkDetail,
@@ -445,14 +439,30 @@ vi.mock('../../services/match3dGeneratedModelCache', () => ({
   preloadMatch3DGeneratedModelAssets: vi.fn(() => Promise.resolve()),
 }));
 
-vi.mock('../../services/match3d-runtime', () => ({
-  clickMatch3DItem: vi.fn(),
-  finishMatch3DTimeUp: vi.fn(),
-  restartMatch3DRun: vi.fn(),
-  startMatch3DRun: vi.fn(),
-  stopMatch3DRun: vi.fn(),
+const match3dRuntimeServiceMocks = vi.hoisted(() => ({
+  createServerMatch3DRuntimeAdapter: vi.fn(),
 }));
 
+const match3dServerRuntimeAdapterMock = vi.hoisted(() => ({
+  clickItem: vi.fn(),
+  finishTimeUp: vi.fn(),
+  getRun: vi.fn(),
+  restartRun: vi.fn(),
+  startRun: vi.fn(),
+  stopRun: vi.fn(),
+}));
+
+vi.mock('../../services/match3d-runtime', async () => {
+  const actual = await vi.importActual<
+    typeof import('../../services/match3d-runtime')
+  >('../../services/match3d-runtime');
+
+  return {
+    ...actual,
+    ...match3dRuntimeServiceMocks,
+  };
+});
+
 vi.mock('../../services/square-hole-creation', () => ({
   squareHoleCreationClient: {
     createSession: vi.fn(),
@@ -1608,6 +1618,24 @@ function TestWrapper({
 
 beforeEach(() => {
   vi.resetAllMocks();
+  vi.mocked(createServerMatch3DRuntimeAdapter).mockReturnValue(
+    match3dServerRuntimeAdapterMock,
+  );
+  match3dServerRuntimeAdapterMock.startRun.mockRejectedValue(
+    new Error('未启动抓大鹅运行态'),
+  );
+  match3dServerRuntimeAdapterMock.clickItem.mockRejectedValue(
+    new Error('未执行抓大鹅点击'),
+  );
+  match3dServerRuntimeAdapterMock.restartRun.mockRejectedValue(
+    new Error('未重新开始抓大鹅运行态'),
+  );
+  match3dServerRuntimeAdapterMock.finishTimeUp.mockResolvedValue({
+    run: buildMockMatch3DRun('match3d-profile-time-up'),
+  });
+  match3dServerRuntimeAdapterMock.stopRun.mockResolvedValue({
+    run: buildMockMatch3DRun('match3d-profile-stopped'),
+  });
   window.history.replaceState(null, '', '/');
   window.sessionStorage.clear();
   window.localStorage.clear();
@@ -2235,17 +2263,6 @@ beforeEach(() => {
   vi.mocked(deleteMatch3DWork).mockResolvedValue({
     items: [],
   });
-  vi.mocked(startMatch3DRun).mockRejectedValue(new Error('未启动抓大鹅运行态'));
-  vi.mocked(clickMatch3DItem).mockRejectedValue(new Error('未执行抓大鹅点击'));
-  vi.mocked(restartMatch3DRun).mockRejectedValue(
-    new Error('未重新开始抓大鹅运行态'),
-  );
-  vi.mocked(finishMatch3DTimeUp).mockResolvedValue({
-    run: buildMockMatch3DRun('match3d-profile-time-up'),
-  });
-  vi.mocked(stopMatch3DRun).mockResolvedValue({
-    run: buildMockMatch3DRun('match3d-profile-stopped'),
-  });
   vi.mocked(squareHoleCreationClient.createSession).mockResolvedValue({
     session: buildMockSquareHoleAgentSession(),
   });
@@ -2722,7 +2739,7 @@ test('match3d result trial passes generated models into first runtime mount', as
   vi.mocked(getMatch3DWorkDetail).mockResolvedValue({
     item: match3dDraftWork,
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(match3dDraftWork.profileId),
   });
 
@@ -2736,7 +2753,10 @@ test('match3d result trial passes generated models into first runtime mount', as
   await user.click(screen.getByRole('button', { name: '试玩' }));
 
   await waitFor(() => {
-    expect(startMatch3DRun).toHaveBeenCalledWith('match3d-profile-draft-1');
+    expect(match3dServerRuntimeAdapterMock.startRun).toHaveBeenCalledWith(
+      'match3d-profile-draft-1',
+      {},
+    );
   });
   expect(
     await screen.findByTestId('match3d-runtime-generated-model-count'),
@@ -2805,7 +2825,7 @@ test('match3d draft generation auto starts trial and runtime back opens draft re
   vi.mocked(getMatch3DWorkDetail).mockResolvedValue({
     item: generatedProfile,
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(generatedProfile.profileId),
   });
 
@@ -2818,7 +2838,9 @@ test('match3d draft generation auto starts trial and runtime back opens draft re
   );
 
   expect(await screen.findByText(/抓大鹅运行态/u)).toBeTruthy();
-  expect(startMatch3DRun).toHaveBeenCalledWith('match3d-profile-auto-1');
+  expect(match3dServerRuntimeAdapterMock.startRun).toHaveBeenCalledWith(
+    'match3d-profile-auto-1',
+  );
   expect(
     await screen.findByTestId('match3d-runtime-generated-model-count'),
   ).toHaveProperty('textContent', '1');
@@ -3874,14 +3896,14 @@ test('home recommendation Match3D runtime keeps profile generated models when ca
   vi.mocked(getMatch3DWorkDetail).mockResolvedValue({
     item: match3dDetail,
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(match3dCard.profileId),
   });
 
   render(<TestWrapper withAuth />);
 
   await waitFor(() => {
-    expect(startMatch3DRun).toHaveBeenCalledWith(
+    expect(match3dServerRuntimeAdapterMock.startRun).toHaveBeenCalledWith(
       'match3d-profile-card-1',
       ISOLATED_RUNTIME_AUTH_OPTIONS,
     );
@@ -3951,7 +3973,7 @@ test('home recommendation Match3D runtime refetches detail when stale card only
   vi.mocked(getMatch3DWorkDetail).mockResolvedValue({
     item: match3dDetail,
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(match3dCard.profileId),
   });
 
@@ -5076,7 +5098,7 @@ test('public code search opens a published Match3D work by M3 code and starts ru
   vi.mocked(getMatch3DWorkDetail).mockResolvedValue({
     item: match3dWork,
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(match3dWork.profileId),
   });
 
@@ -5093,7 +5115,10 @@ test('public code search opens a published Match3D work by M3 code and starts ru
   await user.click(screen.getByRole('button', { name: '启动' }));
 
   await waitFor(() => {
-    expect(startMatch3DRun).toHaveBeenCalledWith('match3d-profile-public-1');
+    expect(match3dServerRuntimeAdapterMock.startRun).toHaveBeenCalledWith(
+      'match3d-profile-public-1',
+      {},
+    );
   });
   expect(
     await screen.findByText(
@@ -5147,7 +5172,7 @@ test('published Match3D runtime receives persisted generated models', async () =
   vi.mocked(listMatch3DGallery).mockResolvedValue({
     items: [match3dWork],
   });
-  vi.mocked(startMatch3DRun).mockResolvedValue({
+  match3dServerRuntimeAdapterMock.startRun.mockResolvedValue({
     run: buildMockMatch3DRun(match3dWork.profileId),
   });
 
@@ -5161,6 +5186,12 @@ test('published Match3D runtime receives persisted generated models', async () =
 
   await user.click(await screen.findByRole('button', { name: '启动' }));
 
+  await waitFor(() => {
+    expect(match3dServerRuntimeAdapterMock.startRun).toHaveBeenCalledWith(
+      'match3d-profile-model-1',
+      {},
+    );
+  });
   expect(
     await screen.findByTestId('match3d-runtime-generated-model-count'),
   ).toHaveProperty('textContent', '1');