clash-kit 1.0.2 → 1.0.4

package/.gitignore

@@ -0,0 +1,20 @@
+.DS_Store
+node_modules
+.env
+dist
+
+.vscode
+.idea
+
+*.log
+
+clash-kit
+config.yaml
+profiles
+ruleset
+
+# clash 相关
+cache.db
+geoip.metadb
+m.yaml
+.current_profile

package/LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2020-present, 荣顶 and wechat-bot contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,9 +1,11 @@
 # Clash Kit
 
-<img width="800" alt="clash-kit" src="https://github.com/user-attachments/assets/dd7dfd29-f59a-418b-8623-6ab08ece9ddb" />
-
 一个基于 Node.js 的 Clash 命令行管理工具，旨在简化 Clash 的配置管理、订阅切换和节点测速等操作。
 
+## 截图
+
+<img width="1920" alt="image" src="https://github.com/user-attachments/assets/1183f778-62b0-4ac7-ab55-b821b66161f0" />
+
 ## 特性
 
 - 🔄 **订阅管理**：支持添加、切换多个订阅源。
@@ -95,24 +97,10 @@ sudo ck tun on
 | `ck sysproxy` (`sys`) | 设置系统代理 (on/off)      | `ck sys on`                     |
 | `ck tun`              | 设置 TUN 模式 (on/off)     | `sudo ck tun on`                |
 
-## 截图
-
-<img width="2742" height="1994" alt="image" src="https://github.com/user-attachments/assets/1183f778-62b0-4ac7-ab55-b821b66161f0" />
-
-## 目录结构
-
-- `bin/`: CLI 入口文件
-- `lib/`: 核心逻辑库
-- `profiles/`: 存放下载的订阅配置文件
-- `clash-meta`: Clash 核心二进制文件
-- `config.yaml`: 当前生效的配置文件
-
-## 注意事项
-
-- 本工具依赖 `clash-meta` 二进制文件，请确保其与本工具在同一目录下（安装包已包含）。
-- 测速功能依赖 Clash API，请确保 `clash start` 正在运行。
-- 默认 API 地址为 `http://127.0.0.1:9090`。
 
 ## License
 
-ISC
+[MIT](./LICENSE).
+
+开源不易，点赞鼓励！
+点一个 Star⭐️ 支持我们~ 🌸Let's enjoy it!

package/index.js

@@ -11,14 +11,14 @@ const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
 // ---------------- 1. 配置项 ----------------
-const CLASH_BIN_PATH = path.join(__dirname, 'clash-meta') // 解压后的二进制文件路径
+const CLASH_BIN_PATH = path.join(__dirname, 'clash-kit') // 解压后的二进制文件路径
 const CLASH_CONFIG_PATH = path.join(__dirname, 'config.yaml') // 配置文件路径
 
 // ---------------- 2. 启动 Clash.Meta 进程 ----------------
 function startClash() {
   // 尝试停止已存在的进程
   try {
-    execSync('pkill -f clash-meta')
+    execSync('pkill -f clash-kit')
   } catch (e) {
     // 忽略错误，说明没有运行中的进程
   }
@@ -65,7 +65,7 @@ async function cleanup() {
 
     // 停止 Clash 进程
     try {
-      execSync('pkill -f clash-meta')
+      execSync('pkill -f clash-kit')
       console.log('Clash 服务已停止')
     } catch (e) {
       // 进程可能已经停止
@@ -101,7 +101,7 @@ function setupExitHandlers() {
 
 // ---------------- 5. 执行流程 ----------------
 export function main() {
-  // 检查 clash-meta 二进制文件是否存在
+  // 检查 clash-kit 二进制文件是否存在
   if (!fs.existsSync(CLASH_BIN_PATH)) {
     return console.error(chalk.red('\n找不到 Clash.Meta 内核文件,请先运行 clash init 命令初始化内核！\n'))
   }
@@ -118,7 +118,7 @@ export function main() {
 
   console.log(chalk.green('\n代理服务已在后台启动✅'))
   if (clashProcess.pid) {
-    console.log(`PID: ${chalk.yellow(clashProcess.pid)}`)
+    console.log(`进程名称：${chalk.yellow('clash-kit')} PID: ${chalk.yellow(clashProcess.pid)}`)
   }
 
   console.log(``)
@@ -126,7 +126,13 @@ export function main() {
   console.log(`SOCKS5 Proxy: ${chalk.cyan(`127.0.0.1:${socks}`)}`)
   console.log(`API:          ${chalk.cyan.underline(getApiBase())}`)
   console.log(``)
-  console.log(chalk.gray('提示: 如需停止代理可使用 clash stop 命令'))
+
+  console.log(chalk.gray('运行日志文件: ' + path.join(__dirname, 'clash.log')))
+  console.log(chalk.blue('提示：如需查看运行状态可使用 clash status 命令'))
+  console.log(chalk.blue('如需停止代理可使用 clash stop 命令'))
+  console.log(chalk.gray('----------------------------------------'))
+  console.log(chalk.gray('如需切换系统代理模式可使用 clash sysproxy on/off 命令'))
+  console.log(chalk.gray('如需切换 TUN 模式可使用 clash tun on/off 命令'))
 }
 
 // 运行脚本

package/lib/commands/init.js

@@ -56,7 +56,7 @@ async function downloadResource(resource, targetDir) {
 
 export async function init(options) {
   const rootDir = path.join(__dirname, '../..')
-  const binName = process.platform === 'win32' ? 'clash-meta.exe' : 'clash-meta'
+  const binName = process.platform === 'win32' ? 'clash-kit.exe' : 'clash-kit'
   const binPath = path.join(rootDir, binName)
   const configPath = path.join(rootDir, 'config.yaml')
 

package/lib/commands/stop.js

@@ -17,9 +17,9 @@ export async function stop() {
       console.log('TUN 模式已关闭')
     }
 
-    // 使用 pkill 匹配进程名包含 clash-meta 的进程
+    // 使用 pkill 匹配进程名包含 clash-kit 的进程
     spinner.text = '正在停止 Clash 服务...'
-    execSync('pkill -f clash-meta')
+    execSync('pkill -f clash-kit')
     spinner.succeed('Clash 服务已停止')
   } catch (err) {
     // pkill 如果没找到进程会抛出错误，这里捕获并提示

package/lib/kernel.js

@@ -52,7 +52,7 @@ export async function downloadClash(targetDir) {
   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-meta${isWin ? '.exe' : ''}`
+  const targetBinName = `clash-kit${isWin ? '.exe' : ''}`
   const targetBinPath = path.join(targetDir, targetBinName)
 
   // 3. 下载文件

package/lib/subscription.js

@@ -4,6 +4,7 @@ import axios from 'axios'
 import { fileURLToPath } from 'url'
 import ora from 'ora'
 import { reloadConfig, isClashRunning } from './api.js'
+import YAML from 'yaml'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -20,9 +21,46 @@ if (!fs.existsSync(PROFILES_DIR)) {
 export async function downloadSubscription(url, name) {
   const spinner = ora(`正在下载订阅 ${name}...`).start()
   try {
-    const res = await axios.get(url, { responseType: 'text' })
+    const res = await axios.get(url, {
+      responseType: 'text',
+      headers: {
+        'User-Agent': 'Clash/1.0.0', // 伪装成 Clash 客户端，通常能直接获取 YAML 格式
+      },
+    })
+
+    let content = res.data
+
+    // 尝试解析 YAML，如果不是对象或者看起来不像配置，尝试 Base64 解码
+    let isConfig = false
+    try {
+      const parsed = YAML.parse(content)
+      if (parsed && typeof parsed === 'object' && (parsed.proxies || parsed.Proxy || parsed.port)) {
+        isConfig = true
+      }
+    } catch (e) {
+      console.warn('订阅服务商返回的不是有效 YAML，尝试 Base64 解码...')
+    }
+
+    if (!isConfig) {
+      try {
+        // 尝试 Base64 解码
+        const decoded = Buffer.from(content, 'base64').toString('utf-8')
+        // 再次检查解码后是否为有效 YAML 配置
+        const parsedDecoded = YAML.parse(decoded)
+        if (
+          parsedDecoded &&
+          typeof parsedDecoded === 'object' &&
+          (parsedDecoded.proxies || parsedDecoded.Proxy || parsedDecoded.port)
+        ) {
+          content = decoded
+        }
+      } catch (e) {
+        console.warn('Base64 解码失败，保留原始内容')
+      }
+    }
+
     const filePath = path.join(PROFILES_DIR, `${name}.yaml`)
-    fs.writeFileSync(filePath, res.data)
+    fs.writeFileSync(filePath, content)
     spinner.succeed(`订阅 ${name} 下载成功`)
     return filePath
   } catch (err) {
@@ -51,9 +89,27 @@ export async function useProfile(name) {
 
   const spinner = ora(`正在切换到配置 ${name}...`).start()
 
-  // 直接复制配置文件，保持原样
-  fs.copyFileSync(source, CONFIG_PATH)
-  fs.writeFileSync(CURRENT_PROFILE_PATH, name)
+  // 读取订阅配置
+  const subscriptionConfig = YAML.parse(fs.readFileSync(source, 'utf8'))
+
+  // 读取现有配置（如果存在）
+  let existingConfig = {}
+  if (fs.existsSync(CONFIG_PATH)) {
+    existingConfig = YAML.parse(fs.readFileSync(CONFIG_PATH, 'utf8'))
+  }
+
+  // 合并配置：保留用户自定义字段，更新订阅字段
+  const mergedConfig = {
+    ...subscriptionConfig,
+    port: existingConfig['port'],
+    'bind-address': existingConfig['bind-address'],
+    'socks-port': existingConfig['socks-port'],
+    'allow-lan': existingConfig['allow-lan'],
+    // 其他需要保留的自定义字段...
+  }
+
+  // 写入合并后的配置
+  fs.writeFileSync(CONFIG_PATH, YAML.stringify(mergedConfig))
 
   // 尝试热重载
   if (await isClashRunning()) {

package/lib/tun.js

@@ -8,7 +8,7 @@ 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-meta')
+const BIN_PATH = path.join(__dirname, '../clash-kit')
 
 export function checkTunPermissions() {
   if (process.platform === 'win32') return true // Windows 需要管理员权限终端，难以通过文件属性判断

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clash-kit",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "description": "A command-line interface for managing Clash configurations, subscriptions, and proxies.",
   "bin": {
@@ -10,9 +10,11 @@
   "files": [
     "bin",
     "lib",
-    "index.js",
-    "country.mmdb",
+    ".gitignore",
     "default.yaml",
+    "country.mmdb",
+    "index.js",
+    "LICENSE.md",
     "package.json",
     "README.md"
   ],