FIX: node-tree-killのエラー処理のミスを修正

VOICEVOX · May 8, 2024 · 6b66b28 · 6b66b28
1 parent 6801519
commit 6b66b28
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/backend/electron/manager/engineManager.ts b/src/backend/electron/manager/engineManager.ts
@@ -420,10 +420,13 @@ export class EngineManager {
       return undefined;
     }
 
+    const enginePid = engineProcess.pid;
+    if (enginePid == undefined) {
+      log.error(`ENGINE ${engineId}: Pid is ${enginePid}`);
+      return undefined;
+    }
     return new Promise<void>((resolve, reject) => {
-      log.info(
-        `ENGINE ${engineId}: Killing process (PID=${engineProcess.pid})`,
-      );
+      log.info(`ENGINE ${engineId}: Killing process (PID=${enginePid})`);
 
       // エラーダイアログを抑制
       engineProcessContainer.willQuitEngine = true;
@@ -434,12 +437,12 @@ export class EngineManager {
         resolve();
       });
 
-      try {
-        engineProcess.pid != undefined && treeKill(engineProcess.pid);
-      } catch (error: unknown) {
-        log.error(`ENGINE ${engineId}: Error during killing process`);
-        reject(error);
-      }
+      treeKill(enginePid, (error) => {
+        if (error != undefined) {
+          log.error(`ENGINE ${engineId}: Error during killing process`);
+          reject(error);
+        }
+      });
     });
   }