WebSocket関連をServiceへ

nitnc-17s · Nov 4, 2020 · 6bdc92d · 6bdc92d
1 parent 7ca44ac
commit 6bdc92d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 32 deletions.
diff --git a/pkg/controller/webSocketController.go b/pkg/controller/webSocketController.go
@@ -0,0 +1,10 @@
+package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"lottery_back/pkg/service"
+)
+
+func WebSocketConnector(ctx *gin.Context) {
+	service.WebsocketApp.WebSocketHandler(ctx)
+}
diff --git a/pkg/server/routes.go b/pkg/server/routes.go
@@ -7,8 +7,7 @@ import (
 )
 
 func (server *Server) setRoutes() {
-	server.Engine.GET("/ws", server.WsApp.wsHandler)
-
+	server.Engine.GET("/ws", controller.WebSocketConnector)
 	server.Engine.POST("/operation", controller.OperationReceiver)
 
 	server.Engine.GET("/ping", func(ctx *gin.Context) {

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -3,21 +3,18 @@ package server
 import (
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
-	"log"
 	"lottery_back/pkg/config"
-	"lottery_back/pkg/model"
-	"time"
+	"lottery_back/pkg/service"
 )
 
 type Server struct {
 	Engine *gin.Engine
-	WsApp  WsApp
 }
 
 // Up start server
 func (server *Server) Up() {
 	server.Engine = gin.Default()
-	server.WsApp = GenerateWsApp()
+	service.GenerateWsApp()
 
 	// CORS setup
 	corsConfig := cors.DefaultConfig()
@@ -26,23 +23,5 @@ func (server *Server) Up() {
 
 	server.setRoutes()
 
-	go server.WsApp.messageSender()
-
-	go server.testSender() // For test Run
-
 	server.Engine.Run(":8080")
 }
-
-func (server *Server) testSender() {
-	time.Sleep(time.Second * 5)
-
-	for i := 1; i < 100; i++ {
-		result, err := model.GetResult(i)
-		if err != nil {
-			log.Printf("warn: %v", err)
-		}
-
-		server.WsApp.sender <- result
-		time.Sleep(time.Second * 10)
-	}
-}
diff --git a/pkg/server/websocket.go → pkg/service/websocketService.go b/pkg/server/websocket.go → pkg/service/websocketService.go
@@ -1,4 +1,4 @@
-package server
+package service
 
 import (
 	"github.com/gin-gonic/gin"
@@ -16,9 +16,14 @@ type WsApp struct {
 	sync.RWMutex
 }
 
+// JSONData is JSON formatted data
+type JSONData interface{}
+
+var WebsocketApp WsApp
+
 // GenerateWsApp is websocket app generate
-func GenerateWsApp() WsApp {
-	return WsApp{
+func GenerateWsApp() {
+	WebsocketApp = WsApp{
 		clients: make(map[*websocket.Conn]bool),
 		upgrader: websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool {
@@ -29,14 +34,12 @@ func GenerateWsApp() WsApp {
 	}
 }
 
-// JSONData is JSON formatted data
-type JSONData interface{} // もう少しマシな書き方がある気がする
-
 // wsHandler is websocket connection handler
-func (wsApp *WsApp) wsHandler(ctx *gin.Context) {
+func (wsApp *WsApp) WebSocketHandler(ctx *gin.Context) {
 	ws, err := wsApp.upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
 	if err != nil {
 		log.Printf("error: %v", err)
+		ctx.String(http.StatusBadRequest, "Can't upgrade websocket\n", err)
 		return
 	}