clash-kit 1.0.1 → 1.0.2

package/default.yaml

@@ -0,0 +1,46 @@
+# HTTP 代理端口
+port: 7890
+# SOCKS5 代理端口
+socks-port: 7891
+# 允许局域网连接
+allow-lan: true
+
+# 规则模式：Rule（规则） / Global（全局）/ Direct（直连）
+mode: Rule
+# 日志级别：info / warning / error / debug / silent
+log-level: info
+# 外部控制接口（用于 Dashboard）
+external-controller: 127.0.0.1:9090
+
+# 代理节点定义 (示例)
+proxies:
+  # - name: "Shadowsocks 示例"
+  #   type: ss
+  #   server: server
+  #   port: 443
+  #   cipher: chacha20-ietf-poly1305
+  #   password: "password"
+
+  # - name: "Vmess 示例"
+  #   type: vmess
+  #   server: server
+  #   port: 443
+  #   uuid: uuid
+  #   alterId: 64
+  #   cipher: auto
+
+# 代理组定义
+proxy-groups:
+  - name: PROXY
+    type: select
+    proxies:
+      - DIRECT
+      # - "Shadowsocks 示例"
+
+# 规则定义
+rules:
+  - DOMAIN-SUFFIX,google.com,PROXY
+  - DOMAIN-KEYWORD,google,PROXY
+  - DOMAIN,google.com,PROXY
+  - GEOIP,CN,DIRECT
+  - MATCH,PROXY

package/lib/api.js

@@ -104,3 +104,13 @@ export async function reloadConfig(configPath) {
     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

@@ -2,12 +2,57 @@ 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
-`
+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, '../..')
@@ -18,9 +63,33 @@ export async function init(options) {
   try {
     // 创建默认配置文件（如果不存在）
     if (!fs.existsSync(configPath)) {
-      fs.writeFileSync(configPath, DEFAULT_CONFIG, 'utf8')
-      console.log(`已创建默认配置文件: ${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}`)

package/lib/commands/sub.js

@@ -23,10 +23,7 @@ async function handleAddSubscription(url, name) {
 
 export async function manageSub(options) {
   if (options.add) {
-    if (!options.name) {
-      console.error('错误: 添加订阅时必须指定名称 (-n)')
-      return
-    }
+    if (!options.name) return console.error('错误: 添加订阅时必须指定名称 (-n)')
     try {
       await handleAddSubscription(options.add, options.name)
     } catch (err) {
@@ -34,7 +31,7 @@ export async function manageSub(options) {
     }
   } else if (options.list) {
     const profiles = sub.listProfiles()
-    console.log('可用订阅:')
+    console.log(`${profiles.length ? '已添加的订阅:' : '暂无已添加的订阅'}`)
     profiles.forEach(p => console.log(`- ${p}`))
   } else if (options.use) {
     try {

package/lib/subscription.js

@@ -3,7 +3,7 @@ import path from 'path'
 import axios from 'axios'
 import { fileURLToPath } from 'url'
 import ora from 'ora'
-import { reloadConfig } from './api.js'
+import { reloadConfig, isClashRunning } from './api.js'
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -47,9 +47,7 @@ export function getCurrentProfile() {
 
 export async function useProfile(name) {
   const source = path.join(PROFILES_DIR, `${name}.yaml`)
-  if (!fs.existsSync(source)) {
-    throw new Error(`配置文件 ${name} 不存在`)
-  }
+  if (!fs.existsSync(source)) throw new Error(`配置文件 ${name} 不存在`)
 
   const spinner = ora(`正在切换到配置 ${name}...`).start()
 
@@ -58,11 +56,14 @@ export async function useProfile(name) {
   fs.writeFileSync(CURRENT_PROFILE_PATH, name)
 
   // 尝试热重载
-  try {
-    await reloadConfig(CONFIG_PATH)
-    spinner.succeed('Clash 配置已切换并热重载生效')
-  } catch (err) {
-    // 忽略错误，可能是 Clash 未运行
-    spinner.warn('配置已切换，但 Clash 未运行或无法连接，将在下次启动时生效')
+  if (await isClashRunning()) {
+    try {
+      await reloadConfig(CONFIG_PATH)
+      spinner.succeed('Clash 配置已切换并热重载生效')
+    } catch (err) {
+      spinner.warn(`配置已切换，但热重载失败: ${err.message}`)
+    }
+  } else {
+    spinner.succeed('配置已切换（Clash 未运行，将在下次启动时生效）')
   }
 }

package/package.json

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