clash-kit 1.1.0 → 1.1.2

package/lib/commands/sub.js

@@ -1,81 +1,81 @@
-import { select, input } from '@inquirer/prompts'
-import path from 'path'
-import fs from 'fs'
-import { fileURLToPath } from 'url'
-import chalk from 'chalk'
-import * as sub from '../subscription.js'
-import { CLASH_BIN_PATH } from '../../index.js'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-async function handleAddSubscription(url, name) {
-  const profiles = sub.listProfiles()
-  // 没有找到可选的订阅，或没找到 config.yaml
-  // __dirname here is lib/commands. Config is at ROOT/config.yaml. so join ../../config.yaml
-  const isFirst = profiles.length === 0 || !fs.existsSync(path.join(__dirname, '../../config.yaml'))
-
-  await sub.downloadSubscription(url, name)
-
-  if (!isFirst) return
-  console.log(`检测到这是第一个订阅，正在自动切换到 ${name}...`)
-  await sub.useProfile(name)
-}
-
-export async function manageSub(options) {
-  // 检查 clash-kit 二进制文件是否存在
-  if (!fs.existsSync(CLASH_BIN_PATH)) {
-    return console.error(chalk.red('\n找不到 Clash.Meta 内核文件,请先运行 clash init 命令初始化内核！\n'))
-  }
-
-  if (options.add) {
-    if (!options.name) return console.error('错误: 添加订阅时必须指定名称 (-n)')
-    try {
-      await handleAddSubscription(options.add, options.name)
-    } catch (err) {
-      console.error(err.message)
-    }
-  } else if (options.list) {
-    const profiles = sub.listProfiles()
-    console.log(`${profiles.length ? '已添加的订阅:' : '暂无已添加的订阅'}`)
-    profiles.forEach(p => console.log(`- ${p}`))
-  } else if (options.use) {
-    try {
-      await sub.useProfile(options.use)
-    } catch (err) {
-      console.error(err.message)
-    }
-  } else {
-    // 交互式模式
-    const profiles = sub.listProfiles()
-
-    const action = await select({
-      message: '请选择操作:',
-      choices: [
-        { name: '切换订阅', value: 'switch' },
-        { name: '添加订阅', value: 'add' },
-      ],
-    })
-
-    if (action === 'switch') {
-      if (profiles.length === 0) {
-        console.log('暂无订阅，请先添加')
-        return
-      }
-      const profile = await select({
-        message: '选择要使用的订阅:',
-        choices: profiles.map(p => ({ name: p, value: p })),
-      })
-      await sub.useProfile(profile)
-    } else if (action === 'add') {
-      const url = await input({ message: '请输入订阅链接:' })
-      const name = await input({ message: '请输入订阅名称:' })
-
-      try {
-        await handleAddSubscription(url, name)
-      } catch (err) {
-        console.error(err.message)
-      }
-    }
-  }
-}
+import { select, input } from '@inquirer/prompts'
+import path from 'path'
+import fs from 'fs'
+import { fileURLToPath } from 'url'
+import chalk from 'chalk'
+import * as sub from '../subscription.js'
+import { CLASH_BIN_PATH } from '../../index.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+async function handleAddSubscription(url, name) {
+  const profiles = sub.listProfiles()
+  // 没有找到可选的订阅，或没找到 config.yaml
+  // __dirname here is lib/commands. Config is at ROOT/config.yaml. so join ../../config.yaml
+  const isFirst = profiles.length === 0 || !fs.existsSync(path.join(__dirname, '../../config.yaml'))
+
+  await sub.downloadSubscription(url, name)
+
+  if (!isFirst) return
+  console.log(`检测到这是第一个订阅，正在自动切换到 ${name}...`)
+  await sub.useProfile(name)
+}
+
+export async function manageSub(options) {
+  // 检查 clash-kit 二进制文件是否存在
+  if (!fs.existsSync(CLASH_BIN_PATH)) {
+    return console.error(chalk.red('\n找不到 Clash.Meta 内核文件,请先运行 clash init 命令初始化内核！\n'))
+  }
+
+  if (options.add) {
+    if (!options.name) return console.error('错误: 添加订阅时必须指定名称 (-n)')
+    try {
+      await handleAddSubscription(options.add, options.name)
+    } catch (err) {
+      console.error(err.message)
+    }
+  } else if (options.list) {
+    const profiles = sub.listProfiles()
+    console.log(`${profiles.length ? '已添加的订阅:' : '暂无已添加的订阅'}`)
+    profiles.forEach(p => console.log(`- ${p}`))
+  } else if (options.use) {
+    try {
+      await sub.useProfile(options.use)
+    } catch (err) {
+      console.error(err.message)
+    }
+  } else {
+    // 交互式模式
+    const profiles = sub.listProfiles()
+
+    const action = await select({
+      message: '请选择操作:',
+      choices: [
+        { name: '切换订阅', value: 'switch' },
+        { name: '添加订阅', value: 'add' },
+      ],
+    })
+
+    if (action === 'switch') {
+      if (profiles.length === 0) {
+        console.log('暂无订阅，请先添加')
+        return
+      }
+      const profile = await select({
+        message: '选择要使用的订阅:',
+        choices: profiles.map(p => ({ name: p, value: p })),
+      })
+      await sub.useProfile(profile)
+    } else if (action === 'add') {
+      const url = await input({ message: '请输入订阅链接:' })
+      const name = await input({ message: '请输入订阅名称:' })
+
+      try {
+        await handleAddSubscription(url, name)
+      } catch (err) {
+        console.error(err.message)
+      }
+    }
+  }
+}

package/lib/commands/sysproxy.js

@@ -1,24 +1,60 @@
-import { select } from '@inquirer/prompts'
-import * as sysproxy from '../sysproxy.js'
-
-export async function setSysProxy(action) {
-  if (action === 'on') {
-    await sysproxy.enableSystemProxy()
-  } else if (action === 'off') {
-    await sysproxy.disableSystemProxy()
-  } else {
-    // 交互式选择
-    const answer = await select({
-      message: '请选择系统代理操作:',
-      choices: [
-        { name: '开启系统代理', value: 'on' },
-        { name: '关闭系统代理', value: 'off' },
-      ],
-    })
-    if (answer === 'on') {
-      await sysproxy.enableSystemProxy()
-    } else {
-      await sysproxy.disableSystemProxy()
-    }
-  }
-}
+import { select } from '@inquirer/prompts'
+import * as sysproxy from '../sysproxy.js'
+import ora from 'ora'
+import boxen from 'boxen'
+import chalk from 'chalk'
+
+async function handleAction(action) {
+  if (action === 'on') {
+    const spinner = ora('正在开启系统代理...').start()
+    const result = await sysproxy.enableSystemProxy()
+    if (result.success) {
+      spinner.stop()
+      const content = [`状态: ${chalk.green('已开启')}`, `地址: ${chalk.cyan(`${result.host}:${result.port}`)}`]
+      console.log(
+        boxen(content.join('\n'), {
+          title: '系统代理',
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'green',
+        }),
+      )
+    } else {
+      spinner.fail(`开启失败: ${result.error}`)
+    }
+  } else if (action === 'off') {
+    const spinner = ora('正在关闭系统代理...').start()
+    const result = await sysproxy.disableSystemProxy()
+    if (result.success) {
+      spinner.stop()
+      console.log(
+        boxen(chalk.yellow('状态: 已关闭'), {
+          title: '系统代理',
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'yellow',
+        }),
+      )
+    } else {
+      spinner.fail(`关闭失败: ${result.error}`)
+    }
+  }
+}
+
+export async function setSysProxy(action) {
+  if (action === 'on' || action === 'off') {
+    await handleAction(action)
+  } else {
+    // 交互式选择
+    const answer = await select({
+      message: '请选择系统代理操作:',
+      choices: [
+        { name: '开启系统代理', value: 'on' },
+        { name: '关闭系统代理', value: 'off' },
+      ],
+    })
+    await handleAction(answer)
+  }
+}

package/lib/commands/test.js

@@ -1,70 +1,70 @@
-import chalk from 'chalk'
-import * as api from '../api.js'
-
-export async function test() {
-  try {
-    const proxies = await api.getProxies()
-    // 默认测速 Proxy 组的所有节点
-    const group = proxies['Proxy'] || Object.values(proxies).find(p => p.type === 'Selector')
-
-    if (!group) {
-      console.error('找不到 Proxy 组')
-      return
-    }
-
-    console.log(`\n当前测速目标组: [${group.name}]`)
-    console.log(`包含节点数: ${group.all.length}`)
-    console.log('注意: 测速针对的是当前 Clash 正在运行的配置。')
-    console.log('如果刚切换了订阅，请确保看到"配置已热重载生效"提示，或手动重启 clash start。\n')
-
-    const results = []
-    const concurrency = 10
-    const queue = [...group.all]
-    const total = group.all.length
-    let completed = 0
-
-    console.log(chalk.gray(`准备并发测速 (并发数: ${concurrency})...`))
-
-    const worker = async () => {
-      while (queue.length > 0) {
-        const name = queue.shift()
-        if (!name) break
-
-        try {
-          const delay = await api.getProxyDelay(name)
-          completed++
-          const progress = `[${completed}/${total}]`
-
-          if (delay > 0) {
-            const color = delay < 200 ? chalk.green : delay < 800 ? chalk.yellow : chalk.red
-            console.log(`${chalk.gray(progress)} ${chalk.cyan(name)}: ${color(delay + 'ms')}`)
-            results.push({ name, delay })
-          } else {
-            console.log(`${chalk.gray(progress)} ${chalk.cyan(name)}: ${chalk.red('超时')}`)
-            results.push({ name, delay: 99999 })
-          }
-        } catch (err) {
-          completed++
-          results.push({ name, delay: 99999 })
-        }
-      }
-    }
-
-    await Promise.all(Array.from({ length: Math.min(concurrency, total) }, () => worker()))
-
-    console.log(chalk.bold.blue('\n=== 测速结果 (Top 5) ==='))
-    results.sort((a, b) => a.delay - b.delay)
-    results.slice(0, 5).forEach((r, i) => {
-      let delayInfo
-      if (r.delay === 99999) {
-        delayInfo = chalk.red('超时')
-      } else {
-        const color = r.delay < 200 ? chalk.green : r.delay < 800 ? chalk.yellow : chalk.red
-        delayInfo = color(`${r.delay}ms`)
-      }
-      console.log(`${chalk.gray(i + 1 + '.')} ${chalk.bold(r.name)}: ${delayInfo}`)
-    })
-  } catch (err) {
-    console.error(err.message)
-  }
-}
+import chalk from 'chalk'
+import * as api from '../api.js'
+
+export async function test() {
+  try {
+    const proxies = await api.getProxies()
+    // 默认测速 Proxy 组的所有节点
+    const group = proxies['Proxy'] || Object.values(proxies).find(p => p.type === 'Selector')
+
+    if (!group) {
+      console.error('找不到 Proxy 组')
+      return
+    }
+
+    console.log(`\n[${group.name}]${group.all.length}个节点, 当前选中: ${group.now}\n`)
+
+    const results = []
+    const concurrency = 10 // 并发数量
+    const queue = [...group.all]
+    const total = group.all.length
+    let completed = 0
+    const current = group.now // 当前选中节点
+
+    const worker = async () => {
+      while (queue.length > 0) {
+        const name = queue.shift()
+        if (!name) break
+
+        try {
+          const testUrl = name === 'DIRECT' ? 'http://connect.rom.miui.com/generate_204' : undefined
+          const delay = await api.getProxyDelay(name, testUrl)
+          completed++
+          const progress = `[${completed}/${total}]`
+          const isCurrent = name === current
+          const nameDisplay = isCurrent ? chalk.bold.bgCyan(name) : chalk.cyan(name)
+
+          if (delay > 0) {
+            const color = delay < 200 ? chalk.green : delay < 800 ? chalk.yellow : chalk.red
+            console.log(`${chalk.gray(progress)} ${nameDisplay}: ${color(delay + 'ms')}`)
+            results.push({ name, delay, isCurrent })
+          } else {
+            console.log(`${chalk.gray(progress)} ${nameDisplay}: ${chalk.red('超时')}`)
+            results.push({ name, delay: 99999, isCurrent })
+          }
+        } catch (err) {
+          completed++
+          results.push({ name, delay: 99999, isCurrent: name === current })
+        }
+      }
+    }
+
+    await Promise.all(Array.from({ length: Math.min(concurrency, total) }, () => worker()))
+
+    console.log(chalk.bold.blue('\n=== 测速结果 (Top 5) ==='))
+    results.sort((a, b) => a.delay - b.delay)
+    results.slice(0, 5).forEach((r, i) => {
+      let delayInfo
+      if (r.delay === 99999) {
+        delayInfo = chalk.red('超时')
+      } else {
+        const color = r.delay < 200 ? chalk.green : r.delay < 800 ? chalk.yellow : chalk.red
+        delayInfo = color(`${r.delay}ms`)
+      }
+      const nameDisplay = r.isCurrent ? chalk.bold.bgCyan(r.name) : chalk.cyan(r.name)
+      console.log(`${chalk.gray(i + 1 + '.')} ${nameDisplay}: ${delayInfo}`)
+    })
+  } catch (err) {
+    console.error(err.message)
+  }
+}

package/lib/commands/tun.js

@@ -1,95 +1,123 @@
-import { select } from '@inquirer/prompts'
-import chalk from 'chalk'
-import * as tun from '../tun.js'
-import * as sysnet from '../sysnet.js'
-import { main as startClashService } from '../../index.js'
-
-export async function setTun(action) {
-  try {
-    let shouldRestart = false
-
-    if (action === 'on') {
-      if (process.platform !== 'win32') {
-        const hasPerm = tun.checkTunPermissions()
-        const isRoot = process.getuid && process.getuid() === 0
-
-        if (!hasPerm && !isRoot) {
-          console.log(chalk.yellow('检测到内核缺少 SUID 权限，当前也非 Root 用户，TUN 模式可能无法启动。'))
-          const confirm = await select({
-            message: '是否自动授予内核 SUID 权限 (推荐)?',
-            choices: [
-              { name: '是 (仅需输入一次 sudo 密码)', value: true },
-              { name: '否 (之后需要 sudo clash start)', value: false },
-            ],
-          })
-          if (confirm) {
-            tun.setupPermissions()
-            console.log(chalk.green('权限设置成功！'))
-            shouldRestart = true
-          }
-        }
-      }
-
-      console.log('正在开启 TUN 模式...')
-      await tun.enableTun()
-      sysnet.setDNS(['223.5.5.5', '114.114.114.114'])
-      console.log(chalk.green('TUN 模式配置已开启'))
-
-      if (shouldRestart) {
-        console.log(chalk.yellow('因为更改了权限，正在重启 Clash 服务以应用更改...'))
-        startClashService()
-      } else {
-        console.log(chalk.gray('提示: 如果 TUN 模式未生效，请尝试运行 "clash start" 重启服务。'))
-      }
-    } else if (action === 'off') {
-      console.log('正在关闭 TUN 模式...')
-      await tun.disableTun()
-      sysnet.setDNS([]) // 恢复系统默认 DNS
-      console.log(chalk.green('TUN 模式配置已关闭'))
-      console.log(chalk.gray('配置已热重载。'))
-    } else {
-      const isEnabled = await tun.isTunEnabled()
-      const answer = await select({
-        message: `请选择 TUN 模式操作 (当前状态: ${isEnabled ? chalk.green('开启') : chalk.gray('关闭')}):`,
-        choices: [
-          { name: '开启 TUN 模式', value: 'on' },
-          { name: '关闭 TUN 模式', value: 'off' },
-        ],
-      })
-      if (answer === 'on') {
-        if (process.platform !== 'win32') {
-          const hasPerm = tun.checkTunPermissions()
-          const isRoot = process.getuid && process.getuid() === 0
-          if (!hasPerm && !isRoot) {
-            console.log(chalk.yellow('提示: 建议授予内核 SUID 权限以避免 sudo 启动。'))
-            const confirm = await select({
-              message: '是否授予权限?',
-              choices: [
-                { name: '是', value: true },
-                { name: '否', value: false },
-              ],
-            })
-            if (confirm) {
-              tun.setupPermissions()
-              shouldRestart = true
-            }
-          }
-        }
-        await tun.enableTun()
-        sysnet.setDNS(['223.5.5.5', '114.114.114.114'])
-        console.log(chalk.green('TUN 模式配置已开启'))
-
-        if (shouldRestart) {
-          console.log(chalk.yellow('正在重启 Clash 服务...'))
-          startClashService()
-        }
-      } else {
-        await tun.disableTun()
-        sysnet.setDNS([])
-        console.log(chalk.green('TUN 模式配置已关闭'))
-      }
-    }
-  } catch (err) {
-    console.error(chalk.red(`设置 TUN 模式失败: ${err.message}`))
-  }
-}
+import { select } from '@inquirer/prompts'
+import chalk from 'chalk'
+import ora from 'ora'
+import boxen from 'boxen'
+import * as tun from '../tun.js'
+import * as sysnet from '../sysnet.js'
+import { main as startClashService } from '../../index.js'
+
+async function turnOn() {
+  const spinner = ora('正在配置 TUN 模式...').start()
+  let shouldRestart = false
+
+  try {
+    if (process.platform !== 'win32') {
+      spinner.text = '正在检查权限...'
+      const hasPerm = tun.checkTunPermissions()
+      const isRoot = process.getuid && process.getuid() === 0
+
+      if (!hasPerm && !isRoot) {
+        spinner.stop() // Stop spinner for user interaction
+        console.log(chalk.yellow('检测到内核缺少 SUID 权限，TUN 模式可能无法启动。'))
+        const confirm = await select({
+          message: '是否自动授予内核 SUID 权限 (推荐)?',
+          choices: [
+            { name: '是 (需要 sudo 密码)', value: true },
+            { name: '否 (之后可能需要 sudo 启动)', value: false },
+          ],
+        })
+        if (confirm) {
+          tun.setupPermissions() // This is noisy
+          shouldRestart = true
+        }
+        spinner.start('正在继续配置...')
+      }
+    }
+
+    spinner.text = '正在更新配置文件...'
+    await tun.enableTun()
+
+    spinner.text = '正在设置系统 DNS...'
+    sysnet.setDNS(['223.5.5.5', '114.114.114.114']) // This is noisy
+
+    spinner.stop()
+
+    const content = [`TUN 模式: ${chalk.green('已开启')}`, `DNS 设置: ${chalk.cyan('223.5.5.5, 114.114.114.114')}`]
+    console.log(
+      boxen(content.join('\n'), {
+        title: 'TUN 配置成功',
+        padding: 1,
+        margin: 1,
+        borderStyle: 'round',
+        borderColor: 'green',
+      }),
+    )
+
+    if (shouldRestart) {
+      console.log(chalk.yellow('权限已变更，正在重启 Clash 服务以应用...'))
+      await startClashService()
+    } else {
+      console.log(chalk.gray('提示: 配置已热重载。如 TUN 未生效, 可尝试 `clash restart`。'))
+    }
+  } catch (err) {
+    if (spinner.isSpinning) spinner.fail(`设置 TUN 失败: ${err.message}`)
+    else console.error(chalk.red(`设置 TUN 失败: ${err.message}`))
+  }
+}
+
+async function turnOff(options = {}) {
+  const silent = options.silent || false
+  const spinner = silent ? null : ora('正在关闭 TUN 模式...').start()
+  try {
+    if (spinner) spinner.text = '正在更新配置文件...'
+    await tun.disableTun()
+
+    if (spinner) spinner.text = '正在恢复系统 DNS...'
+    const dnsResult = sysnet.setDNS([]) // This is silent now
+    if (!dnsResult.success) {
+      throw new Error(`恢复 DNS 失败: ${dnsResult.error}`)
+    }
+
+    if (spinner) spinner.stop()
+    if (!silent) {
+      console.log(
+        boxen('TUN 模式: ' + chalk.yellow('已关闭'), {
+          title: 'TUN 配置成功',
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'yellow',
+        }),
+      )
+      console.log(chalk.gray('提示: 配置已热重载。'))
+    }
+    return { success: true }
+  } catch (err) {
+    if (spinner) spinner.fail(`关闭 TUN 失败: ${err.message}`)
+    return { success: false, error: err.message }
+  }
+}
+
+export async function setTun(action, options = {}) {
+  try {
+    if (action === 'on') {
+      await turnOn()
+    } else if (action === 'off') {
+      return await turnOff(options)
+    } else {
+      const isEnabled = await tun.isTunEnabled()
+      const answer = await select({
+        message: `请选择 TUN 模式操作 (当前状态: ${isEnabled ? chalk.green('开启') : chalk.gray('关闭')}):`,
+        choices: [
+          { name: '开启 TUN 模式', value: 'on' },
+          { name: '关闭 TUN 模式', value: 'off' },
+        ],
+      })
+      if (answer === 'on') await turnOn()
+      else await turnOff(options)
+    }
+  } catch (err) {
+    // Catch errors from select/prompts
+    console.error(chalk.red(`操作失败: ${err.message}`))
+  }
+}