@juejin-opensource/jusage 0.1.1-beta.8 → 0.1.1

package/bin/jusage.js

@@ -1,2 +1,5 @@
 #!/usr/bin/env node
-import '../dist/index.js';
+if (process.argv[2] === 'service' && process.argv[3] === 'start') {
+  process.stdout.write('正在等待检测进程与面板 /health …\n');
+}
+await import('../dist/index.js');

package/dist/daemon.d.ts

@@ -4,7 +4,16 @@ export declare function daemonLogPath(dataDir?: string): string;
 export declare function ensureDaemonLogDir(dataDir?: string): Promise<string>;
 /** Soft then hard kill. Returns true if the process is gone. */
 export declare function stopPid(pid: number, timeoutMs?: number): Promise<boolean>;
+/** True when local-api `/health` returns `{ ok: true }`. */
+export declare function probeLocalHealth(port: number): Promise<boolean>;
 export declare function waitForPid(dataDir?: string, timeoutMs?: number): Promise<number | null>;
+export interface ServiceReady {
+    pid: number | null;
+    health: boolean;
+}
+/** Wait until the pid file is live, or `/health` is up as a fallback. */
+export declare function waitForServiceReady(dataDir: string, port: number, timeoutMs?: number): Promise<ServiceReady>;
+export declare function readDaemonLogTail(dataDir?: string, maxChars?: number): Promise<string>;
 export declare function resolveServiceCommand(cliBinPath: string): {
     nodePath: string;
     args: string[];

package/dist/daemon.js

@@ -1,6 +1,8 @@
-import { mkdir } from 'node:fs/promises';
+import { spawnSync } from 'node:child_process';
+import { realpathSync } from 'node:fs';
+import { mkdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { DEFAULT_DATA_DIR, logsDir, clearPid, getRunningOwner, getRunningPid, isPidAlive, pidFilePath, readPid, readRuntimeOwner, writePid, writeRuntimeOwner, } from '@juejin-opensource/jusage-core';
+import { DEFAULT_DATA_DIR, argsMatchRuntimeKind, logsDir, clearPid, getRunningOwner, getRunningPid, isPidAlive, pidFilePath, readPid, readProcessArgs, readRuntimeOwner, writePid, writeRuntimeOwner, } from '@juejin-opensource/jusage-core';
 export { clearPid, getRunningOwner, getRunningPid, isPidAlive, pidFilePath, readPid, readRuntimeOwner, writePid, writeRuntimeOwner, };
 export function daemonLogPath(dataDir = DEFAULT_DATA_DIR) {
     return join(logsDir(dataDir), 'daemon.log');
@@ -43,22 +45,124 @@ export async function stopPid(pid, timeoutMs = 5000) {
     await new Promise((r) => setTimeout(r, 200));
     return !isPidAlive(pid);
 }
+async function readLivePid(dataDir) {
+    // Do not go through getRunningOwner: a locale-mismatched startedAt would
+    // delete the pid file the daemon just wrote, and this wait would never see it.
+    const owner = await readRuntimeOwner(dataDir);
+    if (owner != null && isPidAlive(owner.pid))
+        return owner.pid;
+    return null;
+}
+/** True when local-api `/health` returns `{ ok: true }`. */
+export async function probeLocalHealth(port) {
+    try {
+        const res = await fetch(`http://127.0.0.1:${port}/health`, {
+            signal: AbortSignal.timeout(400),
+        });
+        if (!res.ok)
+            return false;
+        const body = (await res.json());
+        return body.ok === true;
+    }
+    catch {
+        return false;
+    }
+}
+function readListeningPid(port) {
+    try {
+        if (process.platform === 'win32') {
+            const result = spawnSync('powershell.exe', [
+                '-NoProfile',
+                '-NonInteractive',
+                '-ExecutionPolicy',
+                'Bypass',
+                '-Command',
+                `(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -First 1 -ExpandProperty OwningProcess)`,
+            ], { encoding: 'utf8', windowsHide: true, timeout: 3_000 });
+            const pid = Number((result.stdout ?? '').trim());
+            return Number.isInteger(pid) && pid > 0 ? pid : null;
+        }
+        const result = spawnSync('lsof', ['-nP', `-iTCP:${port}`, '-sTCP:LISTEN', '-t'], { encoding: 'utf8', timeout: 2_000 });
+        const pid = Number((result.stdout ?? '').trim().split('\n')[0]);
+        return Number.isInteger(pid) && pid > 0 ? pid : null;
+    }
+    catch {
+        return null;
+    }
+}
+async function recoverPidFromHealth(dataDir, port) {
+    const listenPid = readListeningPid(port);
+    if (listenPid == null || !isPidAlive(listenPid))
+        return null;
+    const args = readProcessArgs(listenPid) ?? '';
+    const kind = argsMatchRuntimeKind(args, 'desktop')
+        ? 'desktop'
+        : argsMatchRuntimeKind(args, 'cli')
+            ? 'cli'
+            : null;
+    if (!kind)
+        return null;
+    await writePid(listenPid, dataDir, kind);
+    return listenPid;
+}
 export async function waitForPid(dataDir = DEFAULT_DATA_DIR, timeoutMs = 15_000) {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
-        const pid = await getRunningPid(dataDir);
+        const pid = await readLivePid(dataDir);
         if (pid != null)
             return pid;
         await new Promise((r) => setTimeout(r, 200));
     }
     return getRunningPid(dataDir);
 }
+/** Wait until the pid file is live, or `/health` is up as a fallback. */
+export async function waitForServiceReady(dataDir, port, timeoutMs = 15_000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        const pid = await readLivePid(dataDir);
+        if (pid != null)
+            return { pid, health: await probeLocalHealth(port) };
+        if (await probeLocalHealth(port)) {
+            return { pid: await recoverPidFromHealth(dataDir, port), health: true };
+        }
+        await new Promise((r) => setTimeout(r, 200));
+    }
+    const pid = (await readLivePid(dataDir)) ?? (await getRunningPid(dataDir));
+    if (pid != null)
+        return { pid, health: await probeLocalHealth(port) };
+    if (await probeLocalHealth(port)) {
+        return { pid: await recoverPidFromHealth(dataDir, port), health: true };
+    }
+    return { pid: null, health: false };
+}
+export async function readDaemonLogTail(dataDir = DEFAULT_DATA_DIR, maxChars = 2000) {
+    try {
+        const raw = await readFile(daemonLogPath(dataDir), 'utf8');
+        const trimmed = raw.trimEnd();
+        if (!trimmed)
+            return '';
+        return trimmed.length <= maxChars ? trimmed : trimmed.slice(-maxChars);
+    }
+    catch {
+        return '';
+    }
+}
+function resolveExistingPath(path) {
+    try {
+        return realpathSync(path);
+    }
+    catch {
+        return path;
+    }
+}
 export function resolveServiceCommand(cliBinPath) {
-    const nodePath = process.execPath;
-    const args = [cliBinPath, 'start'];
+    // fnm/nvm shims live in session-specific dirs; persist the real binary.
+    const nodePath = resolveExistingPath(process.execPath);
+    const binPath = resolveExistingPath(cliBinPath);
+    const args = [binPath, 'start'];
     const commandLine = process.platform === 'win32'
-        ? `"${nodePath}" "${cliBinPath}" start`
-        : `${shellQuote(nodePath)} ${shellQuote(cliBinPath)} start`;
+        ? `"${nodePath}" "${binPath}" start`
+        : `${shellQuote(nodePath)} ${shellQuote(binPath)} start`;
     return { nodePath, args, commandLine };
 }
 function shellQuote(value) {

package/dist/dashboard/assets/ChevronDown-CBnDSnT1.js

@@ -0,0 +1 @@
+import{t as p,R as l,j as t,c7 as v,r as s,c8 as g,a9 as c,c2 as f,c3 as x,a7 as h,c1 as w,c9 as u,ca as m,a$ as $}from"./index-DKJwDJt7.js";const j=p({slots:{base:"popover",dialog:"popover__dialog",heading:"popover__heading",trigger:"popover__trigger"}}),n=s.createContext({}),d=({children:o,...a})=>{const r=l.useMemo(()=>j(),[]);return t.jsx(n,{value:{slots:r},children:t.jsx(v,{"data-slot":"popover-root",...a,children:o})})},b=({children:o,className:a,...r})=>{const{slots:e}=s.use(n);return t.jsx(n,{value:{slots:e},children:t.jsx(f,{value:{variant:"default"},children:t.jsx(x,{...r,className:h(a,e==null?void 0:e.base()),children:o})})})},C=({children:o,className:a,...r})=>{const e=t.jsx("svg",{"data-slot":"popover-overlay-arrow",fill:"none",height:"12",viewBox:"0 0 12 12",width:"12",xmlns:"http://www.w3.org/2000/svg",children:t.jsx("path",{d:"M0 0C5.48483 8 6.5 8 12 0Z"})}),i=l.isValidElement(o)?l.cloneElement(o,{"data-slot":"popover-overlay-arrow"}):e;return t.jsx(w,{"data-slot":"popover-overlay-arrow-group",...r,className:a,children:i})},P=({children:o,className:a,...r})=>{const{slots:e}=s.use(n);return t.jsx(u,{"data-slot":"popover-dialog",...r,className:c(e==null?void 0:e.dialog,a),children:o})},R=({children:o,className:a,...r})=>{const{slots:e}=s.use(n);return t.jsx(m,{children:t.jsx($.div,{className:c(e==null?void 0:e.trigger,a),"data-slot":"popover-trigger",role:"button",...r,children:o})})},E=({children:o,className:a,...r})=>{const{slots:e}=s.use(n);return t.jsx(g,{slot:"title",...r,className:c(e==null?void 0:e.heading,a),children:o})},_=Object.assign(d,{Root:d,Trigger:R,Dialog:P,Arrow:C,Content:b,Heading:E}),A=o=>s.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",width:16,height:16,fill:"none",viewBox:"0 0 16 16"},o),s.createElement("path",{fill:"currentColor",fillRule:"evenodd",d:"M13.488 3.43a.75.75 0 0 1 .081 1.058l-6 7a.75.75 0 0 1-1.1.042l-3.5-3.5A.75.75 0 0 1 4.03 6.97l2.928 2.927 5.473-6.385a.75.75 0 0 1 1.057-.081",clipRule:"evenodd"})),M=o=>s.createElement("svg",Object.assign({xmlns:"http://www.w3.org/2000/svg",width:16,height:16,fill:"none",viewBox:"0 0 16 16"},o),s.createElement("path",{fill:"currentColor",fillRule:"evenodd",d:"M2.97 5.47a.75.75 0 0 1 1.06 0L8 9.44l3.97-3.97a.75.75 0 1 1 1.06 1.06l-4.5 4.5a.75.75 0 0 1-1.06 0l-4.5-4.5a.75.75 0 0 1 0-1.06",clipRule:"evenodd"}));export{M as C,_ as P,A as a};