Merge remote-tracking branch 'upstream/main' into pr/takusea/2276-3

takusea · Oct 12, 2024 · 1a64b3a · 1a64b3a
2 parents 689c85b + 755d84b
commit 1a64b3a
Show file tree

Hide file tree

Showing 58 changed files with 499 additions and 518 deletions.
diff --git a/docs/res/起動シーケンス図.md b/docs/res/起動シーケンス図.md
@@ -25,7 +25,7 @@ flowchart
       870482["store.get registeredEngineDirs"] --> 250263
       222321 --> 967432["engine.runEngineAll"]
       656570["engine.fetchEngineInfos"] --> 870482
-      110954["engine.initializeEngineInfosAndAltPortInfo"] --> 656570
+      110954["engine.initializeAltPortInfo"] --> 656570
       967432 --> 302398["runtimeInfo.setEngineInfos"]
       302398 --> 321984
       subgraph 656570["engine.fetchEngineInfos"]

diff --git a/openapi.json b/openapi.json
diff --git a/src/backend/browser/contract.ts b/src/backend/browser/contract.ts
@@ -1,12 +1,19 @@
-import { EngineInfo, envEngineInfoSchema } from "@/type/preload";
+import { type EngineInfo, envEngineInfoSchema } from "@/type/preload";
 
 const baseEngineInfo = envEngineInfoSchema
   .array()
   .parse(JSON.parse(import.meta.env.VITE_DEFAULT_ENGINE_INFOS))[0];
 
-export const defaultEngine: EngineInfo = {
-  ...baseEngineInfo,
-  type: "path", // FIXME: ダミーで"path"にしているので、エンジンAPIのURLを設定できるようにし、type: "URL"にする
-  isDefault: true,
-};
+export const defaultEngine: EngineInfo = (() => {
+  const { protocol, hostname, port, pathname } = new URL(baseEngineInfo.host);
+  return {
+    ...baseEngineInfo,
+    protocol,
+    hostname,
+    defaultPort: port,
+    pathname: pathname === "/" ? "" : pathname,
+    type: "path", // FIXME: ダミーで"path"にしているので、エンジンAPIのURLを設定できるようにし、type: "URL"にする
+    isDefault: true,
+  };
+})();
 export const directoryHandleStoreKey = "directoryHandle";
diff --git a/src/backend/electron/engineAndVvppController.ts b/src/backend/electron/engineAndVvppController.ts
@@ -132,8 +132,8 @@ export class EngineAndVvppController {
 
   // エンジンの準備と起動
   async launchEngines() {
-    // エンジンの追加と削除を反映させるためEngineInfoとAltPortInfosを再生成する。
-    this.engineInfoManager.initializeEngineInfosAndAltPortInfo();
+    // AltPortInfosを再生成する。
+    this.engineInfoManager.initializeAltPortInfo();
 
     // TODO: デフォルトエンジンの処理をConfigManagerに移してブラウザ版と共通化する
     const engineInfos = this.engineInfoManager.fetchEngineInfos();
@@ -147,7 +147,10 @@ export class EngineAndVvppController {
     this.configManager.set("engineSettings", engineSettings);
 
     await this.engineProcessManager.runEngineAll();
-    this.runtimeInfoManager.setEngineInfos(engineInfos);
+    this.runtimeInfoManager.setEngineInfos(
+      engineInfos,
+      this.engineInfoManager.altPortInfos,
+    );
     await this.runtimeInfoManager.exportFile();
   }
 
@@ -162,6 +165,7 @@ export class EngineAndVvppController {
     // TODO: setからexportの処理は排他処理にしたほうがより良い
     this.runtimeInfoManager.setEngineInfos(
       this.engineInfoManager.fetchEngineInfos(),
+      this.engineInfoManager.altPortInfos,
     );
     await this.runtimeInfoManager.exportFile();
   }

diff --git a/src/backend/electron/manager/RuntimeInfoManager.ts b/src/backend/electron/manager/RuntimeInfoManager.ts
@@ -6,14 +6,15 @@
 import fs from "fs";
 import AsyncLock from "async-lock";
 import log from "electron-log/main";
+import type { AltPortInfos } from "@/store/type";
 import { EngineId, EngineInfo } from "@/type/preload";
 
 /**
  * ランタイム情報書き出しに必要なEngineInfo
  */
 export type EngineInfoForRuntimeInfo = Pick<
   EngineInfo,
-  "uuid" | "host" | "name"
+  "uuid" | "protocol" | "hostname" | "defaultPort" | "pathname" | "name"
 >;
 
 /**
@@ -58,12 +59,17 @@ export class RuntimeInfoManager {
    * エンジン情報（書き出し用に記憶）
    */
   private engineInfos: EngineInfoForRuntimeInfo[] = [];
+  private altportInfos: AltPortInfos = {};
 
   /**
    * エンジン情報を登録する
    */
-  public setEngineInfos(engineInfos: EngineInfoForRuntimeInfo[]) {
+  public setEngineInfos(
+    engineInfos: EngineInfoForRuntimeInfo[],
+    altportInfos: AltPortInfos,
+  ) {
     this.engineInfos = engineInfos;
+    this.altportInfos = altportInfos;
   }
 
   /**
@@ -76,9 +82,16 @@ export class RuntimeInfoManager {
         formatVersion: this.fileFormatVersion,
         appVersion: this.appVersion,
         engineInfos: this.engineInfos.map((engineInfo) => {
+          const altPort: string | undefined =
+            this.altportInfos[engineInfo.uuid];
+          const port = altPort ?? engineInfo.defaultPort;
+          // NOTE: URLを正規化する
+          const url = new URL(`${engineInfo.protocol}//${engineInfo.hostname}`);
+          url.port = port;
           return {
             uuid: engineInfo.uuid,
-            url: engineInfo.host, // NOTE: 元のEngineInfo.hostにURLが入っている
+            // NOTE: URLインターフェースは"pathname"が空文字でも"/"を付けるので手動で結合する。
+            url: `${url.origin}${engineInfo.pathname}`,
             name: engineInfo.name,
           };
         }),

diff --git a/src/backend/electron/manager/engineInfoManager.ts b/src/backend/electron/manager/engineInfoManager.ts
@@ -18,9 +18,9 @@ import { AltPortInfos } from "@/store/type";
 import { BaseConfigManager } from "@/backend/common/ConfigManager";
 
 /**
- * デフォルトエンジンの情報を作成する
+ * デフォルトエンジンの情報を取得する
  */
-function createDefaultEngineInfos(defaultEngineDir: string): EngineInfo[] {
+function fetchDefaultEngineInfos(defaultEngineDir: string): EngineInfo[] {
   // TODO: envから直接ではなく、envに書いたengine_manifest.jsonから情報を得るようにする
   const defaultEngineInfosEnv =
     import.meta.env.VITE_DEFAULT_ENGINE_INFOS ?? "[]";
@@ -29,8 +29,13 @@ function createDefaultEngineInfos(defaultEngineDir: string): EngineInfo[] {
   const engines = envSchema.parse(JSON.parse(defaultEngineInfosEnv));
 
   return engines.map((engineInfo) => {
+    const { protocol, hostname, port, pathname } = new URL(engineInfo.host);
     return {
       ...engineInfo,
+      protocol,
+      hostname,
+      defaultPort: port,
+      pathname: pathname === "/" ? "" : pathname,
       isDefault: true,
       type: "path",
       executionFilePath: path.resolve(engineInfo.executionFilePath),
@@ -48,9 +53,6 @@ export class EngineInfoManager {
   defaultEngineDir: string;
   vvppEngineDir: string;
 
-  defaultEngineInfos: EngineInfo[] = [];
-  additionalEngineInfos: EngineInfo[] = [];
-
   /** 代替ポート情報 */
   public altPortInfos: AltPortInfos = {};
 
@@ -65,10 +67,10 @@ export class EngineInfoManager {
   }
 
   /**
-   * 追加エンジンの一覧を作成する。
+   * 追加エンジンの一覧を取得する。
    * FIXME: store.get("registeredEngineDirs")への副作用をEngineManager外に移動する
    */
-  private createAdditionalEngineInfos(): EngineInfo[] {
+  private fetchAdditionalEngineInfos(): EngineInfo[] {
     const engines: EngineInfo[] = [];
     const addEngine = (engineDir: string, type: "vvpp" | "path") => {
       const manifestPath = path.join(engineDir, "engine_manifest.json");
@@ -88,7 +90,10 @@ export class EngineInfoManager {
 
       engines.push({
         uuid: manifest.uuid,
-        host: `http://127.0.0.1:${manifest.port}`,
+        protocol: "http:",
+        hostname: "127.0.0.1",
+        defaultPort: manifest.port.toString(),
+        pathname: "",
         name: manifest.name,
         path: engineDir,
         executionEnabled: true,
@@ -139,7 +144,11 @@ export class EngineInfoManager {
    * 全てのエンジンの一覧を取得する。デフォルトエンジン＋追加エンジン。
    */
   fetchEngineInfos(): EngineInfo[] {
-    return [...this.defaultEngineInfos, ...this.additionalEngineInfos];
+    const engineInfos = [
+      ...fetchDefaultEngineInfos(this.defaultEngineDir),
+      ...this.fetchAdditionalEngineInfos(),
+    ];
+    return engineInfos;
   }
 
   /**
@@ -170,11 +179,9 @@ export class EngineInfoManager {
   }
 
   /**
-   * EngineInfosとAltPortInfoを初期化する。
+   * AltPortInfoを初期化する。
    */
-  initializeEngineInfosAndAltPortInfo() {
-    this.defaultEngineInfos = createDefaultEngineInfos(this.defaultEngineDir);
-    this.additionalEngineInfos = this.createAdditionalEngineInfos();
+  initializeAltPortInfo() {
     this.altPortInfos = {};
   }
 
@@ -183,15 +190,7 @@ export class EngineInfoManager {
    * エンジン起動時にポートが競合して代替ポートを使う場合に使用する。
    */
   updateAltPort(engineId: EngineId, port: number) {
-    const engineInfo = this.fetchEngineInfo(engineId);
-    const url = new URL(engineInfo.host);
-    this.altPortInfos[engineId] = {
-      from: Number(url.port),
-      to: port,
-    };
-
-    url.port = port.toString();
-    engineInfo.host = url.toString();
+    this.altPortInfos[engineId] = port.toString();
   }
 
   /**

diff --git a/src/backend/electron/manager/engineProcessManager.ts b/src/backend/electron/manager/engineProcessManager.ts
@@ -9,8 +9,8 @@ import {
   findAltPort,
   getPidFromPort,
   getProcessNameFromPid,
+  type HostInfo,
   isAssignablePort,
-  url2HostInfo,
 } from "../portHelper";
 
 import { EngineInfo, EngineId, EngineSettings } from "@/type/preload";
@@ -86,41 +86,40 @@ export class EngineProcessManager {
     }
 
     // { hostname (localhost), port (50021) } <- url (http://localhost:50021)
-    const engineHostInfo = url2HostInfo(new URL(engineInfo.host));
-
+    const engineHostInfo: HostInfo = {
+      protocol: engineInfo.protocol,
+      hostname: engineInfo.hostname,
+      port: Number(engineInfo.defaultPort),
+    };
+
+    // ポートが塞がっていれば代替ポートを探す
+    let port = engineHostInfo.port;
     log.info(
-      `ENGINE ${engineId}: Checking whether port ${engineHostInfo.port} is assignable...`,
+      `ENGINE ${engineId}: Checking whether port ${port} is assignable...`,
     );
 
-    if (
-      !(await isAssignablePort(engineHostInfo.port, engineHostInfo.hostname))
-    ) {
+    if (!(await isAssignablePort(port, engineHostInfo.hostname))) {
       // ポートを既に割り当てているプロセスidの取得
       const pid = await getPidFromPort(engineHostInfo);
       if (pid != undefined) {
         const processName = await getProcessNameFromPid(engineHostInfo, pid);
         log.warn(
-          `ENGINE ${engineId}: Port ${engineHostInfo.port} has already been assigned by ${processName} (pid=${pid})`,
+          `ENGINE ${engineId}: Port ${port} has already been assigned by ${processName} (pid=${pid})`,
         );
       } else {
         // ポートは使用不可能だがプロセスidは見つからなかった
-        log.warn(
-          `ENGINE ${engineId}: Port ${engineHostInfo.port} was unavailable`,
-        );
+        log.warn(`ENGINE ${engineId}: Port ${port} was unavailable`);
       }
 
       // 代替ポートの検索
-      const altPort = await findAltPort(
-        engineHostInfo.port,
-        engineHostInfo.hostname,
-      );
+      const altPort = await findAltPort(port, engineHostInfo.hostname);
 
       // 代替ポートが見つからないとき
       if (altPort == undefined) {
         log.error(`ENGINE ${engineId}: No Alternative Port Found`);
         dialog.showErrorBox(
           `${engineInfo.name} の起動に失敗しました`,
-          `${engineHostInfo.port}番ポートの代わりに利用可能なポートが見つかりませんでした。PCを再起動してください。`,
+          `${port}番ポートの代わりに利用可能なポートが見つかりませんでした。PCを再起動してください。`,
         );
         app.exit(1);
         throw new Error("No Alternative Port Found");
@@ -129,8 +128,10 @@ export class EngineProcessManager {
       // 代替ポート情報を更新
       this.engineAltPortUpdater(engineId, altPort);
       log.warn(
-        `ENGINE ${engineId}: Applied Alternative Port: ${engineHostInfo.port} -> ${altPort}`,
+        `ENGINE ${engineId}: Applied Alternative Port: ${port} -> ${altPort}`,
       );
+
+      port = altPort;
     }
 
     log.info(`ENGINE ${engineId}: Starting process`);
@@ -155,9 +156,9 @@ export class EngineProcessManager {
     const enginePath = engineInfo.executionFilePath;
     const args = engineInfo.executionArgs.concat(useGpu ? ["--use_gpu"] : [], [
       "--host",
-      new URL(engineInfo.host).hostname,
+      engineHostInfo.hostname,
       "--port",
-      new URL(engineInfo.host).port,
+      port.toString(),
     ]);
 
     log.info(`ENGINE ${engineId} path: ${enginePath}`);

diff --git a/src/backend/electron/portHelper.ts b/src/backend/electron/portHelper.ts
@@ -17,14 +17,6 @@ const portWarn = (port: number, message: string, isNested = false) => {
   log.warn(`${isNested ? "| " : ""}PORT ${port}: ${message}`);
 };
 
-export function url2HostInfo(url: URL): HostInfo {
-  return {
-    protocol: url.protocol,
-    hostname: url.hostname,
-    port: Number(url.port),
-  };
-}
-
 /**
  * "netstat -ano" の stdout から, 指定したポートを LISTENING しているプロセスの id を取得します.
  *

diff --git a/src/components/Dialog/EngineManageDialog.vue b/src/components/Dialog/EngineManageDialog.vue
@@ -383,6 +383,7 @@ const getFeatureName = (name: keyof SupportedFeatures) => {
       adjustPitchScale: "全体の音高の調整",
       adjustIntonationScale: "全体の抑揚の調整",
       adjustVolumeScale: "全体の音量の調整",
+      adjustPauseLength: "句読点などの無音時間の調整",
       interrogativeUpspeak: "疑問文の自動調整",
       synthesisMorphing: "2種類のスタイルでモーフィングした音声を合成",
       sing: "歌唱音声合成",

diff --git a/src/components/Dialog/ImportSongProjectDialog.vue b/src/components/Dialog/ImportSongProjectDialog.vue
@@ -40,17 +40,10 @@
           >
             <QItemSection avatar>
               <QCheckbox
-                v-if="multiTrackEnabled"
                 v-model="selectedTrackIndexes"
                 :val="track.value"
                 :disable="track.disable"
               />
-              <QRadio
-                v-else
-                v-model="selectedTrackIndex"
-                :val="track.value"
-                :disable="track.disable"
-              />
             </QItemSection>
             <QItemSection>
               <QItemLabel>
@@ -117,10 +110,6 @@ const { dialogRef, onDialogOK, onDialogCancel } = useDialogPluginComponent();
 const store = useStore();
 const log = createLogger("ImportExternalProjectDialog");
 
-const multiTrackEnabled = computed(
-  () => store.state.experimentalSetting.enableMultiTrack,
-);
-
 // 受け入れる拡張子
 const acceptExtensions = computed(
   () => supportedExtensions.map((ext) => `.${ext}`).join(",") + ",.vvproj",
@@ -243,23 +232,6 @@ const trackOptions = computed(() => {
 });
 // 選択中のトラック
 const selectedTrackIndexes = ref<number[] | null>(null);
-const selectedTrackIndex = computed<number | null>({
-  get: () => {
-    if (selectedTrackIndexes.value == null) {
-      return null;
-    }
-    if (selectedTrackIndexes.value.length === 0) {
-      return null;
-    }
-    return selectedTrackIndexes.value[0];
-  },
-  set: (index: number | null) => {
-    if (index == null) {
-      throw new Error("assert: index != null");
-    }
-    selectedTrackIndexes.value = [index];
-  },
-});
 
 // データ初期化
 const initializeValues = () => {