cleanup stray scheduler processes

Author: gwleuverink

resources/js/electron-plugin/src/index.ts

@@ -7,6 +7,7 @@ import {
   retrieveNativePHPConfig,
   retrievePhpIniSettings,
   runScheduler,
+  killScheduler,
   startAPI,
   startPhpApp,
 } from "./server/index.js";
@@ -22,8 +23,8 @@ const { autoUpdater } = electronUpdater;
 
 class NativePHP {
   processes = [];
-  schedulerInterval = undefined;
   mainWindow = null;
+  schedulerInterval = undefined;
 
   public bootstrap(
     app: CrossProcessExports.App,
@@ -244,12 +245,13 @@ class NativePHP {
   }
 
 
-    private stopScheduler() {
-        if (this.schedulerInterval) {
-            clearInterval(this.schedulerInterval);
-            this.schedulerInterval = null;
-        }
-    }
+  private stopScheduler() {
+      if (this.schedulerInterval) {
+          clearInterval(this.schedulerInterval);
+          this.schedulerInterval = null;
+      }
+      killScheduler();
+  }
 
   private startScheduler() {
     const now = new Date();
@@ -270,6 +272,8 @@ class NativePHP {
   }
 
   private killChildProcesses() {
+    this.stopScheduler();
+
     this.processes
       .filter((p) => p !== undefined)
       .forEach((process) => {

resources/js/electron-plugin/src/server/index.ts

@@ -7,6 +7,9 @@ import {
 } from "./php.js";
 import { appendCookie } from "./utils.js";
 import state from "./state.js";
+import { ChildProcess } from "child_process";
+
+let schedulerProcess: ChildProcess | null = null;
 
 export async function startPhpApp() {
   const result = await serveApp(
@@ -23,7 +26,15 @@ export async function startPhpApp() {
 }
 
 export function runScheduler() {
-  startScheduler(state.randomSecret, state.electronApiPort, state.phpIni);
+  killScheduler();
+  schedulerProcess = startScheduler(state.randomSecret, state.electronApiPort, state.phpIni);
+}
+
+export function killScheduler() {
+  if (schedulerProcess && !schedulerProcess.killed) {
+    schedulerProcess.kill();
+    schedulerProcess = null;
+  }
 }
 
 export function startAPI(): Promise<APIProcess> {