clash-kit 1.1.0 → 1.1.2

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')
-    } else {
-      execSync('pkill -f clash-kit')
-    }
-    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()

package/lib/port.js

@@ -1,115 +1,115 @@
-import net from 'net'
-import { execSync } from 'child_process'
-import os from 'os'
-
-/**
- * 检查端口是否被占用 (true = 空闲, false = 被占用)
- * @param {number} port 
- * @returns {Promise<boolean>}
- */
-export function isPortOpen(port) {
-  return new Promise((resolve) => {
-    const server = net.createServer()
-    server.once('error', (err) => {
-      resolve(false) // 端口被占用
-    })
-    server.once('listening', () => {
-      server.close()
-      resolve(true) // 端口可用
-    })
-    server.listen(port, '127.0.0.1')
-  })
-}
-
-/**
- * 获取占用端口的进程信息
- * @param {number} port 
- * @returns {string|null} 进程名称(PID)，例如 "mihomo (PID: 1234)"
- */
-export function getPortOccupier(port) {
-  try {
-    const platform = os.platform()
-    if (platform === 'win32') {
-      // Windows 实现
-      try {
-        const output = execSync(`netstat -ano | findstr :${port}`).toString()
-        const lines = output.trim().split('\n')
-        if(lines.length > 0) {
-            const parts = lines[0].trim().split(/\s+/)
-            const pid = parts[parts.length - 1]
-            try {
-              const tasklist = execSync(`tasklist /fi "pid eq ${pid}" /fo csv /nh`).toString().trim()
-              // "Image Name","PID","Session Name","Session#","Mem Usage"
-              // "node.exe","24424","Console","1","38,824 K"
-              const match = tasklist.match(/^"([^"]+)"/);
-              if (match) return `${match[1]} (PID: ${pid})`
-            } catch (e) {}
-            return `PID: ${pid}`
-        }
-      } catch (e) { return null }
-    } else {
-        // macOS / Linux
-        // lsof output format: COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
-        const output = execSync(`lsof -i :${port} -sTCP:LISTEN -P -n`).toString().trim()
-        const lines = output.split('\n')
-        if (lines.length > 1) {
-            const parts = lines[1].trim().split(/\s+/)
-            return `${parts[0]} (PID: ${parts[1]})`
-        }
-    }
-  } catch (e) {
-    // lsof 找不到时会返回非 0 退出码，抛出错误
-    return null
-  }
-  return null
-}
-
-/**
- * 寻找可用端口
- * @param {number} startPort 
- * @returns {Promise<number>}
- */
-export function findAvailablePort(startPort) {
-  return new Promise((resolve, reject) => {
-    const server = net.createServer()
-    server.on('error', (err) => {
-      if (startPort <= 65535) {
-        // 核心逻辑：如果报错，递归尝试 +1 的端口
-        resolve(findAvailablePort(startPort + 1))
-      } else {
-        reject(err)
-      }
-    })
-    server.on('listening', () => {
-      server.close(() => {
-        resolve(startPort)
-      })
-    })
-    server.listen(startPort, '127.0.0.1')
-  })
-}
-
-/**
- * 从配置值中提取端口号
- * @param {string|number} val - 例如 9090, ":9090", "127.0.0.1:9090"
- * @returns {number|null}
- */
-export function extractPort(val) {
-  if (!val) return null
-  if (typeof val === 'number') return val
-  if (typeof val === 'string') {
-    // 移除空白
-    val = val.trim()
-    // 如果是纯数字字符串
-    if (/^\d+$/.test(val)) return parseInt(val, 10)
-    
-    // 如果包含冒号，取最后一部分
-    if (val.includes(':')) {
-      const parts = val.split(':')
-      const lastPart = parts[parts.length - 1]
-      const port = parseInt(lastPart, 10)
-      return isNaN(port) ? null : port
-    }
-  }
-  return null
-}
+import net from 'net'
+import { execSync } from 'child_process'
+import os from 'os'
+
+/**
+ * 检查端口是否被占用 (true = 空闲, false = 被占用)
+ * @param {number} port 
+ * @returns {Promise<boolean>}
+ */
+export function isPortOpen(port) {
+  return new Promise((resolve) => {
+    const server = net.createServer()
+    server.once('error', (err) => {
+      resolve(false) // 端口被占用
+    })
+    server.once('listening', () => {
+      server.close()
+      resolve(true) // 端口可用
+    })
+    server.listen(port, '127.0.0.1')
+  })
+}
+
+/**
+ * 获取占用端口的进程信息
+ * @param {number} port 
+ * @returns {string|null} 进程名称(PID)，例如 "mihomo (PID: 1234)"
+ */
+export function getPortOccupier(port) {
+  try {
+    const platform = os.platform()
+    if (platform === 'win32') {
+      // Windows 实现
+      try {
+        const output = execSync(`netstat -ano | findstr :${port}`).toString()
+        const lines = output.trim().split('\n')
+        if(lines.length > 0) {
+            const parts = lines[0].trim().split(/\s+/)
+            const pid = parts[parts.length - 1]
+            try {
+              const tasklist = execSync(`tasklist /fi "pid eq ${pid}" /fo csv /nh`).toString().trim()
+              // "Image Name","PID","Session Name","Session#","Mem Usage"
+              // "node.exe","24424","Console","1","38,824 K"
+              const match = tasklist.match(/^"([^"]+)"/);
+              if (match) return `${match[1]} (PID: ${pid})`
+            } catch (e) {}
+            return `PID: ${pid}`
+        }
+      } catch (e) { return null }
+    } else {
+        // macOS / Linux
+        // lsof output format: COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
+        const output = execSync(`lsof -i :${port} -sTCP:LISTEN -P -n`).toString().trim()
+        const lines = output.split('\n')
+        if (lines.length > 1) {
+            const parts = lines[1].trim().split(/\s+/)
+            return `${parts[0]} (PID: ${parts[1]})`
+        }
+    }
+  } catch (e) {
+    // lsof 找不到时会返回非 0 退出码，抛出错误
+    return null
+  }
+  return null
+}
+
+/**
+ * 寻找可用端口
+ * @param {number} startPort 
+ * @returns {Promise<number>}
+ */
+export function findAvailablePort(startPort) {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer()
+    server.on('error', (err) => {
+      if (startPort <= 65535) {
+        // 核心逻辑：如果报错，递归尝试 +1 的端口
+        resolve(findAvailablePort(startPort + 1))
+      } else {
+        reject(err)
+      }
+    })
+    server.on('listening', () => {
+      server.close(() => {
+        resolve(startPort)
+      })
+    })
+    server.listen(startPort, '127.0.0.1')
+  })
+}
+
+/**
+ * 从配置值中提取端口号
+ * @param {string|number} val - 例如 9090, ":9090", "127.0.0.1:9090"
+ * @returns {number|null}
+ */
+export function extractPort(val) {
+  if (!val) return null
+  if (typeof val === 'number') return val
+  if (typeof val === 'string') {
+    // 移除空白
+    val = val.trim()
+    // 如果是纯数字字符串
+    if (/^\d+$/.test(val)) return parseInt(val, 10)
+    
+    // 如果包含冒号，取最后一部分
+    if (val.includes(':')) {
+      const parts = val.split(':')
+      const lastPart = parts[parts.length - 1]
+      const port = parseInt(lastPart, 10)
+      return isNaN(port) ? null : port
+    }
+  }
+  return null
+}