improve server start

Author: honmaple

server/cmd/desktop/main.go

@@ -9,36 +9,21 @@ import (
 
 func main() {}
 
-var (
-	server *app.Server
-)
-
 //export Start
 func Start(cfgPtr *C.char) (*C.char, *C.char) {
-	if server != nil {
-		return C.CString(server.Addr()), nil
-	}
-
 	if cfgPtr == nil {
 		return nil, C.CString("cfg is required")
 	}
 	cfg := C.GoString(cfgPtr)
 
-	var err error
-
-	server, err = app.NewServer(cfg)
+	result, err := app.Start(cfg)
 	if err != nil {
 		return nil, C.CString(err.Error())
 	}
-	go server.Start()
-
-	return C.CString(server.Addr()), nil
+	return C.CString(result), nil
 }
 
 //export Stop
 func Stop() {
-	if server != nil {
-		server.Shutdown()
-	}
-	server = nil
+	app.Stop()
 }

server/cmd/mobile/main.go

@@ -7,29 +7,10 @@ import (
 	_ "golang.org/x/mobile/bind"
 )
 
-var (
-	server *app.Server
-)
-
 func Start(cfg string) (string, error) {
-	if server != nil {
-		return server.Addr(), nil
-	}
-
-	var err error
-
-	server, err = app.NewServer(cfg)
-	if err != nil {
-		return "", err
-	}
-	go server.Start()
-
-	return server.Addr(), nil
+	return app.Start(cfg)
 }
 
 func Stop() {
-	if server != nil {
-		server.Shutdown()
-	}
-	server = nil
+	app.Stop()
 }

server/internal/app/cmd.go

@@ -0,0 +1,38 @@
+package app
+
+import (
+	"net/http"
+)
+
+var (
+	_server *Server
+	_result string
+)
+
+func Start(cfg string) (string, error) {
+	if _server != nil {
+		return _result, nil
+	}
+
+	var err error
+
+	_server, err = NewServer(cfg)
+	if err != nil {
+		return "", err
+	}
+	_result = _server.Addr()
+
+	go func() {
+		if err := _server.Start(); err != nil && err != http.ErrServerClosed {
+			panic(err)
+		}
+	}()
+	return _result, nil
+}
+
+func Stop() {
+	if _server != nil {
+		_server.Shutdown()
+	}
+	_server = nil
+}