keep hosts

xishang0128 · Feb 9, 2025 · 5fa776e · 5fa776e
1 parent 6f8ed50
commit 5fa776e
Show file tree

Hide file tree

Showing 9 changed files with 1,107 additions and 1,144 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "autoprefixer": "^10.4.20",
     "cron-validator": "^1.3.1",
     "driver.js": "^1.3.1",
-    "electron": "^33.1.0",
+    "electron": "^33.4.0",
     "electron-builder": "25.0.4",
     "electron-vite": "^2.3.0",
     "electron-window-state": "^5.0.3",
@@ -88,7 +88,7 @@
     "tsx": "^4.19.2",
     "types-pac": "^1.0.3",
     "typescript": "^5.6.3",
-    "vite": "^6.0.7",
+    "vite": "^6.1.0",
     "vite-plugin-monaco-editor": "^1.1.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/main/core/manager.ts b/src/main/core/manager.ts
@@ -49,7 +49,7 @@ chokidar.watch(path.join(mihomoCoreDir(), 'meta-update'), {}).on('unlinkDir', as
 })
 
 export const mihomoIpcPath =
-  process.platform === 'win32' ? '\\\\.\\pipe\\MihomoParty\\mihomo' : '/tmp/mihomo-party.sock'
+  process.platform === 'win32' ? '\\\\.\\pipe\\Party\\mihomo' : '/tmp/party.sock'
 const ctlParam = process.platform === 'win32' ? '-ext-ctl-pipe' : '-ext-ctl-unix'
 
 let setPublicDNSTimer: NodeJS.Timeout | null = null
@@ -64,8 +64,6 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
     diffWorkDir = false,
     mihomoCpuPriority = 'PRIORITY_NORMAL',
     disableLoopbackDetector = false,
-    disableEmbedCA = false,
-    disableSystemCA = false,
     skipSafePathCheck = false
   } = await getAppConfig()
   const { 'log-level': logLevel } = await getControledMihomoConfig()
@@ -97,9 +95,8 @@ export async function startCore(detached = false): Promise<Promise<void>[]> {
   const stdout = createWriteStream(logPath(), { flags: 'a' })
   const stderr = createWriteStream(logPath(), { flags: 'a' })
   const env = {
+    ...process.env,
     DISABLE_LOOPBACK_DETECTOR: String(disableLoopbackDetector),
-    DISABLE_EMBED_CA: String(disableEmbedCA),
-    DISABLE_SYSTEM_CA: String(disableSystemCA),
     SKIP_SAFE_PATH_CHECK: String(skipSafePathCheck)
   }
   child = spawn(

diff --git a/src/main/utils/template.ts b/src/main/utils/template.ts
@@ -17,6 +17,7 @@ export const defaultConfig: IAppConfig = {
   controlDns: true,
   controlSniff: true,
   nameserverPolicy: {},
+  hosts: [],
   siderOrder: [
     'sysproxy',
     'tun',
@@ -34,7 +35,8 @@ export const defaultConfig: IAppConfig = {
   ],
   siderWidth: 250,
   sysProxy: { enable: false, mode: 'manual' },
-  updateChannel: "release"
+  disableLoopbackDetector: false,
+  skipSafePathCheck: false
 }
 
 export const defaultControledMihomoConfig: Partial<IMihomoConfig> = {

diff --git a/src/renderer/src/components/resources/proxy-provider.tsx b/src/renderer/src/components/resources/proxy-provider.tsx
@@ -49,25 +49,10 @@ const ProxyProvider: React.FC = () => {
   const providers = useMemo(() => {
     if (!data) return []
     return Object.values(data.providers)
-      .map(provider => {
-        if (provider.vehicleType === 'Inline' || provider.vehicleType === 'File') {
-          return {
-            ...provider,
-            subscriptionInfo: null
-          }
-        }
-        return provider
-      })
-
-      .filter(provider => 'subscriptionInfo' in provider)
+      .filter((provider) => provider.vehicleType !== 'Compatible')
       .sort((a, b) => {
-        if (a.vehicleType === 'File' && b.vehicleType !== 'File') {
-          return -1
-        }
-        if (a.vehicleType !== 'File' && b.vehicleType === 'File') {
-          return 1
-        }
-        return 0
+        const order = { File: 1, Inline: 2, HTTP: 3 }
+        return (order[a.vehicleType] || 4) - (order[b.vehicleType] || 4)
       })
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))

diff --git a/src/renderer/src/components/resources/rule-provider.tsx b/src/renderer/src/components/resources/rule-provider.tsx
@@ -28,7 +28,7 @@ const RuleProvider: React.FC = () => {
     if (showDetails.title) {
       const fetchProviderPath = async (name: string): Promise<void> => {
         try {
-          const providers= await getRuntimeConfig()
+          const providers = await getRuntimeConfig()
           const provider = providers['rule-providers'][name]
           if (provider) {
             setShowDetails((prev) => ({
@@ -49,13 +49,8 @@ const RuleProvider: React.FC = () => {
   const providers = useMemo(() => {
     if (!data) return []
     return Object.values(data.providers).sort((a, b) => {
-      if (a.vehicleType === 'File' && b.vehicleType !== 'File') {
-        return -1
-      }
-      if (a.vehicleType !== 'File' && b.vehicleType === 'File') {
-        return 1
-      }
-      return 0
+      const order = { File: 1, Inline: 2, HTTP: 3 }
+      return (order[a.vehicleType] || 4) - (order[b.vehicleType] || 4)
     })
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))
@@ -119,7 +114,7 @@ const RuleProvider: React.FC = () => {
           >
             <div className="flex h-[32px] leading-[32px] text-foreground-500">
               <div>{dayjs(provider.updatedAt).fromNow()}</div>
-              {provider.format !== 'MrsRule' && (
+              {provider.format !== 'MrsRule' && provider.vehicleType !== 'Inline' &&  (
                 <Button
                   isIconOnly
                   title={provider.vehicleType == 'File' ? '编辑' : '查看'}

diff --git a/src/renderer/src/pages/dns.tsx b/src/renderer/src/pages/dns.tsx
@@ -11,7 +11,7 @@ import React, { Key, ReactNode, useState } from 'react'
 const DNS: React.FC = () => {
   const { controledMihomoConfig, patchControledMihomoConfig } = useControledMihomoConfig()
   const { appConfig, patchAppConfig } = useAppConfig()
-  const { nameserverPolicy, useNameserverPolicy } = appConfig || {}
+  const { hosts, nameserverPolicy, useNameserverPolicy } = appConfig || {}
   const { dns } = controledMihomoConfig || {}
   const {
     ipv6 = false,
@@ -54,7 +54,7 @@ const DNS: React.FC = () => {
       domain,
       value
     })),
-    hosts: useHosts ? [] : undefined
+    hosts: useHosts ? hosts : undefined
   })
 
   const setValues = (v: typeof values): void => {
@@ -119,7 +119,8 @@ const DNS: React.FC = () => {
       nameserverPolicy: Object.fromEntries(
         values.nameserverPolicy.map(({ domain, value }) => [domain, value])
       ),
-      useNameserverPolicy: values.useNameserverPolicy
+      useNameserverPolicy: values.useNameserverPolicy,
+      hosts: values.hosts
     })
     try {
       setChanged(false)
@@ -320,7 +321,7 @@ const DNS: React.FC = () => {
             size="sm"
             isSelected={values.useHosts}
             onValueChange={(v) => {
-              setValues({ ...values, useHosts: v, hosts: v ? [] : undefined })
+              setValues({ ...values, useHosts: v })
             }}
           />
         </SettingItem>

diff --git a/src/renderer/src/pages/mihomo.tsx b/src/renderer/src/pages/mihomo.tsx
@@ -30,9 +30,8 @@ const Mihomo: React.FC = () => {
     maxLogDays = 7,
     sysProxy,
     disableLoopbackDetector,
-    disableEmbedCA,
-    disableSystemCA,
-    skipSafePathCheck } = appConfig || {}
+    skipSafePathCheck
+  } = appConfig || {}
   const { controledMihomoConfig, patchControledMihomoConfig } = useControledMihomoConfig()
   const {
     ipv6,
@@ -663,24 +662,6 @@ const Mihomo: React.FC = () => {
               }}
             />
           </SettingItem>
-          <SettingItem title="不使用内置 CA 证书" divider>
-            <Switch
-              size="sm"
-              isSelected={disableEmbedCA}
-              onValueChange={(v) => {
-                handleConfigChangeWithRestart('disableEmbedCA', v)
-              }}
-            />
-          </SettingItem>
-          <SettingItem title="不使用系统 CA 证书" divider>
-            <Switch
-              size="sm"
-              isSelected={disableSystemCA}
-              onValueChange={(v) => {
-                handleConfigChangeWithRestart('disableSystemCA', v)
-              }}
-            />
-          </SettingItem>
           <SettingItem title="日志保留天数" divider>
             <Input
               size="sm"

diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
@@ -256,11 +256,14 @@ interface ISysProxyConfig {
   pacScript?: string
 }
 
+interface IHost {
+  domain: string
+  value: string | string[]
+}
+
 interface IAppConfig {
   core: 'mihomo' | 'mihomo-alpha'
   disableLoopbackDetector: boolean
-  disableEmbedCA: boolean
-  disableSystemCA: boolean
   skipSafePathCheck: boolean
   proxyDisplayMode: 'simple' | 'full'
   proxyDisplayOrder: 'default' | 'delay' | 'name'
@@ -308,7 +311,6 @@ interface IAppConfig {
   appTheme: AppTheme
   customTheme?: string
   autoCheckUpdate: boolean
-  updateChannel: string
   silentStart: boolean
   autoCloseConnection: boolean
   sysProxy: ISysProxyConfig
@@ -328,6 +330,7 @@ interface IAppConfig {
   webdavPassword?: string
   useNameserverPolicy: boolean
   nameserverPolicy: { [key: string]: string | string[] }
+  hosts: IHost[]
   showWindowShortcut?: string
   showFloatingWindowShortcut?: string
   triggerSysProxyShortcut?: string