Merge upstream/main into refactor/extract-initialize-engine-settings

コンフリクト解消:
- updateEngineSettingメソッドは削除（PR #2765でインライン化済み）
- initializeEngineSettingsメソッドは追加（本PRの変更）

Author: Hiroshiba

.github/workflows/build.yml

@@ -124,7 +124,7 @@ jobs:
             app_asar_dir: prepackage/VOICEVOX.app/Contents/Resources
             installer_artifact_name: macos-cpu-x64-dmg
             macos_artifact_name: "VOICEVOX.${version}-x64.${ext}"
-            os: macos-13
+            os: macos-15-intel
           # macOS CPU (arm64)
           - artifact_name: macos-cpu-arm64-prepackage
             artifact_path: dist_electron/mac-arm64
@@ -454,8 +454,10 @@ jobs:
           for appImageFile in *.AppImage; do
             echo "Splitting ${appImageFile}"
 
-            # compressed to MyArtifact.AppImage.7z.001, MyArtifact.AppImage.7z.002, ...
-            7z -v1g a "${{ matrix.linux_appimage_7z_name }}.7z" "${appImageFile}"
+            # Split to MyArtifact.AppImage.7z.001, MyArtifact.AppImage.7z.002, ...
+            # Use compression level 0 since AppImage is already compressed
+            # .7z is needed for installer_linux.sh yet
+            7z -mx=0 -v1g a "${{ matrix.linux_appimage_7z_name }}.7z" "${appImageFile}"
 
             # Output split archive name<TAB>size<TAB>hash list to myartifact.7z.txt
             ls "${{ matrix.linux_appimage_7z_name }}.7z".* > archives_name.txt

.npmrc

@@ -1,4 +1,3 @@
+@jsr:registry=https://npm.jsr.io
 engine-strict=true
 save-exact=true
-@jsr:registry=https://npm.jsr.io
-manage-package-manager-versions=true

.pnpmfile.cjs

@@ -0,0 +1,19 @@
+function readPackage(pkg, context) {
+  // NOTE: @storybook/vue3はvue-component-type-helpersのlatestを要求しており、minimumReleaseAgeと相性が悪いので、ここで置き換える。
+  if (pkg.name === "@storybook/vue3") {
+    const deps = pkg.dependencies;
+    if (deps["vue-component-type-helpers"] === "latest") {
+      deps["vue-component-type-helpers"] = "~3.0.0";
+      context.log(
+        "vue-component-type-helpers@latest => vue-component-type-helpers@~3.0.0 in dependencies of @storybook/vue3",
+      );
+    }
+  }
+  return pkg;
+}
+
+module.exports = {
+  hooks: {
+    readPackage,
+  },
+};

package.json

@@ -11,7 +11,7 @@
   "volta": {
     "node": "22.14.0"
   },
-  "packageManager": "pnpm@10.12.4",
+  "packageManager": "pnpm@10.17.1",
   "scripts": {
     "// --- lint ---": "",
     "lint": "cross-env ESLINT_FILE_PROGRESS=1 eslint --cache",
@@ -93,7 +93,7 @@
     "@openapitools/openapi-generator-cli": "2.20.5",
     "@playwright/test": "1.53.1",
     "@quasar/vite-plugin": "1.9.0",
-    "@storybook/addon-docs": "^9.0.11",
+    "@storybook/addon-docs": "9.0.13",
     "@storybook/addon-links": "9.0.13",
     "@storybook/addon-themes": "9.0.13",
     "@storybook/addon-vitest": "9.0.13",
@@ -111,7 +111,7 @@
     "@vitest/browser": "3.2.4",
     "@vitest/eslint-plugin": "1.2.7",
     "@vitest/ui": "3.2.4",
-    "@voicevox/eslint-plugin": "file:./eslint-plugin",
+    "@voicevox/eslint-plugin": "file:eslint-plugin",
     "@vue/eslint-config-prettier": "10.2.0",
     "@vue/eslint-config-typescript": "14.5.1",
     "@vue/test-utils": "2.4.6",

pnpm-lock.yaml

@@ -0,0 +1,2 @@
+managePackageManagerVersions: true
+minimumReleaseAge: 10080

pnpm-workspace.yaml

@@ -10,12 +10,7 @@ import { getEngineProcessManager } from "./manager/engineProcessManager";
 import { getRuntimeInfoManager } from "./manager/RuntimeInfoManager";
 import { getVvppManager } from "./manager/vvppManager";
 import { getWindowManager } from "./manager/windowManager";
-import {
-  EngineId,
-  EngineInfo,
-  engineSettingSchema,
-  EngineSettingType,
-} from "@/type/preload";
+import { EngineId, EngineInfo, engineSettingSchema } from "@/type/preload";
 import {
   PackageInfo,
   fetchLatestDefaultEngineInfo,
@@ -337,13 +332,6 @@ export class EngineAndVvppController {
     }
   }
 
-  /** エンジンの設定を更新し、保存する */
-  updateEngineSetting(engineId: EngineId, engineSetting: EngineSettingType) {
-    const engineSettings = this.configManager.get("engineSettings");
-    engineSettings[engineId] = engineSetting;
-    this.configManager.set(`engineSettings`, engineSettings);
-  }
-
   /** 各エンジンの設定を初期化する */
   private initializeEngineSettings() {
     // TODO: デフォルトエンジンの処理をConfigManagerに移してブラウザ版と共通化する

src/backend/electron/engineAndVvppController.ts

@@ -304,7 +304,9 @@ export function getIpcMainHandle(params: {
     },
 
     SET_ENGINE_SETTING: async (_, engineId, engineSetting) => {
-      engineAndVvppController.updateEngineSetting(engineId, engineSetting);
+      const engineSettings = configManager.get("engineSettings");
+      engineSettings[engineId] = engineSetting;
+      configManager.set("engineSettings", engineSettings);
     },
 
     SET_NATIVE_THEME: (_, source) => {

src/backend/electron/ipcMainHandle.ts

@@ -4,7 +4,7 @@ import path from "node:path";
 
 import fs from "node:fs";
 import { pathToFileURL } from "node:url";
-import { app, dialog, Menu, net, protocol, shell } from "electron";
+import { app, dialog, Menu, net, protocol, session, shell } from "electron";
 import installExtension, { VUEJS_DEVTOOLS } from "electron-devtools-installer";
 
 import electronLog from "electron-log/main";
@@ -22,6 +22,7 @@ import { registerIpcMainHandle, ipcMainSendProxy, IpcMainHandle } from "./ipc";
 import { getConfigManager } from "./electronConfig";
 import { getEngineAndVvppController } from "./engineAndVvppController";
 import { getIpcMainHandle } from "./ipcMainHandle";
+import { assertNonNullable } from "@/type/utility";
 import { EngineInfo } from "@/type/preload";
 import { isMac, isProduction } from "@/helpers/platform";
 import { createLogger } from "@/helpers/log";
@@ -163,6 +164,28 @@ void app.whenReady().then(() => {
   });
 });
 
+// 信頼できるオリジン（開発サーバーまたは app プロトコル）からのセッション権限リクエストのみ許可し、それ以外は拒否
+void app.whenReady().then(() => {
+  session.defaultSession.setPermissionRequestHandler(
+    (webContents, permission, callback, { requestingUrl }) => {
+      const parsedUrl = new URL(webContents.getURL());
+      const parsedRequestingUrl = new URL(requestingUrl);
+      let isAllowedResource: boolean;
+      if (isDevelopment) {
+        assertNonNullable(import.meta.env.VITE_DEV_SERVER_URL);
+        const { origin } = new URL(import.meta.env.VITE_DEV_SERVER_URL);
+        isAllowedResource =
+          parsedUrl.origin === origin && parsedRequestingUrl.origin === origin;
+      } else {
+        isAllowedResource =
+          parsedUrl.protocol === "app:" &&
+          parsedRequestingUrl.protocol === "app:";
+      }
+      return callback(isAllowedResource);
+    },
+  );
+});
+
 // engine
 const vvppEngineDir = path.join(app.getPath("userData"), "vvpp-engines");
 

src/backend/electron/main.ts

@@ -20,7 +20,7 @@ import { createLogger } from "@/helpers/log";
 const log = createLogger("EngineProcessManager");
 
 type EngineProcessContainer = {
-  willQuitEngine: boolean;
+  isGracefulShutdown: boolean;
   engineProcess?: ChildProcess;
 };
 
@@ -135,12 +135,12 @@ export class EngineProcessManager {
 
     if (!(engineId in this.engineProcessContainers)) {
       this.engineProcessContainers[engineId] = {
-        willQuitEngine: false,
+        isGracefulShutdown: false,
       };
     }
 
     const engineProcessContainer = this.engineProcessContainers[engineId];
-    engineProcessContainer.willQuitEngine = false;
+    engineProcessContainer.isGracefulShutdown = false;
 
     const engineSetting = this.configManager.get("engineSettings")[engineId];
     if (engineSetting == undefined)
@@ -193,7 +193,7 @@ export class EngineProcessManager {
       );
       log.info(`ENGINE ${engineId}: Process exited with code ${code}`);
 
-      if (!engineProcessContainer.willQuitEngine) {
+      if (!engineProcessContainer.isGracefulShutdown) {
         const errorMessage =
           engineInfos.length === 1
             ? "音声合成エンジンが異常終了しました。エンジンを再起動してください。"
@@ -275,7 +275,7 @@ export class EngineProcessManager {
       log.info(`ENGINE ${engineId}: Killing process (PID=${enginePid})`);
 
       // エラーダイアログを抑制
-      engineProcessContainer.willQuitEngine = true;
+      engineProcessContainer.isGracefulShutdown = true;
 
       // プロセス終了時のイベントハンドラ
       engineProcess.once("close", () => {
@@ -322,7 +322,7 @@ export class EngineProcessManager {
       }
 
       // エンジンエラー時のエラーウィンドウ抑制用。
-      engineProcessContainer.willQuitEngine = true;
+      engineProcessContainer.isGracefulShutdown = true;
 
       // 「killに使用するコマンドが終了するタイミング」と「OSがプロセスをkillするタイミング」が違うので単純にtreeKillのコールバック関数でrunEngine()を実行すると失敗します。
       // closeイベントはexitイベントよりも後に発火します。