From bf6b46ec8ee12ba0913e4297e6023897452231f6 Mon Sep 17 00:00:00 2001
From: m1m1sha <18262227804@163.com>
Date: Wed, 8 May 2024 19:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=20func?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easytier-gui/src/composables/network.ts |  6 +++---
 easytier-gui/src/stores/network.ts      | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/easytier-gui/src/composables/network.ts b/easytier-gui/src/composables/network.ts
index 1d808be..1b94770 100644
--- a/easytier-gui/src/composables/network.ts
+++ b/easytier-gui/src/composables/network.ts
@@ -2,15 +2,15 @@ import { invoke } from '@tauri-apps/api/tauri'
 import type { NetworkConfig, NetworkInstanceRunningInfo } from '~/types/network'
 
 export async function parseNetworkConfig(cfg: NetworkConfig): Promise<string> {
-  return await invoke('parse_network_config', { cfg: JSON.stringify(cfg) })
+  return invoke<string>('parse_network_config', { cfg: JSON.stringify(cfg) })
 }
 
 export async function runNetworkInstance(cfg: NetworkConfig): Promise<string> {
-  return await invoke<string>('run_network_instance', { cfg: JSON.stringify(cfg) })
+  return invoke<string>('run_network_instance', { cfg: JSON.stringify(cfg) })
 }
 
 export async function retainNetworkInstance(instanceIds: string[]): Promise<string> {
-  return await invoke<string>('retain_network_instance', { instanceIds: JSON.stringify(instanceIds) })
+  return invoke<string>('retain_network_instance', { instanceIds: JSON.stringify(instanceIds) })
 }
 
 export async function collectNetworkInfos(): Promise<Record<string, NetworkInstanceRunningInfo>> {
diff --git a/easytier-gui/src/stores/network.ts b/easytier-gui/src/stores/network.ts
index 78d8bb4..a89c291 100644
--- a/easytier-gui/src/stores/network.ts
+++ b/easytier-gui/src/stores/network.ts
@@ -73,18 +73,19 @@ export const useNetworkStore = defineStore('networkStore', {
     },
 
     loadFromLocalStorage() {
-      const networkList = JSON.parse(localStorage.getItem('networkList') || '[]')
-      const result = []
-      for (const cfg of networkList) {
-        result.push({
-          ...DEFAULT_NETWORK_CONFIG,
-          ...cfg,
+      let networkList: NetworkConfig[]
+
+      try {
+        networkList = JSON.parse(localStorage.getItem('networkList') || '[]')
+        networkList = networkList.map((cfg) => {
+          return { ...DEFAULT_NETWORK_CONFIG(), ...cfg } as NetworkConfig
         })
       }
-      if (result.length === 0)
-        result.push(DEFAULT_NETWORK_CONFIG)
+      catch {
+        networkList = [DEFAULT_NETWORK_CONFIG()]
+      }
 
-      this.networkList = result
+      this.networkList = networkList
       this.curNetwork = this.networkList[0]
     },