launch-unity 0.6.1 → 0.7.0

package/README.ja.md

@@ -18,7 +18,7 @@ npx launch-unity
 ## 使用例
 ```bash
 # NPX（推奨 / インストール不要）
-npx launch-unity                    # カレントディレクトリを開く（ビルドターゲット未指定時はプロジェクトの現在のビルドターゲットを使用）
+npx launch-unity                    # カレントディレクトリから3階層下までUnityプロジェクトを探索して開く
 npx launch-unity /path/to/Proj      # プロジェクトを指定
 npx launch-unity /path Android      # ビルドターゲットを指定
 npx -y launch-unity                 # npx の「Ok to proceed?」確認をスキップ
@@ -31,11 +31,6 @@ npx launch-unity /path Android -- -executeMethod My.Build.Entry
 launch-unity
 launch-unity /path/to/MyUnityProject Android
 launch-unity . -- -buildTarget iOS -projectPath . # 上書きも可能
-
-# プロジェクトを開いている Unity を終了
-quit-unity                 # カレントディレクトリのプロジェクトの Unity を終了
-quit-unity /path/to/Proj   # 指定プロジェクトの Unity を終了
-quit-unity . --timeout 20000 --force
 ```
 
 指定した Unity プロジェクトの `ProjectSettings/ProjectVersion.txt` から必要な Unity Editor のバージョンを読み取り、
@@ -61,17 +56,6 @@ Unity Hub でインストール済みの該当バージョンを起動する mac
 - macOS / Windows: Unity Hub のデフォルトインストールパスを前提にサポート。
 - Linux: 未対応です。対応 PR を歓迎します。
 
-## quit-unity 使い方（詳細）
-```bash
-# 基本構文
-quit-unity [PROJECT_PATH] [--timeout <ms>] [--force]
-
-# フラグ
-# -t, --timeout <ms>  正常終了を待つ時間（既定: 15000ms）
-# -f, --force         タイムアウト後に強制終了
-# -h, --help          ヘルプ
-```
-
 ## セキュリティ
 
 このプロジェクトはサプライチェーン攻撃対策を実施しています：

package/README.md

@@ -18,7 +18,7 @@ npx launch-unity
 ## Usage Examples
 ```bash
 # NPX (recommended, zero install)
-npx launch-unity                   # Open the current directory (if PLATFORM is omitted, uses the project's current build target)
+npx launch-unity                   # Search up to 3 levels deep for a Unity project and open it
 npx launch-unity /path/to/Proj     # Open a specific project
 npx launch-unity /path Android     # Specify build target
 npx -y launch-unity                # Skip npx "Ok to proceed?" prompt
@@ -31,11 +31,6 @@ npx launch-unity /path Android -- -executeMethod My.Build.Entry
 launch-unity
 launch-unity /path/to/MyUnityProject Android
 launch-unity . -- -buildTarget iOS -projectPath . # You can override
-
-# Quit the Unity instance holding a project open
-quit-unity                 # Quit Unity for current directory project
-quit-unity /path/to/Proj   # Quit Unity for a specific project
-quit-unity . --timeout 20000 --force
 ```
 
 A TypeScript CLI for macOS and Windows that reads the required Unity Editor version from
@@ -63,14 +58,6 @@ launch-unity [PROJECT_PATH] [PLATFORM]
 
 # Flags
 # -h, --help  Show help
-
-# Quit syntax
-quit-unity [PROJECT_PATH] [--timeout <ms>] [--force]
-
-# Flags (quit-unity)
-# -t, --timeout <ms>  Time to wait for graceful quit (default: 15000)
-# -f, --force         Force kill if not exited within timeout
-# -h, --help          Show help
 ```
 
 

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,12 +1,11 @@
 {
   "name": "launch-unity",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Open a Unity project with the matching Editor version (macOS/Windows)",
   "type": "module",
   "main": "dist/launch.js",
   "bin": {
-    "launch-unity": "dist/launch.js",
-    "quit-unity": "dist/quit.js"
+    "launch-unity": "dist/launch.js"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/dist/quit.js

@@ -1,186 +0,0 @@
-#!/usr/bin/env node
-/*
-  quit-unity: Quit the Unity Editor instance that has the specified project open.
-  Platforms: macOS, Windows
-*/
-import { existsSync, readFileSync } from "node:fs";
-import { rm } from "node:fs/promises";
-import { join, resolve } from "node:path";
-const TEMP_DIRECTORY_NAME = "Temp";
-function parseArgs(argv) {
-    const defaultProjectPath = process.cwd();
-    const defaultTimeoutMs = 15000;
-    const defaultForce = false;
-    const args = argv.slice(2);
-    let projectPath = defaultProjectPath;
-    let timeoutMs = defaultTimeoutMs;
-    let force = defaultForce;
-    for (let i = 0; i < args.length; i++) {
-        const arg = args[i] ?? "";
-        if (arg === "--help" || arg === "-h") {
-            printHelp();
-            process.exit(0);
-        }
-        if (arg === "--force" || arg === "-f") {
-            force = true;
-            continue;
-        }
-        if (arg === "--timeout" || arg === "-t") {
-            const value = args[i + 1];
-            if (!value || value.startsWith("-")) {
-                console.error("Error: --timeout requires a millisecond value");
-                process.exit(1);
-            }
-            const parsedValue = Number(value);
-            const parsed = parsedValue;
-            if (!Number.isFinite(parsed) || parsed < 0) {
-                console.error("Error: --timeout must be a non-negative number (milliseconds)");
-                process.exit(1);
-            }
-            timeoutMs = parsed;
-            i++;
-            continue;
-        }
-        if (arg.startsWith("-")) {
-            // Unknown flags are ignored to keep CLI permissive
-            continue;
-        }
-        // First positional = project path
-        projectPath = resolve(arg);
-    }
-    return { projectPath, timeoutMs, force };
-}
-function printHelp() {
-    const help = `
-Usage: quit-unity [PROJECT_PATH] [--timeout <ms>] [--force]
-
-Quit the Unity Editor instance that has PROJECT_PATH open.
-
-Arguments:
-  PROJECT_PATH        Optional. Defaults to current directory
-
-Flags:
-  -t, --timeout <ms>  Time to wait for graceful quit (default: 15000)
-  -f, --force         Force kill if not exited within timeout
-  -h, --help          Show this help message
-`;
-    process.stdout.write(help);
-}
-function ensureProjectPath(projectPath) {
-    if (!existsSync(projectPath)) {
-        console.error(`Error: Project directory not found: ${projectPath}`);
-        process.exit(1);
-    }
-}
-function readPidFromEditorInstance(projectPath) {
-    const editorInstancePath = join(projectPath, "Library", "EditorInstance.json");
-    if (!existsSync(editorInstancePath))
-        return null;
-    try {
-        const content = readFileSync(editorInstancePath, "utf8");
-        const data = JSON.parse(content);
-        const candidateKeys = [
-            "process_id",
-            "processId",
-            "processID",
-            "pid",
-            "PID",
-        ];
-        for (const key of candidateKeys) {
-            const value = data[key];
-            if (typeof value === "number" && Number.isFinite(value))
-                return value;
-            if (typeof value === "string" && /^\d+$/.test(value))
-                return Number(value);
-        }
-    }
-    catch {
-        // fallthrough
-    }
-    return null;
-}
-function isProcessAlive(pid) {
-    try {
-        // signal 0: does not actually send a signal, just tests for existence/permissions
-        process.kill(pid, 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-async function waitForExit(pid, timeoutMs) {
-    const start = Date.now();
-    const stepIntervalMs = 200;
-    const stepMs = stepIntervalMs;
-    while (Date.now() - start < timeoutMs) {
-        if (!isProcessAlive(pid))
-            return true;
-        await new Promise((r) => setTimeout(r, stepMs));
-    }
-    return !isProcessAlive(pid);
-}
-async function quitByPid(pid, force, timeoutMs) {
-    // Try graceful first
-    try {
-        process.kill(pid, "SIGTERM");
-    }
-    catch {
-        // If process already exited, consider it success
-        if (!isProcessAlive(pid))
-            return true;
-        // If we cannot send the signal and the process is alive, escalate when force is true
-        if (!force)
-            return false;
-    }
-    const graceful = await waitForExit(pid, timeoutMs);
-    if (graceful)
-        return true;
-    if (!force)
-        return false;
-    // Force kill
-    try {
-        process.kill(pid, "SIGKILL");
-    }
-    catch {
-        // ignore
-    }
-    // Give a short moment after force
-    return await waitForExit(pid, 2000);
-}
-async function removeTempDirectory(projectPath) {
-    const tempDirectoryPath = join(projectPath, TEMP_DIRECTORY_NAME);
-    if (!existsSync(tempDirectoryPath))
-        return;
-    try {
-        await rm(tempDirectoryPath, { recursive: true, force: true });
-        console.log(`Deleted Temp directory: ${tempDirectoryPath}`);
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.warn(`Failed to delete Temp directory: ${message}`);
-    }
-}
-async function main() {
-    const options = parseArgs(process.argv);
-    ensureProjectPath(options.projectPath);
-    const pid = readPidFromEditorInstance(options.projectPath);
-    if (pid === null) {
-        console.error("Error: Could not find Unity PID. Is this project currently open in Unity? (Missing Library/EditorInstance.json)");
-        process.exit(1);
-        return;
-    }
-    console.log(`Attempting to quit Unity (pid: ${pid}) for project: ${options.projectPath}`);
-    const ok = await quitByPid(pid, options.force, options.timeoutMs);
-    if (!ok) {
-        console.error(`Failed to quit Unity (pid: ${pid}) within ${options.timeoutMs}ms.${options.force ? "" : " Try --force."}`);
-        process.exit(1);
-        return;
-    }
-    console.log("Unity has exited.");
-    await removeTempDirectory(options.projectPath);
-}
-main().catch((error) => {
-    console.error(error);
-    process.exit(1);
-});