完善服务器

Server/Gateway/app/app.go

@@ -8,7 +8,7 @@ import (
 	"common/net/socket/websocket"
 	"fmt"
 	"gateway/config"
-	"gateway/grpc_server"
+	"gateway/grpc_server/server"
 	"github.com/gin-gonic/gin"
 	"github.com/judwhite/go-svc"
 	"runtime/debug"
@@ -51,7 +51,7 @@ func (p *Program) Start() error {
 	}()
 
 	discover.Listen()
-	p.server = grpc_server.NewServer(config.Get().Serve.Grpc.TTL)
+	p.server = server.NewServer(config.Get().Serve.Grpc.TTL)
 	p.server.Init(config.Get().Serve.Grpc.Address, config.Get().Serve.Grpc.Port)
 	go func() {
 		cfg := config.Get()

Server/Gateway/config/config.dev.yaml

@@ -4,9 +4,9 @@ app:
 log:
   debug: true
   level: "debug"
-  max_size: 100
-  max_backups: 3
-  max_age: 7
+  maxSize: 100
+  maxBackups: 3
+  maxAge: 7
 
 db:
   etcd:

Server/Gateway/config/config.go

@@ -13,9 +13,9 @@ type AppConfig struct {
 
 type LogConfig struct {
 	Debug      bool   `yaml:"debug"`
-	MaxSize    int    `yaml:"max_size"`
-	MaxBackups int    `yaml:"max_backups"`
-	MaxAge     int    `yaml:"max_age"`
+	MaxSize    int    `yaml:"maxSize"`
+	MaxBackups int    `yaml:"maxBackups"`
+	MaxAge     int    `yaml:"maxAge"`
 	Level      string `yaml:"level"`
 }
 
@@ -27,8 +27,9 @@ type DBConfig struct {
 
 type ServeConfig struct {
 	Grpc *struct {
-		AddressConfig
-		TTL int64 `yaml:"ttl"`
+		Address string `yaml:"address"`
+		Port    int    `yaml:"port"`
+		TTL     int64  `yaml:"ttl"`
 	} `yaml:"grpc"`
 	Socket *struct {
 		Web *AddressConfig `yaml:"web"`

Server/Gateway/grpc_server/server/server.go

@@ -1,4 +1,4 @@
-package grpc_server
+package server
 
 import (
 	"common/log"

Server/Gateway/grpc_server/server/server_init.go

@@ -1,4 +1,4 @@
-package grpc_server
+package server
 
 import (
 	"common/discover/common"

Server/Gateway/grpc_server/stream_client/scene.go

@@ -0,0 +1,44 @@
+package stream_client
+
+import (
+	"common/log"
+	"common/net/grpc/service"
+	"context"
+	"google.golang.org/grpc"
+)
+
+var sceneServerM map[int64]map[SceneFun]grpc.ClientStream // map[sid]map[方法名]流连接
+
+type SceneFun int
+
+const (
+	FunAction SceneFun = iota
+)
+
+func FindSceneBySID(sid int64, fun SceneFun) grpc.ClientStream {
+	g := sceneServerM[sid]
+	if g == nil {
+		g = make(map[SceneFun]grpc.ClientStream)
+		sceneServerM[sid] = g
+	}
+	sceneLink := g[fun]
+	if sceneLink == nil {
+		sceneClient, err := service.SceneNewClient(sid)
+		if err != nil {
+			log.Errorf("cannot find sceneClient: %v", err)
+			return nil
+		}
+		var link grpc.ClientStream
+		switch fun {
+		case FunAction:
+			link, err = sceneClient.Action(context.Background())
+		}
+		if err != nil {
+			log.Errorf("FindSceneBySID %v err: %v, sid: %v", fun, err, sid)
+			return nil
+		}
+		g[fun] = link
+		sceneLink = link
+	}
+	return sceneLink
+}

Server/Gateway/handler/ws_handler/client.go

@@ -3,7 +3,6 @@ package ws_handler
 import (
 	"common/log"
 	"common/net/socket"
-	"common/utils"
 	"context"
 	"fmt"
 	"go.uber.org/zap"
@@ -21,10 +20,11 @@ type Client struct {
 	cancel    context.CancelFunc // 取消上下文
 	heartBeat time.Time          // 最后一次心跳
 
-	UID int32
+	UID      int
+	SceneSID int64 // 场景服ID
 }
 
-func NewClient(uid int32, conn socket.ISocketConn) *Client {
+func NewClient(uid int, conn socket.ISocketConn) *Client {
 	client := &Client{
 		UID:       uid,
 		conn:      conn,
@@ -78,27 +78,6 @@ func (c *Client) OnEvent(event Event) {
 	}
 }
 
-func (c *Client) handle(event Event) {
-	switch e := event.(type) {
-	case *ClientEvent:
-		m, err := parseMsg(e.Msg)
-		if err != nil {
-			c.logger.Errorf("handle event json.Unmarshal err: %v", err)
-			c.cancel()
-		}
-		c.logger.Infof("收到客户端消息：%+v", *m)
-		switch m.Type {
-		case "init":
-			_ = c.conn.Write(wapMsg(&msg{
-				Type: "init",
-				Data: fmt.Sprintf("[%v,%v]", utils.RandInt(1, 100), utils.RandInt(1, 100)),
-			}))
-		}
-	case *PongEvent:
-		c.heartBeat = time.Now()
-	}
-}
-
 // CloseClient 关闭客户端（同步，会等待onClose执行完成）
 func (c *Client) CloseClient() {
 	if c.cancel != nil {

Server/Gateway/handler/ws_handler/handler.go

@@ -0,0 +1,71 @@
+package ws_handler
+
+import (
+	"common/net/grpc/service"
+	"common/proto/gen/grpc_pb"
+	"encoding/json"
+	"gateway/grpc_server/stream_client"
+	"time"
+)
+
+func (c *Client) handle(event Event) {
+	switch e := event.(type) {
+	case *ClientEvent:
+		m, err := parseMsg(e.Msg)
+		if err != nil {
+			c.logger.Errorf("handle event json.Unmarshal err: %v", err)
+			c.cancel()
+		}
+		c.logger.Infof("收到客户端消息：%+v", *m)
+		switch m.Type {
+		case "enter":
+			c.onEnter(m)
+		case "action":
+			c.onAction(m)
+		}
+	case *PongEvent:
+		c.heartBeat = time.Now()
+	}
+}
+
+func (c *Client) onEnter(msg *tempMsg) {
+	//_ = c.conn.Write(wapMsg(&tempMsg{
+	//	Type: "init",
+	//	Data: fmt.Sprintf("[%v,%v]", utils.RandInt(1, 100), utils.RandInt(1, 100)),
+	//}))
+	client, err := service.SceneNewClient()
+	if err != nil {
+		c.logger.Errorf("SceneNewClient err: %v", err)
+		return
+	}
+	resp, err := client.Enter(c.ctx, &grpc_pb.EnterReq{
+		UID:        int32(c.UID),
+		SID:        0,
+		InstanceID: 1,
+	})
+	if err != nil {
+		c.logger.Errorf("enter err: %v", err)
+		return
+	}
+	c.SceneSID = resp.SID
+}
+
+func (c *Client) onAction(msg *tempMsg) {
+	if c.SceneSID == 0 {
+		return
+	}
+	d := &tempAction{}
+	if err := json.Unmarshal([]byte(msg.Data), d); err != nil {
+		return
+	}
+	m := &tempActionMove{}
+	if err := json.Unmarshal([]byte(d.Data), m); err != nil {
+		return
+	}
+	stream := stream_client.FindSceneBySID(c.SceneSID, stream_client.FunAction)
+	if err := stream.SendMsg(&grpc_pb.ActionReq{
+		Action: int32(m.Move),
+	}); err != nil {
+		c.logger.Errorf("send action err: %v", err)
+	}
+}

Server/Gateway/handler/ws_handler/manager.go

@@ -7,35 +7,35 @@ import (
 var UserMgr *userManager
 
 type userManager struct {
-	userMap map[int32]*Client
+	userMap map[int]*Client
 	sync.RWMutex
 }
 
 func init() {
 	UserMgr = &userManager{
-		userMap: make(map[int32]*Client),
+		userMap: make(map[int]*Client),
 	}
 }
 
-func (m *userManager) Add(uid int32, client *Client) {
+func (m *userManager) Add(uid int, client *Client) {
 	m.Lock()
 	defer m.Unlock()
 	m.userMap[uid] = client
 }
 
-func (m *userManager) Delete(uid int32) {
+func (m *userManager) Delete(uid int) {
 	m.Lock()
 	defer m.Unlock()
 	delete(m.userMap, uid)
 }
 
-func (m *userManager) GetAll() map[int32]*Client {
+func (m *userManager) GetAll() map[int]*Client {
 	m.RLock()
 	defer m.RUnlock()
 	return m.userMap
 }
 
-func (m *userManager) GetByUID(uid int32) *Client {
+func (m *userManager) GetByUID(uid int) *Client {
 	m.RLock()
 	defer m.RUnlock()
 	return m.userMap[uid]

Server/Gateway/handler/ws_handler/temp.go

@@ -2,20 +2,29 @@ package ws_handler
 
 import "encoding/json"
 
-type msg struct {
+type tempMsg struct {
 	Type string `json:"type"`
 	Data string `json:"data"`
 }
 
-func parseMsg(data []byte) (*msg, error) {
-	m := &msg{}
+type tempAction struct {
+	Action int    `json:"action"`
+	Data   string `json:"data"`
+}
+
+type tempActionMove struct {
+	Move int `json:"move"`
+}
+
+func parseMsg(data []byte) (*tempMsg, error) {
+	m := &tempMsg{}
 	if err := json.Unmarshal(data, m); err != nil {
 		return nil, err
 	}
 	return m, nil
 }
 
-func wapMsg(m *msg) []byte {
+func wapMsg(m *tempMsg) []byte {
 	data, _ := json.Marshal(m)
 	return data
 }

Server/Gateway/net/ws_gateway/server.go

@@ -30,8 +30,8 @@ func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) {
 	if err != nil {
 		_ = conn.Close()
 	}
-	client := ws_handler.NewClient(int32(t), conn)
-	ws_handler.UserMgr.Add(int32(t), client)
+	client := ws_handler.NewClient(t, conn)
+	ws_handler.UserMgr.Add(t, client)
 	conn.SetParam("client", client)
 }