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

package/dist/service-windows.js

@@ -1,4 +1,5 @@
 import { spawnSync } from 'node:child_process';
+import { homedir } from 'node:os';
 import { ensureDaemonLogDir, resolveServiceCommand } from './daemon.js';
 export const WINDOWS_TASK_NAME = 'jusage';
 /** Previous scheduled-task name; remove on start/stop so upgrades do not leave two daemons. */
@@ -26,7 +27,7 @@ export async function registerWindowsAutostart(cliBinPath, dataDir) {
     const script = `
 $ErrorActionPreference = 'Stop'
 $taskName = ${psQuote(WINDOWS_TASK_NAME)}
-$action = New-ScheduledTaskAction -Execute ${psQuote(nodePath)} -Argument ${psQuote(argument)}
+$action = New-ScheduledTaskAction -Execute ${psQuote(nodePath)} -Argument ${psQuote(argument)} -WorkingDirectory ${psQuote(homedir())}
 $trigger = New-ScheduledTaskTrigger -AtLogOn
 $settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable -ExecutionTimeLimit ([TimeSpan]::Zero) -RestartCount 3 -RestartInterval (New-TimeSpan -Minutes 1)
 $principal = New-ScheduledTaskPrincipal -UserId $env:USERNAME -LogonType Interactive -RunLevel Limited

package/dist/service.js

@@ -1,6 +1,6 @@
 import { platform } from 'node:os';
 import { DEFAULT_DATA_DIR, DEFAULT_PORT, getRunningOwner, loadConfig, runtimeKindLabel, touchStatsSince, } from '@juejin-opensource/jusage-core';
-import { clearPid, stopPid, waitForPid, } from './daemon.js';
+import { clearPid, daemonLogPath, readDaemonLogTail, stopPid, waitForServiceReady, } from './daemon.js';
 import { isMacosAutostartRegistered, registerMacosAutostart, unregisterMacosAutostart, } from './service-macos.js';
 import { isWindowsAutostartRegistered, registerWindowsAutostart, unregisterWindowsAutostart, } from './service-windows.js';
 function assertSupportedPlatform() {
@@ -33,6 +33,19 @@ async function unregisterAutostart() {
 }
 export async function cmdServiceStart(cliBinPath, daysAgo) {
     assertSupportedPlatform();
+    const startedAt = Date.now();
+    const waitTimer = setInterval(() => {
+        const elapsed = Math.round((Date.now() - startedAt) / 1000);
+        console.log(`  仍在等待检测中（已 ${elapsed}s）…`);
+    }, 3_000);
+    try {
+        await cmdServiceStartBody(cliBinPath, daysAgo);
+    }
+    finally {
+        clearInterval(waitTimer);
+    }
+}
+async function cmdServiceStartBody(cliBinPath, daysAgo) {
     const { dir, config } = await loadConfig();
     // Seed statsSince before launchd starts `jusage start` (do not bake --days into plist).
     await touchStatsSince(dir, config, daysAgo != null ? { daysAgo } : undefined);
@@ -56,13 +69,23 @@ export async function cmdServiceStart(cliBinPath, daysAgo) {
         return;
     }
     await registerAutostart(cliBinPath, dir);
-    const pid = await waitForPid(dir);
-    if (pid == null) {
-        throw new Error('自启已注册，但进程未在预期时间内启动，请查看 ~/.ai-usage/logs/daemon.log');
+    const port = config.serverPort || DEFAULT_PORT;
+    const ready = await waitForServiceReady(dir, port);
+    if (ready.pid == null && !ready.health) {
+        const logPath = daemonLogPath(dir);
+        const tail = await readDaemonLogTail(dir);
+        const hint = tail ? `\n--- daemon.log ---\n${tail}` : '';
+        throw new Error(`自启已注册，但进程未在预期时间内启动（/health 也未就绪），请查看 ${logPath}${hint}`);
     }
     const { config: refreshed } = await loadConfig(dir);
-    console.log(`✓ 服务已在后台启动 (pid ${pid})`);
-    console.log(`  面板: http://127.0.0.1:${refreshed.serverPort || DEFAULT_PORT}`);
+    const panelPort = refreshed.serverPort || DEFAULT_PORT;
+    if (ready.pid != null) {
+        console.log(`✓ 服务已在后台启动 (pid ${ready.pid})`);
+    }
+    else {
+        console.log('✓ 服务已在后台启动（面板 /health 已就绪）');
+    }
+    console.log(`  面板: http://127.0.0.1:${panelPort}`);
     console.log(`  数据: ${dir}`);
     console.log(`  开机自启: 已注册`);
     console.log(`  日志: ${dir}/logs/daemon.log`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juejin-opensource/jusage",
-  "version": "0.1.1-beta.8",
+  "version": "0.1.1",
   "description": "本地优先的 AI Agent Token 用量看板 CLI（采集 + 本地面板 + 可选云端上报）",
   "type": "module",
   "license": "MIT",
@@ -30,12 +30,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@juejin-opensource/jusage-core": "0.1.1-beta.8"
+    "@juejin-opensource/jusage-core": "0.1.1"
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
     "typescript": "^5.8.2",
-    "@juejin-opensource/jusage-dashboard": "0.1.1-beta.8"
+    "@juejin-opensource/jusage-dashboard": "0.1.1"
   },
   "engines": {
     "node": ">=20"