launch-unity 0.6.2 → 0.7.0

package/dist/launch.js

@@ -25,12 +25,17 @@ function parseArgs(argv) {
     const unityArgs = doubleDashIndex >= 0 ? args.slice(doubleDashIndex + 1) : [];
     const positionals = [];
     let maxDepth = 3; // default 3; -1 means unlimited
+    let restart = false;
     for (let i = 0; i < cliArgs.length; i++) {
         const arg = cliArgs[i] ?? "";
         if (arg === "--help" || arg === "-h") {
             printHelp();
             process.exit(0);
         }
+        if (arg === "-r" || arg === "--restart") {
+            restart = true;
+            continue;
+        }
         if (arg.startsWith("--max-depth")) {
             const parts = arg.split("=");
             if (parts.length === 2) {
@@ -79,7 +84,7 @@ function parseArgs(argv) {
         projectPath = resolve(positionals[0] ?? "");
         platform = String(positionals[1] ?? "");
     }
-    const options = { unityArgs, searchMaxDepth: maxDepth };
+    const options = { unityArgs, searchMaxDepth: maxDepth, restart };
     if (projectPath !== undefined) {
         options.projectPath = projectPath;
     }
@@ -104,6 +109,7 @@ Forwarding:
 
 Flags:
   -h, --help          Show this help message
+  -r, --restart       Kill running Unity and restart
   --max-depth <N>     Search depth when PROJECT_PATH is omitted (default 3, -1 unlimited)
 `;
     process.stdout.write(help);
@@ -386,6 +392,51 @@ async function handleStaleLockfile(projectPath) {
         console.warn(`Failed to delete UnityLockfile: ${message}`);
     }
 }
+const KILL_POLL_INTERVAL_MS = 100;
+const KILL_TIMEOUT_MS = 10000;
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function killProcess(pid) {
+    try {
+        process.kill(pid, "SIGKILL");
+    }
+    catch {
+        // Process already exited
+    }
+}
+async function waitForProcessExit(pid) {
+    const start = Date.now();
+    while (Date.now() - start < KILL_TIMEOUT_MS) {
+        if (!isProcessAlive(pid)) {
+            return true;
+        }
+        await new Promise((resolve) => setTimeout(resolve, KILL_POLL_INTERVAL_MS));
+    }
+    return false;
+}
+async function killRunningUnity(projectPath) {
+    const processInfo = await findRunningUnityProcess(projectPath);
+    if (!processInfo) {
+        console.log("No running Unity process found for this project.");
+        return;
+    }
+    const pid = processInfo.pid;
+    console.log(`Killing Unity (PID: ${pid})...`);
+    killProcess(pid);
+    const exited = await waitForProcessExit(pid);
+    if (!exited) {
+        console.error(`Error: Failed to kill Unity (PID: ${pid}) within ${KILL_TIMEOUT_MS / 1000}s.`);
+        process.exit(1);
+    }
+    console.log("Unity killed.");
+}
 function hasBuildTargetArg(unityArgs) {
     for (const arg of unityArgs) {
         if (arg === "-buildTarget") {
@@ -526,12 +577,17 @@ async function main() {
         resolvedProjectPath = found;
     }
     ensureProjectPath(resolvedProjectPath);
-    const runningProcess = await findRunningUnityProcess(resolvedProjectPath);
-    if (runningProcess) {
-        console.log(`Unity process already running for project: ${resolvedProjectPath} (PID: ${runningProcess.pid})`);
-        await focusUnityProcess(runningProcess.pid);
-        process.exit(0);
-        return;
+    if (options.restart) {
+        await killRunningUnity(resolvedProjectPath);
+    }
+    else {
+        const runningProcess = await findRunningUnityProcess(resolvedProjectPath);
+        if (runningProcess) {
+            console.log(`Unity process already running for project: ${resolvedProjectPath} (PID: ${runningProcess.pid})`);
+            await focusUnityProcess(runningProcess.pid);
+            process.exit(0);
+            return;
+        }
     }
     await handleStaleLockfile(resolvedProjectPath);
     const resolved = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "launch-unity",
-  "version": "0.6.2",
+  "version": "0.7.0",
   "description": "Open a Unity project with the matching Editor version (macOS/Windows)",
   "type": "module",
   "main": "dist/launch.js",