update jsonrpc

BlakeLiAFK · BlakeLiAFK · commit 1d930c4b83cf · 2020-07-23T23:23:01.000+08:00
diff --git a/cmd/alu/main.go b/cmd/alu/main.go
@@ -4,7 +4,7 @@ import (
     "archive/tar"
     "fmt"
     "github.com/BabyEngine/Backend/logger"
-    "github.com/BabyEngine/Backend/game"
+    "github.com/BabyEngine/Backend/core"
     "github.com/BabyEngine/Backend/hotzone"
     "github.com/DGHeroin/golua/lua"
     "io"
@@ -17,7 +17,7 @@ import (
 )
 
 var (
-    app *game.Application
+    app *core.Application
     Version string = "v00.00.00"
 )
 
@@ -51,7 +51,7 @@ func printHelp() {
 }
 
 func runLuaApp() {
-    app = game.NewApp()
+    app = core.NewApp()
     if os.Getenv("HotReload") == "true" {
        go hotzone.EnableHotRestart(app, runLuaApp)
     }
diff --git a/core/Application.go b/core/Application.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "bufio"
diff --git a/core/LuaUtils.go b/core/LuaUtils.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "fmt"
diff --git a/core/funcs.go b/core/funcs.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "bytes"
diff --git a/core/mod_app.go b/core/mod_app.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "github.com/DGHeroin/golua/lua"
diff --git a/core/mod_cipher.go b/core/mod_cipher.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "bytes"
diff --git a/core/mod_cron.go b/core/mod_cron.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "github.com/BabyEngine/Backend/jobs"
diff --git a/core/mod_hash.go b/core/mod_hash.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "bufio"
diff --git a/core/mod_kv.go b/core/mod_kv.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "fmt"
diff --git a/core/mod_logger.go b/core/mod_logger.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import "github.com/DGHeroin/golua/lua"
 
diff --git a/core/mod_net.go b/core/mod_net.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "context"
diff --git a/core/mod_redis.go b/core/mod_redis.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "github.com/BabyEngine/Backend/logger"
diff --git a/core/mod_rpc.go b/core/mod_rpc.go
@@ -1,4 +1,4 @@
-package game
+package core
 
 import (
     "errors"
@@ -45,7 +45,6 @@ func initModRPC(L *lua.State) {
 }
 
 type rpcServer struct {
-    //server *rpc.JSONRPCServer
     server rpc.Server
 }
 
diff --git a/hotzone/hotdebug.go b/hotzone/hotdebug.go
@@ -3,7 +3,7 @@ package hotzone
 import (
     "fmt"
     "github.com/BabyEngine/Backend/logger"
-    "github.com/BabyEngine/Backend/game"
+    "github.com/BabyEngine/Backend/core"
     "github.com/gorilla/websocket"
     "log"
     "net/http"
@@ -235,7 +235,7 @@ var (
 func enableCors(w *http.ResponseWriter) {
     (*w).Header().Set("Access-Control-Allow-Origin", "*")
 }
-func EnableHotRestart(app *game.Application, restartCb func()) {
+func EnableHotRestart(app *core.Application, restartCb func()) {
     if isRunning { return }
     isRunning = true
     defer func() {
diff --git a/rpc/jsonrpc_client.go b/rpc/jsonrpc_client.go
@@ -1,16 +1,20 @@
 package rpc
 
 import (
-    "bytes"
     "fmt"
-    "github.com/gorilla/rpc/json"
-    "net/http"
+    "net"
+    "net/rpc"
+    "net/rpc/jsonrpc"
     "sync"
+    "sync/atomic"
+    "time"
 )
 
 type JSONRPCClient struct {
     mutex   sync.RWMutex
     address string
+    client *rpc.Client
+    status int32
 }
 
 func NewJSONRPCClient(address string) *JSONRPCClient {
@@ -21,30 +25,49 @@ func NewJSONRPCClient(address string) *JSONRPCClient {
 }
 
 func (c *JSONRPCClient) Connect() error {
+    atomic.StoreInt32(&c.status, 1)
+    conn, err := net.DialTimeout("tcp", c.address, time.Second * 30)
+    if err != nil {
+        atomic.StoreInt32(&c.status, 3)
+        return err
+    }
+    c.client = jsonrpc.NewClient(conn)
+    atomic.StoreInt32(&c.status, 2)
     return nil
 }
+func (c *JSONRPCClient) reconnect()  {
+    c.Connect()
+}
 func (c *JSONRPCClient) Disconnect() error {
     return nil
 }
 
 func (c *JSONRPCClient) Call(action string, data []byte) (r Reply, err error) {
-    var (
-        message []byte
-        resp    *http.Response
-    )
-    message, err = json.EncodeClientRequest("RPC.Call", Request{Action: action, Data: data})
+    req := &Request{Action:action, Data:data}
+    rsp := new(Reply)
+    err = c.client.Call("JsonRpcServer.Invoke", req, &rsp)
     if err != nil {
-        return
-    }
-    url := fmt.Sprintf("%s/jsonrpc", c.address)
-    resp, err = http.Post(url, "application/json", bytes.NewReader(message))
-    if err != nil {
-        return
+        b := atomic.CompareAndSwapInt32(&c.status, 2, 1)
+        if b {
+            fmt.Println("reconnect...")
+            go c.reconnect()
+        } else {
+            switch atomic.LoadInt32(&c.status) {
+            case 0: //  init
+            case 1: // connecting
+            case 2: // connected
+            case 3: // error
+                go c.reconnect()
+            }
+        }
+
     }
-    err = json.DecodeClientResponse(resp.Body, &r)
+    r.Data = rsp.Data
+    r.Code = rsp.Code
     return
 }
 
 func (c *JSONRPCClient) Stop() error {
+    c.client.Close()
     return nil
 }
diff --git a/rpc/jsonrpc_server.go b/rpc/jsonrpc_server.go
@@ -4,16 +4,29 @@ import (
     "io"
     "net"
     "net/http"
-    "github.com/gorilla/mux"
-    "github.com/gorilla/rpc"
-    "github.com/gorilla/rpc/json"
+    "net/rpc"
+    "net/rpc/jsonrpc"
+
+    //"github.com/gorilla/mux"
+    //"github.com/gorilla/rpc"
+    //"github.com/gorilla/rpc/json"
 )
 
 type JSONRPCServer struct {
     rpcServer  *rpc.Server
     httpServer *http.Server
     rpc        RPC
     closer     io.Closer
+
+    r *JsonRpcServer
+    s *rpc.Server
+}
+
+type JsonRpcServer struct {
+    Handler func(request Request, reply *Reply) error
+}
+func (s *JsonRpcServer) Invoke(request Request, reply *Reply) error {
+    return s.Handler(request, reply)
 }
 
 func (s *JSONRPCServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -23,39 +36,58 @@ func (s *JSONRPCServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 func NewJSONRPCServer(cb func(request Request, reply *Reply) error) *JSONRPCServer {
     s := &JSONRPCServer{}
     s.rpc.Handler = cb
+
+    ss := new(JsonRpcServer)
+    ss.Handler = cb
+    s.s = rpc.NewServer()
+    s.r = ss
+
+    s.s.Register(ss)
+
     return s
 }
 
 func (s *JSONRPCServer) ListenServe(address string) error {
-    return s.ListenServeTLS(address, "", "")
-}
-
-func (s *JSONRPCServer) ListenServeTLS(address string, crt string, key string) error {
-    rpcServer := rpc.NewServer()
-    rpcServer.RegisterCodec(json.NewCodec(), "application/json")
-    rpcServer.RegisterCodec(json.NewCodec(), "application/json;charset=UTF-8")
-    rpcServer.RegisterService(&s.rpc, "")
-    r := mux.NewRouter()
-    r.Handle("/jsonrpc", rpcServer)
-
-    s.rpcServer = rpcServer
+    //return s.ListenServeTLS(address, "", "")
     ln, err := net.Listen("tcp", address)
     if err != nil {
         return err
     }
-    s.closer = ln
-    s.httpServer = &http.Server{
-        Addr:    address,
-        Handler: s.rpcServer,
-    }
-
-    if crt != "" && key != "" {
-        return s.httpServer.ServeTLS(ln, crt, key)
-    } else {
-        return s.httpServer.Serve(ln)
+    for{
+        conn, err := ln.Accept()
+        if err!= nil {
+            return err
+        }
+        s.s.ServeCodec(jsonrpc.NewServerCodec(conn))
     }
 }
 
+//func (s *JSONRPCServer) ListenServeTLS(address string, crt string, key string) error {
+//    rpcServer := rpc.NewServer()
+//    rpcServer.RegisterCodec(json.NewCodec(), "application/json")
+//    rpcServer.RegisterCodec(json.NewCodec(), "application/json;charset=UTF-8")
+//    rpcServer.RegisterService(&s.rpc, "")
+//    r := mux.NewRouter()
+//    r.Handle("/jsonrpc", rpcServer)
+//
+//    s.rpcServer = rpcServer
+//    ln, err := net.Listen("tcp", address)
+//    if err != nil {
+//        return err
+//    }
+//    s.closer = ln
+//    s.httpServer = &http.Server{
+//        Addr:    address,
+//        Handler: s.rpcServer,
+//    }
+//
+//    if crt != "" && key != "" {
+//        return s.httpServer.ServeTLS(ln, crt, key)
+//    } else {
+//        return s.httpServer.Serve(ln)
+//    }
+//}
+
 func (s *JSONRPCServer) Close() error {
     return s.closer.Close()
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"archive/tar"`
`5`	`5`	`"fmt"`
`6`	`6`	`"github.com/BabyEngine/Backend/logger"`
`7`		`- "github.com/BabyEngine/Backend/game"`
	`7`	`+ "github.com/BabyEngine/Backend/core"`
`8`	`8`	`"github.com/BabyEngine/Backend/hotzone"`
`9`	`9`	`"github.com/DGHeroin/golua/lua"`
`10`	`10`	`"io"`
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`var (`
`20`		`- app *game.Application`
	`20`	`+ app *core.Application`
`21`	`21`	`Version string = "v00.00.00"`
`22`	`22`	`)`
`23`	`23`
`@@ -51,7 +51,7 @@ func printHelp() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`func runLuaApp() {`
`54`		`- app = game.NewApp()`
	`54`	`+ app = core.NewApp()`
`55`	`55`	`if os.Getenv("HotReload") == "true" {`
`56`	`56`	`go hotzone.EnableHotRestart(app, runLuaApp)`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package game`
	`1`	`+package core`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"bufio"`