hunter-mate 0.1.2 → 0.1.4

package/dist/commands/extension.js

@@ -1,50 +1,12 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extensionCommand = void 0;
-exports.ensureEnvReady = ensureEnvReady;
-exports.runExtensionCheck = runExtensionCheck;
-const commander_1 = require("commander");
-const axios_1 = __importDefault(require("axios"));
-const ws_1 = __importDefault(require("ws"));
-const config_1 = require("../config");
-const i18n_1 = require("../i18n");
-const install_1 = require("./install");
+import { Command } from 'commander';
+import axios from 'axios';
+import WebSocket from 'ws';
+import * as fs from 'fs';
+import * as path from 'path';
+import { loadConfig } from '../config.js';
+import { i18n } from '../i18n/index.js';
+import { showInstallGuide, runInstall } from './install.js';
+import { getCliLogger } from '../logger.js';
 const B = {
     reset: '\x1b[0m', bold: '\x1b[1m',
     green: '\x1b[32m', yellow: '\x1b[33m', red: '\x1b[31m', cyan: '\x1b[36m', magenta: '\x1b[35m',
@@ -53,16 +15,31 @@ const B = {
 // 共用: 构建 HTTP client(baseURL = hunter-mate config serverUrl)
 // ----------------------------------------------------------------------------
 function http(baseUrl) {
-    return axios_1.default.create({
+    return axios.create({
         baseURL: baseUrl,
         timeout: 60_000,
         headers: { 'Content-Type': 'application/json' },
     });
 }
+/** 带鉴权的 client(server /extensions* 端点要求 UTOKEN,与 job/record/search 等模块一致)。 */
+async function httpAuth(baseUrl) {
+    const { getToken } = await import('../keychain.js');
+    const token = await getToken();
+    return axios.create({
+        baseURL: baseUrl,
+        timeout: 60_000,
+        headers: {
+            'Content-Type': 'application/json',
+            ...(token ? { Authorization: `UTOKEN ${token}` } : {}),
+        },
+    });
+}
 function requireServerUrl() {
-    const config = (0, config_1.loadConfig)();
+    const config = loadConfig();
     if (!config.serverUrl) {
-        console.error(`${B.red}✗  hunter-mate: serverUrl 未配置${B.reset}\n   请先 ${B.bold}hunter-mate config${B.reset} 设置 serverUrl`);
+        getCliLogger().error('extension:no-server-url', {
+            hint: '请先 hunter-mate config 设置 serverUrl',
+        });
         process.exit(1);
     }
     return config.serverUrl;
@@ -117,16 +94,16 @@ function JSON2YAML(input, indent = 0) {
 // ----------------------------------------------------------------------------
 let envReadyPromise = null;
 /** 确保环境就绪(自动启动 server、自动安装扩展、打印引导) */
-function ensureEnvReady() {
+export function ensureEnvReady() {
     if (envReadyPromise)
         return envReadyPromise;
     envReadyPromise = (async () => {
-        const config = (0, config_1.loadConfig)();
+        const config = loadConfig();
         const serverUrl = config.serverUrl;
         // 1) 检查 server 是否运行
         let serverUp = false;
         try {
-            await axios_1.default.get(`${serverUrl}/health`, { timeout: 2000 });
+            await axios.get(`${serverUrl}/health`, { timeout: 2000 });
             serverUp = true;
         }
         catch {
@@ -135,13 +112,13 @@ function ensureEnvReady() {
                 console.log(`${B.yellow}⚠  HunterMate Server 未运行, 正在自动启动...${B.reset}`);
             }
             try {
-                const { runStart } = await Promise.resolve().then(() => __importStar(require('./server')));
+                const { runStart } = await import('./server.js');
                 runStart({ foreground: false });
                 // 等待 server 就绪(最多 8s)
                 for (let i = 0; i < 16; i++) {
                     await new Promise((r) => setTimeout(r, 500));
                     try {
-                        await axios_1.default.get(`${serverUrl}/health`, { timeout: 1500 });
+                        await axios.get(`${serverUrl}/health`, { timeout: 1500 });
                         serverUp = true;
                         break;
                     }
@@ -151,13 +128,13 @@ function ensureEnvReady() {
             catch { /* ignore */ }
         }
         if (!serverUp) {
-            console.error(`${B.red}✗  HunterMate Server 启动失败${B.reset}\n   请手动执行: ${B.bold}hunter-mate start -f${B.reset}`);
+            getCliLogger().error('extension:server-start-failed', {
+                hint: '请手动执行 hunter-mate start -f',
+            });
             process.exit(1);
         }
         // 2) 检查扩展是否安装
-        const fs = require('fs');
-        const path = require('path');
-        const { runInit } = await Promise.resolve().then(() => __importStar(require('./init')));
+        const { runInit } = await import('./init.js');
         const init = runInit();
         const manifestPath = path.join(init.extensionDir, 'manifest.json');
         if (!fs.existsSync(manifestPath)) {
@@ -165,26 +142,25 @@ function ensureEnvReady() {
             if (!process.env.HUNTER_MATE_SILENT_START) {
                 console.log(`${B.yellow}⚠  Hunter Mate 扩展未安装, 正在自动安装...${B.reset}`);
             }
-            const r = (0, install_1.runInstall)(init.extensionDir);
+            const r = runInstall(init.extensionDir);
             if (!r.source) {
                 // 内置 dist 不存在, 无法自动安装
-                console.error(`${B.red}✗  无法自动安装扩展(内置 extension dist 未构建)${B.reset}\n` +
-                    `   请在 hunter-mate monorepo 执行:\n` +
-                    `   ${B.bold}pnpm --filter @hunter-mate/extension build${B.reset}\n` +
-                    `   或手动安装: ${B.bold}hunter-mate install${B.reset}`);
+                getCliLogger().error('extension:auto-install-failed', {
+                    hint: '请在 hunter-mate monorepo 执行 pnpm --filter @hunter-mate/extension build,或手动 hunter-mate install',
+                });
                 process.exit(1);
             }
             console.log(`${B.green}✓  扩展已自动安装到 ${r.target}${B.reset}`);
-            // 打开目录引导
+            // 打开扩展所在目录(父目录),方便用户把 extension 文件夹拖到 chrome://extensions
             try {
-                const { default: open } = await Promise.resolve().then(() => __importStar(require('open')));
-                open(init.extensionDir).catch(() => { });
+                const { default: open } = await import('open');
+                open(path.dirname(init.extensionDir)).catch(() => { });
             }
             catch { }
-            (0, install_1.showInstallGuide)(init.extensionDir);
+            showInstallGuide(init.extensionDir);
             // 打开 chrome://extensions
             try {
-                const { default: open } = await Promise.resolve().then(() => __importStar(require('open')));
+                const { default: open } = await import('open');
                 open('chrome://extensions').catch(() => { });
             }
             catch { }
@@ -193,12 +169,12 @@ function ensureEnvReady() {
         }
         // 3) 检查扩展是否连接
         try {
-            const r = await http(serverUrl).get('/extensions', { timeout: 3000 });
+            const r = await (await httpAuth(serverUrl)).get('/extensions', { timeout: 3000 });
             const count = Array.isArray(r.data) ? r.data.length : 0;
             if (count === 0) {
                 // 扩展已安装但未连接
                 console.log(`${B.yellow}⚠  Hunter Mate 扩展已安装但尚未连接到 Chrome${B.reset}\n`);
-                (0, install_1.showInstallGuide)(init.extensionDir);
+                showInstallGuide(init.extensionDir);
                 console.log(`${B.bold}请确认:${B.reset}\n` +
                     `   ${B.magenta}①${B.reset} Chrome 工具栏的 Hunter Mate 图标是否已显示?\n` +
                     `   ${B.magenta}②${B.reset} 点击图标, 侧栏是否显示「已连接」?\n` +
@@ -213,7 +189,9 @@ function ensureEnvReady() {
         }
         catch {
             // /extensions 端点不可达
-            console.error(`${B.red}✗  无法检查扩展连接状态${B.reset}\n   Server 可能未正确启动, 请执行: ${B.bold}hunter-mate start -f${B.reset}`);
+            getCliLogger().error('extension:check-failed', {
+                hint: 'Server 可能未正确启动, 请执行 hunter-mate start -f',
+            });
             process.exit(1);
         }
     })();
@@ -224,10 +202,10 @@ function ensureEnvReady() {
 // ----------------------------------------------------------------------------
 // 原 check 命令(增强: 自动修复 + 友好引导)
 // ----------------------------------------------------------------------------
-async function runExtensionCheck(timeoutMs = 5000) {
-    const config = (0, config_1.loadConfig)();
+export async function runExtensionCheck(timeoutMs = 5000) {
+    const config = loadConfig();
     const wsUrl = config.serverUrl.replace(/^http/, 'ws') + '/ws';
-    const ws = new ws_1.default(wsUrl);
+    const ws = new WebSocket(wsUrl);
     return new Promise((resolve, reject) => {
         const timeout = setTimeout(() => {
             ws.terminate();
@@ -279,10 +257,10 @@ async function withEnvCheck(fn) {
     }
     catch (err) {
         const msg = err.response?.data?.message ?? err.response?.data?.error ?? err.message;
-        console.error(`${B.red}✗  hunter-mate extension 执行失败:${B.reset} ${msg}`);
+        getCliLogger().error('extension:exec-failed', { error: msg });
         if (msg.includes('no Hunter Mate Chrome extension registered') || msg.includes('no Hunter Mate')) {
-            const init = await Promise.resolve().then(() => __importStar(require('./init'))).then((m) => m.runInit());
-            (0, install_1.showInstallGuide)(init.extensionDir);
+            const init = await import('./init.js').then((m) => m.runInit());
+            showInstallGuide(init.extensionDir);
         }
         process.exit(1);
     }
@@ -290,7 +268,7 @@ async function withEnvCheck(fn) {
 async function cmdList(opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await http(serverUrl).get('/extensions');
+        const r = await (await httpAuth(serverUrl)).get('/extensions');
         const data = Array.isArray(r.data) && r.data.length > 0
             ? r.data
             : [{ extensionId: '(none connected)', hint: '请在 Chrome 中加载 Hunter Mate 扩展' }];
@@ -306,15 +284,18 @@ async function cmdControl(command, argsJson, opts) {
                 params = JSON.parse(argsJson);
             }
             catch {
-                console.error('extension control: args 必须是合法 JSON 字符串');
+                getCliLogger().error('extension:invalid-control-args', {
+                    hint: 'args 必须是合法 JSON 字符串',
+                });
                 process.exit(1);
             }
         }
-        const r = await http(serverUrl).post('/extensions/control', {
+        const r = await (await httpAuth(serverUrl)).post('/extensions/control', {
             command,
             params,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
+            sessionId: opts.sessionId ?? opts.taskId,
         });
         printResult(r.data, opts.format);
     });
@@ -322,11 +303,12 @@ async function cmdControl(command, argsJson, opts) {
 async function cmdGoto(url, opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await http(serverUrl).post('/extensions/goto', {
+        const r = await (await httpAuth(serverUrl)).post('/extensions/goto', {
             url,
             waitUntil: opts.waitUntil,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
+            sessionId: opts.sessionId ?? opts.taskId,
         });
         printResult(r.data, opts.format);
     });
@@ -334,7 +316,7 @@ async function cmdGoto(url, opts) {
 async function cmdEval(expression, opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await http(serverUrl).post('/extensions/eval', {
+        const r = await (await httpAuth(serverUrl)).post('/extensions/eval', {
             expression,
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
@@ -345,7 +327,7 @@ async function cmdEval(expression, opts) {
 async function cmdScreenshot(opts) {
     return withEnvCheck(async () => {
         const serverUrl = requireServerUrl();
-        const r = await http(serverUrl).post('/extensions/screenshot', {
+        const r = await (await httpAuth(serverUrl)).post('/extensions/screenshot', {
             fullPage: opts.full ? true : undefined,
             selector: opts.selector,
             format: opts.imageFormat ?? 'png',
@@ -353,7 +335,7 @@ async function cmdScreenshot(opts) {
             extensionId: opts.extensionId,
         });
         if (opts.out) {
-            const fs = await Promise.resolve().then(() => __importStar(require('fs')));
+            const fs = await import('fs');
             const body = r.data.result;
             const base64 = (body ?? '').replace(/^data:image\/(png|jpeg);base64,/, '');
             fs.writeFileSync(opts.out, Buffer.from(base64, 'base64'));
@@ -373,7 +355,9 @@ async function cmdRun(site, command, opts) {
                 params = JSON.parse(opts.args);
             }
             catch {
-                console.error('extension run --args 必须是合法 JSON 字符串');
+                getCliLogger().error('extension:invalid-run-args', {
+                    hint: 'args 必须是合法 JSON 字符串',
+                });
                 process.exit(1);
             }
         }
@@ -382,20 +366,22 @@ async function cmdRun(site, command, opts) {
             timeoutMs: opts.timeout ? Number(opts.timeout) : undefined,
             extensionId: opts.extensionId,
         };
-        const r = await http(serverUrl).post(endpoint, payload);
+        const r = await (await httpAuth(serverUrl)).post(endpoint, payload);
         printResult(r.data, opts.format);
     });
 }
 // ----------------------------------------------------------------------------
 // commander 注册
 // ----------------------------------------------------------------------------
-exports.extensionCommand = new commander_1.Command('extension')
-    .description(i18n_1.i18n.t('extension.description') + ' — 自动确保 server 运行 + 扩展就绪, 无感启动');
+export const extensionCommand = new Command('extension')
+    .description(i18n.t('extension.description') + ' — 自动确保 server 运行 + 扩展就绪, 无感启动');
 const common = (cmd) => cmd
     .option('-f, --format <format>', '输出格式 json|yaml|table|md|csv', 'json')
     .option('-e, --extension-id <id>', '指定扩展实例（多浏览器时必填）')
+    .option('-s, --session-id <id>', '会话 ID，用于自动归组新标签页')
+    .option('-T, --task-id <id>', '等价于 --session-id')
     .option('-t, --timeout <ms>', '命令超时(ms)，默认 15000');
-exports.extensionCommand
+extensionCommand
     .command('check')
     .description('检查扩展连接状态（自动启动 server + 自动安装扩展 + 中文引导）')
     .action(async () => {
@@ -405,25 +391,25 @@ exports.extensionCommand
         console.log(`\n${B.green}✓  Hunter Mate 扩展已连接 (${count} 个浏览器实例)${B.reset}\n`);
     }
     catch (err) {
-        console.error(`${B.red}✗  扩展检查失败: ${err.message}${B.reset}`);
+        getCliLogger().error('extension:check-error', { error: err.message });
         process.exit(1);
     }
 });
-common(exports.extensionCommand
+common(extensionCommand
     .command('list')
     .description('列出已连接的 Hunter Mate 浏览器扩展实例')).action(async (opts) => cmdList(opts));
-common(exports.extensionCommand
+common(extensionCommand
     .command('control <command> [argsJson]')
-    .description('通用页面控制（OpenCLI 风格, 对应 chromepilot control）：cp.state/cp.find/cp.click/cp.fill/cp.select/cp.scroll/cp.eval/cp.screenshot/cp.goto/cp.waitFor')).action(async (command, argsJson, opts) => cmdControl(command, argsJson, opts));
-common(exports.extensionCommand
+    .description('通用页面控制（OpenCLI 全能力, 对应 chromepilot control）：cp.state/cp.goto/cp.find/cp.click/cp.type/cp.fill/cp.select/cp.keys/cp.hover/cp.focus/cp.dblclick/cp.check/cp.uncheck/cp.get/cp.extract/cp.eval/cp.network/cp.frames/cp.wait/cp.upload/cp.drag/cp.scroll/cp.back/cp.screenshot/cp.insert/cp.cdp/cp.cookies/cp.window.close/cp.tab.*(list|new|select|close|bind|unbind)。参数 JSON 内 "__tab":"<tabId>" 定向 tab')).action(async (command, argsJson, opts) => cmdControl(command, argsJson, opts));
+common(extensionCommand
     .command('goto <url>')
     .description('导航到指定 URL (对应 chromepilot control cp.goto)'))
     .option('--wait-until <mode>', 'domcontentloaded|load|networkidle0|networkidle2')
     .action(async (url, opts) => cmdGoto(url, opts));
-common(exports.extensionCommand
+common(extensionCommand
     .command('eval <expression>')
     .description('在当前页面执行 JS 表达式 (对应 chromepilot control cp.eval)')).action(async (expression, opts) => cmdEval(expression, opts));
-common(exports.extensionCommand
+common(extensionCommand
     .command('screenshot')
     .description('当前页面截图 (对应 chromepilot control cp.screenshot)'))
     .option('--full', '整页截图')
@@ -431,7 +417,7 @@ common(exports.extensionCommand
     .option('--image-format <fmt>', '图片格式 png|jpeg', 'png')
     .option('--out <file>', '保存到文件（否则输出 base64 JSON）')
     .action(async (opts) => cmdScreenshot(opts));
-common(exports.extensionCommand
+common(extensionCommand
     .command('run <site> <command>')
     .description('站点适配器命令 (对应 chromepilot run): linkedin search|extract|invite 或 resume extract'))
     .option('--args <json>', '命令参数 JSON 字符串')

package/dist/commands/extras.d.ts

@@ -1,10 +1,40 @@
 import { Command } from 'commander';
-/** 对应 ChromePilot reload: 通过 WS 向所有已连接扩展广播 {type: 'reload'} */
+/**
+ * 通知所有已连接扩展 reload（自愈主链路）:
+ * 1) 优先 HTTP POST /system/broadcast-extension（返回明确 broadcast 计数和错误）
+ * 2) Fallback: 直连 WS /ws 发 {type:'broadcast', payload:{type:'reload'}}（兼容旧 server 无 HTTP 端点）
+ */
 export declare function runReload(timeoutMs?: number): Promise<{
     broadcast: number;
     msg: string;
+    errors?: Array<{
+        extensionId: string;
+        error: string;
+    }>;
 }>;
-/** 对应 ChromePilot open-ext / open-extension-folder: 打开 ~/.hunter-mate/extension */
+/** 对应 ChromePilot open-ext / open-extension-folder: 打开扩展所在目录(~/.hunter-mate),方便拖到 chrome://extensions */
 export declare function runOpenExt(target?: string): Promise<string>;
 export declare const reloadCommand: Command;
 export declare const openExtCommand: Command;
+export interface PurgeResult {
+    ok: boolean;
+    skipped?: boolean;
+    root: string;
+    serverStopped: {
+        stopped: boolean;
+        pid: number | null;
+        msg: string;
+    } | null;
+    removedFiles?: number;
+    removedBytes?: number;
+    msg: string;
+}
+/**
+ * 彻底清理本地 hunter-mate：
+ * 1. 停止本地 server（若运行中）
+ * 2. 删除整个 ~/.hunter-mate 目录（含 config、token、cache DB、插件、skill、trace、日志、pid 等）
+ */
+export declare function runPurge(opts: {
+    force?: boolean;
+}): Promise<PurgeResult>;
+export declare const purgeCommand: Command;