clash-kit 1.1.1 → 1.1.5

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 '../service.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([])
+    if (!dnsResult.success) {
+      console.warn(chalk.yellow(`\n  DNS 恢复失败 (可忽略，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}`))
+  }
+}

package/lib/kernel.js

@@ -1,178 +1,197 @@
-import axios from 'axios'
-import fs from 'fs'
-import path from 'path'
-import os from 'os'
-import zlib from 'zlib'
-import AdmZip from 'adm-zip'
-import { fileURLToPath } from 'url'
-import ora from 'ora'
-import cliProgress from 'cli-progress'
-import chalk from 'chalk'
-import { execSync } from 'child_process'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const MIHOMO_VERSION_URL = 'https://github.com/MetaCubeX/mihomo/releases/latest/download/version.txt'
-
-const PLATFORM_MAP = {
-  'win32-x64': 'mihomo-windows-amd64-compatible',
-  'win32-ia32': 'mihomo-windows-386',
-  'win32-arm64': 'mihomo-windows-arm64',
-  'darwin-x64': 'mihomo-darwin-amd64-compatible',
-  'darwin-arm64': 'mihomo-darwin-arm64',
-  'linux-x64': 'mihomo-linux-amd64-compatible',
-  'linux-arm64': 'mihomo-linux-arm64',
-}
-
-export async function downloadClash(targetDir) {
-  const platform = os.platform()
-  const arch = os.arch()
-  const key = `${platform}-${arch}`
-  const name = PLATFORM_MAP[key]
-
-  if (!name) {
-    throw new Error(`不支持的平台: ${platform}-${arch}`)
-  }
-
-  // 1. 获取最新版本
-  const spinner = ora('正在获取最新 Mihomo 版本信息...').start()
-  let version
-  try {
-    const { data } = await axios.get(MIHOMO_VERSION_URL)
-    version = data.trim()
-    spinner.succeed(`检测到最新版本: ${version}`)
-  } catch (e) {
-    spinner.fail(`获取版本信息失败: ${e.message}`)
-    throw new Error(`获取版本信息失败: ${e.message}`)
-  }
-
-  // 2. 构建下载 URL
-  const isWin = platform === 'win32'
-  const urlExt = isWin ? 'zip' : 'gz'
-  const downloadUrl = `https://github.com/MetaCubeX/mihomo/releases/download/${version}/${name}-${version}.${urlExt}`
-  const tempFileName = `mihomo-temp.${urlExt}`
-  const tempPath = path.join(targetDir, tempFileName)
-  const targetBinName = `clash-kit${isWin ? '.exe' : ''}`
-  const targetBinPath = path.join(targetDir, targetBinName)
-
-  // 3. 下载文件
-  console.log(`正在下载: ${downloadUrl}`)
-  const bar = new cliProgress.SingleBar(
-    {
-      format: '下载进度 | {bar} | {percentage}% | {valueFormatted}/{totalFormatted} MB',
-      hideCursor: true,
-    },
-    cliProgress.Presets.shades_classic
-  )
-
-  try {
-    let started = false
-    let totalMB = '0.0'
-    const response = await axios({
-      url: downloadUrl,
-      method: 'GET',
-      responseType: 'arraybuffer',
-      onDownloadProgress: progressEvent => {
-        if (progressEvent.total) {
-          const loadedMB = (progressEvent.loaded / 1024 / 1024).toFixed(1)
-          if (!started) {
-            totalMB = (progressEvent.total / 1024 / 1024).toFixed(1)
-            bar.start(progressEvent.total, 0, {
-              valueFormatted: '0.0',
-              totalFormatted: totalMB,
-            })
-            started = true
-          }
-          bar.update(progressEvent.loaded, {
-            valueFormatted: loadedMB,
-            totalFormatted: totalMB,
-          })
-        }
-      },
-    })
-    bar.stop()
-
-    fs.writeFileSync(tempPath, response.data)
-    spinner.start(chalk.green('下载完成，正在解压...'))
-  } catch (e) {
-    bar.stop()
-    throw new Error(`下载失败: ${e.message}`)
-  }
-
-  // 4. 解压文件
-  try {
-    if (isWin) {
-      // ZIP 解压
-      const zip = new AdmZip(tempPath)
-      const zipEntries = zip.getEntries()
-      // 查找可执行文件（通常名字包含 mihoo 或 name）
-      const entry = zipEntries.find(e => e.entryName.includes(name) || e.entryName.endsWith('.exe'))
-      if (!entry) {
-        throw new Error('压缩包中未找到可执行文件')
-      }
-
-      // 1. 解压文件 (使用原文件名)
-      zip.extractEntryTo(entry, targetDir, false, true)
-
-      // 2. 重命名为目标文件名
-      const extractedPath = path.join(targetDir, entry.entryName)
-      if (targetBinName !== entry.entryName) {
-        // 确保目标文件不存在
-        if (fs.existsSync(targetBinPath)) {
-          fs.unlinkSync(targetBinPath)
-        }
-        fs.renameSync(extractedPath, targetBinPath)
-      }
-    } else {
-      // GZ 解压
-      const fileContents = fs.readFileSync(tempPath)
-      const unzipped = zlib.gunzipSync(fileContents)
-      fs.writeFileSync(targetBinPath, unzipped)
-    }
-  } catch (e) {
-    spinner.fail(chalk.red(`解压失败: ${e.message}`))
-    throw new Error(`解压失败: ${e.message}`)
-  } finally {
-    // 清理临时文件
-    fs.unlinkSync(tempPath)
-    spinner.succeed(chalk.green(`解压完成: ${targetBinPath}`))
-  }
-
-  // 5. 设置权限
-  if (!isWin) {
-    spinner.start('正在设置执行权限...')
-    fs.chmodSync(targetBinPath, 0o755)
-    spinner.succeed(chalk.green('设置执行权限完成'))
-  }
-
-  return targetBinPath
-}
-
-export function killClashProcess() {
-  try {
-    if (process.platform === 'win32') {
-      execSync('taskkill /F /IM clash-kit.exe', { stdio: 'ignore' })
-    } else {
-      execSync('pkill -f clash-kit', { stdio: 'ignore' })
-    }
-    return true
-  } catch (e) {
-    return false
-  }
-}
-
-function testDownload() {
-  // 测试下载功能
-  const rootDir = path.join(__dirname, '..')
-  downloadClash(rootDir)
-    .then(binPath => {
-      console.log(`Mihomo 内核已下载并解压到: ${binPath}`)
-    })
-    .catch(err => {
-      console.error(`下载失败: ${err.message}`)
-    })
-}
-
-// 如果直接运行此文件，则执行测试
-if (import.meta.url === `file://${process.argv[1]}`) testDownload()
+import axios from 'axios'
+import fs from 'fs'
+import path from 'path'
+import os from 'os'
+import zlib from 'zlib'
+import AdmZip from 'adm-zip'
+import { fileURLToPath } from 'url'
+import ora from 'ora'
+import cliProgress from 'cli-progress'
+import chalk from 'chalk'
+import { execSync } from 'child_process'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const MIHOMO_VERSION_URL = 'https://github.com/MetaCubeX/mihomo/releases/latest/download/version.txt'
+
+const PLATFORM_MAP = {
+  'win32-x64': 'mihomo-windows-amd64-compatible',
+  'win32-ia32': 'mihomo-windows-386',
+  'win32-arm64': 'mihomo-windows-arm64',
+  'darwin-x64': 'mihomo-darwin-amd64-compatible',
+  'darwin-arm64': 'mihomo-darwin-arm64',
+  'linux-x64': 'mihomo-linux-amd64-compatible',
+  'linux-arm64': 'mihomo-linux-arm64',
+}
+
+export async function downloadClash(targetDir) {
+  const platform = os.platform()
+  const arch = os.arch()
+  const key = `${platform}-${arch}`
+  const name = PLATFORM_MAP[key]
+
+  if (!name) {
+    throw new Error(`不支持的平台: ${platform}-${arch}`)
+  }
+
+  // 1. 获取最新版本
+  const spinner = ora('正在获取最新 Mihomo 版本信息...').start()
+  let version
+  try {
+    const { data } = await axios.get(MIHOMO_VERSION_URL)
+    version = data.trim()
+    spinner.succeed(`检测到最新版本: ${version}`)
+  } catch (e) {
+    spinner.fail(`获取版本信息失败: ${e.message}`)
+    throw new Error(`获取版本信息失败: ${e.message}`)
+  }
+
+  // 2. 构建下载 URL
+  const isWin = platform === 'win32'
+  const urlExt = isWin ? 'zip' : 'gz'
+  const downloadUrl = `https://github.com/MetaCubeX/mihomo/releases/download/${version}/${name}-${version}.${urlExt}`
+  const tempFileName = `mihomo-temp.${urlExt}`
+  const tempPath = path.join(targetDir, tempFileName)
+  const targetBinName = `clash-kit${isWin ? '.exe' : ''}`
+  const targetBinPath = path.join(targetDir, targetBinName)
+
+  // 3. 下载文件
+  console.log(`正在下载: ${downloadUrl}`)
+  const bar = new cliProgress.SingleBar(
+    {
+      format: '下载进度 | {bar} | {percentage}% | {valueFormatted}/{totalFormatted} MB',
+      hideCursor: true,
+    },
+    cliProgress.Presets.shades_classic
+  )
+
+  try {
+    let started = false
+    let totalMB = '0.0'
+    const response = await axios({
+      url: downloadUrl,
+      method: 'GET',
+      responseType: 'arraybuffer',
+      onDownloadProgress: progressEvent => {
+        if (progressEvent.total) {
+          const loadedMB = (progressEvent.loaded / 1024 / 1024).toFixed(1)
+          if (!started) {
+            totalMB = (progressEvent.total / 1024 / 1024).toFixed(1)
+            bar.start(progressEvent.total, 0, {
+              valueFormatted: '0.0',
+              totalFormatted: totalMB,
+            })
+            started = true
+          }
+          bar.update(progressEvent.loaded, {
+            valueFormatted: loadedMB,
+            totalFormatted: totalMB,
+          })
+        }
+      },
+    })
+    bar.stop()
+
+    fs.writeFileSync(tempPath, response.data)
+    spinner.start(chalk.green('下载完成，正在解压...'))
+  } catch (e) {
+    bar.stop()
+    throw new Error(`下载失败: ${e.message}`)
+  }
+
+  // 4. 解压文件
+  try {
+    if (isWin) {
+      // ZIP 解压
+      const zip = new AdmZip(tempPath)
+      const zipEntries = zip.getEntries()
+      // 查找可执行文件（通常名字包含 mihoo 或 name）
+      const entry = zipEntries.find(e => e.entryName.includes(name) || e.entryName.endsWith('.exe'))
+      if (!entry) {
+        throw new Error('压缩包中未找到可执行文件')
+      }
+
+      // 1. 解压文件 (使用原文件名)
+      zip.extractEntryTo(entry, targetDir, false, true)
+
+      // 2. 重命名为目标文件名
+      const extractedPath = path.join(targetDir, entry.entryName)
+      if (targetBinName !== entry.entryName) {
+        // 确保目标文件不存在
+        if (fs.existsSync(targetBinPath)) {
+          fs.unlinkSync(targetBinPath)
+        }
+        fs.renameSync(extractedPath, targetBinPath)
+      }
+    } else {
+      // GZ 解压
+      const fileContents = fs.readFileSync(tempPath)
+      const unzipped = zlib.gunzipSync(fileContents)
+      fs.writeFileSync(targetBinPath, unzipped)
+    }
+  } catch (e) {
+    spinner.fail(chalk.red(`解压失败: ${e.message}`))
+    throw new Error(`解压失败: ${e.message}`)
+  } finally {
+    // 清理临时文件
+    fs.unlinkSync(tempPath)
+    spinner.succeed(chalk.green(`解压完成: ${targetBinPath}`))
+  }
+
+  // 5. 设置权限
+  if (!isWin) {
+    spinner.start('正在设置执行权限...')
+    fs.chmodSync(targetBinPath, 0o755)
+    spinner.succeed(chalk.green('设置执行权限完成'))
+  }
+
+  return targetBinPath
+}
+
+export function getClashProcessInfo() {
+  try {
+    let pid
+    if (process.platform === 'win32') {
+      const command = "tasklist | findstr clash-kit.exe"
+      const output = execSync(command, { encoding: 'utf-8' })
+      const match = output.match(/(\d+)/)
+      pid = match ? match[0] : null
+    } else {
+      const command = "pgrep -f clash-kit"
+      pid = execSync(command, { encoding: 'utf-8' }).trim()
+    }
+    return pid ? { pid } : null
+  } catch (e) {
+    // pgrep/findstr throws an error if no process is found
+    return null
+  }
+}
+
+export function killClashProcess() {
+  try {
+    if (process.platform === 'win32') {
+      execSync('taskkill /F /IM clash-kit.exe', { stdio: 'ignore' })
+    } else {
+      execSync('pkill -f clash-kit', { stdio: 'ignore' })
+    }
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
+function testDownload() {
+  // 测试下载功能
+  const rootDir = path.join(__dirname, '..')
+  downloadClash(rootDir)
+    .then(binPath => {
+      console.log(`Mihomo 内核已下载并解压到: ${binPath}`)
+    })
+    .catch(err => {
+      console.error(`下载失败: ${err.message}`)
+    })
+}
+
+// 如果直接运行此文件，则执行测试
+if (import.meta.url === `file://${process.argv[1]}`) testDownload()