优化服务启动流程

server/server.go

@@ -2,10 +2,7 @@ package server
 
 import (
 	"context"
-	"encoding/base64"
-	"encoding/json"
 	"log/slog"
-	"net/http"
 	"os"
 	"os/signal"
 	"proxy-server/pkg/utils"
@@ -14,8 +11,8 @@ import (
 	"proxy-server/server/pkg/env"
 	"proxy-server/server/pkg/log"
 	"proxy-server/server/pkg/orm"
+	"proxy-server/server/report"
 	"proxy-server/server/web"
-	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -33,6 +30,7 @@ const (
 )
 
 type server struct {
+	id   int32
 	name string
 }
 
@@ -62,27 +60,22 @@ func (s *server) Run() (err error) {
 
 	// 转发服务
 	wg.Add(1)
-	fwdQuit := make(chan struct{}, 1)
+	fwdQuit := make(chan error, 1)
+	defer close(fwdQuit)
 	go func() {
 		defer wg.Done()
-		defer close(fwdQuit)
-		err := startFwdServer(ctx)
-		if err != nil {
-			slog.Error("转发服务发生错误", "err", err)
-		}
-		fwdQuit <- struct{}{}
+		err = s.startFwd(ctx)
+		fwdQuit <- err
 	}()
 
 	// 接口服务
 	wg.Add(1)
-	apiQuit := make(chan struct{}, 1)
+	apiQuit := make(chan error, 1)
+	defer close(apiQuit)
 	go func() {
 		defer wg.Done()
-		err := startWebServer(ctx)
-		if err != nil {
-			slog.Error("接口服务发生错误", "err", err)
-		}
-		apiQuit <- struct{}{}
+		err := s.startWeb(ctx)
+		apiQuit <- err
 	}()
 
 	// debug
@@ -101,42 +94,73 @@ func (s *server) Run() (err error) {
 
 	// 报告上线
 	slog.Debug("报告服务上线")
-	go reportOnline(ctx, s.name)
+	var reportErrCh = make(chan error, 1)
+	defer close(reportErrCh)
+	go func() {
+		id, err := report.Online(ctx, s.name)
+		if err != nil {
+			reportErrCh <- err
+		}
+		s.id = id
+	}()
 
 	// 等待退出信号
 	osQuit := make(chan os.Signal, 1)
 	signal.Notify(osQuit, os.Interrupt, syscall.SIGTERM)
 
+	var reportErr error
 	select {
 	case <-osQuit:
 		slog.Info("服务主动退出")
-	case <-fwdQuit:
-		slog.Warn("fwd 服务异常退出")
-	case <-apiQuit:
-		slog.Warn("web 服务异常退出")
+	case err := <-fwdQuit:
+		slog.Warn("fwd 服务异常退出", "err", err)
+	case err := <-apiQuit:
+		slog.Warn("web 服务异常退出", "err", err)
+	case reportErr = <-reportErrCh:
+		slog.Warn("报告服务上线发生错误", "err", reportErr)
 	}
-
-	// 报告下线
-	slog.Debug("报告服务下线")
-	go reportOffline(ctx, s.name)
-
-	// 退出其他服务
 	cancel()
 
+	// 报告下线
+	if reportErr == nil {
+		slog.Debug("报告服务下线")
+		go func() {
+			err := report.Offline(ctx, s.name)
+			if err != nil {
+				slog.Error("报告服务下线发生错误", "err", err)
+			}
+		}()
+	}
+
+	// 等待其它服务关闭
 	timeout, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
 	select {
 	case <-utils.ChanWgWait(timeout, &wg):
-		slog.Info("服务已退出")
+		slog.Info("服务正常关闭")
 	case <-timeout.Done():
-		slog.Warn("退出超时，强制退出")
+		slog.Warn("超时强制关闭")
 	}
 
 	return nil
 }
 
-func (s *server) restore() (err error) {
+func (s *server) init() error {
+
+	err := godotenv.Load()
+	if err != nil {
+		println("没有本地环境变量文件")
+	}
+
+	log.Init()
+	env.Init()
+	orm.Init()
+
+	return nil
+}
+
+func (s *server) restore() error {
 	var file = "proxy.lock"
 
 	bytes, err := os.ReadFile(file)
@@ -165,74 +189,23 @@ func (s *server) restore() (err error) {
 	return nil
 }
 
-func (s *server) init() error {
-
-	err := godotenv.Load()
-	if err != nil {
-		println("没有本地环境变量文件")
-	}
-
-	log.Init()
-	env.Init()
-	orm.Init()
-
-	return nil
-}
-
-func startFwdServer(ctx context.Context) error {
+func (s *server) startFwd(ctx context.Context) error {
 	server := fwd.New(nil)
 	go func() {
 		<-ctx.Done()
-		server.Close()
+		server.Stop()
 	}()
-	server.Run()
-	return nil
+	return server.Run()
 }
 
-func startWebServer(ctx context.Context) error {
-	return web.Start(ctx)
-}
-
-func reportOnline(ctx context.Context, name string) {
-	reportRepeat(ctx, env.EndpointOnline, map[string]any{
-		"name":    name,
-		"version": Version,
-	})
-}
-
-func reportOffline(ctx context.Context, name string) {
-	reportRepeat(ctx, env.EndpointOffline, map[string]any{
-		"name":    name,
-		"version": Version,
-	})
-}
-
-func reportRepeat(ctx context.Context, endpoint string, body any) {
-	bodyStr, err := json.Marshal(body)
-	if err != nil {
-		panic(err)
-	}
-
-	for {
-		req, err := http.NewRequest("POST", endpoint, strings.NewReader(string(bodyStr)))
+func (s *server) startWeb(ctx context.Context) error {
+	server := web.New()
+	go func() {
+		<-ctx.Done()
+		err := server.Stop()
 		if err != nil {
-			panic(err)
+			slog.Error("web 服务关闭发生错误", "err", err)
 		}
-
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("Authorization", "Basic "+base64.RawURLEncoding.EncodeToString([]byte("proxy:proxy")))
-
-		resp, err := http.DefaultClient.Do(req)
-		if resp != nil && resp.StatusCode == http.StatusOK {
-			return
-		}
-		select {
-		case <-ctx.Done():
-			return
-		default:
-		}
-
-		slog.Warn("服务注册失败，五秒后重试", "err", err)
-		time.Sleep(5 * time.Second)
-	}
+	}()
+	return server.Run()
 }