config 导入

bug修复

Author: danbai225

app.go

@@ -56,7 +56,7 @@ func (a *App) systemTray() {
 
 func (a *App) testPing() {
 	a.PingAll()
-	tick := time.Tick(time.Second * 60)
+	tick := time.Tick(time.Second * 5)
 	for range tick {
 		a.PingAll()
 	}
@@ -86,18 +86,17 @@ func (a *App) startup(ctx context.Context) {
 		rdata, err2 := httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db.sha256sum")
 		if err2 == nil {
 			sum256 := sha256.Sum256(file)
-			fmt.Println(fmt.Sprintf("%x", sum256), string(rdata))
 			if fmt.Sprintf("%x", sum256) != string(rdata) {
 				rdata, err2 = httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db")
 				if err2 == nil {
-					_ = os.WriteFile(geoPath, rdata, 0644)
+					_ = os.WriteFile(geoPath, rdata, 0o644)
 				}
 			}
 		}
 	} else {
 		rdata, err2 := httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db")
 		if err2 == nil {
-			_ = os.WriteFile(geoPath, rdata, 0644)
+			_ = os.WriteFile(geoPath, rdata, 0o644)
 		}
 	}
 	geoPath = fmt.Sprintf("%s%c%s%c%s", home, os.PathSeparator, ".gpp", os.PathSeparator, "geosite.db")
@@ -106,24 +105,26 @@ func (a *App) startup(ctx context.Context) {
 		rdata, err2 := httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db.sha256sum")
 		if err2 == nil {
 			sum256 := sha256.Sum256(file)
-			fmt.Println(fmt.Sprintf("%x", sum256), string(rdata))
 			if fmt.Sprintf("%x", sum256) != string(rdata) {
 				rdata, err2 = httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db")
 				if err2 == nil {
-					_ = os.WriteFile(geoPath, rdata, 0644)
+					_ = os.WriteFile(geoPath, rdata, 0o644)
 				}
 			}
 		}
 	} else {
 		rdata, err2 := httpGet("https://mirror.ghproxy.com/https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db")
 		if err2 == nil {
-			_ = os.WriteFile(geoPath, rdata, 0644)
+			_ = os.WriteFile(geoPath, rdata, 0o644)
 		}
 	}
 }
 func (a *App) PingAll() {
 	group := sync.WaitGroup{}
 	for i := range a.conf.PeerList {
+		if a.conf.PeerList[i].Protocol == "direct" {
+			continue
+		}
 		group.Add(1)
 		peer := a.conf.PeerList[i]
 		go func() {
@@ -160,16 +161,31 @@ func (a *App) Add(token string) string {
 	}
 	err, peer := config.ParsePeer(token)
 	if err != nil {
+		_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			Type:    runtime.ErrorDialog,
+			Title:   "导入错误",
+			Message: err.Error(),
+		})
 		return err.Error()
 	}
 	for _, p := range a.conf.PeerList {
 		if p.Name == peer.Name {
+			_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+				Type:    runtime.ErrorDialog,
+				Title:   "导入错误",
+				Message: fmt.Sprintf("节点 %s 已存在", peer.Name),
+			})
 			return fmt.Sprintf("peer %s already exists", peer.Name)
 		}
 	}
 	a.conf.PeerList = append(a.conf.PeerList, peer)
 	err = config.SaveConfig(a.conf)
 	if err != nil {
+		_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			Type:    runtime.ErrorDialog,
+			Title:   "导入错误",
+			Message: err.Error(),
+		})
 		return err.Error()
 	}
 	return "ok"
@@ -211,10 +227,20 @@ func (a *App) Start() string {
 	var err error
 	a.box, err = client.Client(a.gamePeer, a.httpPeer, a.processList)
 	if err != nil {
+		_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			Type:    runtime.ErrorDialog,
+			Title:   "加速失败",
+			Message: err.Error(),
+		})
 		return err.Error()
 	}
 	err = a.box.Start()
 	if err != nil {
+		_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			Type:    runtime.ErrorDialog,
+			Title:   "加速失败",
+			Message: err.Error(),
+		})
 		return err.Error()
 	}
 	return "ok"
@@ -227,6 +253,11 @@ func (a *App) Stop() string {
 	}
 	err := a.box.Close()
 	if err != nil {
+		_, _ = runtime.MessageDialog(a.ctx, runtime.MessageDialogOptions{
+			Type:    runtime.ErrorDialog,
+			Title:   "停止失败",
+			Message: err.Error(),
+		})
 		return err.Error()
 	}
 	a.box = nil

backend/config/config.go

@@ -34,11 +34,11 @@ func InitConfig() {
 	if err != nil {
 		_path = fmt.Sprintf("%s%c%s%c%s", home, os.PathSeparator, ".gpp", os.PathSeparator, "config.json")
 	}
-	_ = os.MkdirAll(filepath.Dir(_path), os.ModeDir|os.ModePerm)
+	_ = os.MkdirAll(filepath.Dir(_path), 0o755)
 	_, err = os.Stat(_path)
 	if err != nil {
 		file, _ := json.Marshal(Config{PeerList: make([]*Peer, 0)})
-		err = os.WriteFile(_path, file, os.ModePerm)
+		err = os.WriteFile(_path, file, 0o644)
 	}
 }
 func LoadConfig() (*Config, error) {
@@ -76,7 +76,7 @@ func SaveConfig(config *Config) error {
 		_path = fmt.Sprintf("%s%c%s%c%s", home, os.PathSeparator, ".gpp", os.PathSeparator, "config.json")
 	}
 	file, _ := json.Marshal(config)
-	return os.WriteFile(_path, file, os.ModePerm)
+	return os.WriteFile(_path, file, 0o644)
 }
 func ParsePeer(token string) (error, *Peer) {
 	split := strings.Split(token, "#")
@@ -93,7 +93,7 @@ func ParsePeer(token string) (error, *Peer) {
 	split = strings.Split(token, "@")
 	protocol := strings.ReplaceAll(split[0], "gpp://", "")
 	switch protocol {
-	case "vless", "shadowsocks", "socks":
+	case "vless", "shadowsocks", "socks", "hysteria2":
 	default:
 		return fmt.Errorf("unknown protocol: %s", protocol), nil
 	}

frontend/src/views/Index.vue

@@ -51,7 +51,7 @@
           </n-button>
         </n-space>
         <n-gradient-text type="success" style="margin-left: 130px;margin-top: 35px">
-          v1.2.8
+          v1.3.0
         </n-gradient-text>
       </n-space>
       <div>

go.mod

@@ -105,4 +105,4 @@ require (
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	lukechampine.com/blake3 v1.3.0 // indirect
-)
+)

server/.gitignore

@@ -13,6 +13,7 @@ echo "请选择一个选项："
 echo "1) shadowsocks"
 echo "2) socks"
 echo "3) vless"
+echo "4) hysteria2"
 read -p "输入选项 (1-3): " input
 PROTOCOL="vless"
 case $input in
@@ -25,6 +26,9 @@ case $input in
     3)
         PROTOCOL="vless"
         ;;
+    4)
+        PROTOCOL="hysteria2"
+        ;;
     *)
         echo "无效选项: $input"
           exit 0
@@ -89,13 +93,13 @@ if [ "\$1" = "start" ]; then
     echo "Starting gpp"
     nohup ${INSTALL_PATH}/gpp > "\$log_file" 2>&1 &
     echo \$! > "\$pid_file"
-    echo "stm started with pid \$!"
+    echo "gpp started with pid \$!"
     exit 0
   fi
 elif [ "\$1" = "stop" ]; then
   if [ -f "\$pid_file" ]; then
     pid=\$(cat "\$pid_file")
-    echo "Stopping stm with pid \$pid"
+    echo "Stopping gpp with pid \$pid"
     kill "\$pid"
     rm "\$pid_file"
     exit 0
@@ -112,7 +116,6 @@ EOF
 chmod +x run.sh
 
 echo "安装完成,请执行 ${INSTALL_PATH}/run.sh start 启动服务端,执行 ${INSTALL_PATH}/run.sh stop 停止服务端"
-#fmt.Sprintf("gpp://%s@%s:%d/%s", config.Protocol, ipStr, config.Port, config.UUID
 result="gpp://$PROTOCOL@$NET_IP:$LISTEN_PORT/$UUID"
 encoded_result=$(echo -n $result | base64)
-echo "导入Token：${encoded_result}"
+echo "导入链接：${encoded_result}"