@jixoai/gh-runner 0.2.5 → 0.2.7

package/dist/main.mjs

@@ -1,16 +1,16 @@
 #!/usr/bin/env node
 import { mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
+import { dirname, isAbsolute, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { createTray } from "opentray";
 import { attachDialog } from "@opentray/ext-dialog";
 import { attachOpener } from "@opentray/ext-opener";
 import { arch, homedir, platform } from "node:os";
-import { dirname, isAbsolute, join } from "node:path";
 import { createWriteStream, existsSync, readFileSync } from "node:fs";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import { fileURLToPath } from "node:url";
 import { WebviewExt } from "@opentray/ext-webview";
 // src/platform.ts
 const IS_WIN = platform() === "win32";
@@ -1273,7 +1273,7 @@ var TrayProjection = class {
 	}
 };
 // src/version.ts
-const APP_VERSION = "0.2.5";
+const APP_VERSION = "0.2.7";
 // src/window.ts
 const DRAIN_INTERVAL_MS = 150;
 const PUSH_DEBOUNCE_MS = 120;
@@ -1300,6 +1300,8 @@ var UiHost = class {
 	#pushInFlight = false;
 	#pushPending = false;
 	#visible = true;
+	/** 隐藏期间 isVisible 慢轮询的分频计数（150ms 滴答 ×7 ≈ 1s）。 */
+	#tick = 0;
 	constructor(fleet, webviewTray, onOpenDiag, pickPackageFile, pickRunnerDir, openExternal) {
 		this.fleet = fleet;
 		this.webviewTray = webviewTray;
@@ -1309,9 +1311,13 @@ var UiHost = class {
 		this.openExternal = openExternal;
 	}
 	async open() {
-		if (this.#window) {
+		if (this.#window) try {
 			await this.#window.show();
 			await this.#window.focus();
+		} catch {
+			this.#window = null;
+		}
+		if (this.#window) {
 			this.#visible = true;
 			this.#logOffsets.clear();
 			this.#doPush();
@@ -1341,15 +1347,20 @@ var UiHost = class {
 		await win.show();
 		await win.setMinimumSize(720, 520);
 		win.listen("visibleChange", (event) => {
-			const visible = event.payload.visible ?? true;
-			this.#visible = visible;
+			const visible = event.payload.visible;
+			this.#visible = typeof visible === "boolean" ? visible : true;
 			if (visible) {
 				this.#logOffsets.clear();
 				this.#doPush();
 			}
 		});
-		this.#drainTimer = setInterval(() => void this.#drain(), DRAIN_INTERVAL_MS);
-		this.#drainTimer.unref?.();
+		win.listen("closed", () => {
+			this.#visible = false;
+		});
+		if (!this.#drainTimer) {
+			this.#drainTimer = setInterval(() => void this.#drain(), DRAIN_INTERVAL_MS);
+			this.#drainTimer.unref?.();
+		}
 		this.#flush();
 	}
 	push(snapshot) {
@@ -1391,7 +1402,13 @@ var UiHost = class {
 	async #doPush() {
 		const win = this.#window;
 		const snap = this.#lastSnapshot;
-		if (!win || !snap || win.connectionDead || !this.#visible) return;
+		if (!win || !snap || win.connectionDead) return;
+		if (this.#visible) try {
+			this.#visible = await win.isVisible();
+		} catch {
+			this.#visible = false;
+		}
+		if (!this.#visible) return;
 		if (this.#pushInFlight) {
 			this.#pushPending = true;
 			return;
@@ -1413,7 +1430,10 @@ var UiHost = class {
 				download: snap.download
 			};
 			await this.#evaluate(JSON.stringify(summary));
-			for (const inst of snap.instances) await this.#pushLogDelta(win, inst.id);
+			for (const inst of snap.instances) {
+				if (!this.#visible) return;
+				await this.#pushLogDelta(win, inst.id);
+			}
 		} finally {
 			this.#pushInFlight = false;
 			if (this.#pushPending && this.#window) {
@@ -1448,6 +1468,7 @@ var UiHost = class {
 		if (cur.length > 0) chunks.push(cur);
 		let offset = total - allLines.length;
 		for (const lines of chunks) {
+			if (!this.#visible) return;
 			const msg = {
 				kind: "log",
 				seq: ++this.#seq,
@@ -1477,6 +1498,18 @@ var UiHost = class {
 	async #drain() {
 		const win = this.#window;
 		if (!win || win.connectionDead) return;
+		if (!this.#visible) {
+			if (++this.#tick % 7 !== 0) return;
+			try {
+				if (!await win.isVisible()) return;
+			} catch {
+				return;
+			}
+			this.#visible = true;
+			this.#logOffsets.clear();
+			this.#doPush();
+			return;
+		}
 		let messages;
 		try {
 			messages = await win.drainIpcMessages();
@@ -1560,6 +1593,7 @@ function extendWebview(tray) {
 }
 // src/main.ts
 const APP_ID = "com.jixoai.gh-runner";
+const packageRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
 /** 导入本地分发包：系统文件选择框（ext-dialog；darwin NSOpenPanel / win32 对话框）。 */
 async function pickPackageFile(tray) {
 	try {
@@ -1710,7 +1744,8 @@ async function main() {
 	}, {
 		appId: APP_ID,
 		appName: "GH Runner",
-		appIcon: appIcon()
+		appIcon: appIcon(),
+		packageRoot
 	});
 	const projection = new TrayProjection(tray, {
 		openWindow: () => void uiHost.open(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jixoai/gh-runner",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "Menu-bar (tray) manager for multiple GitHub Actions self-hosted runners: discover, register from downloaded/imported packages, start/stop, and live job-result analysis. macOS & Windows.",
   "type": "module",
   "license": "MIT",