mihomo-cli 1.2.4 → 1.3.0

package/src/subscription.js

@@ -1,15 +1,20 @@
-const axios = require('axios');
+// 内置模块
+// （无内置模块依赖）
+
+// 第三方模块
+// （无第三方模块依赖，axios 通过 utils.createHttpClient 间接使用）
+
+// 本地模块
 const config = require('./config');
+const utils = require('./utils');
 
+const { colors } = utils;
 const DEFAULT_UPDATE_INTERVAL_HOURS = 12;
 
-const HTTP_CLIENT = axios.create({
+// 订阅专用 HTTP 客户端（超时较短，适合下载订阅配置）
+const HTTP_CLIENT = utils.createHttpClient({
   timeout: 60000,
-  headers: {
-    'User-Agent': 'mihomo-cli/1.0',
-  },
   maxContentLength: 50 * 1024 * 1024,
-  maxBodyLength: 50 * 1024 * 1024,
 });
 
 function parseUserInfo(header) {
@@ -28,11 +33,9 @@ function parseUserInfo(header) {
 
 function parseUsernameFromContentDisposition(header) {
   if (!header) return null;
-  // 匹配 filename="..." 或 filename='...'
   const match = header.match(/filename\s*=\s*["']?([^"';\s]+)["']?/i);
   if (!match) return null;
   const filename = match[1];
-  // 可能是 "glados.one/user@example.com" 格式，取最后一部分
   const parts = filename.split('/');
   return parts[parts.length - 1] || null;
 }
@@ -44,6 +47,60 @@ function formatProxySummary(info) {
   return parts.join(', ');
 }
 
+/**
+ * 获取当前默认订阅（从 index.js 移入）
+ */
+function getActiveSubscription() {
+  const subs = config.getSubscriptions();
+  if (subs.length === 0) {
+    return null;
+  }
+  return subs[0];
+}
+
+/**
+ * 模糊查找订阅（从 index.js 移入）
+ */
+function findSubscriptionFuzzy(subs, pattern) {
+  const lowerPattern = pattern.toLowerCase();
+  let exact = [];
+  let prefix = [];
+  let includes = [];
+
+  for (const s of subs) {
+    const name = s.name.toLowerCase();
+    if (name === lowerPattern) {
+      exact.push(s);
+    } else if (name.startsWith(lowerPattern)) {
+      prefix.push(s);
+    } else if (name.includes(lowerPattern)) {
+      includes.push(s);
+    }
+  }
+
+  if (exact.length > 0) return exact;
+  if (prefix.length > 0) return prefix;
+  return includes;
+}
+
+/**
+ * 从匹配列表中选择单个订阅（从 index.js 移入）
+ * 如果匹配多个，打印错误并退出进程
+ */
+function pickSingleSubscription(subs, pattern) {
+  if (subs.length === 0) {
+    console.error('错误: 未找到匹配 "' + pattern + '" 的订阅');
+    process.exit(1);
+  }
+  if (subs.length === 1) {
+    return subs[0];
+  }
+  console.error('错误: 匹配到多个订阅，请更精确指定');
+  console.log('\n匹配的订阅:');
+  subs.forEach(s => console.log('  ' + s.name));
+  process.exit(1);
+}
+
 async function downloadSubscription(url, subName) {
   if (subName === undefined) subName = 'default';
 
@@ -72,17 +129,14 @@ async function downloadSubscription(url, subName) {
     throw new Error('订阅内容为空');
   }
 
-  config.saveSubRawConfig(subName, content);
+  config.saveSubscriptionRawConfig(subName, content);
 
-  // 提取 response headers 中的订阅信息
   const headers = response.headers;
   const userInfo = parseUserInfo(headers['subscription-userinfo']);
   const updateInterval = headers['profile-update-interval'] ? parseInt(headers['profile-update-interval']) : null;
   const webPageUrl = headers['profile-web-page-url'] || null;
   const username = parseUsernameFromContentDisposition(headers['content-disposition']);
 
-  // 2. 动态数据 + updated_at 保存到缓存文件（settings 只存 name/url）
-
   const cacheData = {
     updated_at: new Date().toISOString(),
   };
@@ -116,7 +170,7 @@ async function downloadSubscription(url, subName) {
 function prepareConfigForStart(mode, subName) {
   if (subName === undefined) subName = 'default';
 
-  const rawContent = config.readSubRawConfig(subName);
+  const rawContent = config.readSubscriptionRawConfig(subName);
   if (!rawContent) {
     throw new Error('未找到订阅配置 "' + subName + '"，请先添加订阅');
   }
@@ -170,9 +224,9 @@ async function autoUpdateStaleSubscription() {
   results.forEach(r => {
     if (r.success) {
       updatedCount++;
-      console.log('✓ ' + r.name + ': 已更新 (' + formatProxySummary(r) + ')');
+      console.log(colors.green('✓') + ' ' + r.name + ': ' + colors.green('已更新') + ' (' + formatProxySummary(r) + ')');
     } else {
-      console.log('✗ ' + r.name + ': 失败 (' + r.error.split('\n')[0] + ')');
+      console.log(colors.red('✗') + ' ' + r.name + ': ' + colors.red('失败') + ' (' + r.error.split('\n')[0] + ')');
     }
   });
 
@@ -185,6 +239,9 @@ async function autoUpdateStaleSubscription() {
 
 module.exports = {
   DEFAULT_UPDATE_INTERVAL_HOURS,
+  getActiveSubscription,
+  findSubscriptionFuzzy,
+  pickSingleSubscription,
   downloadSubscription,
   prepareConfigForStart,
   formatProxySummary,

package/src/utils.js

@@ -1,9 +1,34 @@
+// 内置模块
 const { execSync } = require('child_process');
 
-const _sleepBuf = new Int32Array(1);
+// 第三方模块
+const axios = require('axios');
+
+// 本地模块
+// （无本地模块依赖）
+
+const VERSION = require('../package.json').version;
+
+const sleepBuf = new Int32Array(1);
+
+const NO_COLOR = process.env.NO_COLOR !== undefined || !process.stdout.isTTY;
+
+function colorize(code, str) {
+  if (NO_COLOR) return String(str);
+  return code + String(str) + '\x1b[0m';
+}
+
+const colors = {
+  bold: s => colorize('\x1b[1m', s),
+  red: s => colorize('\x1b[31m', s),
+  green: s => colorize('\x1b[32m', s),
+  yellow: s => colorize('\x1b[33m', s),
+  cyan: s => colorize('\x1b[36m', s),
+  gray: s => colorize('\x1b[90m', s),
+};
 
 function sleepSync(ms) {
-  Atomics.wait(_sleepBuf, 0, 0, ms);
+  Atomics.wait(sleepBuf, 0, 0, ms);
 }
 
 function formatBytes(bytes) {
@@ -71,7 +96,7 @@ function isProcessRunning(pid) {
       encoding: 'utf8',
     }).trim();
     return output.length > 0;
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }
@@ -83,12 +108,78 @@ function isProcessRoot(pid) {
       encoding: 'utf8',
     }).trim();
     return uidOutput === '0';
-  } catch (e) {
+  } catch (_e) {
     return false;
   }
 }
 
+/**
+ * 创建统一的 HTTP 客户端
+ */
+function createHttpClient(options) {
+  const opts = options || {};
+  const timeout = opts.timeout || 60000;
+  const maxContentLength = opts.maxContentLength || 50 * 1024 * 1024;
+  const userAgent = opts.userAgent || 'mihomo-cli/' + VERSION;
+
+  return axios.create({
+    timeout,
+    headers: { 'User-Agent': userAgent },
+    maxContentLength,
+    maxBodyLength: maxContentLength,
+  });
+}
+
+/**
+ * 规范化镜像 URL（从 index.js 移入）
+ */
+function normalizeMirrorUrl(val) {
+  if (!val) return null;
+  if (val === 'direct' || val === 'no' || val === 'none') return null;
+
+  let url = val;
+  if (!url.startsWith('http')) {
+    url = 'https://' + url;
+  }
+  if (!url.endsWith('/')) {
+    url += '/';
+  }
+  return url;
+}
+
+/**
+ * 解析镜像参数（从 index.js 移入）
+ * 返回: { mirror: 镜像URL|null, isOverride: boolean }
+ * mirror = null 表示禁用镜像
+ * mirror = undefined 表示使用默认/配置
+ */
+function parseMirrorArg(args) {
+  if (!args || args.length < 2) {
+    return { mirror: undefined, isOverride: false };
+  }
+
+  if (args.includes('--no-mirror') || args.includes('--direct')) {
+    return { mirror: null, isOverride: true };
+  }
+
+  const mirrorIdx = args.indexOf('--mirror');
+  if (mirrorIdx >= 0 && mirrorIdx + 1 < args.length) {
+    let mirrorVal = args[mirrorIdx + 1];
+    return { mirror: normalizeMirrorUrl(mirrorVal), isOverride: true };
+  }
+
+  for (let i = 1; i < args.length; i++) {
+    const arg = args[i];
+    if (!arg.startsWith('-')) {
+      return { mirror: normalizeMirrorUrl(arg), isOverride: true };
+    }
+  }
+
+  return { mirror: undefined, isOverride: false };
+}
+
 module.exports = {
+  VERSION,
   sleepSync,
   formatBytes,
   formatTimestamp,
@@ -98,4 +189,8 @@ module.exports = {
   getNonFlagArg,
   isProcessRunning,
   isProcessRoot,
+  colors,
+  createHttpClient,
+  normalizeMirrorUrl,
+  parseMirrorArg,
 };