unity-cli@v1.1.2 (#18)

- try to fix hanging on windows during editor execution

Author: StephenHodgson

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
           registry-url: "https://registry.npmjs.org"
       - run: |
           npm i

.github/workflows/unity-build.yml

@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.x
+          node-version: 24.x
       - name: setup unity-cli
         shell: bash
         run: |

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@rage-against-the-pixel/unity-cli",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A command line utility for the Unity Game Engine.",
   "author": "RageAgainstThePixel",
   "license": "MIT",
@@ -48,22 +48,21 @@
     "tests": "jest --roots tests"
   },
   "dependencies": {
-    "@electron/asar": "4.0.1",
-    "@rage-against-the-pixel/unity-releases-api": "1.0.3",
-    "commander": "14.0.1",
+    "@electron/asar": "^4.0.1",
+    "@rage-against-the-pixel/unity-releases-api": "^1.0.3",
+    "commander": "^14.0.1",
     "glob": "11.0.3",
-    "semver": "7.7.2",
-    "source-map-support": "0.5.21",
-    "yaml": "2.8.1"
+    "semver": "^7.7.2",
+    "source-map-support": "^0.5.21",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/commander": "2.12.5",
-    "@types/jest": "30.0.0",
-    "@types/node": "24.6.2",
-    "@types/semver": "7.7.1",
-    "jest": "30.2.0",
-    "ts-jest": "29.4.4",
-    "ts-node": "10.9.2",
-    "typescript": "5.9.3"
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.6.2",
+    "@types/semver": "^7.7.1",
+    "jest": "^30.2.0",
+    "ts-jest": "^29.4.4",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
   }
-}
+}

package.json

@@ -211,29 +211,24 @@ export class UnityEditor {
             process.once('SIGTERM', onCancel);
             procInfo = { pid: unityProcess.pid, ppid: process.pid, name: this.editorPath };
             this.logger.debug(`Unity process started with pid: ${procInfo.pid}`);
-            const timeout = 10000; // 10 seconds
-            await WaitForFileToBeCreatedAndReadable(logPath, timeout);
+            await WaitForFileToBeCreatedAndReadable(logPath, 10_000);
             logTail = TailLogFile(logPath);
             exitCode = await new Promise((resolve, reject) => {
                 unityProcess.on('close', (code) => {
-                    setTimeout(() => {
-                        logTail?.stopLogTail();
-                        resolve(code === null ? 1 : code);
-                    }, timeout);
+                    logTail?.stopLogTail();
+                    resolve(code === null ? 1 : code);
                 });
                 unityProcess.on('error', (error) => {
-                    setTimeout(() => {
-                        logTail?.stopLogTail();
-                        reject(error);
-                    }, timeout);
+                    logTail?.stopLogTail();
+                    reject(error);
                 });
             });
             // Wait for log tailing to finish writing remaining content
             if (logTail && logTail.tailPromise) {
                 try {
                     await logTail.tailPromise;
                 } catch (error) {
-                    this.logger.error(`Error occurred while tailing log file: ${error}`);
+                    this.logger.error(`Error occurred while tailing log: ${error}`);
                 }
             }
         } finally {

src/unity-editor.ts

@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import * as yaml from 'yaml';
+import * as asar from '@electron/asar';
 import { spawn } from 'child_process';
 import { Logger, LogLevel } from './logging';
 import { UnityEditor } from './unity-editor';
@@ -94,7 +95,8 @@ export class UnityHub {
             'You have to request `id` or `_id` fields for all selection sets or create a custom `keys` config for `UnityReleaseLabel`.',
             'Entities without keys will be embedded directly on the parent entity. If this is intentional, create a `keys` config for `UnityReleaseLabel` that always returns null.',
             'https://bit.ly/2XbVrpR#15',
-            'Interaction is not allowed with the Security Server." (-25308)'
+            'Interaction is not allowed with the Security Server." (-25308)',
+            'Network service crashed, restarting service.',
         ];
 
         try {
@@ -245,6 +247,7 @@ export class UnityHub {
                         throw new Error(`Failed to execute Unity Hub: [${exitCode}] ${errorMessage}`);
                 }
             }
+
             output = output.split('\n')
                 .filter(line => line.trim().length > 0)
                 .filter(line => !ignoredLines.some(ignored => line.includes(ignored)))
@@ -426,7 +429,6 @@ chmod -R 777 "$hubPath"`]);
         }
 
         await fs.promises.access(asarPath, fs.constants.R_OK);
-        const asar = await import('@electron/asar');
         const fileBuffer = asar.extractFile(asarPath, 'package.json');
         const packageJson = JSON.parse(fileBuffer.toString());
         const version = coerce(packageJson.version);
@@ -517,7 +519,7 @@ chmod -R 777 "$hubPath"`]);
         if (!resolvedVersion.isLegacy()) {
             try {
                 if (!resolvedVersion.isFullyQualified()) {
-                    const releases = await this.getLatestHubReleases();
+                    const releases = await this.ListAvailableReleases();
                     resolvedVersion = resolvedVersion.findMatch(releases);
                 }
 
@@ -609,7 +611,7 @@ chmod -R 777 "$hubPath"`]);
     public async ListInstalledEditors(): Promise<string[]> {
         const output = await this.Exec(['editors', '-i']);
         return output.split('\n')
-            .filter(line => line.trim().length > 0)
+            .filter(line => /installed at/.test(line))
             .map(line => line.trim());
     }
 
@@ -619,8 +621,9 @@ chmod -R 777 "$hubPath"`]);
      */
     public async ListAvailableReleases(): Promise<string[]> {
         const output = await this.Exec(['editors', '--releases']);
+        // filter out version lines only 2021.3.45f2 (may include installed path following version)
         return output.split('\n')
-            .filter(line => line.trim().length > 0)
+            .filter(line => /^\d{1,4}\.\d+\.\d+[abcfpx]?\d*/.test(line.trim()))
             .map(line => line.trim());
     }
 
@@ -722,25 +725,6 @@ chmod -R 777 "$hubPath"`]);
         return editorPath;
     }
 
-    private async getLatestHubReleases(): Promise<string[]> {
-        // Normalize output to bare version strings (e.g., 2022.3.62f1)
-        // Unity Hub can return lines like:
-        //  - "6000.0.56f1 (Apple silicon)"
-        //  - "2022.3.62f1 installed at C:\\..."
-        //  - "2022.3.62f1, installed at ..." (older format)
-        // We extract the first version token and discard the rest.
-        const versionRegex = /(\d{1,4})\.(\d+)\.(\d+)([abcfpx])(\d+)/;
-        return (await this.Exec([`editors`, `--releases`]))
-            .split('\n')
-            .map(line => line.trim())
-            .filter(line => line.length > 0)
-            .map(line => {
-                const match = line.match(versionRegex);
-                return match ? match[0] : '';
-            })
-            .filter(v => v.length > 0);
-    }
-
     /**
      * Patches the Bee Backend for Unity Linux Editor.
      * https://discussions.unity.com/t/linux-editor-stuck-on-loading-because-of-bee-backend-w-workaround/854480
@@ -782,9 +766,9 @@ done
         if (fullUnityVersionPattern.test(unityVersion.version)) {
             version = unityVersion.version;
         } else {
-            const mm = unityVersion.version.match(/^(\d{1,4})(?:\.(\d+))?/);
-            if (mm) {
-                version = mm[2] ? `${mm[1]}.${mm[2]}` : mm[1]!;
+            const match = unityVersion.version.match(/^(\d{1,4})(?:\.(\d+))?/);
+            if (match) {
+                version = match[2] ? `${match[1]}.${match[2]}` : match[1]!;
             } else {
                 version = unityVersion.version.split('.')[0]!;
             }

src/unity-hub.ts

@@ -144,19 +144,25 @@ export async function Exec(command: string, args: string[], options: ExecOptions
             child.on('close', (code) => {
                 removeListeners();
 
-                // Flush any remaining buffered content
-                if (lineBuffer.length > 0) {
-                    const lines = lineBuffer.split('\n') // split by newline
-                        .map(line => line.replace(/\r$/, '')) // remove trailing carriage return
-                        .filter(line => line.length > 0); // filter out empty lines
-
-                    for (const line of lines) {
-                        output += `${line}\n`;
-
-                        if (!isSilent) {
-                            process.stdout.write(`${line}\n`);
+                try {
+                    // Flush any remaining buffered content
+                    if (lineBuffer.length > 0) {
+                        const lines = lineBuffer.split('\n') // split by newline
+                            .map(line => line.replace(/\r$/, '')) // remove trailing carriage return
+                            .filter(line => line.length > 0); // filter out empty lines
+
+                        for (const line of lines) {
+                            output += `${line}\n`;
+
+                            if (!isSilent) {
+                                process.stdout.write(`${line}\n`);
+                            }
                         }
                     }
+                } catch (error: any) {
+                    if (error.code !== 'EPIPE') {
+                        logger.error(`Error while flushing output: ${error}`);
+                    }
                 }
 
                 resolve(code === null ? 0 : code);
@@ -524,8 +530,7 @@ export async function KillProcess(procInfo: ProcInfo, signal: NodeJS.Signals = '
 
         try {
             if (process.platform === 'win32') {
-                const command = `taskkill /PID ${procInfo.pid} /F /T`;
-                await Exec('powershell', ['-Command', command], { silent: true, showCommand: false });
+                await Exec('taskkill', ['/PID', procInfo.pid.toString(), '/F', '/T'], { silent: true, showCommand: false });
             } else { // linux and macos
                 process.kill(procInfo.pid, 'SIGKILL');
             }
@@ -552,7 +557,7 @@ export async function KillChildProcesses(procInfo: ProcInfo): Promise<void> {
     try {
         if (process.platform === 'win32') {
             const command = `Get-CimInstance Win32_Process -Filter "ParentProcessId=${procInfo.pid}" | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }`;
-            await Exec('powershell', ['-Command', command], { silent: true, showCommand: true });
+            await Exec('powershell', ['-Command', command], { silent: true, showCommand: false });
         } else { // linux and macos
             const psOutput = await Exec('ps', ['-eo', 'pid,ppid,comm'], { silent: true, showCommand: false });
             const lines = psOutput.split('\n').slice(1); // Skip header line