clash-kit 1.1.1 → 1.1.5

package/lib/sysproxy.js

@@ -1,145 +1,133 @@
-import ora from 'ora'
-import { triggerManualProxy } from '@mihomo-party/sysproxy'
-import { execSync } from 'child_process'
-import * as api from './api.js'
-
-const defaultBypass = (() => {
-  switch (process.platform) {
-    case 'linux':
-      return ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1']
-    case 'darwin':
-      return [
-        '127.0.0.1',
-        '192.168.0.0/16',
-        '10.0.0.0/8',
-        '172.16.0.0/12',
-        'localhost',
-        '*.local',
-        '*.crashlytics.com',
-        '<local>',
-      ]
-    case 'win32':
-      return [
-        'localhost',
-        '127.*',
-        '192.168.*',
-        '10.*',
-        '172.16.*',
-        '172.17.*',
-        '172.18.*',
-        '172.19.*',
-        '172.20.*',
-        '172.21.*',
-        '172.22.*',
-        '172.23.*',
-        '172.24.*',
-        '172.25.*',
-        '172.26.*',
-        '172.27.*',
-        '172.28.*',
-        '172.29.*',
-        '172.30.*',
-        '172.31.*',
-        '<local>',
-      ]
-    default:
-      return ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1']
-  }
-})()
-
-export async function enableSystemProxy() {
-  const spinner = ora('正在等待 Clash API 就绪以设置系统代理...').start()
-  try {
-    const config = await api.getConfig()
-    const port = config['mixed-port'] || config['port']
-
-    if (!port) {
-      throw new Error('未找到 HTTP 代理端口配置 (port 或 mixed-port)')
-    }
-
-    // 默认代理地址为 127.0.0.1
-    const host = '127.0.0.1'
-    const bypass = defaultBypass.join(',')
-
-    // 开启系统代理
-    triggerManualProxy(true, host, port, bypass)
-    spinner.succeed(`系统代理已开启: ${host}:${port}`)
-    return true
-  } catch (err) {
-    if (spinner && spinner.isSpinning) spinner.fail(`开启系统代理失败: ${err.message}`)
-    else console.error(err.message)
-    return false
-  }
-}
-
-export async function disableSystemProxy() {
-  try {
-    // 关闭系统代理
-    triggerManualProxy(false, '', 0, '')
-
-    console.log('系统代理已关闭')
-    return true
-  } catch (err) {
-    console.error(`关闭系统代理失败: ${err.message}`)
-    return false
-  }
-}
-
-export async function getSystemProxyStatus() {
-  // 使用 macOS networksetup 命令获取系统代理状态
-  if (process.platform === 'darwin') {
-    try {
-      const output = execSync('networksetup -getwebproxy Wi-Fi', { encoding: 'utf-8' })
-      const enabled = output.includes('Enabled: Yes')
-      if (enabled) {
-        const serverMatch = output.match(/Server: (.+)/)
-        const portMatch = output.match(/Port: (\d+)/)
-        const server = serverMatch ? serverMatch[1].trim() : ''
-        const port = portMatch ? portMatch[1].trim() : ''
-        return { enabled: true, server, port }
-      }
-      return { enabled: false }
-    } catch (e) {
-      return { enabled: false, error: e.message }
-    }
-  } else if (process.platform === 'win32') {
-    try {
-      const regPath = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings'
-      // 查询 ProxyEnable
-      const enableOutput = execSync(`reg query "${regPath}" /v ProxyEnable`, { encoding: 'utf-8' })
-      // 检查输出中是否包含 0x1，表示代理已开启
-      const isEnabled = /ProxyEnable\s+REG_DWORD\s+0x1/.test(enableOutput)
-
-      if (isEnabled) {
-        let server = ''
-        let port = ''
-        try {
-          // 查询 ProxyServer
-          const serverOutput = execSync(`reg query "${regPath}" /v ProxyServer`, { encoding: 'utf-8' })
-          const match = serverOutput.match(/ProxyServer\s+REG_SZ\s+(.*)/)
-
-          if (match && match[1]) {
-            const fullAddress = match[1].trim()
-            // 简单的处理 host:port 格式
-            const lastColonIndex = fullAddress.lastIndexOf(':')
-            if (lastColonIndex !== -1) {
-              server = fullAddress.substring(0, lastColonIndex)
-              port = fullAddress.substring(lastColonIndex + 1)
-            } else {
-              server = fullAddress
-            }
-          }
-        } catch (e) {
-          // 忽略获取详细信息的错误
-        }
-        return { enabled: true, server, port }
-      }
-      return { enabled: false }
-    } catch (e) {
-      // 如果注册表键不存在或查询出错
-      return { enabled: false, error: e.message }
-    }
-  } else {
-    return { enabled: false, error: '不支持的平台' }
-  }
-}
+import { triggerManualProxy } from '@mihomo-party/sysproxy'
+import { execSync } from 'child_process'
+import * as api from './api.js'
+
+const defaultBypass = (() => {
+  switch (process.platform) {
+    case 'linux':
+      return ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1']
+    case 'darwin':
+      return [
+        '127.0.0.1',
+        '192.168.0.0/16',
+        '10.0.0.0/8',
+        '172.16.0.0/12',
+        'localhost',
+        '*.local',
+        '*.crashlytics.com',
+        '<local>',
+      ]
+    case 'win32':
+      return [
+        'localhost',
+        '127.*',
+        '192.168.*',
+        '10.*',
+        '172.16.*',
+        '172.17.*',
+        '172.18.*',
+        '172.19.*',
+        '172.20.*',
+        '172.21.*',
+        '172.22.*',
+        '172.23.*',
+        '172.24.*',
+        '172.25.*',
+        '172.26.*',
+        '172.27.*',
+        '172.28.*',
+        '172.29.*',
+        '172.30.*',
+        '172.31.*',
+        '<local>',
+      ]
+    default:
+      return ['localhost', '127.0.0.1', '192.168.0.0/16', '10.0.0.0/8', '172.16.0.0/12', '::1']
+  }
+})()
+
+export async function enableSystemProxy() {
+  try {
+    const config = await api.getConfig()
+    const port = config['mixed-port'] || config['port']
+    if (!port) throw new Error('未找到 HTTP 代理端口配置 (port 或 mixed-port)')
+    // 默认代理地址为 127.0.0.1
+    const host = '127.0.0.1'
+    const bypass = defaultBypass.join(',')
+
+    // 开启系统代理
+    triggerManualProxy(true, host, port, bypass)
+    return { success: true, host, port }
+  } catch (err) {
+    return { success: false, error: err.message }
+  }
+}
+
+export async function disableSystemProxy() {
+  try {
+    // 关闭系统代理
+    triggerManualProxy(false, '', 0, '')
+    return { success: true }
+  } catch (err) {
+    return { success: false, error: err.message }
+  }
+}
+
+export async function getSystemProxyStatus() {
+  // 使用 macOS networksetup 命令获取系统代理状态
+  if (process.platform === 'darwin') {
+    try {
+      const output = execSync('networksetup -getwebproxy Wi-Fi', { encoding: 'utf-8' })
+      const enabled = output.includes('Enabled: Yes')
+      if (enabled) {
+        const serverMatch = output.match(/Server: (.+)/)
+        const portMatch = output.match(/Port: (\d+)/)
+        const server = serverMatch ? serverMatch[1].trim() : ''
+        const port = portMatch ? portMatch[1].trim() : ''
+        return { enabled: true, server, port }
+      }
+      return { enabled: false }
+    } catch (e) {
+      return { enabled: false, error: e.message }
+    }
+  } else if (process.platform === 'win32') {
+    try {
+      const regPath = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings'
+      // 查询 ProxyEnable
+      const enableOutput = execSync(`reg query "${regPath}" /v ProxyEnable`, { encoding: 'utf-8' })
+      // 检查输出中是否包含 0x1，表示代理已开启
+      const isEnabled = /ProxyEnable\s+REG_DWORD\s+0x1/.test(enableOutput)
+
+      if (isEnabled) {
+        let server = ''
+        let port = ''
+        try {
+          // 查询 ProxyServer
+          const serverOutput = execSync(`reg query "${regPath}" /v ProxyServer`, { encoding: 'utf-8' })
+          const match = serverOutput.match(/ProxyServer\s+REG_SZ\s+(.*)/)
+
+          if (match && match[1]) {
+            const fullAddress = match[1].trim()
+            // 简单的处理 host:port 格式
+            const lastColonIndex = fullAddress.lastIndexOf(':')
+            if (lastColonIndex !== -1) {
+              server = fullAddress.substring(0, lastColonIndex)
+              port = fullAddress.substring(lastColonIndex + 1)
+            } else {
+              server = fullAddress
+            }
+          }
+        } catch (e) {
+          // 忽略获取详细信息的错误
+        }
+        return { enabled: true, server, port }
+      }
+      return { enabled: false }
+    } catch (e) {
+      // 如果注册表键不存在或查询出错
+      return { enabled: false, error: e.message }
+    }
+  } else {
+    return { enabled: false, error: '不支持的平台' }
+  }
+}

package/lib/tun.js

@@ -1,126 +1,126 @@
-import { execSync } from 'child_process'
-import fs from 'fs'
-import path from 'path'
-import YAML from 'yaml'
-import { fileURLToPath } from 'url'
-import { reloadConfig } from './api.js'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const CONFIG_PATH = path.join(__dirname, '../config.yaml')
-const BIN_PATH = path.join(__dirname, '../clash-kit')
-
-export function checkTunPermissions() {
-  if (process.platform === 'win32') return true // Windows 需要管理员权限终端，难以通过文件属性判断
-
-  try {
-    const stats = fs.statSync(BIN_PATH)
-    // SUID 位是 0o4000
-    // 检查所有者是否为 root (uid 0) 并且拥有 SUID 位
-    const isRootOwned = stats.uid === 0
-    const hasSuid = (stats.mode & 0o4000) === 0o4000
-    return isRootOwned && hasSuid
-  } catch (e) {
-    return false
-  }
-}
-
-export function setupPermissions() {
-  if (process.platform === 'win32') {
-    throw new Error('Windows 请使用管理员身份运行终端即可')
-  }
-
-  const group = process.platform === 'darwin' ? 'admin' : 'root'
-  const cmdChown = `chown root:${group} "${BIN_PATH}"`
-  const cmdChmod = `chmod +sx "${BIN_PATH}"`
-
-  try {
-    console.log('正在提升内核权限 (需要 sudo 密码)...')
-    execSync(`sudo ${cmdChown}`, { stdio: 'inherit' })
-    execSync(`sudo ${cmdChmod}`, { stdio: 'inherit' })
-    return true
-  } catch (e) {
-    throw new Error('权限设置失败')
-  }
-}
-
-export async function isTunEnabled() {
-  try {
-    if (!fs.existsSync(CONFIG_PATH)) return false
-    const file = fs.readFileSync(CONFIG_PATH, 'utf8')
-    const config = YAML.parse(file)
-    return config?.tun?.enable === true
-  } catch (error) {
-    return false
-  }
-}
-
-export async function enableTun() {
-  await updateTunConfig(true)
-}
-
-export async function disableTun() {
-  await updateTunConfig(false)
-}
-
-async function updateTunConfig(enable) {
-  try {
-    if (!fs.existsSync(CONFIG_PATH)) {
-      throw new Error('配置文件不存在')
-    }
-
-    const file = fs.readFileSync(CONFIG_PATH, 'utf8')
-    const config = YAML.parse(file) || {}
-
-    // 基础 TUN 配置
-    if (!config.tun) {
-      config.tun = {}
-    }
-
-    // 强制更新关键配置
-    config.tun.enable = enable
-    if (enable) {
-      config.tun.stack = 'mixed' // 推荐使用 mixed 模式 (system/gvisor)
-      config.tun['auto-route'] = true
-      config.tun['auto-detect-interface'] = true
-      config.tun['dns-hijack'] = ['any:53']
-      if (process.platform === 'darwin') {
-        config.tun.device = 'utun1500' // macOS 推荐指定 device
-      }
-    }
-
-    // 开启 TUN 时必须配合 DNS 增强模式
-    if (enable) {
-      if (!config.dns) config.dns = {}
-
-      config.dns.enable = true
-      config.dns['enhanced-mode'] = 'fake-ip'
-      config.dns.listen = config.dns.listen || '0.0.0.0:1053'
-      config.dns.ipv6 = false // 避免 IPv6 导致的一些漏网之鱼，视情况开启
-
-      // 确保有可用的 Nameservers (参考 clash-party 默认值)
-      const defaultNameservers = [
-        'https://223.5.5.5/dns-query', // AliDNS
-        'https://doh.pub/dns-query', // DNSPod
-        '8.8.8.8',
-      ]
-
-      if (!config.dns.nameserver || config.dns.nameserver.length === 0) {
-        config.dns.nameserver = defaultNameservers
-      }
-
-      // 添加 Fake-IP 过滤，防止回环
-      if (!config.dns['fake-ip-filter']) {
-        config.dns['fake-ip-filter'] = ['*', '+.lan', '+.local']
-      }
-    }
-
-    const newYaml = YAML.stringify(config)
-    fs.writeFileSync(CONFIG_PATH, newYaml, 'utf8')
-
-    // 重载配置使生效
-    await reloadConfig(CONFIG_PATH)
-  } catch (error) {
-    throw new Error(`修改 TUN 配置失败: ${error.message}`)
-  }
-}
+import { execSync } from 'child_process'
+import fs from 'fs'
+import path from 'path'
+import YAML from 'yaml'
+import { fileURLToPath } from 'url'
+import { reloadConfig } from './api.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const CONFIG_PATH = path.join(__dirname, '../config.yaml')
+const BIN_PATH = path.join(__dirname, '../clash-kit')
+
+export function checkTunPermissions() {
+  if (process.platform === 'win32') return true // Windows 需要管理员权限终端，难以通过文件属性判断
+
+  try {
+    const stats = fs.statSync(BIN_PATH)
+    // SUID 位是 0o4000
+    // 检查所有者是否为 root (uid 0) 并且拥有 SUID 位
+    const isRootOwned = stats.uid === 0
+    const hasSuid = (stats.mode & 0o4000) === 0o4000
+    return isRootOwned && hasSuid
+  } catch (e) {
+    return false
+  }
+}
+
+export function setupPermissions() {
+  if (process.platform === 'win32') {
+    throw new Error('Windows 请使用管理员身份运行终端即可')
+  }
+
+  const group = process.platform === 'darwin' ? 'admin' : 'root'
+  const cmdChown = `chown root:${group} "${BIN_PATH}"`
+  const cmdChmod = `chmod +sx "${BIN_PATH}"`
+
+  try {
+    console.log('正在提升内核权限 (需要 sudo 密码)...')
+    execSync(`sudo ${cmdChown}`, { stdio: 'inherit' })
+    execSync(`sudo ${cmdChmod}`, { stdio: 'inherit' })
+    return true
+  } catch (e) {
+    throw new Error('权限设置失败')
+  }
+}
+
+export async function isTunEnabled() {
+  try {
+    if (!fs.existsSync(CONFIG_PATH)) return false
+    const file = fs.readFileSync(CONFIG_PATH, 'utf8')
+    const config = YAML.parse(file)
+    return config?.tun?.enable === true
+  } catch (error) {
+    return false
+  }
+}
+
+export async function enableTun() {
+  await updateTunConfig(true)
+}
+
+export async function disableTun() {
+  await updateTunConfig(false)
+}
+
+async function updateTunConfig(enable) {
+  try {
+    if (!fs.existsSync(CONFIG_PATH)) {
+      throw new Error('配置文件不存在')
+    }
+
+    const file = fs.readFileSync(CONFIG_PATH, 'utf8')
+    const config = YAML.parse(file) || {}
+
+    // 基础 TUN 配置
+    if (!config.tun) {
+      config.tun = {}
+    }
+
+    // 强制更新关键配置
+    config.tun.enable = enable
+    if (enable) {
+      config.tun.stack = 'mixed' // 推荐使用 mixed 模式 (system/gvisor)
+      config.tun['auto-route'] = true
+      config.tun['auto-detect-interface'] = true
+      config.tun['dns-hijack'] = ['any:53']
+      if (process.platform === 'darwin') {
+        config.tun.device = 'utun1500' // macOS 推荐指定 device
+      }
+    }
+
+    // 开启 TUN 时必须配合 DNS 增强模式
+    if (enable) {
+      if (!config.dns) config.dns = {}
+
+      config.dns.enable = true
+      config.dns['enhanced-mode'] = 'fake-ip'
+      config.dns.listen = config.dns.listen || '0.0.0.0:1053'
+      config.dns.ipv6 = false // 避免 IPv6 导致的一些漏网之鱼，视情况开启
+
+      // 确保有可用的 Nameservers (参考 clash-party 默认值)
+      const defaultNameservers = [
+        'https://223.5.5.5/dns-query', // AliDNS
+        'https://doh.pub/dns-query', // DNSPod
+        '8.8.8.8',
+      ]
+
+      if (!config.dns.nameserver || config.dns.nameserver.length === 0) {
+        config.dns.nameserver = defaultNameservers
+      }
+
+      // 添加 Fake-IP 过滤，防止回环
+      if (!config.dns['fake-ip-filter']) {
+        config.dns['fake-ip-filter'] = ['*', '+.lan', '+.local']
+      }
+    }
+
+    const newYaml = YAML.stringify(config)
+    fs.writeFileSync(CONFIG_PATH, newYaml, 'utf8')
+
+    // 重载配置使生效
+    await reloadConfig(CONFIG_PATH)
+  } catch (error) {
+    throw new Error(`修改 TUN 配置失败: ${error.message}`)
+  }
+}

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "clash-kit",
-  "version": "1.1.1",
-  "type": "module",
-  "description": "A command-line interface for managing Clash configurations, subscriptions, and proxies.",
-  "bin": {
-    "ck": "./bin/index.js",
-    "clash": "./bin/index.js"
-  },
-  "files": [
-    "bin",
-    "lib",
-    ".gitignore",
-    "default.yaml",
-    "country.mmdb",
-    "index.js",
-    "LICENSE.md",
-    "package.json",
-    "README.md"
-  ],
-  "main": "index.js",
-  "scripts": {
-    "start": "node bin/index.js start",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prepublishOnly": "node scripts/release.js"
-  },
-  "keywords": [
-    "clash",
-    "proxy",
-    "cli",
-    "subscription",
-    "manager"
-  ],
-  "author": "荣顶",
-  "license": "ISC",
-  "packageManager": "pnpm@10.23.0",
-  "dependencies": {
-    "@inquirer/prompts": "^8.1.0",
-    "@mihomo-party/sysproxy": "^2.0.8",
-    "adm-zip": "^0.5.16",
-    "axios": "^1.13.2",
-    "chalk": "^5.6.2",
-    "cli-progress": "^3.12.0",
-    "commander": "^14.0.2",
-    "inquirer": "^13.1.0",
-    "ora": "^9.0.0",
-    "yaml": "^2.8.2"
-  }
-}
+{
+  "name": "clash-kit",
+  "version": "1.1.5",
+  "type": "module",
+  "description": "A command-line interface for managing Clash configurations, subscriptions, and proxies.",
+  "bin": {
+    "ck": "./bin/index.js",
+    "clash": "./bin/index.js"
+  },
+  "files": [
+    "bin",
+    "lib",
+    ".gitignore",
+    "default.yaml",
+    "country.mmdb",
+    "LICENSE.md",
+    "package.json",
+    "README.md"
+  ],
+  "scripts": {
+    "start": "node bin/index.js start",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepublishOnly": "node scripts/release.js"
+  },
+  "keywords": [
+    "clash",
+    "proxy",
+    "cli",
+    "subscription",
+    "manager"
+  ],
+  "author": "荣顶",
+  "license": "ISC",
+  "packageManager": "pnpm@10.23.0",
+  "dependencies": {
+    "@inquirer/prompts": "^8.1.0",
+    "@mihomo-party/sysproxy": "^2.0.8",
+    "adm-zip": "^0.5.16",
+    "axios": "^1.13.2",
+    "boxen": "^8.0.1",
+    "chalk": "^5.6.2",
+    "cli-progress": "^3.12.0",
+    "commander": "^14.0.2",
+    "inquirer": "^13.1.0",
+    "ora": "^9.0.0",
+    "update-notifier": "^7.3.1",
+    "yaml": "^2.8.2"
+  }
+}