@jixoai/gh-runner 0.2.0 → 0.2.2

package/dist/main.mjs

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import { arch, homedir, platform } from "node:os";
 import { mkdir, open, readFile, readdir, realpath, rename, rm, stat, writeFile } from "node:fs/promises";
-import { execFile, spawn } from "node:child_process";
 import { createTray } from "opentray";
 import { attachDialog } from "@opentray/ext-dialog";
+import { attachOpener } from "@opentray/ext-opener";
 import { dirname, isAbsolute, join } from "node:path";
 import { createWriteStream, existsSync } 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";
@@ -223,21 +224,6 @@ function defaultSearchDirs() {
 	if (IS_WIN) return ["C:\\actions-runner", homedir()];
 	return [homedir()];
 }
-/** 在系统文件管理器中揭示目录/文件。 */
-function revealInFileManager(path) {
-	if (PLATFORM === "darwin") return {
-		file: "open",
-		args: ["-R", path]
-	};
-	if (IS_WIN) return {
-		file: "explorer",
-		args: [`/select,${path}`]
-	};
-	return {
-		file: "xdg-open",
-		args: [path]
-	};
-}
 /** 平台路径分段（win32 反斜杠）。 */
 function basenameOf(dir) {
 	const parts = dir.split(/[\\/]+/).filter(Boolean);
@@ -461,14 +447,23 @@ async function stopProcessGroup(pid, graceMs = 8e3) {
 // src/config.ts
 const DEFAULT_SEARCH_DIRS = defaultSearchDirs();
 function configDir() {
+	if (process.platform === "win32") {
+		const appData = process.env.APPDATA ?? join(homedir(), "AppData", "Roaming");
+		return join(appData, "gh-runner");
+	}
 	return join(homedir(), "Library", "Application Support", "gh-runner");
 }
 function configPath() {
 	return join(configDir(), "config.json");
 }
-/** 形状校验：损坏的实例项直接丢弃（手编配置/撕裂写的容错），不让 boot 崩掉。 */
+/** 形状校验：损坏的实例项直接丢弃（手编配置/撕裂写的容错），不让 boot 崩掉。
+*  路径合法性平台无关（POSIX 绝对 / win32 盘符 / UNC 均可）——config 是本机产物，
+*  但 Windows 盘符路径曾被 startsWith("/") 全量误杀并回写空清单（v0.2.2 实证事故）。 */
+function isAbsoluteish(p) {
+	return p.startsWith("/") || /^[A-Za-z]:[\\/]/.test(p) || p.startsWith("\\\\");
+}
 function validInstance(item) {
-	return typeof item === "object" && item !== null && typeof item.dir === "string" && item.dir.startsWith("/") && typeof item.id === "string";
+	return typeof item === "object" && item !== null && typeof item.dir === "string" && isAbsoluteish(item.dir) && typeof item.id === "string";
 }
 async function loadConfig() {
 	try {
@@ -1226,6 +1221,7 @@ var UiHost = class {
 	webviewTray;
 	onOpenDiag;
 	pickPackageFile;
+	openExternal;
 	#window = null;
 	#lastSnapshot = null;
 	#ackedSeq = 0;
@@ -1237,11 +1233,12 @@ var UiHost = class {
 	/** 单飞守卫：hello 全量重推与去抖推送并发交错会让同一批日志行重复送达页面。 */
 	#pushInFlight = false;
 	#pushPending = false;
-	constructor(fleet, webviewTray, onOpenDiag, pickPackageFile) {
+	constructor(fleet, webviewTray, onOpenDiag, pickPackageFile, openExternal) {
 		this.fleet = fleet;
 		this.webviewTray = webviewTray;
 		this.onOpenDiag = onOpenDiag;
 		this.pickPackageFile = pickPackageFile;
+		this.openExternal = openExternal;
 	}
 	async open() {
 		if (this.#window) {
@@ -1431,6 +1428,13 @@ var UiHost = class {
 			case "open-diag":
 				this.onOpenDiag(cmd.id);
 				break;
+			case "open-url":
+				try {
+					await this.openExternal(cmd.url);
+				} catch (err) {
+					console.error("[gh-runner] 打开链接失败:", err);
+				}
+				break;
 			case "register":
 				await this.fleet.register({
 					dir: cmd.dir,
@@ -1459,12 +1463,6 @@ function extendWebview(tray) {
 }
 // src/main.ts
 const APP_ID = "com.jixoai.gh-runner";
-async function revealPath(path) {
-	const { file, args } = revealInFileManager(path);
-	await new Promise((resolve) => {
-		execFile(file, args, () => resolve());
-	});
-}
 /** 导入本地分发包：系统文件选择框（ext-dialog；darwin NSOpenPanel / win32 对话框）。 */
 async function pickPackageFile(tray) {
 	try {
@@ -1624,10 +1622,12 @@ async function main() {
 		},
 		quit: () => void shutdown()
 	});
-	const uiHost = new UiHost(fleet, extendWebview(tray), (id) => {
+	const webviewTray = extendWebview(tray);
+	const opener = attachOpener(tray);
+	const uiHost = new UiHost(fleet, webviewTray, (id) => {
 		const view = fleet.view(id);
-		if (view) revealPath(`${view.dir}/_diag`);
-	}, () => pickPackageFile(tray));
+		if (view) opener.revealInFolder(`${view.dir}/_diag`).catch((err) => console.error("[gh-runner] 揭示目录失败:", err));
+	}, () => pickPackageFile(tray), (url) => opener.open(url));
 	fleet.onSnapshot((snap) => {
 		projection.update(snap);
 		uiHost.push(snap);

package/dist/ui/index.html

@@ -126,6 +126,7 @@
   .field input:focus { outline: 2px solid color-mix(in srgb, var(--run) 55%, transparent); border-color: transparent; }
   .field .hint { font-size: 10.5px; color: var(--ink-2); }
   .field .hint a { color: var(--run); text-decoration: none; }
+  a.ext-link { cursor: pointer; }
   .pkg-row { display: flex; gap: 6px; }
   .pkg-row select {
     flex: 1; min-width: 0; font: inherit; padding: 5px 7px; border: 1px solid var(--line);
@@ -196,7 +197,7 @@
       <div class="field">
         <label>注册 Token（org 设置页生成，一次性）</label>
         <input name="token" type="password" placeholder="粘贴一次性注册 Token" required>
-        <span class="hint">获取：<a href="https://github.com/organizations/jixoai/settings/actions/runners/new" target="_blank">org runners 新建页</a>（自动解包本机已有分发包）</span>
+        <span class="hint">获取：<a href="#" id="link-runner-new" data-url="https://github.com/organizations/jixoai/settings/actions/runners/new">org runners 新建页</a>（系统浏览器打开；自动解包本机已有分发包）</span>
       </div>
       <div class="field">
         <label>Labels</label>
@@ -329,6 +330,16 @@ function renderPackages(packages, download) {
   }
 }
 
+document.querySelectorAll("a.ext-link").forEach((a) => {
+  a.addEventListener("click", (e) => {
+    e.preventDefault();
+    const url = a.dataset.url;
+    if (!url) return;
+    const ipc = navigator.opentray && navigator.opentray.ipc;
+    if (ipc) void ipc.postMessage({ type: "open-url", url });
+    else window.open(url, "_blank");
+  });
+});
 $("#pkg-download").addEventListener("click", () => send({ type: "download-latest" }));
 $("#pkg-import").addEventListener("click", () => send({ type: "import-package" }));
 document.querySelector('#register-form input[name="labels"]').addEventListener("input", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jixoai/gh-runner",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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",
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@opentray/ext-dialog": "^0.36.0",
+    "@opentray/ext-opener": "^0.36.0",
     "@opentray/ext-webview": "^0.36.0",
     "opentray": "^0.36.0"
   },