chore: bump version to 1.8.7

This reverts commit 68bbde0d163ca08fe8b709c60b02b726598fb221.

changelog.md

@@ -1,3 +1,14 @@
+## 1.8.7
+
+### 新功能 (Feat)
+ - 增加关闭动画开关
+ - 增加订阅超时时间设置
+ - 
+
+### 样式调整 (Sytle)
+ - 改进 logo 设计
+ - 改进代理模式的图标
+
 ## 1.8.6
 
 **本次更新修改了软件名称，可能导致不可预期的 BUG，请大家积极反馈**
@@ -18,29 +29,3 @@
   
 ### 样式调整 (Sytle)
  - DNS 设置部分样式微调
-
-## 1.8.5
-
-**🎉 本次更新增加了大家期待已久的托盘图标根据代理状态变化颜色，系统代理为蓝色，虚拟网卡为绿色，双开为红色
-⚡ 完善 Smart 规则写，当原有规则中有 url-test 和 load-balance 组时，自动替换为 Smart 规则组；当没有 url-test 和 load-balance 时，增加 全局 Smart 规则组，接管全部流量**
-
-#### 新增 Smart Core 详细文档： [点击查看](https://mihomo.party/docs/guide/smart-core)
-
-### 新功能 (Feat)
- - 支持 cron 表达式以自定义订阅更新频率(#766)
- - 修复权限检查并优化TUN与自启联动(#977)
- - 托盘图标能根据代理状态实时变化颜色
- - 更健壮完善的 Smart 覆写规则
-### 修复 (Fix)
-- Windows 下当前运行内核权限检测（之前没有正确检测管理员权限运行的内核）
-- Windows 下 开机自启 按钮卡顿问题 隐藏运行黑框 现在申请权限会弹通知
-- 修复 部分情况下 yaml 文件解析错误 (#889)
-- 修复 系统中已经运行的内核名称检测
-- 修复 订阅信息中的因格式问题导致的信息缺失(#951)
-- 修复 轻量模式延迟启动延时输入数值问题(#962)
-- 修复 轻量模式下轻量模式下规则失效的问题(#963)
-- 修复 MacOS 下默认虚拟网卡名称没有生效的问题
-- 修复 ES Module 兼容性问题
-
-### 样式调整 (Sytle)
-- 部分样式微调

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mihomo-party",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "Clash Party",
   "main": "./out/main/index.js",
   "author": "mihomo-party-org",

src/main/core/factory.ts

@@ -44,6 +44,11 @@ export async function generateProfile(): Promise<void> {
   }
 
   const profile = deepMerge(currentProfile, controledMihomoConfig)
+  // 确保可以拿到基础日志信息
+  // 使用 debug 可以调试内核相关问题 `debug/pprof`
+  if (['info', 'debug'].includes(profile['log-level']) === false) {
+    profile['log-level'] = 'info'
+  }
   runtimeConfig = profile
   
   // 先正常生成 YAML 字符串

src/main/core/manager.ts

@@ -7,8 +7,7 @@ import {
   mihomoProfileWorkDir,
   mihomoTestDir,
   mihomoWorkConfigPath,
-  mihomoWorkDir,
+  mihomoWorkDir
-  mihomoIpcPath
 } from '../utils/dirs'
 import { generateProfile } from './factory'
 import {
@@ -29,14 +28,16 @@ import {
   stopMihomoTraffic,
   stopMihomoLogs,
   stopMihomoMemory,
-  mihomoVersion
+  patchMihomoConfig
 } from './mihomoApi'
 import chokidar from 'chokidar'
 import { readFile, rm, writeFile } from 'fs/promises'
 import { promisify } from 'util'
+import { mainWindow } from '..'
 import path from 'path'
 import os from 'os'
 import { createWriteStream, existsSync } from 'fs'
+import { uploadRuntimeConfig } from '../resolve/gistApi'
 import { startMonitor } from '../resolve/trafficMonitor'
 import { safeShowErrorBox } from '../utils/init'
 import i18next from '../../shared/i18n'
@@ -51,6 +52,8 @@ chokidar.watch(path.join(mihomoCoreDir(), 'meta-update'), {}).on('unlinkDir', as
   }
 })
 
+export const mihomoIpcPath =
+  process.platform === 'win32' ? '\\\\.\\pipe\\MihomoParty\\mihomo' : '/tmp/mihomo-party.sock'
 const ctlParam = process.platform === 'win32' ? '-ext-ctl-pipe' : '-ext-ctl-unix'
 
 let setPublicDNSTimer: NodeJS.Timeout | null = null
@@ -69,6 +72,7 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
     disableSystemCA = false,
     skipSafePathCheck = false
   } = await getAppConfig()
+  const { 'log-level': logLevel } = await getControledMihomoConfig()
   if (existsSync(path.join(dataDir(), 'core.pid'))) {
     const pid = parseInt(await readFile(path.join(dataDir(), 'core.pid'), 'utf-8'))
     try {
@@ -135,42 +139,50 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
   })
   child.stdout?.pipe(stdout)
   child.stderr?.pipe(stderr)
+  return new Promise((resolve, reject) => {
+    child.stdout?.on('data', async (data) => {
+      const str = data.toString()
+      if (str.includes('configure tun interface: operation not permitted')) {
+        patchControledMihomoConfig({ tun: { enable: false } })
+        mainWindow?.webContents.send('controledMihomoConfigUpdated')
+        ipcMain.emit('updateTrayMenu')
+        reject(i18next.t('tun.error.tunPermissionDenied'))
+      }
+
+      if ((process.platform !== 'win32' && str.includes('External controller unix listen error')) ||
+        (process.platform === 'win32' && str.includes('External controller pipe listen error'))
+      ) {
+        reject(i18next.t('mihomo.error.externalControllerListenError'))
+      }
+
+      if (
+        (process.platform !== 'win32' && str.includes('RESTful API unix listening at')) ||
+        (process.platform === 'win32' && str.includes('RESTful API pipe listening at'))
+      ) {
+        resolve([
+          new Promise((resolve) => {
+            child.stdout?.on('data', async (data) => {
+              if (data.toString().toLowerCase().includes('start initial compatible provider default')) {
                 try {
-    await waitForCoreReady()
+                  mainWindow?.webContents.send('groupsUpdated')
-    await managerLogger.info('Core API is ready, starting background services.')
+                  mainWindow?.webContents.send('rulesUpdated')
+                  await uploadRuntimeConfig()
+                } catch {
+                  // ignore
+                }
+                await patchMihomoConfig({ 'log-level': logLevel })
+                resolve()
+              }
+            })
+          })
+        ])
         await startMihomoTraffic()
         await startMihomoConnections()
         await startMihomoLogs()
         await startMihomoMemory()
         retry = 10
-    return [Promise.resolve()]
-  } catch (error) {
-    await managerLogger.error('Core failed to start or API not responding.', error)
-    await stopCore() // Stop the failed core process
-    throw error // Re-throw the error to be caught by the caller
       }
-}
+    })
-
-async function waitForCoreReady(timeoutMs = 15000): Promise<void> {
-  const startTime = Date.now()
-  const pollInterval = 1000 // ms
-
-  return new Promise((resolve, reject) => {
-    const poll = setInterval(async () => {
-      if (Date.now() - startTime > timeoutMs) {
-        clearInterval(poll)
-        reject(new Error(`Core API did not respond within ${timeoutMs / 1000}s.`))
-        return
-      }
-
-      try {
-        await mihomoVersion()
-        clearInterval(poll)
-        resolve()
-      } catch (error) {
-        // Ignore connection errors and keep polling
-      }
-    }, pollInterval)
   })
 }
 

src/main/core/mihomoApi.ts

@@ -6,7 +6,7 @@ import { tray } from '../resolve/tray'
 import { calcTraffic } from '../utils/calc'
 import { getRuntimeConfig } from './factory'
 import { floatingWindow } from '../resolve/floatingWindow'
-import { mihomoIpcPath } from '../utils/dirs'
+import { mihomoIpcPath } from './manager'
 
 let axiosIns: AxiosInstance = null!
 let mihomoTrafficWs: WebSocket | null = null

src/main/utils/dirs.ts

@@ -158,6 +158,3 @@ export function coreLogPath(): string {
   const name = `core-${year}-${month}-${day}`
   return path.join(logDir(), `${name}.log`)
 }
-
-export const mihomoIpcPath =
-  process.platform === 'win32' ? '\\\\.\\pipe\\MihomoParty\\mihomo' : '/tmp/mihomo-party.sock'

src/main/utils/init.ts

@@ -324,6 +324,9 @@ async function migration(): Promise<void> {
       'external-controller-pipe': undefined
     })
   }
+  if (externalController === undefined) {
+    await patchControledMihomoConfig({ 'external-controller': '' })
+  }
   if (!showFloatingWindow && disableTray) {
     await patchAppConfig({ disableTray: false })
   }

src/main/utils/template.ts

@@ -59,8 +59,8 @@ export const defaultControledMihomoConfig: Partial<IMihomoConfig> = {
   'tproxy-port': 0,
   'allow-lan': false,
   'unified-delay': true,
-  'tcp-concurrent': true,
+  'tcp-concurrent': false,
-  'log-level': 'warning',
+  'log-level': 'info',
   'find-process-mode': 'strict',
   'bind-address': '*',
   'lan-allowed-ips': ['0.0.0.0/0', '::/0'],
@@ -80,17 +80,16 @@ export const defaultControledMihomoConfig: Partial<IMihomoConfig> = {
   },
   dns: {
     enable: true,
-    ipv6: true,
+    ipv6: false,
     'enhanced-mode': 'fake-ip',
     'fake-ip-range': '198.18.0.1/16',
-    'fake-ip-filter': ['+.lan', '+.local', '+.arpa', 'time.*.com', 'ntp.*.com', '+.market.xiaomi.com', 'localhost.ptlogin2.qq.com', '+.msftncsi.com', 'www.msftconnecttest.com'],
+    'fake-ip-filter': ['*', '+.lan', '+.local', 'time.*.com', 'ntp.*.com', '+.market.xiaomi.com'],
-    'fake-ip-filter-mode': 'blacklist',
     'use-hosts': false,
     'use-system-hosts': false,
     'respect-rules': false,
-    'default-nameserver': ['system', '223.6.6.6', '8.8.8.8', '2400:3200::1', '2001:4860:4860::8888'],
+    'default-nameserver': ['tls://223.5.5.5'],
-    nameserver: ['8.8.8.8', 'https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query'],
+    nameserver: ['https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query'],
-    'proxy-server-nameserver': ['https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query', 'tls://223.5.5.5'],
+    'proxy-server-nameserver': ['https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query'],
     'direct-nameserver': [],
     fallback: [],
     'fallback-filter': {
@@ -138,10 +137,10 @@ export const defaultControledMihomoConfig: Partial<IMihomoConfig> = {
   'geo-update-interval': 24,
   'geodata-mode': false,
   'geox-url': {
-    geoip: 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip-lite.dat',
+    geoip: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat',
-    geosite: 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geosite.dat',
+    geosite: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geosite.dat',
-    mmdb: 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/geoip.metadb',
+    mmdb: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.metadb',
-    asn: 'https://cdn.jsdelivr.net/gh/MetaCubeX/meta-rules-dat@release/GeoLite2-ASN.mmdb'
+    asn: 'https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/GeoLite2-ASN.mmdb'
   }
 }
 

src/renderer/src/components/base/mihomo-icon.tsx

@@ -1,70 +1,30 @@
-import React from 'react'
+const SVGComponent = (props) => (
-import { GenIcon } from 'react-icons'
+  <svg
-
+    viewBox="0 0 123 126.11"
-function MihomoIcon(props: any): React.JSX.Element {
+    {...props}
-  return GenIcon({
+  >
-    tag: 'svg',
+    <path
-    attr: { viewBox: '0 0 128 128' },
+      className="cls-1"
-    child: [
+      d="M123,105.41c0,15.99-13.44,20.46-20.54,20.6h-29.1c5.33-1.74,8.97-5.24,9.18-5.44.05-.05.28-.27.55-.56h19.31c1.44-.04,14.6-.78,14.6-14.6,0-9.22-3.85-21.88-34.64-29.67l-1.47-6.53c28.67,6.6,42.11,18.22,42.11,36.2Z"
-      {
+    />
-        tag: 'g',
+    <path
-        attr: {
+      className="cls-1"
-          transform: 'matrix(-1, 0, 0, 1, 127.931404, 0)'
+      d="M81.1,37.6c-2.42.76-4.68,1.55-6.78,2.37l-1.33-5.92c2.05-.77,4.21-1.51,6.47-2.21.27,2.03.83,3.96,1.64,5.76Z"
-        },
+    />
-        child: [
+    <circle className="cls-1" cx={53.83} cy={33.01} r={3} />
-          {
+    <circle className="cls-1" cx={33.83} cy={33.01} r={3} />
-            tag: 'path',
+    <path
-            attr: {
+      className="cls-1"
-              d: 'm121.3 103.3-22.3-99.3-4.3 4.3c-3.7 3.7-8.6 5.7-13.7 5.7s-10-2-13.7-5.7l-4.3-4.3-22.3 99.3c-1 4.3-.2 8.5 1.7 12l-26.9-6.4c-4.8-1.1-9.4 2.6-9.4 7.5 0 4.3 3.5 7.7 7.7 7.7h91c10.8-.1 18.9-10.2 16.5-20.8z',
+      d="M67.53,126.01h-1.49c-1.83,0-3.4-1.54-3.19-3.36.17-1.52,1.4-2.64,2.98-2.64h1.7c4.3,0,8.3-1.9,11-5.3,2.7-3.3,3.6-7.6,2.7-11.8L60.13,8.91l-.4.4c-4.3,4.4-9.9,6.7-15.9,6.7s-11.6-2.3-15.8-6.6l-.5-.4L6.33,103.01c-.9,4.1,0,8.4,2.7,11.8s6.7,5.3,11,5.3h.59c1.83,0,3.4,1.54,3.19,3.36-.17,1.52-1.4,2.64-2.98,2.64h-.8c-6.1,0-11.8-2.7-15.7-7.5-3.8-4.9-5.2-11-3.8-17L22.93,2.31c.2-1.1,1-1.9,2.1-2.2,1-.3,2.2,0,3,.8l4.3,4.3c3,3.1,7.1,4.8,11.5,4.8s8.5-1.7,11.6-4.8l4.24-4.24c.37-.37.81-.68,1.31-.83,1.95-.58,3.56.68,3.86,2.16l22.3,99.3c1.3,5.9-.1,12.1-3.9,16.8-.4.5-1.4,1.5-1.4,1.5,0,0-6.26,6.1-14.3,6.1h0Z"
-              fill: '#fff',
+    />
-              strokeWidth: '6'
+    <path
-            },
+      className="cls-1"
-            child: []
+      d="M22.23,70.11c1.6-.3,3.2.7,3.5,2.4l9,45.1c.3,1.5,1.5,2.5,3,2.5,1.7,0,3-1.3,3-3v-34.1c0-1.7,1.3-3,3-3s3,1.3,3,3v34c0,1.6,1.4,3,3.1,3h1c1.5,0,2.7-1,3-2.5l9.1-45.1c.3-1.6,1.9-2.7,3.5-2.3,1.6.3,2.7,1.9,2.3,3.5l-9.1,45c-.7,4.3-4.5,7.4-8.9,7.4h-1c-2.3,0-4.5-.9-6.1-2.3-1.6,1.4-3.7,2.3-6,2.3-4.3,0-7.9-3-8.8-7.3l-9-45.1c-.3-1.6.8-3.2,2.4-3.5Z"
-          },
+    />
-          {
+    <path
-            tag: 'circle',
+      className="cls-1"
-            attr: {
+      d="M100.75,7.39c-11.85,0-21.5,9.64-21.5,21.5,0,1,.07,1.99.21,2.95.27,2.03.83,3.96,1.64,5.76,3.35,7.53,10.9,12.79,19.65,12.79,11.86,0,21.5-9.65,21.5-21.5s-9.64-21.5-21.5-21.5ZM100.75,45.39c-9.1,0-16.5-7.4-16.5-16.5s7.4-16.5,16.5-16.5,16.5,7.4,16.5,16.5-7.4,16.5-16.5,16.5Z"
-              cx: '71',
+    />
-              cy: '34',
+  </svg>
-              fill: '#444b54',
+);
-              r: '3',
+export default SVGComponent;
-              strokeWidth: '6'
-            },
-            child: []
-          },
-          {
-            tag: 'circle',
-            attr: {
-              cx: '91',
-              cy: '34',
-              fill: '#444b54',
-              r: '3',
-              strokeWidth: '6'
-            },
-            child: []
-          },
-          {
-            tag: 'path',
-            attr: {
-              d: 'm124.3 102.6-22.4-99.3c-.2-1.1-1-1.9-2.1-2.2-1-.3-2.2 0-3 .8l-4.3 4.3c-3 3.1-7.1 4.8-11.5 4.8s-8.5-1.7-11.6-4.8l-4.3-4.3c-.8-.8-1.9-1.1-3-.8s-1.9 1.2-2.1 2.2l-22.3 99.3c-1.3 5.9.1 12.1 3.9 16.8.4.5.9 1 1.4 1.5h-29.3c-2.6 0-4.7-2.1-4.7-4.7 0-1.4.6-2.8 1.8-3.7 1.1-.9 2.6-1.2 4-.9l11.9 2.8c1.6.4 3.2-.6 3.6-2.2s-.6-3.2-2.2-3.6l-11.9-2.8c-3.2-.7-6.5 0-9.1 2.1-2.6 2-4 5.1-4 8.4 0 5.9 4.8 10.7 10.7 10.7h43.5.1 1.6c1.7 0 3-1.3 3-3s-1.3-3-3-3h-1.7c-4.3 0-8.3-1.9-11-5.3-2.7-3.3-3.6-7.6-2.7-11.8l21.1-94 .4.4c4.3 4.4 9.9 6.7 15.9 6.7s11.6-2.3 15.8-6.6l.5-.4 21.2 94c.9 4.1 0 8.4-2.7 11.8s-6.7 5.3-11 5.3h-.8c-1.7 0-3 1.3-3 3s1.3 3 3 3h.8c6.1 0 11.8-2.7 15.7-7.5 3.8-4.9 5.2-11 3.8-17z',
-              fill: '#444b54',
-              strokeWidth: '6'
-            },
-            child: []
-          },
-          {
-            tag: 'path',
-            attr: {
-              d: 'm102.6 71.1c-1.6-.3-3.2.7-3.5 2.4l-9 45.1c-.3 1.5-1.5 2.5-3 2.5-1.7 0-3-1.3-3-3v-34.1c0-1.7-1.3-3-3-3s-3 1.3-3 3v34c0 1.6-1.4 3-3.1 3h-1c-1.5 0-2.7-1-3-2.5l-9.1-45.1c-.3-1.6-1.9-2.7-3.5-2.3-1.6.3-2.7 1.9-2.3 3.5l9.1 45c.7 4.3 4.5 7.4 8.9 7.4h1c2.3 0 4.5-.9 6.1-2.3 1.6 1.4 3.7 2.3 6 2.3 4.3 0 7.9-3 8.8-7.3l9-45.1c.3-1.6-.8-3.2-2.4-3.5z',
-              fill: '#444b54',
-              strokeWidth: '6'
-            },
-            child: []
-          }
-        ]
-      }
-    ]
-  })(props)
-}
-
-export default MihomoIcon

src/renderer/src/pages/dns.tsx

@@ -17,30 +17,25 @@ const DNS: React.FC = () => {
   const { dns, hosts } = controledMihomoConfig || {}
   const {
     enable = true,
-    ipv6 = true,
+    ipv6 = false,
     'fake-ip-range': fakeIPRange = '198.18.0.1/16',
     'fake-ip-filter': fakeIPFilter = [
+      '*',
       '+.lan',
       '+.local',
-      '+.arpa',
       'time.*.com',
       'ntp.*.com',
-      '+.market.xiaomi.com',
+      '+.market.xiaomi.com'
-      'localhost.ptlogin2.qq.com',
-      '+.msftncsi.com',
-      'www.msftconnecttest.com'
     ],
-    'fake-ip-filter-mode': fakeIPFilterMode = 'blacklist',
     'enhanced-mode': enhancedMode = 'fake-ip',
     'use-hosts': useHosts = false,
     'use-system-hosts': useSystemHosts = false,
     'respect-rules': respectRules = false,
-    'default-nameserver': defaultNameserver = ['system', '223.6.6.6', '8.8.8.8', '2400:3200::1', '2001:4860:4860::8888'],
+    'default-nameserver': defaultNameserver = ['tls://223.5.5.5'],
-    nameserver = ['8.8.8.8', 'https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query'],
+    nameserver = ['https://doh.pub/dns-query', 'https://dns.alidns.com/dns-query'],
     'proxy-server-nameserver': proxyServerNameserver = [
       'https://doh.pub/dns-query',
-      'https://dns.alidns.com/dns-query',
+      'https://dns.alidns.com/dns-query'
-      'tls://223.5.5.5'
     ],
     'direct-nameserver': directNameserver = [],
     fallback = [],
@@ -59,7 +54,6 @@ const DNS: React.FC = () => {
     enhancedMode,
     fakeIPRange,
     fakeIPFilter,
-    fakeIPFilterMode,
     useSystemHosts,
     respectRules,
     defaultNameserver,
@@ -67,10 +61,10 @@ const DNS: React.FC = () => {
     proxyServerNameserver,
     directNameserver,
     fallback,
-    fallbackGeoip: fallbackFilter.geoip,
+    fallbackGeoip: fallbackFilter?.geoip || true,
-    fallbackGeoipCode: fallbackFilter['geoip-code'],
+    fallbackGeoipCode: fallbackFilter?.['geoip-code'] || 'CN',
-    fallbackIpcidr: fallbackFilter.ipcidr,
+    fallbackIpcidr: fallbackFilter?.ipcidr || ['240.0.0.0/4', '0.0.0.0/32'],
-    fallbackDomain: fallbackFilter.domain,
+    fallbackDomain: fallbackFilter?.domain || ['+.google.com', '+.facebook.com', '+.youtube.com'],
     useNameserverPolicy,
     nameserverPolicy: Object.entries(nameserverPolicy || {}).map(([domain, value]) => ({
       domain,

src/renderer/src/pages/mihomo.tsx

@@ -49,7 +49,7 @@ const Mihomo: React.FC = () => {
     secret,
     authentication = [],
     'skip-auth-prefixes': skipAuthPrefixes = ['127.0.0.1/32', '::1/128'],
-    'log-level': logLevel = 'warning',
+    'log-level': logLevel = 'info',
     'find-process-mode': findProcessMode = 'strict',
     'allow-lan': allowLan,
     'lan-allowed-ips': lanAllowedIps = ['0.0.0.0/0', '::/0'],

src/shared/types.d.ts

@@ -354,12 +354,7 @@ interface IMihomoDNSConfig {
   'default-nameserver'?: string[]
   nameserver?: string[]
   fallback?: string[]
-  'fallback-filter'?: {
+  'fallback-filter'?: { [key: string]: boolean | string | string[] }
-    geoip?: boolean
-    'geoip-code'?: string
-    ipcidr?: string[]
-    domain?: string[]
-  }
   'proxy-server-nameserver'?: string[]
   'direct-nameserver'?: string[]
   'direct-nameserver-follow-policy'?: boolean