improve error handling

src/renderer/src/components/profiles/profile-item.tsx

@@ -94,7 +94,7 @@ const ProfileItem: React.FC<Props> = (props) => {
     return list
   }, [info])
 
-  const onMenuAction = (key: Key): void => {
+  const onMenuAction = async (key: Key): Promise<void> => {
     switch (key) {
       case 'edit-info': {
         setOpenInfo(true)
@@ -105,7 +105,7 @@ const ProfileItem: React.FC<Props> = (props) => {
         break
       }
       case 'delete': {
-        removeProfileItem(info.id)
+        await removeProfileItem(info.id)
         mutateProfileConfig()
         break
       }
@@ -177,15 +177,10 @@ const ProfileItem: React.FC<Props> = (props) => {
                   variant="light"
                   color="default"
                   disabled={updating}
-                  onPress={() => {
+                  onPress={async () => {
                     setUpdating(true)
-                    addProfileItem(info)
+                    await addProfileItem(info)
-                      .catch((e) => {
-                        alert(e)
-                      })
-                      .finally(() => {
                     setUpdating(false)
-                      })
                   }}
                 >
                   <IoMdRefresh

src/renderer/src/components/resources/geo-data.tsx

@@ -115,16 +115,16 @@ const GeoData: React.FC = () => {
             size="sm"
             isIconOnly
             variant="light"
-            onPress={() => {
+            onPress={async () => {
               setUpdating(true)
-              mihomoUpgradeGeo()
+              try {
-                .catch((e) => {
+                await mihomoUpgradeGeo()
-                  new Notification('更新失败', { body: e.message })
-                })
-                .finally(() => {
                 new Notification('Geo 数据库更新成功')
+              } catch (e) {
+                alert(e)
+              } finally {
                 setUpdating(false)
-                })
+              }
             }}
           >
             <IoMdRefresh className={`text-lg ${updating ? 'animate-spin' : ''}`} />

src/renderer/src/components/resources/proxy-provider.tsx

@@ -20,18 +20,22 @@ const ProxyProvider: React.FC = () => {
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))
 
-  const onUpdate = (name: string, index: number): void => {
+  const onUpdate = async (name: string, index: number): Promise<void> => {
     setUpdating((prev) => {
       prev[index] = true
       return [...prev]
     })
-    mihomoUpdateProxyProviders(name).finally(() => {
+    try {
+      await mihomoUpdateProxyProviders(name)
+      mutate()
+    } catch (e) {
+      alert(e)
+    } finally {
       setUpdating((prev) => {
         prev[index] = false
         return [...prev]
       })
-      mutate()
+    }
-    })
   }
 
   if (!providers.length) {

src/renderer/src/components/resources/rule-provider.tsx

@@ -15,18 +15,22 @@ const RuleProvider: React.FC = () => {
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))
 
-  const onUpdate = (name: string, index: number): void => {
+  const onUpdate = async (name: string, index: number): Promise<void> => {
     setUpdating((prev) => {
       prev[index] = true
       return [...prev]
     })
-    mihomoUpdateRuleProviders(name).finally(() => {
+    try {
+      await mihomoUpdateRuleProviders(name)
+      mutate()
+    } catch (e) {
+      alert(e)
+    } finally {
       setUpdating((prev) => {
         prev[index] = false
         return [...prev]
       })
-      mutate()
+    }
-    })
   }
 
   if (!providers.length) {

src/renderer/src/components/sider/mihomo-core-card.tsx

@@ -22,9 +22,6 @@ const MihomoCoreCard: React.FC = () => {
   useEffect(() => {
     const token = PubSub.subscribe('mihomo-core-changed', () => {
       mutate()
-      setTimeout(() => {
-        mutate()
-      }, 1000)
     })
     window.electron.ipcRenderer.on('mihomoMemory', (_e, info: IMihomoMemoryInfo) => {
       setMem(info.inuse)
@@ -70,11 +67,13 @@ const MihomoCoreCard: React.FC = () => {
               variant="light"
               color="default"
               onPress={async () => {
+                try {
                   await restartCore()
+                } catch (e) {
+                  alert(e)
+                } finally {
                   mutate()
-                setTimeout(() => {
+                }
-                  mutate()
-                }, 2000)
               }}
             >
               <IoMdRefresh className={`${match ? 'text-white' : 'text-foreground'} text-[24px]`} />

src/renderer/src/components/sider/profile-card.tsx

@@ -87,11 +87,10 @@ const ProfileCard: React.FC = () => {
                   disabled={updating}
                   variant="light"
                   color="default"
-                  onPress={() => {
+                  onPress={async () => {
                     setUpdating(true)
-                    addProfileItem(info).finally(() => {
+                    await addProfileItem(info)
                     setUpdating(false)
-                    })
                   }}
                 >
                   <IoMdRefresh

src/renderer/src/hooks/use-app-config.tsx

@@ -12,10 +12,15 @@ export const useAppConfig = (listenUpdate = false): RetuenType => {
   const { data: appConfig, mutate: mutateAppConfig } = useSWR('getConfig', () => getAppConfig())
 
   const patchAppConfig = async (value: Partial<IAppConfig>): Promise<void> => {
+    try {
       await patch(value)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateAppConfig()
       window.electron.ipcRenderer.send('appConfigUpdated')
     }
+  }
 
   useEffect(() => {
     if (!listenUpdate) return

src/renderer/src/hooks/use-controled-mihomo-config.tsx

@@ -15,10 +15,15 @@ export const useControledMihomoConfig = (listenUpdate = false): RetuenType => {
   )
 
   const patchControledMihomoConfig = async (value: Partial<IMihomoConfig>): Promise<void> => {
+    try {
       await patch(value)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateControledMihomoConfig()
       window.electron.ipcRenderer.send('controledMihomoConfigUpdated')
     }
+  }
 
   useEffect(() => {
     if (!listenUpdate) return

src/renderer/src/hooks/use-override-config.tsx

@@ -22,24 +22,44 @@ export const useOverrideConfig = (): RetuenType => {
   )
 
   const setOverrideConfig = async (config: IOverrideConfig): Promise<void> => {
+    try {
       await set(config)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateOverrideConfig()
     }
+  }
 
   const addOverrideItem = async (item: Partial<IOverrideItem>): Promise<void> => {
+    try {
       await add(item)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateOverrideConfig()
     }
+  }
 
   const removeOverrideItem = async (id: string): Promise<void> => {
+    try {
       await remove(id)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateOverrideConfig()
     }
+  }
 
   const updateOverrideItem = async (item: IOverrideItem): Promise<void> => {
+    try {
       await update(item)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateOverrideConfig()
     }
+  }
 
   return {
     overrideConfig,

src/renderer/src/hooks/use-profile-config.tsx

@@ -25,29 +25,54 @@ export const useProfileConfig = (): RetuenType => {
   )
 
   const setProfileConfig = async (config: IProfileConfig): Promise<void> => {
+    try {
       await set(config)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateProfileConfig()
     }
+  }
 
   const addProfileItem = async (item: Partial<IProfileItem>): Promise<void> => {
+    try {
       await add(item)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateProfileConfig()
     }
+  }
 
   const removeProfileItem = async (id: string): Promise<void> => {
+    try {
       await remove(id)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateProfileConfig()
     }
+  }
 
   const updateProfileItem = async (item: IProfileItem): Promise<void> => {
+    try {
       await update(item)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateProfileConfig()
     }
+  }
 
   const changeCurrentProfile = async (id: string): Promise<void> => {
+    try {
       await change(id)
+    } catch (e) {
+      alert(e)
+    } finally {
       mutateProfileConfig()
     }
+  }
 
   useEffect(() => {
     window.electron.ipcRenderer.on('profileConfigUpdated', () => {

src/renderer/src/pages/mihomo.tsx

@@ -59,8 +59,14 @@ const Mihomo: React.FC = () => {
             size="sm"
             selectedKeys={new Set([core])}
             onSelectionChange={async (v) => {
+              try {
                 await patchAppConfig({ core: v.currentKey as 'mihomo' | 'mihomo-alpha' })
-              restartCore().then(() => PubSub.publish('mihomo-core-changed'))
+                await restartCore()
+              } catch (e) {
+                alert(e)
+              } finally {
+                PubSub.publish('mihomo-core-changed')
+              }
             }}
           >
             <SelectItem key="mihomo">{CoreMap['mihomo']}</SelectItem>

src/renderer/src/pages/profiles.tsx

@@ -33,14 +33,9 @@ const Profiles: React.FC = () => {
   const sensors = useSensors(useSensor(PointerSensor))
   const handleImport = async (): Promise<void> => {
     setImporting(true)
-    try {
     await addProfileItem({ name: '', type: 'remote', url })
-    } catch (e) {
-      alert(e)
-    } finally {
     setImporting(false)
   }
-  }
   const pageRef = useRef<HTMLDivElement>(null)
 
   const onDragEnd = async (event: DragEndEvent): Promise<void> => {
@@ -75,11 +70,11 @@ const Profiles: React.FC = () => {
       if (event.dataTransfer?.files) {
         const file = event.dataTransfer.files[0]
         if (file.name.endsWith('.yml') || file.name.endsWith('.yaml')) {
-          const content = await readTextFile(file.path)
           try {
+            const content = await readTextFile(file.path)
             await addProfileItem({ name: file.name, type: 'local', file: content })
-          } finally {
+          } catch (e) {
-            setFileOver(false)
+            alert(e)
           }
         } else {
           alert('不支持的文件类型')
@@ -135,14 +130,17 @@ const Profiles: React.FC = () => {
           size="sm"
           color="primary"
           className="ml-2"
-          onPress={() => {
+          onPress={async () => {
-            getFilePath(['yml', 'yaml']).then(async (files) => {
+            try {
+              const files = await getFilePath(['yml', 'yaml'])
               if (files?.length) {
                 const content = await readTextFile(files[0])
                 const fileName = files[0].split('/').pop()?.split('\\').pop()
                 await addProfileItem({ name: fileName, type: 'local', file: content })
               }
-            })
+            } catch (e) {
+              alert(e)
+            }
           }}
         >
           打开
@@ -167,11 +165,7 @@ const Profiles: React.FC = () => {
                 updateProfileItem={updateProfileItem}
                 info={item}
                 onClick={async () => {
-                  try {
                   await changeCurrentProfile(item.id)
-                  } catch (e) {
-                    alert(e)
-                  }
                 }}
               />
             ))}

src/renderer/src/pages/proxies.tsx

@@ -83,13 +83,12 @@ const Proxies: React.FC = () => {
     return { groupCounts, allProxies }
   }, [groups, isOpen, proxyDisplayOrder])
 
-  const onChangeProxy = (group: string, proxy: string): void => {
+  const onChangeProxy = async (group: string, proxy: string): Promise<void> => {
-    mihomoChangeProxy(group, proxy).then(() => {
+    await mihomoChangeProxy(group, proxy)
     if (autoCloseConnection) {
-        mihomoCloseAllConnections()
+      await mihomoCloseAllConnections()
     }
     mutate()
-    })
   }
 
   const onProxyDelay = async (proxy: string, url?: string): Promise<IMihomoDelay> => {
@@ -152,7 +151,7 @@ const Proxies: React.FC = () => {
         style={{ height: 'calc(100vh - 50px)' }}
         groupCounts={groupCounts}
         groupContent={(index) => {
-          return (
+          return groups[index] ? (
             <div
               className={`w-full pt-2 ${index === groupCounts.length - 1 && !isOpen[index] ? 'pb-2' : ''} px-2`}
             >
@@ -242,6 +241,8 @@ const Proxies: React.FC = () => {
                 </CardBody>
               </Card>
             </div>
+          ) : (
+            <div>Never See This</div>
           )
         }}
         itemContent={(index, groupIndex) => {

src/renderer/src/pages/settings.tsx

@@ -86,13 +86,18 @@ const Settings: React.FC = () => {
           <Switch
             size="sm"
             isSelected={enable}
-            onValueChange={(v) => {
+            onValueChange={async (v) => {
+              try {
                 if (v) {
-                enableAutoRun()
+                  await enableAutoRun()
                 } else {
-                disableAutoRun()
+                  await disableAutoRun()
                 }
+              } catch (e) {
+                alert(e)
+              } finally {
                 mutate()
+              }
             }}
           />
         </SettingItem>
@@ -196,17 +201,22 @@ const Settings: React.FC = () => {
         <SettingItem title="检查更新" divider>
           <Button
             size="sm"
-            onPress={() => {
+            onPress={async () => {
-              checkUpdate().then((v) => {
+              try {
-                if (v) {
+                const version = await checkUpdate()
-                  new window.Notification(`v${v}版本已发布`, { body: '点击前往下载' }).onclick =
+
-                    (): void => {
+                if (version) {
-                      open(`https://github.com/pompurin404/mihomo-party/releases/tag/v${v}`)
+                  new window.Notification(`v${version}版本已发布`, {
+                    body: '点击前往下载'
+                  }).onclick = (): void => {
+                    open(`https://github.com/pompurin404/mihomo-party/releases/tag/v${version}`)
                   }
                 } else {
                   new window.Notification('当前已是最新版本', { body: '无需更新' })
                 }
-              })
+              } catch (e) {
+                alert(e)
+              }
             }}
           >
             检查更新

src/renderer/src/pages/syspeoxy.tsx

@@ -5,7 +5,7 @@ import SettingItem from '@renderer/components/base/base-setting-item'
 import PacEditorViewer from '@renderer/components/sysproxy/pac-editor-modal'
 import { useAppConfig } from '@renderer/hooks/use-app-config'
 import { platform } from '@renderer/utils/init'
-import { triggerSysProxy } from '@renderer/utils/ipc'
+import { openUWPTool, triggerSysProxy } from '@renderer/utils/ipc'
 import { Key, useState } from 'react'
 import React from 'react'
 import { MdDeleteForever } from 'react-icons/md'
@@ -90,7 +90,8 @@ const Sysproxy: React.FC = () => {
     try {
       await triggerSysProxy(true)
       await patchAppConfig({ sysProxy: { enable: true } })
-    } catch {
+    } catch (e) {
+      alert(e)
       await patchAppConfig({ sysProxy: { enable: false } })
     }
   }
@@ -141,8 +142,8 @@ const Sysproxy: React.FC = () => {
           <SettingItem title="UWP 工具" divider>
             <Button
               size="sm"
-              onPress={() => {
+              onPress={async () => {
-                window.electron.ipcRenderer.invoke('openUWPTool')
+                await openUWPTool()
               }}
             >
               打开 UWP 工具

src/renderer/src/pages/tun.tsx

@@ -71,13 +71,17 @@ const Tun: React.FC = () => {
               size="sm"
               color="primary"
               isLoading={loading}
-              onPress={() => {
+              onPress={async () => {
                 setLoading(true)
-                setupFirewall()
+                try {
-                  .then(() => {
+                  await setupFirewall()
                   new Notification('防火墙重设成功')
-                  })
+                  await restartCore()
-                  .finally(() => setLoading(false))
+                } catch (e) {
+                  alert(e)
+                } finally {
+                  setLoading(false)
+                }
               }}
             >
               重设防火墙

src/renderer/src/utils/ipc.ts

@@ -233,6 +233,10 @@ export async function getPlatform(): Promise<NodeJS.Platform> {
   return ipcErrorWrapper(await window.electron.ipcRenderer.invoke('platform'))
 }
 
+export async function openUWPTool(): Promise<void> {
+  return ipcErrorWrapper(await window.electron.ipcRenderer.invoke('openUWPTool'))
+}
+
 export async function setupFirewall(): Promise<void> {
   return ipcErrorWrapper(await window.electron.ipcRenderer.invoke('setupFirewall'))
 }