@yixinkj/cli 1.0.7 → 1.0.9

package/README.md

@@ -1,94 +1,36 @@
 # @yixinkj/cli
 
-译心跨境本地 MCP stdio 服务器，用于在 MCP 客户端通过 `npx -y` 启动 MCP 服务并调用本地 Rust 能力。
+译心跨境原生 CLI 启动器。通过 `npx -y` 下载并缓存当前平台的原生二进制，然后把参数直接转发给 `alibaba-cli`。
 
-## MCP 客户端配置
-
-配置方式：`Stdio`
-
-命令：
+## 使用
 
 ```bash
-npx -y @yixinkj/cli@latest
-```
-
-推荐环境变量：
-
-```text
-YIXIN_PHONE=你的手机号
-YIXIN_AUTH_URL=http://47.237.81.135:3000/v1/token
+npx -y @yixinkj/cli@latest --help
+npx -y @yixinkj/cli@latest --ads --period last-week
 ```
 
-`YIXIN_AUTH_URL` 已内置默认值，普通用户只需要填写 `YIXIN_PHONE`。也可以通过 MCP tool `configure_auth` 写入本机配置；环境变量优先于本机配置。
+首次运行会从公开 GitHub Release 下载二进制到 `~/.yixin/bin`。
 
-## 工具
+macOS 下下载完成后会自动处理每个二进制：
 
-### configure_auth
+- 清除 `com.apple.quarantine`
+- 设置可执行权限
 
-参数：
+授权、手机号保存、token 缓存、广告数据抓取和 HTML 报告生成均由原生 `alibaba-cli` 内置完成。
 
-```json
-{
-  "phone": "客户授权手机号",
-  "authUrl": "http://47.237.81.135:3000/v1/token",
-  "skill": "ads"
-}
-```
-
-执行流程：
-
-1. 使用传入的 `phone`、`authUrl` 向授权服务换取一次短期 token。
-2. 验证成功后写入 `~/.yixin/config.json`。
-3. 文件权限尽量设置为 `0600`。
-4. 环境变量仍然优先；环境变量缺失时才读取本机配置。
-
-### check_auth
-
-参数可省略：
-
-```json
-{
-  "skill": "ads"
-}
-```
-
-执行流程：
-
-1. 检查当前平台是否支持。
-2. 如当前版本二进制尚未安装，则从公开 GitHub Release 下载对应平台包并解压到 `~/.yixin/bin`。
-3. 从环境变量或 `~/.yixin/config.json` 读取授权手机号；授权服务地址默认使用 `http://47.237.81.135:3000/v1/token`，也可由配置覆盖。
-4. 向授权服务提交 `{ phone, skill, version }`。
-5. 返回自检结果；不会生成广告报告。
-
-### run_ads_report
-
-参数：
-
-```json
-{
-  "period": "last-week"
-}
-```
-
-执行流程：
-
-1. 从环境变量或 `~/.yixin/config.json` 读取授权手机号；授权服务地址默认使用 `http://47.237.81.135:3000/v1/token`，也可由配置覆盖。
-2. 向授权服务提交 `{ phone, skill: "ads", version }`。
-3. 获取短期授权 token。
-4. 如当前版本二进制尚未安装，则从公开 GitHub Release 下载对应平台包并解压到 `~/.yixin/bin`。
-5. 使用以下参数运行 `~/.yixin/bin/alibaba-cli-{platform}`：
+## 环境变量
 
 ```text
---ads --period <period>
+YIXIN_PHONE       可选。授权手机号；未设置时 CLI 会读取 ~/.yixin/config.json，仍没有则交互式询问。
+YIXIN_AUTH_URL    可选。授权服务地址，默认已内置。
+YIXIN_RELEASE_REPO       可选。默认 yixinkj/cli-releases。
+YIXIN_RELEASE_BASE_URL   可选。覆盖二进制下载基础 URL。
+YIXIN_GITHUB_TOKEN       可选。下载私有 Release 时使用；正式公开分发通常不需要。
 ```
 
-6. 将原生二进制的 stdout 返回给 MCP 客户端。
-
 ## 二进制发布包
 
 默认从 `yixinkj/cli-releases` 下载与 npm 包版本一致的 release asset：
 
 - `darwin-arm64` -> `yixin-mac-arm64.tar.gz`
-- `win32-x64` -> `yixin-win-x64.zip`
-
-可通过 `YIXIN_RELEASE_REPO` 或 `YIXIN_RELEASE_BASE_URL` 覆盖下载来源。
+- `win32-x64` -> `yixin-win32-x64.zip`

package/index.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 
-import http from 'node:http';
 import https from 'node:https';
 import fs from 'node:fs';
 import os from 'node:os';
@@ -8,64 +7,40 @@ import path from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { createRequire } from 'node:module';
 
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
-
 const require = createRequire(import.meta.url);
 const packageJson = require('./package.json');
 
 const VERSION = packageJson.version;
 const RELEASE_REPO = process.env.YIXIN_RELEASE_REPO || 'yixinkj/cli-releases';
 const CACHE_ROOT = path.join(os.homedir(), '.yixin');
-const BIN_DIR = path.join(os.homedir(), '.yixin', 'bin');
+const BIN_DIR = path.join(CACHE_ROOT, 'bin');
 const VERSION_FILE = path.join(CACHE_ROOT, 'version');
-const CONFIG_FILE = path.join(CACHE_ROOT, 'config.json');
-const DEFAULT_AUTH_URL = process.env.YIXIN_DEFAULT_AUTH_URL || 'http://47.237.81.135:3000/v1/token';
 
 const PLATFORM_TARGETS = {
   'darwin-arm64': {
     id: 'mac-arm64',
     archive: 'yixin-mac-arm64.tar.gz',
     mainBinary: 'alibaba-cli-mac-arm64',
-    binaries: ['alibaba-cli-mac-arm64', 'report-engine-mac-arm64', 'browser-bridge-mac-arm64']
+    binaries: ['alibaba-cli-mac-arm64', 'browser-bridge-mac-arm64']
   },
   'win32-x64': {
-    id: 'win-x64',
-    archive: 'yixin-win-x64.zip',
-    mainBinary: 'alibaba-cli-win-x64.exe',
-    binaries: ['alibaba-cli-win-x64.exe', 'report-engine-win-x64.exe', 'browser-bridge-win-x64.exe']
+    id: 'win32-x64',
+    archive: 'yixin-win32-x64.zip',
+    mainBinary: 'alibaba-cli-win32-x64.exe',
+    binaries: ['alibaba-cli-win32-x64.exe', 'browser-bridge-win32-x64.exe']
   }
 };
 
-const PERIOD_ALIASES = {
-  '上周': 'last-week',
-  'last_week': 'last-week',
-  'last-week': 'last-week',
-  '上月': 'last-month',
-  'last_month': 'last-month',
-  'last-month': 'last-month',
-  '昨日': 'yesterday',
-  '昨天': 'yesterday',
-  'yesterday': 'yesterday',
-  '今日': 'today',
-  '今天': 'today',
-  'today': 'today',
-  '近7天': 'last-7-days',
-  '最近7天': 'last-7-days',
-  'last_7_days': 'last-7-days',
-  'last-7-days': 'last-7-days',
-  '近30天': 'last-30-days',
-  '最近30天': 'last-30-days',
-  'last_30_days': 'last-30-days',
-  'last-30-days': 'last-30-days'
-};
+function fail(message) {
+  console.error(`[yixin] ${message}`);
+  process.exit(1);
+}
 
 function detectTarget() {
   const platformKey = `${process.platform}-${process.arch}`;
   const target = PLATFORM_TARGETS[platformKey];
   if (!target) {
-    throw new Error(`暂不支持当前平台：${process.platform}/${process.arch}。已支持：mac-arm64、win-x64。`);
+    throw new Error(`暂不支持当前平台：${process.platform}/${process.arch}。已支持：mac-arm64、win32-x64。`);
   }
   return target;
 }
@@ -91,51 +66,6 @@ function releaseUrl(target) {
   return `https://github.com/${RELEASE_REPO}/releases/download/v${VERSION}/${target.archive}`;
 }
 
-function readLocalConfig() {
-  if (!fs.existsSync(CONFIG_FILE)) {
-    return {};
-  }
-  try {
-    return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
-  } catch (error) {
-    throw new Error(`本地授权配置文件无效：${CONFIG_FILE}，${error.message}`);
-  }
-}
-
-function writeLocalConfig(config) {
-  fs.mkdirSync(CACHE_ROOT, { recursive: true });
-  const tempPath = `${CONFIG_FILE}.${process.pid}.tmp`;
-  fs.writeFileSync(tempPath, `${JSON.stringify(config, null, 2)}\n`, { mode: 0o600 });
-  fs.renameSync(tempPath, CONFIG_FILE);
-  try {
-    fs.chmodSync(CONFIG_FILE, 0o600);
-  } catch (_) {
-    // Windows 可能会忽略 POSIX 权限位。
-  }
-}
-
-function getAuthSettings() {
-  const localConfig = readLocalConfig();
-  const envPhone = String(process.env.YIXIN_PHONE || '').trim();
-  const envLegacyKey = String(process.env.YIXIN_KEY || '').trim();
-  const envAuthUrl = String(process.env.YIXIN_AUTH_URL || '').trim();
-  const localPhone = String(localConfig.yixinPhone || localConfig.yixinKey || '').trim();
-  const localAuthUrl = String(localConfig.yixinAuthUrl || '').trim();
-  const phone = envPhone || envLegacyKey || localPhone;
-  const authUrl = envAuthUrl || localAuthUrl || DEFAULT_AUTH_URL;
-
-  return {
-    phone,
-    authUrl,
-    phoneSource: envPhone
-      ? 'env:YIXIN_PHONE'
-      : (envLegacyKey ? 'env:YIXIN_KEY' : (localPhone ? CONFIG_FILE : 'missing')),
-    authUrlSource: envAuthUrl
-      ? 'env:YIXIN_AUTH_URL'
-      : (localAuthUrl ? CONFIG_FILE : 'default')
-  };
-}
-
 function downloadFile(url, outputPath, redirectsLeft = 5) {
   return new Promise((resolve, reject) => {
     const requestUrl = new URL(url);
@@ -173,9 +103,7 @@ function downloadFile(url, outputPath, redirectsLeft = 5) {
 
       const file = fs.createWriteStream(outputPath);
       response.pipe(file);
-      file.on('finish', () => {
-        file.close(resolve);
-      });
+      file.on('finish', () => file.close(resolve));
       file.on('error', reject);
     }).on('error', reject);
   });
@@ -222,34 +150,40 @@ function extractArchive(archivePath, target) {
   throw new Error(`暂不支持的压缩包类型：${target.archive}`);
 }
 
-function chmodExecutables(target) {
-  if (process.platform === 'win32') {
+function prepareMacBinary(filePath) {
+  if (process.platform !== 'darwin' || !fs.existsSync(filePath)) {
     return;
   }
-  for (const name of target.binaries) {
-    const filePath = path.join(BIN_DIR, name);
-    if (fs.existsSync(filePath)) {
-      fs.chmodSync(filePath, 0o755);
-    }
+
+  spawnSync('xattr', ['-dr', 'com.apple.quarantine', filePath], {
+    encoding: 'utf8',
+    stdio: 'ignore'
+  });
+
+  const chmod = spawnSync('chmod', ['+x', filePath], {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe']
+  });
+  if (chmod.error) {
+    throw chmod.error;
+  }
+  if (chmod.status !== 0) {
+    throw new Error((chmod.stderr || chmod.stdout || `chmod +x failed: ${filePath}`).trim());
   }
 }
 
-function clearMacQuarantine() {
-  if (process.platform !== 'darwin' || !fs.existsSync(BIN_DIR)) {
+function prepareInstalledBinaries(target) {
+  if (process.platform !== 'darwin') {
     return;
   }
-  const result = spawnSync('xattr', ['-dr', 'com.apple.quarantine', BIN_DIR], {
-    encoding: 'utf8'
-  });
-  if (result.error && result.error.code !== 'ENOENT') {
-    console.error(`[yixin] macOS 安全隔离标记清理失败：${result.error.message}`);
+  for (const name of target.binaries) {
+    prepareMacBinary(path.join(BIN_DIR, name));
   }
 }
 
 async function ensureInstalled(target) {
   if (isInstalled(target)) {
-    clearMacQuarantine();
-    chmodExecutables(target);
+    prepareInstalledBinaries(target);
     return;
   }
 
@@ -262,8 +196,7 @@ async function ensureInstalled(target) {
     console.error(`[yixin] 正在下载 ${url}`);
     await downloadFile(url, archivePath);
     extractArchive(archivePath, target);
-    clearMacQuarantine();
-    chmodExecutables(target);
+    prepareInstalledBinaries(target);
 
     for (const name of target.binaries) {
       const filePath = path.join(BIN_DIR, name);
@@ -278,271 +211,21 @@ async function ensureInstalled(target) {
   }
 }
 
-async function requestToken({ phone, skill, version, authUrl }) {
-  const normalizedAuthUrl = String(authUrl || '').trim();
-  if (!normalizedAuthUrl) {
-    throw new Error('未配置授权服务器地址，请添加 YIXIN_AUTH_URL');
-  }
-
-  const url = new URL(normalizedAuthUrl);
-  const body = JSON.stringify({ phone, skill, version });
-  const client = url.protocol === 'https:' ? https : http;
-
-  return new Promise((resolve, reject) => {
-    const request = client.request({
-      method: 'POST',
-      protocol: url.protocol,
-      hostname: url.hostname,
-      port: url.port || undefined,
-      path: `${url.pathname}${url.search}`,
-      headers: {
-        'Content-Type': 'application/json',
-        'Content-Length': Buffer.byteLength(body),
-        'User-Agent': '@yixinkj/cli'
-      }
-    }, (response) => {
-      let data = '';
-      response.setEncoding('utf8');
-      response.on('data', (chunk) => {
-        data += chunk;
-      });
-      response.on('end', () => {
-        if (response.statusCode < 200 || response.statusCode >= 300) {
-          reject(new Error(`授权服务器请求失败：HTTP ${response.statusCode}`));
-          return;
-        }
-        try {
-          resolve(JSON.parse(data));
-        } catch (error) {
-          reject(new Error(`授权服务器返回了无效 JSON：${error.message}`));
-        }
-      });
-    });
-
-    request.setTimeout(15000, () => {
-      request.destroy(new Error('授权服务器请求超时'));
-    });
-    request.on('error', reject);
-    request.write(body);
-    request.end();
-  });
-}
-
-async function authorize(skill) {
-  const settings = getAuthSettings();
-  const phone = settings.phone;
-  if (!phone) {
-    throw new Error('未配置授权手机号，请在 MCP 客户端环境变量里添加 YIXIN_PHONE=手机号，或调用 configure_auth 写入本机配置');
-  }
-
-  const auth = await requestToken({ phone, skill, version: VERSION, authUrl: settings.authUrl });
-  if (!auth || auth.valid !== true || !auth.token) {
-    throw new Error(auth && auth.reason ? auth.reason : '授权失败');
-  }
-  return auth.token;
-}
-
-async function runNative({ target, args, token }) {
-  await ensureInstalled(target);
-  const executablePath = binaryPath(target);
-  const result = spawnSync(executablePath, args, {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      YIXIN_TOKEN: token
-    }
-  });
-
-  if (result.error) {
-    throw result.error;
-  }
-  if (result.status !== 0) {
-    const detail = [result.stderr, result.stdout].filter(Boolean).join('\n').trim();
-    throw new Error(detail || `${executablePath} exited with code ${result.status}`);
-  }
-  return result.stdout || '';
-}
-
-async function runAdsReport({ period }) {
-  const normalizedPeriod = normalizePeriod(period);
-  if (!normalizedPeriod) {
-    throw new Error('period 不能为空');
-  }
-
-  const token = await authorize('ads');
-  const target = detectTarget();
-  const stdout = await runNative({
-    target,
-    args: ['--ads', '--period', normalizedPeriod],
-    token
-  });
-  return stdout;
-}
-
-async function checkAuth({ skill }) {
-  const normalizedSkill = String(skill || 'ads').trim() || 'ads';
+async function main() {
   const target = detectTarget();
   await ensureInstalled(target);
-  const settings = getAuthSettings();
-  await authorize(normalizedSkill);
-
-  return [
-    'Yixin MCP 自检通过',
-    `version: ${VERSION}`,
-    `skill: ${normalizedSkill}`,
-    `platform: ${target.id}`,
-    `binary: ${binaryPath(target)}`,
-    `phone_source: ${settings.phoneSource}`,
-    `auth_url_source: ${settings.authUrlSource}`,
-    `config_file: ${CONFIG_FILE}`
-  ].join('\n');
-}
-
-async function configureAuth({ phone, authUrl, skill }) {
-  const normalizedPhone = String(phone || '').trim();
-  const hasCustomAuthUrl = authUrl !== undefined && authUrl !== null && String(authUrl).trim() !== '';
-  const normalizedAuthUrl = hasCustomAuthUrl ? String(authUrl).trim() : DEFAULT_AUTH_URL;
-  const normalizedSkill = String(skill || 'ads').trim() || 'ads';
 
-  if (!normalizedPhone) {
-    throw new Error('phone 不能为空');
-  }
-  if (!normalizedAuthUrl) {
-    throw new Error('authUrl 不能为空');
-  }
-  try {
-    new URL(normalizedAuthUrl);
-  } catch (error) {
-    throw new Error(`authUrl 不是有效 URL：${error.message}`);
-  }
-
-  const auth = await requestToken({
-    phone: normalizedPhone,
-    skill: normalizedSkill,
-    version: VERSION,
-    authUrl: normalizedAuthUrl
+  const result = spawnSync(binaryPath(target), process.argv.slice(2), {
+    stdio: 'inherit',
+    env: process.env
   });
-  if (!auth || auth.valid !== true || !auth.token) {
-    throw new Error(auth && auth.reason ? auth.reason : '授权验证失败，未写入本地配置');
-  }
 
-  const existingConfig = readLocalConfig();
-  const nextConfig = {
-    ...existingConfig,
-    yixinPhone: normalizedPhone,
-    updatedAt: new Date().toISOString()
-  };
-  delete nextConfig.yixinKey;
-  if (hasCustomAuthUrl) {
-    nextConfig.yixinAuthUrl = normalizedAuthUrl;
-  } else {
-    delete nextConfig.yixinAuthUrl;
+  if (result.error) {
+    throw result.error;
   }
-  writeLocalConfig(nextConfig);
-
-  return [
-    'Yixin 授权配置已写入本机',
-    `skill: ${normalizedSkill}`,
-    `auth_url: ${hasCustomAuthUrl ? normalizedAuthUrl : `${DEFAULT_AUTH_URL} (default)`}`,
-    `config_file: ${CONFIG_FILE}`,
-    '后续 check_auth/run_ads_report 会优先使用环境变量；环境变量缺失时使用本机配置'
-  ].join('\n');
-}
-
-function normalizePeriod(period) {
-  const value = String(period || '').trim();
-  return PERIOD_ALIASES[value] || PERIOD_ALIASES[value.toLowerCase()] || value;
-}
-
-function registerTools(server) {
-  server.registerTool(
-    'configure_auth',
-    {
-      title: 'Configure Auth',
-      description: '验证并保存译心授权手机号到本机配置；授权服务地址默认内置，也可用 authUrl 或 YIXIN_AUTH_URL 覆盖。',
-      inputSchema: {
-        phone: z
-          .string()
-          .min(1)
-          .describe('客户授权手机号。'),
-        authUrl: z
-          .string()
-          .optional()
-          .describe(`授权服务地址，默认 ${DEFAULT_AUTH_URL}。`),
-        skill: z
-          .string()
-          .optional()
-          .describe('授权能力名，默认 ads。')
-      }
-    },
-    async ({ phone, authUrl, skill }) => {
-      const stdout = await configureAuth({ phone, authUrl, skill });
-      return {
-        content: [{ type: 'text', text: stdout }]
-      };
-    }
-  );
-
-  server.registerTool(
-    'check_auth',
-    {
-      title: 'Check Auth',
-      description: '检查译心 MCP 环境、二进制安装和授权手机号是否可用；不生成广告报告。',
-      inputSchema: {
-        skill: z
-          .string()
-          .optional()
-          .describe('授权能力名，默认 ads。')
-      }
-    },
-    async ({ skill }) => {
-      const stdout = await checkAuth({ skill });
-      return {
-        content: [{ type: 'text', text: stdout }]
-      };
-    }
-  );
-
-  server.registerTool(
-    'run_ads_report',
-    {
-      title: 'Run Ads Report',
-      description: '运行本地译心广告报告二进制。period 可用 last-week（上周）、last-month（上月）、yesterday（昨日）、today（今日）、last-7-days（近7天）、last-30-days（近30天），也支持中文别名和下划线别名。',
-      inputSchema: {
-        period: z
-          .string()
-          .min(1)
-          .describe('相对时间范围。推荐值：last-week、last-month、yesterday、today、last-7-days、last-30-days。')
-      }
-    },
-    async ({ period }) => {
-      const stdout = await runAdsReport({ period });
-      return {
-        content: [{ type: 'text', text: stdout }]
-      };
-    }
-  );
-
-  // 后续新增能力时，在这里继续注册 server.registerTool(...)。
-}
-
-async function startMcpServer() {
-  const server = new McpServer({
-    name: 'yixin-cli',
-    version: VERSION
-  });
-  registerTools(server);
-
-  const transport = new StdioServerTransport();
-  await server.connect(transport);
-  console.error(`Yixin MCP Server v${VERSION} running on stdio`);
-}
-
-async function main() {
-  await startMcpServer();
+  process.exit(result.status === null ? 1 : result.status);
 }
 
 main().catch((error) => {
-  console.error(`[yixin] ${error.message}`);
-  process.exit(1);
+  fail(error.message);
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yixinkj/cli",
-  "version": "1.0.7",
-  "description": "Yixin local MCP server and CLI launcher for MCP clients.",
+  "version": "1.0.9",
+  "description": "Yixin native CLI launcher.",
   "type": "module",
   "bin": {
     "yixin": "index.js"
@@ -10,10 +10,7 @@
     "index.js",
     "README.md"
   ],
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.25.2",
-    "zod": "^3.25.76"
-  },
+  "dependencies": {},
   "engines": {
     "node": ">=18"
   },