registerFileProtocolの離脱 (#1441)

package.json

@@ -93,7 +93,7 @@
  "@vue/test-utils": "2.3.0",
  "cross-env": "7.0.3",
  "cross-var": "1.1.0",
- "electron": "23.3.10",
+ "electron": "25.3.2",
  "electron-builder": "24.0.0-alpha.12",
  "electron-devtools-installer": "3.2.0",
  "eslint": "8.24.0",

src/background.ts

@@ -11,6 +11,7 @@ import {
  Menu,
  shell,
  nativeTheme,
+ net,
 } from "electron";
 import installExtension, { VUEJS_DEVTOOLS } from "electron-devtools-installer";
 import Store, { Schema } from "electron-store";
@@ -128,17 +129,10 @@ if (isDevelopment) {
  __static = __dirname;
 }
 
-// ソフトウェア起動時はプロトコルを app にする
 protocol.registerSchemesAsPrivileged([
  { scheme: "app", privileges: { secure: true, standard: true, stream: true } },
 ]);
-if (process.env.VITE_DEV_SERVER_URL == undefined) {
- // FIXME: registerFileProtocolが非推奨になったので対策を考える
- protocol.registerFileProtocol("app", (request, callback) => {
- const filePath = new URL(request.url).pathname;
- callback(path.join(__dirname, filePath));
- });
-}
+
 const firstUrl = process.env.VITE_DEV_SERVER_URL ?? "app://./index.html";
 
 // 設定ファイル
@@ -495,6 +489,14 @@ async function createWindow() {
  }
  }
 
+ // ソフトウェア起動時はプロトコルを app にする
+ if (process.env.VITE_DEV_SERVER_URL == undefined) {
+ protocol.handle("app", (request) => {
+ const filePath = new URL(request.url).pathname;
+ return net.fetch(`file://${filePath}`);
+ });
+ }
+
  await loadUrl({ projectFilePath });
 
  if (isDevelopment && !isTest) win.webContents.openDevTools();

src/background/engineManager.ts

@@ -495,6 +495,8 @@ export class EngineManager {
 
  if (engineProcess === undefined)
  throw Error("engineProcess === undefined");
+ if (engineProcess.pid === undefined)
+ throw Error("engineProcess.pid === undefined");
 
  engineProcess.once("close", restartEngineOnProcessClosedCallback);