optimize sail service logic

sail/examples/main.go

@@ -6,40 +6,22 @@ package main
 
 import (
 	"fmt"
-	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
 	"github.com/alimy/mir/sail/mir-example/v4/service"
-	sail "github.com/alimy/mir/sail/v4/service"
 	"github.com/fatih/color"
-	"github.com/gin-gonic/gin"
 	"github.com/sourcegraph/conc"
 )
 
 func main() {
-	webEngine, botEngine := service.NewEngine(), service.NewEngine()
-	p := sail.NewHttpServerPool[*gin.Engine]()
-
-	webServerAddr, botServerAddr := ":8080", ":8081"
-	hsWeb := sail.NewBaseHttpService(p, webEngine, &http.Server{
-		Addr: webServerAddr,
-	})
-	hsBot := sail.NewBaseHttpService(p, botEngine, &http.Server{
-		Addr: botServerAddr,
-	})
-
-	webSrv := service.NewWebService(hsWeb, webServerAddr)
-	botSrv := service.NewBotService(hsBot, botServerAddr)
-
-	// init service
-	sail.MustInitService(webSrv, botSrv)
+	runtime := service.NewRuntime()
 
 	// start services
 	wg := conc.NewWaitGroup()
 	fmt.Fprintf(color.Output, "\nstarting run service...\n\n")
-	p.Start(wg)
+	runtime.Start(wg)
 
 	// graceful stop services
 	wg.Go(func() {
@@ -50,7 +32,7 @@ func main() {
 		signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
 		<-quit
 		fmt.Fprintf(color.Output, "\nshutting down server...\n\n")
-		p.Stop()
+		runtime.Stop()
 	})
 	wg.Wait()
 }

sail/examples/service/bot.go

@@ -36,7 +36,7 @@ func (s *botService) String() string {
 	return fmt.Sprintf("listen on %s\n", color.GreenString("http://%s", s.addr))
 }
 
-func NewBotService(s *service.BaseHttpService[*gin.Engine], addr string) *botService {
+func newBotService(s *service.BaseHttpService[*gin.Engine], addr string) *botService {
 	return &botService{
 		BaseHttpService: s,
 		addr:            addr,

sail/examples/service/service.go

@@ -3,10 +3,31 @@ package service
 import (
 	"net/http"
 
+	sail "github.com/alimy/mir/sail/v4/service"
 	"github.com/gin-gonic/gin"
 )
 
-func NewEngine() *gin.Engine {
+func NewRuntime() sail.Runtime {
+	webEngine, botEngine := newEngine(), newEngine()
+	p := sail.NewHttpServerPool[*gin.Engine]()
+
+	webServerAddr, botServerAddr := ":8080", ":8081"
+	hsWeb := sail.NewBaseHttpService(p, webEngine, &http.Server{
+		Addr: webServerAddr,
+	})
+	hsBot := sail.NewBaseHttpService(p, botEngine, &http.Server{
+		Addr: botServerAddr,
+	})
+
+	webSrv := newWebService(hsWeb, webServerAddr)
+	botSrv := newBotService(hsBot, botServerAddr)
+
+	// init service
+	sail.MustInitService(webSrv, botSrv)
+	return p
+}
+
+func newEngine() *gin.Engine {
 	e := gin.New()
 	e.HandleMethodNotAllowed = true
 	e.Use(gin.Logger())

sail/examples/service/web.go

@@ -36,7 +36,7 @@ func (s *webService) String() string {
 	return fmt.Sprintf("listen on %s\n", color.GreenString("http://%s", s.addr))
 }
 
-func NewWebService(s *service.BaseHttpService[*gin.Engine], addr string) *webService {
+func newWebService(s *service.BaseHttpService[*gin.Engine], addr string) *webService {
 	return &webService{
 		BaseHttpService: s,
 		addr:            addr,

sail/service/runtime.go

@@ -0,0 +1,8 @@
+package service
+
+import "github.com/sourcegraph/conc"
+
+type Runtime interface {
+	Start(wg *conc.WaitGroup)
+	Stop()
+}

sail/service/server.go

@@ -12,6 +12,10 @@ import (
 	"github.com/sourcegraph/conc"
 )
 
+var (
+	_ Runtime = (*ServerPool[*httpServer[*http.ServeMux]])(nil)
+)
+
 const (
 	_actOnStart byte = iota
 	_actOnStop