@aweray/hsk-cli 0.2.2 → 0.4.2

package/README.md

@@ -10,8 +10,9 @@
 
 - **多平台自动适配** — 自动检测操作系统和架构，下载对应原生客户端二进制
 - **内网穿透** — 一键将本地服务暴露到公网，支持前台/后台两种保活模式
-- **文件托管** — 上传本地文件或构建产物，获取公网下载链接
-- **构建部署** — `deploy` 命令一键完成 build → pack → upload
+- **文件托管** — 上传本地文件或目录（自动打包），获取公网下载链接
+- **构建部署** — `deploy` 命令一键完成 build → upload，原生二进制自动打包目录
+- **资源复用** — 隧道支持 `--reuse` 检测，有效则复用，失效则重建
 - **AI 友好** — 支持 `--json` 结构化输出，便于 AI Agent 解析和自动化
 - **版本同步** — npm 包版本与原生二进制版本一致，自动匹配升级
 
@@ -61,10 +62,14 @@ hsk-cli tunnel --ip 127.0.0.1 --port 9000 --detach
 
 后台模式启动后 CLI 立即退出，隧道持续运行。使用 `tunnel list` / `tunnel stop` 管理。
 
-### 4. 文件托管
+### 4. 文件托管（上传文件或目录）
 
 ```bash
+# 上传单文件
 hsk-cli host ./document.pdf
+
+# 上传目录（原生二进制自动打包为 zip）
+hsk-cli host ./dist/
 ```
 
 ### 5. 构建并部署项目
@@ -73,7 +78,7 @@ hsk-cli host ./document.pdf
 hsk-cli deploy
 ```
 
-自动执行 `npm run build` → 打包 `dist/` → 上传到文件托管。
+自动执行 `npm run build` → 上传构建产物到文件托管。原生二进制自动打包目录。
 
 ---
 
@@ -104,6 +109,7 @@ hsk-cli tunnel --ip <IP> --port <PORT> [options]
 | `--arch <arch>` | 否 | 强制指定客户端架构: `win32`, `win64`, `macos-x64`, `macos-arm64`, `linux-x64`, `linux-arm64` |
 | `--force-download` | 否 | 强制重新下载客户端二进制 |
 | `--detach` | 否 | 后台模式，CLI 立即退出，隧道持续运行 |
+| `--reuse` | 否 | 复用已有隧道，不存在则创建 |
 | `--json` | 否 | 以 JSON 格式输出 |
 
 #### `tunnel list` — 查看后台隧道
@@ -126,21 +132,21 @@ hsk-cli tunnel stop --all
 
 ### File Hosting
 
-#### `host` — 上传文件
+#### `host` — 文件托管
 
 ```bash
-hsk-cli host <filePath> [options]
+hsk-cli host <fileOrDirPath> [options]
 ```
 
+支持上传单文件或目录。传入目录时，原生二进制自动打包为 zip 后上传。
+
 | Option | Required | Description |
 |--------|----------|-------------|
-| `<filePath>` | 是 | 本地文件路径 |
+| `<fileOrDirPath>` | 是 | 本地文件或目录路径 |
 | `--resource-id <id>` | 否 | 资源 ID（传入则更新已有资源） |
 | `--open` | 否 | 上传完成后自动打开浏览器进行认领 |
 | `--json` | 否 | 以 JSON 格式输出 |
 
-> **注意**: `host` 仅支持单文件。上传目录（如 build/dist）请使用 `deploy` 命令。
-
 ### Deploy
 
 #### `deploy` — 构建并部署项目
@@ -149,20 +155,18 @@ hsk-cli host <filePath> [options]
 hsk-cli deploy [options]
 ```
 
-一键执行：**构建** → **打包** → **上传**。
+一键执行：**构建** → **上传** 到文件托管。原生二进制自动处理目录打包。
 
 | Option | Description |
 |--------|-------------|
 | `--build-cmd <cmd>` | 构建命令（默认: `npm run build`） |
 | `--build-dir <dir>` | 构建输出目录（默认: `dist`） |
-| `--pack-output <file>` | 打包文件名（默认: `dist.zip`） |
-| `--no-build` | 跳过构建，直接打包上传现有目录 |
-| `--no-clean` | 上传后保留打包文件 |
+| `--no-build` | 跳过构建，直接上传现有目录 |
 | `--resource-id <id>` | 更新已有资源 |
 | `--open` | 上传完成后自动打开浏览器 |
 | `--json` | 以 JSON 格式输出 |
 
-**配置优先级**: 命令行参数 > 项目 `package.json` 的 `hsk.deploy` > 全局 `~/.hsk/config.json` > 默认配置
+**配置优先级**: 命令行参数 > 项目 `package.json` 的 `hsk.deploy` > 全局 `~/.hsk/config.json` 的 `deploy` > 默认配置
 
 **项目配置示例（`package.json`）**:
 
@@ -174,9 +178,7 @@ hsk-cli deploy [options]
   "hsk": {
     "deploy": {
       "buildCmd": "npm run build",
-      "buildDir": "dist",
-      "packOutput": "dist.zip",
-      "cleanAfterUpload": true
+      "buildDir": "dist"
     }
   }
 }
@@ -184,6 +186,14 @@ hsk-cli deploy [options]
 
 ### System
 
+#### `status` — 检查资源状态
+
+```bash
+hsk-cli status [--json]
+```
+
+检查已发布的隧道资源状态（进程存活 + URL 可访问）。
+
 #### `download` — 预下载客户端
 
 ```bash
@@ -220,12 +230,19 @@ hsk-cli tunnel list
 
 # 停止全部后台隧道
 hsk-cli tunnel stop --all
+
+# 复用已有隧道（有效则复用，失效则重建）
+hsk-cli tunnel --ip 127.0.0.1 --port 9000 --reuse
 ```
 
-### 上传文件并自动认领
+### 上传文件或目录并自动认领
 
 ```bash
+# 上传单文件
 hsk-cli host ./report.pdf --open
+
+# 上传目录（原生二进制自动打包为 zip）
+hsk-cli host ./dist/ --open
 ```
 
 ### 跨平台预下载
@@ -240,6 +257,7 @@ hsk-cli download --arch linux-x64
 ```bash
 hsk-cli tunnel --ip 127.0.0.1 --port 9000 --json
 hsk-cli host ./document.pdf --json
+hsk-cli status --json
 ```
 
 ### 构建并部署
@@ -251,7 +269,7 @@ hsk-cli deploy
 # 命令行覆盖配置
 hsk-cli deploy --build-cmd "yarn build" --build-dir "build"
 
-# 跳过构建，直接上传
+# 跳过构建，直接上传现有目录
 hsk-cli deploy --no-build
 
 # 更新已有资源
@@ -269,9 +287,7 @@ hsk-cli deploy --resource-id abc123 --open
   "hsk": {
     "deploy": {
       "buildCmd": "npm run build",
-      "buildDir": "dist",
-      "packOutput": "dist.zip",
-      "cleanAfterUpload": true
+      "buildDir": "dist"
     }
   }
 }
@@ -283,23 +299,17 @@ hsk-cli deploy --resource-id abc123 --open
 {
   "deploy": {
     "buildCmd": "npm run build",
-    "buildDir": "dist",
-    "packOutput": "dist.zip",
-    "cleanAfterUpload": true
+    "buildDir": "dist"
   }
 }
 ```
 
 ### 环境变量
 
-| Variable | Description |
-|----------|-------------|
-| `HSK_DOWNLOAD_URL` | 客户端二进制下载基地址 |
-| `HSK_FILE_HOSTING_API` | Ticket API 完整 URL |
-| `HSK_FILE_HOSTING_TICKET_HOST` | Ticket 服务主机 |
-| `HSK_FILE_HOSTING_UPLOAD_HOST` | 上传服务主机 |
-| `HSK_FILE_HOSTING_UPLOAD_PORT` | 上传服务端口 |
-| `HSK_FILE_HOSTING_UPLOAD_SCHEME` | 上传服务协议 |
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `HSK_DOWNLOAD_URL` | 客户端二进制下载基地址 | 从 `versions.json` 读取 |
+| `HSK_FILE_HOSTING_API` | Ticket API 完整 URL，覆盖原生二进制默认 host | 原生二进制内置默认值 |
 
 ---
 
@@ -325,9 +335,10 @@ hsk-cli deploy --resource-id abc123 --open
 └─────────────────┘
 ```
 
-- **npm 包**（启动器）：提供命令行接口、平台检测、自动下载、版本管理
+- **npm 包**（启动器）：提供命令行接口、平台检测、自动下载、版本管理、资源状态持久化
 - **versions.json**：定义 npm 包版本与原生二进制版本的映射关系
 - **原生二进制**：按平台编译（Go/Rust/C++），实际执行网络穿透和文件传输
+- **资源状态**：保存在 `{projectRoot}/.hsk/resources.json` 或 `~/.hsk/resources.json`
 
 ---
 
@@ -338,7 +349,9 @@ hsk-cli deploy --resource-id abc123 --open
 - The npm package version and native binary version are kept in sync. When you update the npm package, the corresponding binary will be downloaded automatically.
 - **前台模式（默认）**: CLI 启动客户端二进制作为子进程，实时输出日志，捕获到公网地址后持续运行。按 `Ctrl+C` 发送 `SIGTERM` 优雅停止。
 - **后台模式（`--detach`）**: CLI 启动子进程后使用 `detached: true` 解除父子绑定，立即退出。子进程在后台独立运行，日志写入 `~/.hsk/logs/`，PID 记录保存到 `~/.hsk/pids/`.
-- **Deploy**: `hsk-cli deploy` 执行 `build` → `pack` → `upload` 三步。打包使用系统原生 `zip`（macOS/Linux）或 PowerShell `Compress-Archive`（Windows），无需额外依赖.
+- **Deploy**: `hsk-cli deploy` 执行 `build` → `upload` 两步。原生二进制自动打包目录，无需额外依赖.
+- **File Hosting**: `hsk-cli host` 支持单文件和目录上传。传入目录时，原生二进制自动打包为 zip.
+- **资源复用**: `hsk-cli tunnel --reuse` 先检测已有隧道（进程存活 + URL 可访问），有效则复用，失效则重新创建.
 - Enable `--dry-run` to preview operations without executing them.
 
 ---
@@ -349,7 +362,7 @@ See [CHANGELOG.md](CHANGELOG.md) for release history.
 
 ## Contributing
 
-We welcome contributions! Please see [CONTRIBUTING.md](c) for guidelines.
+We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines.
 
 ## License
 

package/bin/hsk-cli.js

@@ -181,28 +181,32 @@ const hostCmd = program
   .option('--json', '以 JSON 格式输出（等同于 --format json）')
   .option('--open', '上传完成后自动打开浏览器进行认领')
   .option('--resource-id <id>', '资源 ID（传入则更新已有资源，否则创建新资源）')
+  .option('--reuse', '复用已有资源，不存在则创建新资源')
   .action(async (filePath, options) => {
     const fmt = getFormat(options);
     if (isDryRun(options)) {
       const fs = require('fs');
       const path = require('path');
       const stats = fs.existsSync(filePath) ? fs.statSync(filePath) : null;
-      const uploadBase = fileHosting.getUploadBaseUrl();
+      const apiUrl = process.env.HSK_FILE_HOSTING_API;
+      const cmdParts = ['hsk-cli file-hosting'];
+      if (apiUrl) cmdParts.push(`-api "${apiUrl}"`);
+      if (options.resourceId) cmdParts.push(`-resource-id ${options.resourceId}`);
+      cmdParts.push(filePath);
       console.log(format.dryRunInfo(
-        `POST ${fileHosting.TICKET_API}`,
+        cmdParts.join(' '),
         {
           文件路径: filePath,
           文件大小: stats ? `${(stats.size / 1024 / 1024).toFixed(2)} MB` : '文件不存在',
           资源ID: options.resourceId || '(新建)',
-          预期操作: '计算 SHA-256 → 获取 ticket → 上传/更新文件',
-          上传服务: options.resourceId ? `PUT ${uploadBase}/resource/update` : `POST ${uploadBase}/upload`,
-          预期输出: 'publicUrl + resourceId',
+          预期操作: '原生二进制自动处理：计算 hash → 获取 ticket → 上传/更新',
+          预期输出: '[AI_RESULT] public_url + resource_id',
         }
       ));
       return;
     }
     try {
-      const result = await fileHosting.host(filePath, { resourceId: options.resourceId });
+      const result = await fileHosting.host(filePath, { resourceId: options.resourceId, reuse: options.reuse });
       handleOutput(result, fmt);
       if (options.open && result.publicUrl) {
         console.log(chalk.gray('🌐 正在打开浏览器...'));
@@ -298,8 +302,8 @@ program
   .option('--build-dir <dir>', '构建输出目录，如 "dist"')
   .option('--pack-output <file>', '打包输出文件名，如 "dist.zip"', 'dist.zip')
   .option('--no-build', '跳过构建，直接打包上传')
-  .option('--no-clean', '上传后保留打包文件')
   .option('--resource-id <id>', '资源 ID（更新已有资源）')
+  .option('--reuse', '复用已有资源，不存在则创建新资源')
   .option('--open', '上传完成后自动打开浏览器进行认领')
   .option('--json', '以 JSON 格式输出（等同于 --format json）')
   .action(async (options) => {
@@ -310,19 +314,24 @@ program
     const cfg = config.getDeployConfig();
     const buildCmd = options.buildCmd || cfg.buildCmd;
     const buildDir = options.buildDir || cfg.buildDir;
-    const packOutput = options.packOutput || cfg.packOutput;
-    const cleanAfter = options.clean !== false && cfg.cleanAfterUpload;
 
     if (isDryRun(options)) {
       const info = options.arch ? platform.fromString(options.arch) : platform.detect();
+      const apiUrl = process.env.HSK_FILE_HOSTING_API;
+      const cmdParts = ['hsk-cli file-hosting'];
+      if (apiUrl) cmdParts.push(`-api "${apiUrl}"`);
+      if (options.resourceId) cmdParts.push(`-resource-id ${options.resourceId}`);
+      if (options.reuse) cmdParts.push('--reuse');
+      cmdParts.push(buildDir);
       console.log(format.dryRunInfo(
-        `deploy: ${buildCmd} → pack ${buildDir} → upload ${packOutput}`,
+        `${buildCmd} → ${cmdParts.join(' ')}`,
         {
           构建命令: buildCmd,
           构建目录: buildDir,
-          打包文件: packOutput,
-          上传后清理: cleanAfter,
-          资源ID: options.resourceId || '(新建)'
+          资源ID: options.resourceId || '(新建)',
+          复用检测: options.reuse ? '启用' : '禁用',
+          预期操作: '构建 → 原生二进制自动打包目录 → 上传',
+          预期输出: '[AI_RESULT] public_url + resource_id',
         }
       ));
       return;
@@ -342,21 +351,9 @@ program
         throw new Error(`构建目录不存在: ${buildDir}`);
       }
 
-      // 3. 打包
-      console.log(chalk.cyan(`📦 打包 ${buildDir}...`));
-      const packResult = await pack.packDir(buildDir, packOutput);
-      console.log(chalk.green(`✅ 打包完成: ${packResult.path}`));
-      console.log(chalk.gray(`   大小: ${(packResult.size / 1024 / 1024).toFixed(2)} MB`));
-
-      // 4. 上传
+      // 3. 上传（原生二进制自动打包目录）
       console.log(chalk.cyan('☁️  上传中...'));
-      const result = await fileHosting.host(packResult.path, { resourceId: options.resourceId });
-
-      // 5. 清理
-      if (cleanAfter) {
-        pack.cleanupPack(packResult.path);
-        console.log(chalk.gray('🧹 已清理打包文件'));
-      }
+      const result = await fileHosting.host(buildDir, { resourceId: options.resourceId, reuse: options.reuse });
 
       handleOutput(result, fmt);
 

package/lib/fileHosting.js

@@ -1,257 +1,165 @@
 const fs = require('fs');
 const path = require('path');
-const crypto = require('crypto');
-const fetch = require('node-fetch');
-const FormData = require('form-data');
 const { spawn } = require('child_process');
-const version = require('./version');
-
-const DEFAULT_CONFIG = {
-  ticketHost: 'onion-forward-api.oraybeta.com',
-  ticketPort: 443,
-  ticketScheme: 'https',
-  uploadHost: 'onion-fw-test2.oraybeta.com',
-  uploadPort: 8010,
-  uploadScheme: 'https',
-};
-
-const HEADERS_BASE = {
-  'User-Agent': `HSK-CLI/${version}`,
-  Accept: '*/*',
-  Connection: 'keep-alive',
-};
-
-function getTicketApiUrl() {
-  if (process.env.HSK_FILE_HOSTING_API) {
-    return process.env.HSK_FILE_HOSTING_API.replace(/\/+$/, '');
-  }
-  const host = process.env.HSK_FILE_HOSTING_TICKET_HOST || DEFAULT_CONFIG.ticketHost;
-  const port = process.env.HSK_FILE_HOSTING_TICKET_PORT || DEFAULT_CONFIG.ticketPort;
-  const scheme = process.env.HSK_FILE_HOSTING_TICKET_SCHEME || DEFAULT_CONFIG.ticketScheme;
-  return `${scheme}://${host}:${port}/public/file-hosting`;
-}
-
-function getUploadBaseUrl() {
-  const host = process.env.HSK_FILE_HOSTING_UPLOAD_HOST || DEFAULT_CONFIG.uploadHost;
-  const port = process.env.HSK_FILE_HOSTING_UPLOAD_PORT || DEFAULT_CONFIG.uploadPort;
-  const scheme = process.env.HSK_FILE_HOSTING_UPLOAD_SCHEME || DEFAULT_CONFIG.uploadScheme;
-  return `${scheme}://${host}:${port}`;
-}
-
-const TICKET_API = getTicketApiUrl();
+const download = require('./download');
+const resourceStore = require('./resourceStore');
+const resourceChecker = require('./resourceChecker');
 
 /**
- * 检查文件托管 API 配置
+ * 解析原生二进制输出，提取 [AI_RESULT] 键值对
  */
-function checkApiConfig() {
-  // 可通过环境变量覆盖 ticket / upload 服务地址，见 getTicketApiUrl / getUploadBaseUrl
-}
-
-/**
- * 计算文件 SHA-256 hash
- */
-function sha256File(filePath) {
-  return new Promise((resolve, reject) => {
-    const hash = crypto.createHash('sha256');
-    const stream = fs.createReadStream(filePath);
-    stream.on('data', (chunk) => hash.update(chunk));
-    stream.on('end', () => resolve(hash.digest('hex')));
-    stream.on('error', reject);
-  });
+function parseAiResult(stdout) {
+  const result = {};
+  const lines = stdout.split('\n');
+  for (const line of lines) {
+    const match = line.match(/^\[AI_RESULT\]\s+(\w+):\s*(.+)$/);
+    if (match) {
+      const key = match[1];
+      const value = match[2].trim();
+      try {
+        result[key] = JSON.parse(value);
+      } catch (e) {
+        result[key] = value;
+      }
+    }
+  }
+  return result;
 }
 
 /**
- * 获取文件托管 ticket（创建不传 resourceId，更新时传 resourceId）
+ * 打开浏览器认领页面
  */
-async function getFileHostingTicket(fileHash, resourceId = null) {
-  const payload = { file_hash: fileHash };
-  if (resourceId) {
-    payload.resource_id = resourceId;
-  }
-
-  const res = await fetch(TICKET_API, {
-    method: 'POST',
-    headers: { ...HEADERS_BASE, 'Content-Type': 'application/json' },
-    body: JSON.stringify(payload),
+function openClaimUrl(url) {
+  return new Promise((resolve) => {
+    const platform = process.platform;
+    const command = platform === 'win32' ? 'start' : platform === 'darwin' ? 'open' : 'xdg-open';
+    const proc = spawn(command, [url], { stdio: 'ignore', detached: true, shell: platform === 'win32' });
+    proc.on('error', () => { /* ignore */ });
+    proc.unref();
+    resolve();
   });
-
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`获取 ticket 失败: HTTP ${res.status} - ${text.slice(0, 500)}`);
-  }
-
-  const json = await res.json();
-  const data = json.data;
-
-  if (!data || !data.ticket) {
-    throw new Error(`获取 ticket 响应格式异常: ${JSON.stringify(json)}`);
-  }
-
-  return data;
 }
 
 /**
- * 上传/更新资源文件
- * @param {string} token - Bearer ticket
- * @param {string} filePath - 本地文件路径
- * @param {{ update?: boolean, uploadUrl?: string }} options
+ * 文件托管（创建或更新）
+ * 调用原生二进制：./hsk-cli file-hosting [options] <file_or_dir>
  */
-async function uploadFile(token, filePath, options = {}) {
-  const { update = false, uploadUrl } = options;
-  const fileName = path.basename(filePath);
-  const form = new FormData();
-  form.append('file', fs.createReadStream(filePath), { filename: fileName });
-
-  const url = uploadUrl || `${getUploadBaseUrl()}${update ? '/resource/update' : '/upload'}`;
-  const method = update ? 'PUT' : 'POST';
-
-  const res = await fetch(url, {
-    method,
-    headers: {
-      ...HEADERS_BASE,
-      Authorization: `Bearer ${token}`,
-      ...form.getHeaders(),
-    },
-    body: form,
-  });
-
-  if (!res.ok) {
-    const text = await res.text();
-    throw new Error(`文件${update ? '更新' : '上传'}失败: HTTP ${res.status} - ${text.slice(0, 500)}`);
-  }
-
-  return res.json();
-}
-
-function resolveResourceId(ticketData, uploadResult, resourceIdInput) {
-  let resourceId = ticketData.resource_id || resourceIdInput || null;
-  const resultData = uploadResult && uploadResult.data;
-
-  if (resultData && typeof resultData === 'object' && resultData.resource_id) {
-    resourceId = resultData.resource_id;
+async function host(filePath, options = {}) {
+  const resolvedPath = path.resolve(filePath);
+  if (!fs.existsSync(resolvedPath)) {
+    throw new Error(`文件不存在: ${resolvedPath}`);
   }
 
-  if (!resourceId && ticketData.public_url) {
-    const parts = ticketData.public_url.replace(/\/+$/, '').split('/');
-    if (parts.length) {
-      resourceId = parts[parts.length - 1];
+  // === reuse: 检测已有资源是否有效 ===
+  if (options.reuse) {
+    let existing = null;
+    if (options.resourceId) {
+      existing = resourceStore.findResource((r) => r.type === 'host' && r.resourceId === options.resourceId);
+    } else {
+      existing = resourceStore.findResource((r) => r.type === 'host' && r.filePath === resolvedPath);
+    }
+    if (existing) {
+      const check = await resourceChecker.checkResource(existing);
+      if (check.valid) {
+        return {
+          success: true,
+          mode: 'reused',
+          publicUrl: existing.publicUrl,
+          resourceId: existing.resourceId,
+          filePath: resolvedPath,
+          fileName: path.basename(resolvedPath),
+          reused: true,
+        };
+      }
+      // 失效：保存旧 resourceId 用于更新
+      if (!options.resourceId) {
+        options.resourceId = existing.resourceId;
+      }
     }
   }
 
-  return resourceId;
-}
-
-/**
- * 完整文件托管流程（创建或更新）
- * @param {string} filePath
- * @param {{ resourceId?: string }} options
- */
-async function host(filePath, options = {}) {
-  checkApiConfig();
+  // 确保原生二进制存在
+  const binPath = await download.ensureBinary();
 
-  if (!fs.existsSync(filePath)) {
-    throw new Error(`文件不存在: ${filePath}`);
-  }
-  if (fs.statSync(filePath).isDirectory()) {
-    throw new Error(
-      `路径是目录而非文件: ${filePath}\n` +
-      `请使用 \`hsk-cli deploy\` 命令上传目录，或手动打包后上传。`
-    );
+  // 构造参数
+  const args = ['file-hosting'];
+  const apiUrl = process.env.HSK_FILE_HOSTING_API;
+  if (apiUrl) {
+    args.push('-api', apiUrl);
   }
-  if (!fs.statSync(filePath).isFile()) {
-    throw new Error(`路径不是文件: ${filePath}`);
+  if (options.resourceId) {
+    args.push('-resource-id', options.resourceId);
   }
+  args.push(resolvedPath);
 
-  const fileName = path.basename(filePath);
-  const resourceIdInput = options.resourceId || null;
-  const isUpdate = Boolean(resourceIdInput);
-
-  if (process.env.HSK_FILE_HOSTING_DIRECT) {
-    const form = new FormData();
-    form.append('file', fs.createReadStream(filePath), { filename: fileName });
-
-    const res = await fetch(TICKET_API, {
-      method: 'POST',
-      headers: { ...form.getHeaders() },
-      body: form,
+  return new Promise((resolve, reject) => {
+    const proc = spawn(binPath, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true,
     });
 
-    if (!res.ok) {
-      throw new Error(`文件上传失败: HTTP ${res.status} - ${res.statusText}`);
-    }
-
-    const json = await res.json();
-    const baseUrl = TICKET_API.replace(/\/public\/file-hosting$/, '');
-    const publicUrl = `${baseUrl}/${fileName}`;
+    let stdout = '';
+    let stderr = '';
 
-    return {
-      success: true,
-      mode: 'direct',
-      publicUrl,
-      fileName,
-      filePath,
-      serverResponse: json,
-    };
-  }
-
-  const fileHash = await sha256File(filePath);
-  const ticket = await getFileHostingTicket(fileHash, resourceIdInput);
+    proc.stdout.on('data', (data) => {
+      stdout += data.toString();
+      process.stdout.write(data); // 实时转发到终端
+    });
 
-  const useLegacyUpload = Boolean(ticket.server_address);
-  let uploadResult;
-  let uploadError;
+    proc.stderr.on('data', (data) => {
+      stderr += data.toString();
+      process.stderr.write(data);
+    });
 
-  try {
-    if (useLegacyUpload) {
-      uploadResult = await uploadFile(ticket.ticket, filePath, {
-        uploadUrl: ticket.server_address,
-        update: isUpdate,
+    proc.on('close', (code) => {
+      if (code !== 0) {
+        reject(new Error(`文件托管失败: ${stderr || stdout}`));
+        return;
+      }
+
+      const result = parseAiResult(stdout);
+
+      if (!result.public_url || !result.resource_id) {
+        reject(new Error(`无法从输出中解析结果:\n${stdout}`));
+        return;
+      }
+
+      const isUpdate = Boolean(options.resourceId);
+      const resourceId = String(result.resource_id);
+      const publicUrl = result.public_url;
+
+      // 保存资源状态
+      resourceStore.saveResource({
+        id: `host-${resourceId}`,
+        type: 'host',
+        filePath: resolvedPath,
+        publicUrl,
+        resourceId,
+        fileName: path.basename(resolvedPath),
+        status: 'active',
+        createdAt: new Date().toISOString(),
+        lastCheckedAt: new Date().toISOString(),
       });
-    } else {
-      uploadResult = await uploadFile(ticket.ticket, filePath, { update: isUpdate });
-    }
-  } catch (err) {
-    uploadError = err.message;
-  }
-
-  const resourceId = resolveResourceId(ticket, uploadResult, resourceIdInput);
 
-  return {
-    success: true,
-    mode: isUpdate ? 'update' : 'create',
-    publicUrl: ticket.public_url,
-    verifyCode: ticket.verify_code,
-    resourceId,
-    uploadHost: useLegacyUpload ? ticket.server_address : getUploadBaseUrl(),
-    fileName,
-    fileHash,
-    filePath,
-    uploadResponse: uploadResult,
-    error: uploadError,
-  };
-}
+      resolve({
+        success: true,
+        mode: isUpdate ? 'update' : 'create',
+        publicUrl,
+        verifyCode: result.verify_code || null,
+        resourceId,
+        createResult: result.create_result || null,
+        stdout: stdout.trim(),
+      });
+    });
 
-/**
- * 打开浏览器认领页面
- */
-function openClaimUrl(url) {
-  return new Promise((resolve) => {
-    const platform = process.platform;
-    const command = platform === 'win32' ? 'start' : platform === 'darwin' ? 'open' : 'xdg-open';
-    const proc = spawn(command, [url], { stdio: 'ignore', detached: true, shell: platform === 'win32' });
-    proc.on('error', () => { /* ignore */ });
-    proc.unref();
-    resolve();
+    proc.on('error', (err) => {
+      reject(new Error(`无法启动文件托管: ${err.message}`));
+    });
   });
 }
 
 module.exports = {
-  TICKET_API,
-  getTicketApiUrl,
-  getUploadBaseUrl,
-  sha256File,
-  getFileHostingTicket,
-  uploadFile,
   host,
   openClaimUrl,
+  parseAiResult,
 };

package/lib/tunnel.js

@@ -41,7 +41,7 @@ async function start(options) {
   }
 
   const binPath = await download.ensureBinary(arch);
-  const args = ['-ip', ip, '-port', String(portNum)];
+  const args = ['tunnel', '-ip', ip, '-port', String(portNum)];
 
   if (detached) {
     const logFile = pidManager.getLogFilePath('tunnel', { ip, port: portNum });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aweray/hsk-cli",
-  "version": "0.2.2",
+  "version": "0.4.2",
   "description": "HSK CLI - 内网穿透 & 文件托管，支持 Windows/macOS/Linux 多平台",
   "main": "index.js",
   "bin": {
@@ -28,8 +28,7 @@
   "dependencies": {
     "commander": "^11.0.0",
     "chalk": "^4.1.2",
-    "node-fetch": "^2.7.0",
-    "form-data": "^4.0.0"
+    "node-fetch": "^2.7.0"
   },
   "homepage": "https://hsk.oray.com",
   "files": [

package/versions.json

@@ -1,18 +1,18 @@
 {
-  "version": "0.2.2",
+  "version": "0.4.2",
   "downloadBaseUrl": "https://dw.oray.com/onion/cli",
   "binaries": {
     "windows-amd64": {
-      "filename": "hsk-cli-windows-amd64-v0.2.2.exe"
+      "filename": "hsk-cli-windows-amd64-v0.4.2.exe"
     },
     "darwin-amd64": {
-      "filename": "hsk-cli-darwin-amd64-v0.2.2"
+      "filename": "hsk-cli-darwin-amd64-v0.4.2"
     },
     "darwin-arm64": {
-      "filename": "hsk-cli-darwin-arm64-v0.2.2"
+      "filename": "hsk-cli-darwin-arm64-v0.4.2"
     },
     "linux-amd64": {
-      "filename": "hsk-cli-linux-amd64-v0.2.2"
+      "filename": "hsk-cli-linux-amd64-v0.4.2"
     }
   }
 }