@aweray/hsk-cli 0.3.0 → 0.4.2

package/bin/hsk-cli.js

@@ -181,13 +181,14 @@ 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 apiUrl = process.env.HSK_FILE_HOSTING_API || 'https://onion-forward-api.oraybeta.com/public/file-hosting';
+      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}`);
@@ -205,7 +206,7 @@ const hostCmd = program
       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('🌐 正在打开浏览器...'));
@@ -301,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) => {
@@ -316,10 +317,11 @@ program
 
     if (isDryRun(options)) {
       const info = options.arch ? platform.fromString(options.arch) : platform.detect();
-      const apiUrl = process.env.HSK_FILE_HOSTING_API || 'https://onion-forward-api.oraybeta.com/public/file-hosting';
+      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(
         `${buildCmd} → ${cmdParts.join(' ')}`,
@@ -327,6 +329,7 @@ program
           构建命令: buildCmd,
           构建目录: buildDir,
           资源ID: options.resourceId || '(新建)',
+          复用检测: options.reuse ? '启用' : '禁用',
           预期操作: '构建 → 原生二进制自动打包目录 → 上传',
           预期输出: '[AI_RESULT] public_url + resource_id',
         }
@@ -350,7 +353,7 @@ program
 
       // 3. 上传（原生二进制自动打包目录）
       console.log(chalk.cyan('☁️  上传中...'));
-      const result = await fileHosting.host(buildDir, { resourceId: options.resourceId });
+      const result = await fileHosting.host(buildDir, { resourceId: options.resourceId, reuse: options.reuse });
 
       handleOutput(result, fmt);
 

package/lib/fileHosting.js

@@ -3,6 +3,7 @@ const path = require('path');
 const { spawn } = require('child_process');
 const download = require('./download');
 const resourceStore = require('./resourceStore');
+const resourceChecker = require('./resourceChecker');
 
 /**
  * 解析原生二进制输出，提取 [AI_RESULT] 键值对
@@ -49,6 +50,34 @@ async function host(filePath, options = {}) {
     throw new Error(`文件不存在: ${resolvedPath}`);
   }
 
+  // === 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;
+      }
+    }
+  }
+
   // 确保原生二进制存在
   const binPath = await download.ensureBinary();
 

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.3.0",
+  "version": "0.4.2",
   "description": "HSK CLI - 内网穿透 & 文件托管，支持 Windows/macOS/Linux 多平台",
   "main": "index.js",
   "bin": {

package/versions.json

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