[fix] 修改一些错误

byebyebruce · Mar 11, 2021 · a299604 · a299604
1 parent 6baa7c8
commit a299604
Show file tree

Hide file tree

Showing 11 changed files with 1,064 additions and 423 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ _**用golang写的帧同步服务器**_
 
 ---
   
-`帧同步服务器目标是作为一个可以在运行时扩展，完全脱离玩法逻辑的帧同步服务器。`
+`帧同步服务器目标是作为一个可以横向扩展，完全脱离玩法逻辑的帧同步服务器。`
 * 采用KCP(可根据需求改成其他协议)作为网络底层
 * 帧同步作为同步方式
 * protobuf作为传输协议
@@ -30,7 +30,7 @@ go build
 ### example的创建房间 
 
 1. http方式 
- 1. ./example -web=10002
+ 1. go run example/main.go -web=10002
  1. 浏览器打开 http://127.0.0.1:10002
  1. Room是房间ID，Member填参战者ID(用,隔开)
 

diff --git a/example/api/html.go b/example/api/html.go
@@ -1,4 +1,4 @@
-package web
+package api
 
 const htmlStr = `<html> 
  <head> 
@@ -44,7 +44,7 @@ const htmlStr = `<html>
  </p>
 
  <p>
- <button id="btn" style="height:50px;width:50px">click</button>
+ <button id="btn" style="height:50px;width:100px">Create Room</button>
  </p>
 
  <label for="Return">Return:</label>

diff --git a/example/api/web.go b/example/api/web.go
@@ -1,4 +1,4 @@
-package web
+package api
 
 import (
  "fmt"
@@ -10,11 +10,21 @@ import (
  "github.com/byebyebruce/lockstepserver/room"
 )
 
-func init() {
- http.HandleFunc("/create", HTTPHandleFuncCreate)
- http.HandleFunc("/", HTTPHandleFunc)
+type HttpApi struct {
+ m *room.RoomManager
 }
-func HTTPHandleFunc(w http.ResponseWriter, r *http.Request) {
+
+func NewHttpApi(m *room.RoomManager) *HttpApi {
+ r := &HttpApi{
+ m: m,
+ }
+
+ http.HandleFunc("/create", r.HTTPHandleFuncCreate)
+ http.HandleFunc("/", r.HTTPHandleFunc)
+ return r
+}
+
+func (h *HttpApi) HTTPHandleFunc(w http.ResponseWriter, r *http.Request) {
 
  query := r.URL.Query()
  if 0 == len(query) {
@@ -28,7 +38,7 @@ func HTTPHandleFunc(w http.ResponseWriter, r *http.Request) {
  }
 }
 
-func HTTPHandleFuncCreate(w http.ResponseWriter, r *http.Request) {
+func (h *HttpApi) HTTPHandleFuncCreate(w http.ResponseWriter, r *http.Request) {
 
  ret := "error"
 
@@ -55,11 +65,11 @@ func HTTPHandleFuncCreate(w http.ResponseWriter, r *http.Request) {
 
  }
 
- room, ok := room.CreateRoom(roomID, 0, ps, 0, "test")
- if ok {
- ret = fmt.Sprintf("room.ID=[%d] room.Secret=[%s] room.Time=[%d]", room.ID(), room.SecretKey(), room.TimeStamp())
+ room, err := h.m.CreateRoom(roomID, 0, ps, 0, "test")
+ if nil != err {
+ ret = err.Error()
  } else {
- ret = "failed!"
+ ret = fmt.Sprintf("room.ID=[%d] room.Secret=[%s] room.Time=[%d]", room.ID(), room.SecretKey(), room.TimeStamp())
  }
 
 }
diff --git a/example/main.go b/example/main.go
@@ -17,17 +17,20 @@ import (
  "syscall"
  "time"
 
+ l4g "github.com/alecthomas/log4go"
+ "github.com/byebyebruce/lockstepserver/example/api"
  "github.com/byebyebruce/lockstepserver/kcp_server"
  "github.com/byebyebruce/lockstepserver/protocol"
  "github.com/byebyebruce/lockstepserver/room"
+ "github.com/byebyebruce/lockstepserver/router"
  "github.com/byebyebruce/lockstepserver/util"
- l4g "github.com/alecthomas/log4go"
 )
 
 var (
  nodeId = flag.Uint64("id", 0, "id")
  gWeb = flag.String("web", ":10002", "web listen address")
  outAddress = flag.String("out", ":10086", "out listen address(':10086' means localhost:10086)")
+ m *room.RoomManager
 )
 
 //Init 初始化
@@ -37,16 +40,13 @@ func LoadConfig() bool {
 
 //Init 初始化
 func Init() bool {
- if len(*gWeb) > 0 {
-
- go func() {
- e := http.ListenAndServe(*gWeb, nil)
- if nil != e {
- panic(e)
- }
- }()
- l4g.Info("[main] http.ListenAndServe port=[%s]", *gWeb)
- }
+ go func() {
+ e := http.ListenAndServe(*gWeb, nil)
+ if nil != e {
+ panic(e)
+ }
+ }()
+ l4g.Info("[main] http.ListenAndServe port=[%s]", *gWeb)
 
  return true
 }
@@ -61,17 +61,20 @@ func Run() {
  l4g.Global.Close()
  }()
 
- defer room.Stop()
-
  //address := util.GetLocalIP()
  //udp server
- networkServer, err := kcp_server.ListenAndServe(*outAddress, &room.Router{}, &protocol.MsgProtocol{})
+ networkServer, err := kcp_server.ListenAndServe(*outAddress, router.New(m), &protocol.MsgProtocol{})
  if nil != err {
  panic(err)
  }
- l4g.Info("[main] kcp.Listen addr=[%s]", outAddress)
+ l4g.Info("[main] kcp.Listen addr=[%s]", *outAddress)
  defer networkServer.Stop()
 
+ m = room.NewRoomManager()
+ defer m.Stop()
+
+ _ = api.NewHttpApi(m)
+
  //主循环定时器
  ticker := time.NewTimer(time.Second)
  defer ticker.Stop()

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
  github.com/alecthomas/log4go v0.0.0-20180109082532-d146e6b86faa
- github.com/golang/protobuf v1.3.4
+ github.com/golang/protobuf v1.4.1
  github.com/klauspost/cpuid v1.2.3 // indirect
  github.com/klauspost/reedsolomon v1.9.3 // indirect
  github.com/pkg/errors v0.9.1 // indirect
@@ -15,4 +15,5 @@ require (
  github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
  golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect
  golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
+ google.golang.org/protobuf v1.25.0
 )
diff --git a/go.sum b/go.sum
@@ -1,13 +1,36 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/alecthomas/log4go v0.0.0-20180109082532-d146e6b86faa h1:0zdYOLyuQ3TWIgWNgEH+LnmZNMmkO1ze3wriQt093Mk=
 github.com/alecthomas/log4go v0.0.0-20180109082532-d146e6b86faa/go.mod h1:iCVmQ9g4TfaRX5m5jq5sXY7RXYWPv9/PynM/GocbG3w=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/klauspost/cpuid v1.2.3 h1:CCtW0xUnWGVINKvE/WWOYKdsPV6mawAtvQuSl8guwQs=
 github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/reedsolomon v1.9.3 h1:N/VzgeMfHmLc+KHMD1UL/tNkfXAt8FnUqlgXGIduwAY=
 github.com/klauspost/reedsolomon v1.9.3/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU=
 github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
 github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI=
@@ -22,10 +45,47 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/pb/build_proto.sh b/pb/build_proto.sh
@@ -1,36 +1,4 @@
 #!/bin/bash
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-echo pwd=$DIR
+set -ex
 
-function xrsh_get_osname()
-{
- uname -s
-}
-
-xrsh_get_osname
-
-get_char() 
-{ 
- SAVEDSTTY=`stty -g` 
- stty -echo 
- stty raw 
- dd if=/dev/tty bs=1 count=1 2> /dev/null 
- stty -raw 
- stty echo 
- stty $SAVEDSTTY 
-} 
-
-if [ $(uname -s) = 'Linux' ]; then
- PROTOC=$DIR/../../../deps/protobuf/bin/protoc
-else
- PROTOC=$DIR/../../../tools/protoc_win/protoc.exe
-fi
-
-if $PROTOC --go_out=. *.proto 
-then
- echo build success
- sleep 1
-else
- echo build failed
- get_char
-fi
+protoc --go_out=. *.proto