clash-kit 1.1.0 → 1.1.2

package/lib/commands/proxy.js

@@ -1,73 +1,73 @@
-import { select } from '@inquirer/prompts'
-import ora from 'ora'
-import chalk from 'chalk'
-import * as api from '../api.js'
-
-export async function proxy() {
-  let spinner = ora('正在获取最新代理列表...').start()
-  try {
-    let proxies = await api.getProxies()
-    spinner.stop()
-
-    // 通常我们只关心 Proxy 组或者 Selector 类型的组
-    const groups = Object.values(proxies).filter(p => p.type === 'Selector')
-
-    if (groups.length === 0) {
-      console.log('没有找到可选的节点组')
-      return
-    }
-
-    // 选择组
-    const groupName = await select({
-      message: '请选择节点组:',
-      choices: groups.map(g => ({ name: g.name, value: g.name })),
-    })
-
-    const group = proxies[groupName]
-
-    // 自动对组内所有节点进行测速
-    spinner = ora(`测速后选择合适的节点，正在对 [${groupName}] 进行测速...`).start()
-    await Promise.all(group.all.map(n => api.getProxyDelay(n).catch(() => {})))
-
-    // 测速完成后，刷新数据以获取最新状态
-    proxies = await api.getProxies()
-    spinner.stop()
-
-    const updatedGroup = proxies[groupName]
-
-    // 选择节点
-    const proxyName = await select({
-      message: `[${groupName}] 当前: ${updatedGroup.now}, 请选择节点:`,
-      pageSize: 15,
-      choices: updatedGroup.all.map(n => {
-        const node = proxies[n]
-        const lastHistory = node?.history && node.history.length ? node.history[node.history.length - 1] : null
-        let delayInfo = ''
-
-        if (lastHistory && lastHistory.delay > 0) {
-          const delay = lastHistory.delay
-          if (delay < 800) {
-            delayInfo = chalk.green(` ${delay}ms`)
-          } else if (delay < 1500) {
-            delayInfo = chalk.yellow(` ${delay}ms`)
-          } else {
-            delayInfo = chalk.red(` ${delay}ms`)
-          }
-        } else if (lastHistory && lastHistory.delay === 0) {
-          delayInfo = chalk.red(' [超时]')
-        } else {
-          delayInfo = chalk.gray(' [未测速]')
-        }
-
-        return { name: `${n}${delayInfo}`, value: n }
-      }),
-    })
-
-    spinner = ora(`正在切换到 ${proxyName}...`).start()
-    await api.switchProxy(groupName, proxyName)
-    spinner.succeed(`已切换 ${groupName} -> ${proxyName}`)
-  } catch (err) {
-    if (spinner && spinner.isSpinning) spinner.fail(err.message)
-    else console.error(err.message)
-  }
-}
+import { select } from '@inquirer/prompts'
+import ora from 'ora'
+import chalk from 'chalk'
+import * as api from '../api.js'
+
+export async function proxy() {
+  let spinner = ora('正在获取最新代理列表...').start()
+  try {
+    let proxies = await api.getProxies()
+    spinner.stop()
+
+    // 通常我们只关心 Proxy 组或者 Selector 类型的组
+    const groups = Object.values(proxies).filter(p => p.type === 'Selector')
+
+    if (groups.length === 0) {
+      console.log('没有找到可选的节点组')
+      return
+    }
+
+    // 选择组
+    const groupName = await select({
+      message: '请选择节点组:',
+      choices: groups.map(g => ({ name: g.name, value: g.name })),
+    })
+
+    const group = proxies[groupName]
+
+    // 自动对组内所有节点进行测速
+    spinner = ora(`测速后选择合适的节点，正在对 [${groupName}] 进行测速...`).start()
+    await Promise.all(group.all.map(n => api.getProxyDelay(n).catch(() => {})))
+
+    // 测速完成后，刷新数据以获取最新状态
+    proxies = await api.getProxies()
+    spinner.stop()
+
+    const updatedGroup = proxies[groupName]
+
+    // 选择节点
+    const proxyName = await select({
+      message: `[${groupName}] 当前: ${updatedGroup.now}, 请选择节点:`,
+      pageSize: 15,
+      choices: updatedGroup.all.map(n => {
+        const node = proxies[n]
+        const lastHistory = node?.history && node.history.length ? node.history[node.history.length - 1] : null
+        let delayInfo = ''
+
+        if (lastHistory && lastHistory.delay > 0) {
+          const delay = lastHistory.delay
+          if (delay < 800) {
+            delayInfo = chalk.green(` ${delay}ms`)
+          } else if (delay < 1500) {
+            delayInfo = chalk.yellow(` ${delay}ms`)
+          } else {
+            delayInfo = chalk.red(` ${delay}ms`)
+          }
+        } else if (lastHistory && lastHistory.delay === 0) {
+          delayInfo = chalk.red(' [超时]')
+        } else {
+          delayInfo = chalk.gray(' [未测速]')
+        }
+
+        return { name: `${n}${delayInfo}`, value: n }
+      }),
+    })
+
+    spinner = ora(`正在切换到 ${proxyName}...`).start()
+    await api.switchProxy(groupName, proxyName)
+    spinner.succeed(`已切换 ${groupName} -> ${proxyName}`)
+  } catch (err) {
+    if (spinner && spinner.isSpinning) spinner.fail(err.message)
+    else console.error(err.message)
+  }
+}

package/lib/commands/restart.js

@@ -0,0 +1,10 @@
+import { stop } from './stop.js'
+import { start } from './start.js'
+
+export async function restart(options) {
+  console.log('正在重启 Clash 服务...')
+  await stop()
+  // 稍微等待一下，确保资源释放
+  await new Promise(resolve => setTimeout(resolve, 1000))
+  await start(options)
+}

package/lib/commands/start.js

@@ -1,30 +1,30 @@
-import * as sysproxy from '../sysproxy.js'
-import { main as startClashService } from '../../index.js'
-import { setTun } from './tun.js'
-
-export async function start(options) {
-  await startClashService()
-
-  const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
-
-  if (options.sysproxy) {
-    console.log('正在等待 Clash API 就绪以设置系统代理...')
-
-    // 尝试 5 次，每次间隔 1 秒
-    for (let i = 0; i < 5; i++) {
-      await sleep(1000)
-      try {
-        const success = await sysproxy.enableSystemProxy()
-        if (success) break
-      } catch (e) {
-        if (i === 4) console.error('设置系统代理超时，请稍后手动设置: clash sysproxy on')
-      }
-    }
-  }
-
-  if (options.tun) {
-    // 稍微延迟一下，确保服务可能有响应
-    await sleep(1000)
-    await setTun('on')
-  }
-}
+import * as sysproxy from '../sysproxy.js'
+import { main as startClashService } from '../../index.js'
+import { setTun } from './tun.js'
+
+export async function start(options) {
+  await startClashService()
+
+  const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+
+  if (options.sysproxy) {
+    console.log('正在等待 Clash API 就绪以设置系统代理...')
+
+    // 尝试 5 次，每次间隔 1 秒
+    for (let i = 0; i < 5; i++) {
+      await sleep(1000)
+      try {
+        const success = await sysproxy.enableSystemProxy()
+        if (success) break
+      } catch (e) {
+        if (i === 4) console.error('设置系统代理超时，请稍后手动设置: clash sysproxy on')
+      }
+    }
+  }
+
+  if (options.tun) {
+    // 稍微延迟一下，确保服务可能有响应
+    await sleep(1000)
+    await setTun('on')
+  }
+}

package/lib/commands/status.js

@@ -1,85 +1,105 @@
-import ora from 'ora'
-import * as api from '../api.js'
-import * as sub from '../subscription.js'
-import * as tun from '../tun.js'
-import * as sysproxy from '../sysproxy.js'
-
-export async function status() {
-  const spinner = ora('正在获取 Clash 状态...').start()
-  try {
-    const config = await api.getConfig()
-    spinner.stop()
-    const apiBase = api.getApiBase()
-    const currentProfile = sub.getCurrentProfile()
-
-    // 获取 TUN 和系统代理状态
-    const tunEnabled = await tun.isTunEnabled()
-    const sysProxyStatus = await sysproxy.getSystemProxyStatus()
-
-    console.log('\n=== Clash 状态 ===')
-    console.log(`状态: \x1b[32m运行中\x1b[0m`)
-    console.log(`当前配置: ${currentProfile || '未知 (默认或手动修改)'}`)
-    console.log(`API 地址: ${apiBase}`)
-    console.log(`运行模式: ${config.mode}`)
-    console.log(`HTTP 端口: ${config['port'] || '未设置'}`)
-    console.log(`Socks5 端口: ${config['socks-port'] || '未设置'}`)
-    if (config['mixed-port']) {
-      console.log(`Mixed 端口: ${config['mixed-port']}`)
-    }
-
-    console.log('\n=== 代理模式 ===')
-    // TUN 状态
-    if (tunEnabled) {
-      console.log(`TUN 模式: \x1b[32m已开启\x1b[0m`)
-    } else {
-      console.log(`TUN 模式: \x1b[90m未开启\x1b[0m`)
-    }
-    // 系统代理状态
-    if (sysProxyStatus.enabled) {
-      console.log(`系统代理: \x1b[32m已开启\x1b[0m (${sysProxyStatus.server}:${sysProxyStatus.port})`)
-    } else {
-      console.log(`系统代理: \x1b[90m未开启\x1b[0m`)
-    }
-
-    const proxies = await api.getProxies()
-
-    // 过滤出 Selector 类型的代理组
-    const selectors = Object.entries(proxies)
-      .filter(([name, proxy]) => proxy.type === 'Selector')
-      .map(([name, proxy]) => ({ name, now: proxy.now }))
-
-    console.log('\n=== 节点信息 ===')
-
-    if (selectors.length === 0) {
-      console.log('未找到节点选择组。')
-    } else {
-      for (const { name, now } of selectors) {
-        process.stdout.write(`组 [${name}] 当前节点: ${now} ... 测速中`)
-        const testUrl = now === 'DIRECT' ? 'http://connect.rom.miui.com/generate_204' : undefined
-        const delay = await api.getProxyDelay(now, testUrl)
-
-        let delayStr = ''
-        if (delay > 0) {
-          if (delay < 200) delayStr = `\x1b[32m${delay}ms\x1b[0m`
-          else if (delay < 500) delayStr = `\x1b[33m${delay}ms\x1b[0m`
-          else delayStr = `\x1b[31m${delay}ms\x1b[0m`
-        } else {
-          delayStr = `\x1b[31m超时/失败\x1b[0m`
-        }
-
-        process.stdout.clearLine(0)
-        process.stdout.cursorTo(0)
-        console.log(`组 [${name}] 当前节点: ${now} - 延迟: ${delayStr}`)
-      }
-    }
-  } catch (err) {
-    if (spinner.isSpinning) spinner.stop()
-    if (err.message && (err.message.includes('ECONNREFUSED') || err.message.includes('无法连接'))) {
-      console.log('\n=== Clash 状态 ===')
-      console.log(`状态: \x1b[31m未运行\x1b[0m`)
-      console.log('提示: 请使用 `clash start` 启动服务')
-    } else {
-      console.error(`获取状态失败: ${err.message}`)
-    }
-  }
-}
+import ora from 'ora'
+import path from 'path'
+import * as api from '../api.js'
+import * as sub from '../subscription.js'
+import * as tun from '../tun.js'
+import * as sysproxy from '../sysproxy.js'
+import { getClashProcessInfo } from '../kernel.js'
+import chalk from 'chalk'
+import boxen from 'boxen'
+
+export async function status() {
+  const spinner = ora('正在获取 Clash 状态...').start()
+  try {
+    const [config, currentProfile, tunEnabled, sysProxyStatus, proxies, processInfo] = await Promise.all([
+      api.getConfig(),
+      sub.getCurrentProfile(),
+      tun.isTunEnabled(),
+      sysproxy.getSystemProxyStatus(),
+      api.getProxies(),
+      getClashProcessInfo(),
+    ])
+
+    spinner.stop()
+    const apiBase = api.getApiBase()
+    const configPath = sub.CONFIG_PATH
+    const logPath = path.resolve(path.dirname(configPath), 'clash.log')
+
+    const content = []
+    let statusLine = `状态：${chalk.green('运行中')}`
+    if (processInfo?.pid) {
+      statusLine += ` (PID: ${chalk.yellow(processInfo.pid)})`
+    }
+    content.push(statusLine)
+    content.push(`当前配置: ${currentProfile || '未知'}`)
+    content.push(`运行模式: ${config.mode}`)
+    content.push(`API 地址:    ${chalk.cyan(apiBase)}`)
+    content.push(`HTTP 代理:   ${chalk.cyan(`http://127.0.0.1:${config['port'] || '未设置'}`)}`)
+    content.push(`SOCKS5 代理: ${chalk.cyan(`socks5://127.0.0.1:${config['socks-port'] || '未设置'}`)}`)
+    content.push(
+      `混合代理:    ${config['mixed-port'] ? chalk.cyan(`127.0.0.1:${config['mixed-port']}`) : chalk.gray('未设置')}`,
+    )
+    content.push('')
+    const sysProxyText = sysProxyStatus.enabled
+      ? chalk.green(`已开启 (${sysProxyStatus.server}:${sysProxyStatus.port})`)
+      : chalk.gray('未开启')
+    content.push(`系统代理: ${sysProxyText}`)
+    content.push(`TUN 模式(拦截所有流量): ${tunEnabled ? chalk.green('已开启') : chalk.gray('未开启')}`)
+    content.push('')
+    content.push(`日志文件: ${chalk.blueBright.underline(logPath)}`)
+    content.push(`配置文件: ${chalk.blueBright.underline(configPath)}`)
+    content.push('')
+
+    content.push('')
+    content.push(
+      `${chalk.gray('系统代理: ck sys <on|off> , TUN 模式: ck tun <on|off>')} , 更多命令: ${chalk.blue('ck help')}`,
+    )
+
+    console.log(
+      boxen(content.join('\n'), {
+        title: chalk.bold.bgGreen('Clash Kit'),
+        titleAlignment: 'center',
+        padding: 1,
+        borderStyle: 'bold',
+        borderColor: 'green',
+        margin: { top: 1, bottom: 0, left: 0, right: 0 },
+      }),
+    )
+
+    // 默认测速 Proxy 组的所有节点
+    const group = proxies['Proxy'] || Object.values(proxies).find(p => p.type === 'Selector')
+    if (group?.now) {
+      const testUrl = group.now === 'DIRECT' ? 'http://connect.rom.miui.com/generate_204' : undefined
+      const delay = await api.getProxyDelay(group.now, testUrl)
+      let delayStr = ''
+      if (delay > 0) {
+        if (delay < 200) delayStr = chalk.green(`${delay}ms`)
+        else if (delay < 500) delayStr = chalk.yellow(`${delay}ms`)
+        else delayStr = chalk.red(`${delay}ms`)
+      } else {
+        delayStr = chalk.red('超时/失败')
+      }
+      console.log(`🚀 节点延迟 [${group.name}: ${group.now}]: ${delayStr}`)
+    }
+  } catch (err) {
+    if (spinner.isSpinning) spinner.stop()
+    if (err.message && (err.message.includes('ECONNREFUSED') || err.message.includes('无法连接'))) {
+      const configPath = sub.CONFIG_PATH
+      const content = []
+      content.push(`状态：${chalk.yellow('未运行')}`)
+      content.push('提示：请使用 `ck start` 启动服务')
+      content.push(`当前配置文件: ${configPath || '未知'}`)
+      console.log(
+        boxen(content.join('\n'), {
+          title: chalk.bold.bgYellow('Clash Kit'),
+          titleAlignment: 'center',
+          padding: 1,
+          borderStyle: 'single',
+          margin: { top: 1, bottom: 1, left: 0, right: 0 },
+        }),
+      )
+    } else {
+      console.error(`获取状态失败: ${err.message}`)
+    }
+  }
+}

package/lib/commands/stop.js

@@ -1,30 +1,67 @@
-import ora from 'ora'
-import * as sysproxy from '../sysproxy.js'
-import * as tun from '../tun.js'
-import { killClashProcess } from '../kernel.js'
-
-export async function stop() {
-  const spinner = ora('正在停止 Clash 服务...').start()
-  try {
-    // 停止前先关闭系统代理
-    await sysproxy.disableSystemProxy()
-
-    // 检查并关闭 TUN 模式
-    const tunEnabled = await tun.isTunEnabled()
-    if (tunEnabled) {
-      spinner.text = '正在关闭 TUN 模式...'
-      await tun.disableTun()
-      console.log('TUN 模式已关闭')
-    }
-
-    // 使用公共函数停止进程
-    spinner.text = '正在停止 Clash 服务...'
-    if (killClashProcess()) {
-      spinner.succeed('Clash 服务已停止')
-    } else {
-      spinner.warn('未找到运行中的 Clash 服务，或已停止')
-    }
-  } catch (err) {
-    spinner.warn(`停止服务时出错: ${err.message}`)
-  }
-}
+import ora from 'ora'
+import * as sysproxy from '../sysproxy.js'
+import * as tun from '../tun.js'
+import { setTun } from './tun.js'
+import { killClashProcess } from '../kernel.js'
+import boxen from 'boxen'
+import chalk from 'chalk'
+
+export async function stop() {
+  const spinner = ora('正在停止服务...').start()
+  try {
+    let wasTunEnabled = false
+
+    // 1. 关闭系统代理
+    spinner.text = '正在关闭系统代理...'
+    await sysproxy.disableSystemProxy()
+
+    // 2. 检查并关闭 TUN 模式
+    const tunEnabled = await tun.isTunEnabled()
+    if (tunEnabled) {
+      wasTunEnabled = true
+      spinner.text = '正在关闭 TUN 模式...'
+      const result = await setTun('off', { silent: true })
+      if (!result.success) {
+        throw new Error(`关闭 TUN 模式失败: ${result.error}`)
+      }
+    }
+
+    // 3. 停止 Clash 核心进程
+    spinner.text = '正在停止 Clash 核心进程...'
+    const stopped = killClashProcess()
+    spinner.stop() // All processing is done, stop spinner
+
+    // 4. 显示最终结果
+    if (stopped) {
+      const content = []
+      content.push(`Clash 服务: ${chalk.yellow('已停止')}`)
+      content.push(`系统代理: ${chalk.gray('已关闭')}`)
+      if (wasTunEnabled) content.push(`TUN 模式: ${chalk.gray('已关闭 (DNS 已恢复)')}`)
+
+      console.log(
+        boxen(content.join('\n'), {
+          title: 'Clash Kit',
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'green',
+          titleAlignment: 'center',
+        }),
+      )
+    } else {
+      console.log(
+        boxen(chalk.yellow('未找到运行中的 Clash 服务'), {
+          title: 'Clash Kit',
+          padding: 1,
+          margin: 1,
+          borderStyle: 'round',
+          borderColor: 'yellow',
+          titleAlignment: 'center',
+        }),
+      )
+    }
+  } catch (err) {
+    if (spinner.isSpinning) spinner.stop()
+    console.error(`\n停止服务时出错: ${err.message}`)
+  }
+}