#155 AppのUseCaseを修正(負荷箇所の軽減)

Author: ienaga

README.md

@@ -56,7 +56,7 @@ src/
 │   │   └── DefaultLoader.ts
 │   ├── service/            # Domain services
 │   │   ├── LoadingService.ts
-│   │   ├── ScreenCaptureService.ts
+│   │   ├── ScreenOverlayService.ts
 │   │   └── ViewBinderService.ts
 │   └── variable/           # Domain state
 ├── infrastructure/         # Infrastructure Layer
@@ -234,14 +234,19 @@ graph TD
     
     GotoView --> LoadingCheck{use loading?<br/>Default: true}
     
-    LoadingCheck -->|YES| LoadingStart[Start Loading]
-    LoadingCheck -->|NO| OnExit
-    LoadingStart --> OnExit
+    LoadingCheck -->|YES| ScreenOverlay[Screen Overlay]
+    LoadingCheck -->|NO| RemoveResponse
+    ScreenOverlay --> LoadingStart[Start Loading]
+    LoadingStart --> RemoveResponse
     
-    OnExit[Previous View: onExit] --> RemoveViewFromStage[Remove Previous View from Stage]
-    RemoveViewFromStage --> RemoveResponse[Remove Previous Response Data]
+    RemoveResponse[Remove Previous Response Data] --> ParseQuery[Parse Query String]
+    ParseQuery --> UpdateHistory{SPA mode?}
     
-    RemoveResponse --> RequestType[Request Type]
+    UpdateHistory -->|YES| PushState[Push History State]
+    UpdateHistory -->|NO| RequestType
+    PushState --> RequestType
+    
+    RequestType[Request Type]
     
     RequestType --> JSON[JSON: Get external JSON data]
     RequestType --> CONTENT[CONTENT: Get Animation Tool JSON]
@@ -260,23 +265,31 @@ graph TD
     Cached -->|YES| RegisterResponse
     GlobalData --> RegisterResponse
     
-    RegisterResponse[Register Response Data] --> ViewModelInit[ViewModel: initialize]
+    RegisterResponse[Register Response Data] --> RequestCallback{request callback?}
+    
+    RequestCallback -->|YES| ExecRequestCallback[Execute Request Callback]
+    RequestCallback -->|NO| UnbindView
+    ExecRequestCallback --> UnbindView
+    
+    UnbindView[Previous View: onExit & Unbind] --> BindView[New View/ViewModel: Bind]
+    BindView --> ViewModelInit[ViewModel: initialize]
     
     ViewModelInit --> ViewInit[View: initialize]
     ViewInit --> AddToStage[Add View to Stage]
-    AddToStage --> OnEnter[View: onEnter]
+    AddToStage --> GotoViewCallback{gotoView callback?}
     
-    OnEnter --> CallbackCheck{use callback?<br/>Default: empty}
-    
-    CallbackCheck -->|YES| CallbackStart[Start Callback]
-    CallbackCheck -->|NO| LoadingEndCheck
-    CallbackStart --> LoadingEndCheck
+    GotoViewCallback -->|YES| ExecGotoViewCallback[Execute gotoView Callback]
+    GotoViewCallback -->|NO| LoadingEndCheck
+    ExecGotoViewCallback --> LoadingEndCheck
     
     LoadingEndCheck{use loading?<br/>Default: true}
     
     LoadingEndCheck -->|YES| LoadingEnd[End Loading]
-    LoadingEndCheck -->|NO| StartDrawing
-    LoadingEnd --> StartDrawing
+    LoadingEndCheck -->|NO| OnEnter
+    LoadingEnd --> DisposeOverlay[Dispose Screen Overlay]
+    DisposeOverlay --> OnEnter
+    
+    OnEnter[View: onEnter] --> StartDrawing
     
     StartDrawing[Start Drawing] -->|Response| User
     

src/application/usecase/ApplicationGotoViewUseCase.test.ts

@@ -6,8 +6,8 @@ import { $setConfig } from "../variable/Config";
 import { $setContext } from "../variable/Context";
 import { response } from "../../infrastructure/variable/Response";
 
-vi.mock("../../domain/service/ScreenCaptureService", () => ({
-    ScreenCaptureService: {
+vi.mock("../../domain/service/ScreenOverlayService", () => ({
+    ScreenOverlayService: {
         add: vi.fn().mockResolvedValue(undefined),
         dispose: vi.fn()
     }
@@ -40,7 +40,9 @@ vi.mock("./ExecuteCallbackUseCase", () => ({
 
 vi.mock("../../domain/service/ViewBinderService", () => ({
     ViewBinderService: {
-        bind: vi.fn().mockResolvedValue(null),
+        bind: vi.fn().mockResolvedValue({
+            onEnter: vi.fn().mockResolvedValue(undefined)
+        }),
         unbind: vi.fn().mockResolvedValue(undefined)
     }
 }));
@@ -156,7 +158,7 @@ describe("ApplicationGotoViewUseCase Test", () =>
         const { execute: queryStringParserService } = await import("../service/QueryStringParserService");
         const { execute: requestUseCase } = await import("../../infrastructure/usecase/RequestUseCase");
         const { LoadingService } = await import("../../domain/service/LoadingService");
-        const { ScreenCaptureService } = await import("../../domain/service/ScreenCaptureService");
+        const { ScreenOverlayService } = await import("../../domain/service/ScreenOverlayService");
 
         $setConfig({
             platform: "web",
@@ -179,10 +181,10 @@ describe("ApplicationGotoViewUseCase Test", () =>
 
         await execute(mockApplication, "home");
 
-        expect(ScreenCaptureService.add).toHaveBeenCalled();
+        expect(ScreenOverlayService.add).toHaveBeenCalled();
         expect(LoadingService.start).toHaveBeenCalled();
         expect(LoadingService.end).toHaveBeenCalled();
-        expect(ScreenCaptureService.dispose).toHaveBeenCalled();
+        expect(ScreenOverlayService.dispose).toHaveBeenCalled();
     });
 
     it("execute test case5: response with callback should execute callback", async () =>
@@ -234,7 +236,7 @@ describe("ApplicationGotoViewUseCase Test", () =>
         });
         vi.mocked(requestUseCase).mockResolvedValue([]);
 
-        const mockView = { name: "MockView" };
+        const mockView = { name: "MockView", onEnter: vi.fn().mockResolvedValue(undefined) };
         vi.mocked(ViewBinderService.bind).mockResolvedValue(mockView as any);
 
         await execute(mockApplication, "withCallback");

src/application/usecase/ApplicationGotoViewUseCase.ts

@@ -11,7 +11,7 @@ import { execute as executeCallbackUseCase } from "./ExecuteCallbackUseCase";
 import { execute as responseRemoveVariableUseCase } from "../../infrastructure/usecase/ResponseRemoveVariableUseCase";
 import { ViewBinderService } from "../../domain/service/ViewBinderService";
 import { LoadingService } from "../../domain/service/LoadingService";
-import { ScreenCaptureService } from "../../domain/service/ScreenCaptureService";
+import { ScreenOverlayService } from "../../domain/service/ScreenOverlayService";
 
 /**
  * @description 指定されたパス、もしくはURLのクラスを起動
@@ -36,7 +36,7 @@ export const execute = async (
          * 現時点の描画をキャプチャーして表示
          * Capture and display the current drawing
          */
-        await ScreenCaptureService.add();
+        await ScreenOverlayService.add();
 
         /**
          * ローディング表示を起動
@@ -45,13 +45,6 @@ export const execute = async (
         await LoadingService.start();
     }
 
-    /**
-     * 現在の画面のViewとViewModelをunbind
-     * Unbind the View and ViewModel of the current screen
-     */
-    const context = $getContext();
-    await ViewBinderService.unbind(context);
-
     /**
      * 前の画面で取得したレスポンスデータを初期化
      * Initialize the response data obtained on the previous screen
@@ -89,6 +82,7 @@ export const execute = async (
      * Execute request processing set by routing.json
      */
     const responses = await requestUseCase(application.currentName);
+    // await new Promise((resolve) => setTimeout(resolve, 3000));
 
     /**
      * レスポンス情報をマップに登録し、コールバックを実行
@@ -110,6 +104,27 @@ export const execute = async (
         }
     }
 
+    /**
+     * 現在の画面のViewとViewModelをunbind
+     * Unbind the View and ViewModel of the current screen
+     */
+    const context = $getContext();
+    await ViewBinderService.unbind(context);
+
+    /**
+     * ViewとViewModelを起動
+     * Start View and ViewModel
+     */
+    const view = await ViewBinderService.bind(context, application.currentName);
+
+    /**
+     * コールバック設定があれば実行
+     * Execute callback settings if any.
+     */
+    if (view && config.gotoView) {
+        await executeCallbackUseCase(config.gotoView.callback, view);
+    }
+
     if (hasLoading) {
         /**
          * ローディング表示を終了
@@ -121,20 +136,12 @@ export const execute = async (
          * 前の画面のキャプチャーを終了
          * End previous screen capture
          */
-        ScreenCaptureService.dispose();
+        ScreenOverlayService.dispose();
     }
 
     /**
-     * ViewとViewModelを起動
-     * Start View and ViewModel
+     * 画面表示時の処理を実行
+     * Execute processing when the screen is displayed
      */
-    const view = await ViewBinderService.bind(context, application.currentName);
-
-    /**
-     * コールバック設定があれば実行
-     * Execute callback settings if any.
-     */
-    if (view && config.gotoView) {
-        await executeCallbackUseCase(config.gotoView.callback, view);
-    }
+    await view.onEnter();
 };