feat: Prompt for core restart on active configuration changes

Author: Ayideyia

frontend/src/App.vue

@@ -23,6 +23,14 @@ const kernelApiStore = Stores.useKernelApiStore()
 const subscribesStore = Stores.useSubscribesStore()
 const scheduledTasksStore = Stores.useScheduledTasksStore()
 
+const handleRestartCore = async () => {
+  try {
+    await kernelApiStore.restartCore()
+  } catch (e: any) {
+    message.error(e.message || e)
+  }
+}
+
 EventsOn('onLaunchApp', async ([arg]: string[]) => {
   if (!arg) return
 
@@ -142,4 +150,14 @@ envStore.setupEnv().then(async () => {
   />
 
   <CommandView v-if="!loading" />
+
+  <div v-if="kernelApiStore.needRestart" class="fixed right-32 bottom-32">
+    <Button
+      @click="handleRestartCore"
+      v-tips="'home.overview.restart'"
+      :loading="kernelApiStore.restarting"
+      icon="restart"
+      class="rounded-full w-42 h-42 shadow"
+    />
+  </div>
 </template>

frontend/src/api/kernel.ts

@@ -1,25 +1,17 @@
 import { useAppSettingsStore, useProfilesStore } from '@/stores'
 import { Request } from '@/utils/request'
 
-import type {
-  CoreApiConfig,
-  CoreApiConnections,
-  CoreApiProviders,
-  CoreApiProvidersRules,
-  CoreApiProxies,
-} from '@/types/kernel'
+import type { CoreApiConfig, CoreApiProxies, CoreApiConnections } from '@/types/kernel'
 
 export enum Api {
   Configs = '/configs',
   Memory = '/memory',
   Proxies = '/proxies',
-  Providers = '/providers/proxies',
   ProxyDelay = '/proxies/{0}/delay',
   Connections = '/connections',
   Traffic = '/traffic',
   Logs = '/logs',
   GEO = '/configs/geo',
-  ProvidersRules = '/providers/rules',
 }
 
 const setupKernelApi = () => {
@@ -51,8 +43,6 @@ export const setConfigs = (body = {}) => request.patch<null>(Api.Configs, body)
 
 export const getProxies = () => request.get<CoreApiProxies>(Api.Proxies)
 
-export const getProviders = () => request.get<CoreApiProviders>(Api.Providers)
-
 export const getConnections = () => request.get<CoreApiConnections>(Api.Connections)
 
 export const deleteConnection = (id: string) => request.delete<null>(Api.Connections + '/' + id)
@@ -71,13 +61,3 @@ export const getProxyDelay = (proxy: string, url: string) => {
 }
 
 export const updateGEO = () => request.post<{ message: string } | null>(Api.GEO)
-
-export const getProvidersRules = () => request.get<CoreApiProvidersRules>(Api.ProvidersRules)
-
-export const updateProvidersRules = (ruleset: string) => {
-  return request.put<null>(Api.ProvidersRules + '/' + ruleset)
-}
-
-export const updateProvidersProxies = (provider: string) => {
-  return request.put<null>(Api.Providers + '/' + provider)
-}

frontend/src/stores/kernelApi.ts

@@ -1,16 +1,19 @@
 import { defineStore } from 'pinia'
 import { computed, ref, watch } from 'vue'
 
-import { getConfigs, setConfigs, getProxies, getProviders, Api } from '@/api/kernel'
+import { getConfigs, setConfigs, getProxies, Api } from '@/api/kernel'
 import { ProcessInfo, KillProcess, ExecBackground, ReadFile, WriteFile, RemoveFile } from '@/bridge'
 import { CorePidFilePath, CoreStopOutputKeyword, CoreWorkingDirectory } from '@/constant'
 import { Branch } from '@/enums/app'
+import { RuleType } from '@/enums/kernel'
 import {
   useAppSettingsStore,
   useProfilesStore,
   useLogsStore,
   useEnvStore,
   usePluginsStore,
+  useSubscribesStore,
+  useRulesetsStore,
 } from '@/stores'
 import {
   generateConfigFile,
@@ -21,6 +24,7 @@ import {
   message,
   getKernelRuntimeArgs,
   getKernelRuntimeEnv,
+  eventBus,
 } from '@/utils'
 
 import type {
@@ -39,6 +43,8 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
   const logsStore = useLogsStore()
   const pluginsStore = usePluginsStore()
   const profilesStore = useProfilesStore()
+  const subscribesStore = useSubscribesStore()
+  const rulesetsStore = useRulesetsStore()
   const appSettingsStore = useAppSettingsStore()
 
   /** RESTful API */
@@ -51,18 +57,12 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     mode: '',
     tun: {
       enable: false,
-      stack: 'gVisor',
+      stack: '',
       device: '',
     },
   })
 
   const proxies = ref<Record<string, CoreApiProxy>>({})
-  const providers = ref<{
-    [key: string]: {
-      name: string
-      proxies: CoreApiProxy[]
-    }
-  }>({})
 
   const refreshConfig = async () => {
     config.value = await getConfigs()
@@ -74,8 +74,7 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
   }
 
   const refreshProviderProxies = async () => {
-    const [{ providers: a }, { proxies: b }] = await Promise.all([getProviders(), getProxies()])
-    providers.value = a
+    const { proxies: b } = await getProxies()
     proxies.value = b
   }
 
@@ -207,6 +206,7 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
   const starting = ref(false)
   const stopping = ref(false)
   const restarting = ref(false)
+  const needRestart = ref(false)
   const coreStateLoading = ref(true)
   let isCoreStartedByThisInstance = false
   let { promise: coreStoppedPromise, resolve: coreStoppedResolver } = Promise.withResolvers()
@@ -255,6 +255,7 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
 
     corePid.value = pid
     running.value = true
+    needRestart.value = false
     isCoreStartedByThisInstance = true
     coreStoppedPromise = new Promise((r) => (coreStoppedResolver = r))
 
@@ -361,6 +362,67 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     return undefined
   }
 
+  eventBus.on('profileChange', ({ id }) => {
+    if (running.value && id === appSettingsStore.app.kernel.profile) {
+      needRestart.value = true
+    }
+  })
+
+  eventBus.on('subscriptionChange', ({ id }) => {
+    if (running.value && profilesStore.currentProfile) {
+      const inUse = profilesStore.currentProfile.proxyGroupsConfig.some(
+        (group) => group.use.includes(id) || group.proxies.some((proxy) => proxy.type === id),
+      )
+      if (inUse) {
+        needRestart.value = true
+      }
+    }
+  })
+
+  eventBus.on('subscriptionsChange', () => {
+    if (running.value && profilesStore.currentProfile) {
+      const enabledSubs = subscribesStore.subscribes.flatMap((v) => (v.disabled ? [] : v.id))
+      const inUse = profilesStore.currentProfile.proxyGroupsConfig.some(
+        (group) =>
+          group.use.some((sub) => enabledSubs.includes(sub)) ||
+          group.proxies.some((proxy) => enabledSubs.includes(proxy.type)),
+      )
+      if (inUse) {
+        needRestart.value = true
+      }
+    }
+  })
+
+  const collectRulesetIDs = () => {
+    if (!profilesStore.currentProfile) return []
+    const l1 = Object.keys(profilesStore.currentProfile.dnsConfig['nameserver-policy']).flatMap(
+      (v) => (v.startsWith('rule-set:') ? v.slice('rule-set:'.length) : []),
+    )
+    const l2 = profilesStore.currentProfile.rulesConfig.flatMap((v) =>
+      v.type === RuleType.RuleSet ? v.payload : [],
+    )
+    return [...l1, ...l2]
+  }
+
+  eventBus.on('rulesetChange', ({ id }) => {
+    if (running.value && profilesStore.currentProfile) {
+      const inUse = collectRulesetIDs().includes(id)
+      if (inUse) {
+        needRestart.value = true
+      }
+    }
+  })
+
+  eventBus.on('rulesetsChange', () => {
+    if (running.value && profilesStore.currentProfile) {
+      const enabledRulesets = rulesetsStore.rulesets.flatMap((v) => (v.disabled ? [] : v.id))
+      const inUse = collectRulesetIDs().some((v) => enabledRulesets.includes(v))
+      if (inUse) {
+        needRestart.value = true
+      }
+    }
+  })
+
   const watchSources = computed(() => {
     const source = [config.value.mode, config.value.tun.enable]
     if (!appSettingsStore.app.addGroupToMenu) return source.join('')
@@ -387,10 +449,10 @@ export const useKernelApiStore = defineStore('kernelApi', () => {
     starting,
     stopping,
     restarting,
+    needRestart,
     coreStateLoading,
     config,
     proxies,
-    providers,
     refreshConfig,
     updateConfig,
     refreshProviderProxies,

frontend/src/stores/profiles.ts

@@ -1,11 +1,12 @@
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { parse } from 'yaml'
 
 import { ReadFile, WriteFile } from '@/bridge'
 import { ProfilesFilePath } from '@/constant'
 import { ProxyGroup, RulesetBehavior, RulesetFormat, RuleType } from '@/enums/kernel'
-import { debounce, ignoredError, stringifyNoFolding } from '@/utils'
+import { useAppSettingsStore } from '@/stores'
+import { debounce, eventBus, ignoredError, stringifyNoFolding } from '@/utils'
 
 export type ProfileType = {
   id: string
@@ -139,7 +140,10 @@ export type ProfileType = {
 }
 
 export const useProfilesStore = defineStore('profiles', () => {
+  const appSettingsStore = useAppSettingsStore()
+
   const profiles = ref<ProfileType[]>([])
+  const currentProfile = computed(() => getProfileById(appSettingsStore.app.kernel.profile))
 
   const setupProfiles = async () => {
     const data = await ignoredError(ReadFile, ProfilesFilePath)
@@ -188,6 +192,8 @@ export const useProfilesStore = defineStore('profiles', () => {
       profiles.value.splice(idx, 0, backup)
       throw error
     }
+
+    eventBus.emit('profileChange', { id })
   }
 
   const editProfile = async (id: string, p: ProfileType) => {
@@ -200,12 +206,15 @@ export const useProfilesStore = defineStore('profiles', () => {
       profiles.value.splice(idx, 1, backup)
       throw error
     }
+
+    eventBus.emit('profileChange', { id })
   }
 
   const getProfileById = (id: string) => profiles.value.find((v) => v.id === id)
 
   return {
     profiles,
+    currentProfile,
     setupProfiles,
     saveProfiles,
     addProfile,

frontend/src/stores/rulesets.ts

@@ -12,6 +12,7 @@ import {
   omitArray,
   stringifyNoFolding,
   asyncPool,
+  eventBus,
 } from '@/utils'
 
 export interface RuleSet {
@@ -75,6 +76,8 @@ export const useRulesetsStore = defineStore('rulesets', () => {
       rulesets.value.splice(idx, 0, backup)
       throw error
     }
+
+    eventBus.emit('rulesetChange', { id })
   }
 
   const editRuleset = async (id: string, r: RuleSet) => {
@@ -87,6 +90,8 @@ export const useRulesetsStore = defineStore('rulesets', () => {
       rulesets.value.splice(idx, 1, backup)
       throw error
     }
+
+    eventBus.emit('rulesetChange', { id })
   }
 
   const _doUpdateRuleset = async (r: RuleSet) => {
@@ -100,11 +105,10 @@ export const useRulesetsStore = defineStore('rulesets', () => {
         const { body: b } = await HttpGet(r.url)
         body = b
       } else if (r.type === 'Manual') {
-        isExist = await FileExists(r.path)
-        if (isExist) {
-          body = await ReadFile(r.path)
-        } else {
+        body = await ReadFile(r.path).catch(() => '')
+        if (!body) {
           body = stringifyNoFolding(EmptyRuleSet)
+          isExist = false
         }
       }
 
@@ -144,10 +148,13 @@ export const useRulesetsStore = defineStore('rulesets', () => {
       r.updating = true
       await _doUpdateRuleset(r)
       await saveRulesets()
-      return `Ruleset [${r.name}] updated successfully.`
     } finally {
       r.updating = false
     }
+
+    eventBus.emit('rulesetChange', { id })
+
+    return `Ruleset [${r.name}] updated successfully.`
   }
 
   const updateRulesets = async () => {
@@ -170,6 +177,8 @@ export const useRulesetsStore = defineStore('rulesets', () => {
     )
 
     if (needSave) saveRulesets()
+
+    eventBus.emit('rulesetsChange', undefined)
   }
 
   const rulesetHubLoading = ref(false)