clash-kit 1.1.0 → 1.1.2

package/lib/api.js

@@ -1,116 +1,178 @@
-import axios from 'axios'
-import fs from 'fs'
-import path from 'path'
-import YAML from 'yaml'
-import { fileURLToPath } from 'url'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const CONFIG_PATH = path.join(__dirname, '../config.yaml')
-
-export function getProxyPort() {
-  try {
-    const configContent = fs.readFileSync(CONFIG_PATH, 'utf8')
-    const config = YAML.parse(configContent)
-    const httpPort = config['port'] || config['mixed-port']
-    const socksPort = config['socks-port']
-    return { http: httpPort, socks: socksPort }
-  } catch (error) {
-    throw new Error(`读取配置文件失败: ${error.message}`)
-  }
-}
-
-export function getApiBase() {
-  let apiBase = 'http://127.0.0.1:9090'
-  try {
-    if (fs.existsSync(CONFIG_PATH)) {
-      const configContent = fs.readFileSync(CONFIG_PATH, 'utf8')
-      const config = YAML.parse(configContent)
-      if (config['external-controller']) {
-        let host = config['external-controller']
-        // 处理 :9090 这种情况
-        if (host.startsWith(':')) {
-          host = '127.0.0.1' + host
-        }
-        // 处理 0.0.0.0
-        host = host.replace('0.0.0.0', '127.0.0.1')
-        apiBase = `http://${host}`
-      }
-    }
-  } catch (e) {
-    console.error('读取配置文件失败，使用默认 API 地址', e)
-  }
-  return apiBase
-}
-
-const API_SECRET = 'your-strong-secret-key' // 实际项目中应该从 config 读取
-
-const headers = {
-  Authorization: `Bearer ${API_SECRET}`,
-}
-
-export async function getProxies() {
-  try {
-    const res = await axios.get(`${getApiBase()}/proxies`, { headers })
-    return res.data.proxies
-  } catch (err) {
-    throw new Error(`
-      无法连接到 Clash API: ${err.message}
-      
-      请确保 Clash 正在运行并且 API 密钥正确设置。
-      你可以通过 clash status 命令检查状态。
-    `)
-  }
-}
-
-export async function switchProxy(groupName, proxyName) {
-  try {
-    await axios.put(`${getApiBase()}/proxies/${encodeURIComponent(groupName)}`, { name: proxyName }, { headers })
-  } catch (err) {
-    throw new Error(`切换节点失败: ${err.message}`)
-  }
-}
-
-export async function getProxyDelay(proxyName, testUrl = 'http://www.gstatic.com/generate_204') {
-  try {
-    const res = await axios.get(`${getApiBase()}/proxies/${encodeURIComponent(proxyName)}/delay`, {
-      params: {
-        timeout: 5000,
-        url: testUrl,
-      },
-      headers,
-    })
-    return res.data.delay
-  } catch (err) {
-    return -1 // 超时或失败
-  }
-}
-
-export async function getConfig() {
-  try {
-    const res = await axios.get(`${getApiBase()}/configs`, { headers })
-    return res.data
-  } catch (err) {
-    throw new Error(`获取配置失败: ${err.message}`)
-  }
-}
-
-export async function reloadConfig(configPath) {
-  try {
-    // Clash API: PUT /configs
-    // payload: { path: '/absolute/path/to/config.yaml' }
-    await axios.put(`${getApiBase()}/configs?force=true`, { path: configPath }, { headers })
-  } catch (err) {
-    throw new Error(`重载配置失败: ${err.message}`)
-  }
-}
-
-export async function isClashRunning() {
-  try {
-    // 使用较短的超时时间快速检查
-    await axios.get(`${getApiBase()}/version`, { timeout: 200 })
-    return true
-  } catch (err) {
-    return false
-  }
-}
+import axios from 'axios'
+import fs from 'fs'
+import path from 'path'
+import YAML from 'yaml'
+import { fileURLToPath } from 'url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const CONFIG_PATH = path.join(__dirname, '../config.yaml')
+
+export function getProxyPort() {
+  try {
+    const configContent = fs.readFileSync(CONFIG_PATH, 'utf8')
+    const config = YAML.parse(configContent)
+    const httpPort = config['port'] || config['mixed-port']
+    const socksPort = config['socks-port']
+    return { http: httpPort, socks: socksPort }
+  } catch (error) {
+    throw new Error(`读取配置文件失败: ${error.message}`)
+  }
+}
+
+export function getApiBase() {
+  let apiBase = 'http://127.0.0.1:9090'
+  try {
+    if (fs.existsSync(CONFIG_PATH)) {
+      const configContent = fs.readFileSync(CONFIG_PATH, 'utf8')
+      const config = YAML.parse(configContent)
+      if (config['external-controller']) {
+        let host = config['external-controller']
+        // 处理 :9090 这种情况
+        if (host.startsWith(':')) {
+          host = '127.0.0.1' + host
+        }
+        // 处理 0.0.0.0
+        host = host.replace('0.0.0.0', '127.0.0.1')
+        apiBase = `http://${host}`
+      }
+    }
+  } catch (e) {
+    console.error('读取配置文件失败，使用默认 API 地址', e)
+  }
+  return apiBase
+}
+
+const API_SECRET = 'your-strong-secret-key' // 实际项目中应该从 config 读取
+
+const headers = {
+  Authorization: `Bearer ${API_SECRET}`,
+}
+
+// 获取所有代理节点信息
+export async function getProxies() {
+  try {
+    const res = await axios.get(`${getApiBase()}/proxies`, { headers })
+    return res.data.proxies
+  } catch (err) {
+    throw new Error(`
+      无法连接到 Clash API: ${err.message}
+      
+      请确保 Clash 正在运行，并且配置文件中的 external-controller 已正确设置。
+      你可以通过 ck status 命令检查状态。
+    `)
+  }
+}
+
+export async function switchProxy(groupName, proxyName) {
+  try {
+    await axios.put(`${getApiBase()}/proxies/${encodeURIComponent(groupName)}`, { name: proxyName }, { headers })
+  } catch (err) {
+    throw new Error(`切换节点失败: ${err.message}`)
+  }
+}
+
+export async function getProxyDelay(proxyName, testUrl = 'http://www.gstatic.com/generate_204') {
+  try {
+    const res = await axios.get(`${getApiBase()}/proxies/${encodeURIComponent(proxyName)}/delay`, {
+      params: {
+        timeout: 5000,
+        url: testUrl,
+      },
+      headers,
+    })
+    return res.data.delay
+  } catch (err) {
+    return -1 // 超时或失败
+  }
+}
+
+export async function getConfig() {
+  try {
+    const res = await axios.get(`${getApiBase()}/configs`, { headers })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取配置失败: ${err.message}`)
+  }
+}
+// 重新加载基本配置，必须发送数据，URL 需携带 ?force=true 强制执行
+export async function reloadBaseConfig() {
+  try {
+    const res = await axios.put(`${getApiBase()}/configs?force=true`, {}, { headers })
+  } catch (err) {
+    throw new Error(`重新加载配置失败: ${err.message}`)
+  }
+}
+
+// 获取策略组信息
+export async function getProxyGroups() {
+  try {
+    const res = await axios.get(`${getApiBase()}/group`, { headers })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取策略组失败: ${err.message}`)
+  }
+}
+
+// 获取所有代理集合的所有信息
+export async function getProxyProviders() {
+  try {
+    const res = await axios.get(`${getApiBase()}/providers/proxies`, { headers })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取代理提供者失败: ${err.message}`)
+  }
+}
+
+// 获取规则信息
+export async function getRules() {
+  try {
+    const res = await axios.get(`${getApiBase()}/rules`, { headers })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取规则失败: ${err.message}`)
+  }
+}
+
+// 获取连接信息 /connections
+export async function getConnections() {
+  try {
+    const res = await axios.get(`${getApiBase()}/connections`, { headers })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取连接信息失败: ${err.message}`)
+  }
+}
+
+// 域名解析信息 /dns/query
+export async function getDnsQueries(name, type = 'A') {
+  try {
+    const res = await axios.get(`${getApiBase()}/dns/query`, {
+      params: { name, type },
+      headers,
+    })
+    return res.data
+  } catch (err) {
+    throw new Error(`获取域名解析信息失败: ${err.message}`)
+  }
+}
+
+export async function reloadConfig(configPath) {
+  try {
+    // Clash API: PUT /configs
+    // payload: { path: '/absolute/path/to/config.yaml' }
+    await axios.put(`${getApiBase()}/configs?force=true`, { path: configPath }, { headers })
+  } catch (err) {
+    throw new Error(`重载配置失败: ${err.message}`)
+  }
+}
+
+export async function isClashRunning() {
+  try {
+    // 使用较短的超时时间快速检查
+    await axios.get(`${getApiBase()}/version`, { timeout: 200 })
+    return true
+  } catch (err) {
+    return false
+  }
+}

package/lib/commands/init.js

@@ -1,127 +1,127 @@
-import path from 'path'
-import fs from 'fs'
-import { fileURLToPath } from 'url'
-import { downloadClash } from '../kernel.js'
-import axios from 'axios'
-import ora from 'ora'
-import chalk from 'chalk'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-const DEFAULT_CONFIG = `mixed-port: 7890\n`
-
-const RESOURCES = [
-  {
-    filename: 'country.mmdb',
-    url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country-lite.mmdb',
-  },
-  // {
-  //   filename: 'geoip.metadb',
-  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb',
-  // },
-  // {
-  //   filename: 'geosite.dat',
-  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat',
-  // },
-  // {
-  //   filename: 'geoip.dat',
-  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat',
-  // },
-  // {
-  //   filename: 'ASN.mmdb',
-  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb',
-  // },
-]
-
-async function downloadResource(resource, targetDir) {
-  const filePath = path.join(targetDir, resource.filename)
-  const spinner = ora(`正在下载 ${resource.filename}...`).start()
-
-  try {
-    const response = await axios({
-      url: resource.url,
-      method: 'GET',
-      responseType: 'arraybuffer',
-      timeout: 30 * 1000, // 30s timeout
-    })
-    fs.writeFileSync(filePath, response.data)
-    spinner.succeed(`${resource.filename} 下载完成`)
-  } catch (e) {
-    spinner.fail(`${resource.filename} 下载失败: ${e.message}`)
-    // 不要抛出错误，让其他资源继续下载
-    // throw e
-  }
-}
-
-export async function init(options) {
-  const rootDir = path.join(__dirname, '../..')
-  const binName = process.platform === 'win32' ? 'clash-kit.exe' : 'clash-kit'
-  const binPath = path.join(rootDir, binName)
-  const configPath = path.join(rootDir, 'config.yaml')
-
-  try {
-    // 创建默认配置文件（如果不存在）
-    if (!fs.existsSync(configPath)) {
-      const defaultConfigPath = path.join(rootDir, 'default.yaml')
-      if (fs.existsSync(defaultConfigPath)) {
-        fs.copyFileSync(defaultConfigPath, configPath)
-        console.log(`已从 default.yaml 创建配置文件: ${configPath}`)
-      } else {
-        console.warn(chalk.yellow('警告: 未找到 default.yaml，将创建最小配置文件'))
-        fs.writeFileSync(configPath, DEFAULT_CONFIG, 'utf8')
-      }
-    }
-
-    // 检查并下载资源文件
-    console.log(chalk.blue('\n正在检查资源文件...'))
-    for (const resource of RESOURCES) {
-      const filePath = path.join(rootDir, resource.filename)
-      if (options.force && fs.existsSync(filePath)) {
-        try {
-          fs.unlinkSync(filePath)
-        } catch (e) {}
-      }
-
-      if (!fs.existsSync(filePath)) {
-        await downloadResource(resource, rootDir)
-      } else {
-        console.log(chalk.gray(`资源 ${resource.filename} 已存在`))
-      }
-    }
-    console.log(chalk.green('资源检查完成\n'))
-
-    if (fs.existsSync(binPath) && !options.force) {
-      console.log(`Clash 内核已存在: ${binPath}`)
-      console.log('正在检查权限...')
-      if (process.platform !== 'win32') {
-        // 检查是否已有 SUID 权限，如果有则不再重置为 755
-        const stats = fs.statSync(binPath)
-        const hasSuid = (stats.mode & 0o4000) === 0o4000
-
-        if (!hasSuid) {
-          fs.chmodSync(binPath, 0o755)
-          console.log('权限已设置为 755 (普通执行权限)。')
-        } else {
-          console.log('检测到 SUID 权限，保持不变。')
-        }
-      }
-      console.log('权限检查通过！')
-      return
-    }
-
-    if (options.force && fs.existsSync(binPath)) {
-      console.log('强制更新模式，正在移除旧内核...')
-      try {
-        fs.unlinkSync(binPath)
-      } catch (e) {}
-    }
-
-    console.log('正在初始化 Clash 内核...')
-    await downloadClash(rootDir)
-    console.log('Clash 内核初始化成功！')
-  } catch (err) {
-    console.error(`初始化失败: ${err.message}`)
-    process.exit(1)
-  }
-}
+import path from 'path'
+import fs from 'fs'
+import { fileURLToPath } from 'url'
+import { downloadClash } from '../kernel.js'
+import axios from 'axios'
+import ora from 'ora'
+import chalk from 'chalk'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const DEFAULT_CONFIG = `mixed-port: 7890\n`
+
+const RESOURCES = [
+  {
+    filename: 'country.mmdb',
+    url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/country-lite.mmdb',
+  },
+  // {
+  //   filename: 'geoip.metadb',
+  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb',
+  // },
+  // {
+  //   filename: 'geosite.dat',
+  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat',
+  // },
+  // {
+  //   filename: 'geoip.dat',
+  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat',
+  // },
+  // {
+  //   filename: 'ASN.mmdb',
+  //   url: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb',
+  // },
+]
+
+async function downloadResource(resource, targetDir) {
+  const filePath = path.join(targetDir, resource.filename)
+  const spinner = ora(`正在下载 ${resource.filename}...`).start()
+
+  try {
+    const response = await axios({
+      url: resource.url,
+      method: 'GET',
+      responseType: 'arraybuffer',
+      timeout: 30 * 1000, // 30s timeout
+    })
+    fs.writeFileSync(filePath, response.data)
+    spinner.succeed(`${resource.filename} 下载完成`)
+  } catch (e) {
+    spinner.fail(`${resource.filename} 下载失败: ${e.message}`)
+    // 不要抛出错误，让其他资源继续下载
+    // throw e
+  }
+}
+
+export async function init(options) {
+  const rootDir = path.join(__dirname, '../..')
+  const binName = process.platform === 'win32' ? 'clash-kit.exe' : 'clash-kit'
+  const binPath = path.join(rootDir, binName)
+  const configPath = path.join(rootDir, 'config.yaml')
+
+  try {
+    // 创建默认配置文件（如果不存在）
+    if (!fs.existsSync(configPath)) {
+      const defaultConfigPath = path.join(rootDir, 'default.yaml')
+      if (fs.existsSync(defaultConfigPath)) {
+        fs.copyFileSync(defaultConfigPath, configPath)
+        console.log(`已从 default.yaml 创建配置文件: ${configPath}`)
+      } else {
+        console.warn(chalk.yellow('警告: 未找到 default.yaml，将创建最小配置文件'))
+        fs.writeFileSync(configPath, DEFAULT_CONFIG, 'utf8')
+      }
+    }
+
+    // 检查并下载资源文件
+    console.log(chalk.blue('\n正在检查资源文件...'))
+    for (const resource of RESOURCES) {
+      const filePath = path.join(rootDir, resource.filename)
+      if (options.force && fs.existsSync(filePath)) {
+        try {
+          fs.unlinkSync(filePath)
+        } catch (e) {}
+      }
+
+      if (!fs.existsSync(filePath)) {
+        await downloadResource(resource, rootDir)
+      } else {
+        console.log(chalk.gray(`资源 ${resource.filename} 已存在`))
+      }
+    }
+    console.log(chalk.green('资源检查完成\n'))
+
+    if (fs.existsSync(binPath) && !options.force) {
+      console.log(`Clash 内核已存在: ${binPath}`)
+      console.log('正在检查权限...')
+      if (process.platform !== 'win32') {
+        // 检查是否已有 SUID 权限，如果有则不再重置为 755
+        const stats = fs.statSync(binPath)
+        const hasSuid = (stats.mode & 0o4000) === 0o4000
+
+        if (!hasSuid) {
+          fs.chmodSync(binPath, 0o755)
+          console.log('权限已设置为 755 (普通执行权限)。')
+        } else {
+          console.log('检测到 SUID 权限，保持不变。')
+        }
+      }
+      console.log('权限检查通过！')
+      return
+    }
+
+    if (options.force && fs.existsSync(binPath)) {
+      console.log('强制更新模式，正在移除旧内核...')
+      try {
+        fs.unlinkSync(binPath)
+      } catch (e) {}
+    }
+
+    console.log('正在初始化 Clash 内核...')
+    await downloadClash(rootDir)
+    console.log('Clash 内核初始化成功！')
+  } catch (err) {
+    console.error(`初始化失败: ${err.message}`)
+    process.exit(1)
+  }
+}