introduce getProxyPort function for cleaner proxy management

Author: gui.for.singbox

frontend/src/stores/env.ts

@@ -42,26 +42,10 @@ export const useEnvStore = defineStore('env', () => {
   }
 
   const setSystemProxy = async () => {
-    const kernelApiStore = useKernelApiStore()
-
-    let port = 0
-    let proxyType = 0 // 0: Mixed    1: Http    2: Socks
-    const { port: _port, 'socks-port': socksPort, 'mixed-port': mixedPort } = kernelApiStore.config
-
-    if (mixedPort) {
-      port = mixedPort
-      proxyType = 0
-    } else if (_port) {
-      port = _port
-      proxyType = 1
-    } else if (socksPort) {
-      port = socksPort
-      proxyType = 2
-    }
-
-    if (!port) throw 'home.overview.needPort'
+    const proxyPort = useKernelApiStore().getProxyPort()
+    if (!proxyPort) throw 'home.overview.needPort'
 
-    await SetSystemProxy(true, '127.0.0.1:' + port, proxyType)
+    await SetSystemProxy(true, '127.0.0.1:' + proxyPort.port, proxyPort.proxyType)
 
     systemProxy.value = true
   }

frontend/src/stores/kernelApi.ts

@@ -20,6 +20,8 @@ import {
   useEnvStore
 } from '@/stores'
 
+export type ProxyType = 'mixed' | 'http' | 'socks'
+
 export const useKernelApiStore = defineStore('kernelApi', () => {
   /** RESTful API */
   const config = ref<KernelApiConfig>({
@@ -331,6 +333,35 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     await startKernel()
   }
 
+  const getProxyPort = ():
+    | {
+        port: number
+        proxyType: ProxyType
+      }
+    | undefined => {
+    const { port, 'socks-port': socksPort, 'mixed-port': mixedPort } = config.value
+
+    if (mixedPort) {
+      return {
+        port: mixedPort,
+        proxyType: 'mixed'
+      }
+    }
+    if (port) {
+      return {
+        port,
+        proxyType: 'http'
+      }
+    }
+    if (socksPort) {
+      return {
+        port: socksPort,
+        proxyType: 'socks'
+      }
+    }
+    return undefined
+  }
+
   watch(
     [() => config.value.mode, () => config.value.tun.enable, () => proxies.value],
     updateTrayMenus
@@ -349,6 +380,7 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     refreshConfig,
     updateConfig,
     patchConfig,
-    refreshProviderProxies
+    refreshProviderProxies,
+    getProxyPort
   }
 })

frontend/src/utils/helper.ts

@@ -1,6 +1,12 @@
 import { ignoredError, APP_TITLE } from '@/utils'
 import { deleteConnection, getConnections, useProxy } from '@/api/kernel'
-import { useAppSettingsStore, useEnvStore, useKernelApiStore, usePluginsStore } from '@/stores'
+import {
+  type ProxyType,
+  useAppSettingsStore,
+  useEnvStore,
+  useKernelApiStore,
+  usePluginsStore
+} from '@/stores'
 import { AbsolutePath, Exec, ExitApp, Readfile, Writefile } from '@/bridge'
 import { useConfirm, useMessage } from '@/hooks'
 
@@ -67,7 +73,11 @@ export const GrantTUNPermission = async (path: string) => {
 }
 
 // SystemProxy Helper
-export const SetSystemProxy = async (enable: boolean, server: string, proxyType = 0) => {
+export const SetSystemProxy = async (
+  enable: boolean,
+  server: string,
+  proxyType: ProxyType = 'mixed'
+) => {
   const { os } = useEnvStore().env
 
   if (os === 'windows') {
@@ -85,8 +95,8 @@ export const SetSystemProxy = async (enable: boolean, server: string, proxyType
   }
 }
 
-function setWindowsSystemProxy(server: string, enabled: boolean, proxyType: number) {
-  if (proxyType === 2) throw 'home.overview.notSupportSocks'
+function setWindowsSystemProxy(server: string, enabled: boolean, proxyType: ProxyType) {
+  if (proxyType === 'socks') throw 'home.overview.notSupportSocks'
 
   ignoredError(
     Exec,
@@ -121,12 +131,12 @@ function setWindowsSystemProxy(server: string, enabled: boolean, proxyType: numb
   )
 }
 
-function setDarwinSystemProxy(server: string, enabled: boolean, proxyType: number) {
+function setDarwinSystemProxy(server: string, enabled: boolean, proxyType: ProxyType) {
   function _set(device: string) {
     const state = enabled ? 'on' : 'off'
 
-    const httpState = [0, 1].includes(proxyType) ? state : 'off'
-    const socksState = [0, 2].includes(proxyType) ? state : 'off'
+    const httpState = ['mixed', 'http'].includes(proxyType) ? state : 'off'
+    const socksState = ['mixed', 'socks'].includes(proxyType) ? state : 'off'
 
     ignoredError(Exec, 'networksetup', ['-setwebproxystate', device, httpState])
     ignoredError(Exec, 'networksetup', ['-setsecurewebproxystate', device, httpState])
@@ -146,10 +156,10 @@ function setDarwinSystemProxy(server: string, enabled: boolean, proxyType: numbe
   _set('Wi-Fi')
 }
 
-function setLinuxSystemProxy(server: string, enabled: boolean, proxyType: number) {
+function setLinuxSystemProxy(server: string, enabled: boolean, proxyType: ProxyType) {
   const [serverName, serverPort] = server.split(':')
-  const httpEnabled = enabled && [0, 1].includes(proxyType)
-  const socksEnabled = enabled && [0, 2].includes(proxyType)
+  const httpEnabled = enabled && ['mixed', 'http'].includes(proxyType)
+  const socksEnabled = enabled && ['mixed', 'socks'].includes(proxyType)
 
   ignoredError(Exec, 'gsettings', [
     'set',