ing

servlet/data/data.go

@@ -17,13 +17,13 @@ var (
 	cfg *oosc.Servlet
 )
 
-func ServletInit(sh oogws.ServerHandler)  {
+func ServletInit(sh oogws.ServerHandler) {
 	cfg = oogwc.Config.Servlets[Name]
 	if nil == cfg {
 		logging.Logger().Panic(fmt.Sprintf("Webapp: config of servlet[%s] is not exist", Name))
 	}
 
-	rpcGH := newRPCGatewayHandler()
+	rpcGH := newGatewayRPCHandler()
 	sh.RegisterRPCGatewayServlet(Name, rpcGH)
 
 	//sub := newSubscriberHandler(rpcSH)
@@ -31,7 +31,6 @@ func ServletInit(sh oogws.ServerHandler)  {
 	//sh.RegisterSubscriber(sub)
 }
 
-
-func ServletDestroy()  {
+func ServletDestroy() {
 
 }

servlet/data/gateway_rpc_handlers.go

@@ -4,27 +4,28 @@ import (
 	"fmt"
 
 	"git.loafle.net/commons_go/logging"
+	cwf "git.loafle.net/commons_go/websocket_fasthttp"
 	"git.loafle.net/overflow/overflow_gateway_websocket/config"
 	"git.loafle.net/overflow/overflow_gateway_websocket/rpc"
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/valyala/fasthttp"
 )
 
-func newRPCGatewayHandler() rpc.RPCGatewayHandler {
-	gh := &RPCGatewayHandlers{}
+func newGatewayRPCHandler() rpc.GatewayRPCHandler {
+	gh := &GatewayRPCHandlers{}
 
 	return gh
 }
 
-type RPCGatewayHandlers struct {
-	rpc.RPCGatewayHandlers
+type GatewayRPCHandlers struct {
+	rpc.GatewayRPCHandlers
 }
 
-func (sh *RPCGatewayHandlers) Init() error {
+func (sh *GatewayRPCHandlers) Init(serverCTX cwf.ServerContext) error {
 	return nil
 }
 
-func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) {
+func (sh *GatewayRPCHandlers) Handshake(serverCTX cwf.ServerContext, ctx *fasthttp.RequestCtx) (id string, extensionsHeader *fasthttp.ResponseHeader) {
 	var ok bool
 	// tokenString := string(soc.Conn().Headers().Cookie("AuthToken"))
 	tokenString := "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJvdmVyRmxvdyIsImlhdCI6MTUwNDU5NTExOSwiZXhwIjoxNTM2MTMxMTE5LCJhdWQiOiJ3d3cub3ZlcmZsb3cuY2xvdWQiLCJzdWIiOiJvdmVyZmxvd0Bsb2FmbGUuY29tIn0.-WQi3OykPlJ9x8RcZGhWXEtGw4GhU6wmyJ_AWh2rMeUatQylfPzvmum2Xfp6pwKLMmcP76XoDPNyq06i7RKWNQ"
@@ -51,6 +52,6 @@ func (sh *RPCGatewayHandlers) Handshake(ctx *fasthttp.RequestCtx) (id string, ex
 	return claims["sub"].(string), nil
 }
 
-func (sh *RPCGatewayHandlers) Validate() {
-	sh.RPCGatewayHandlers.Validate()
+func (sh *GatewayRPCHandlers) Validate() {
+	sh.GatewayRPCHandlers.Validate()
 }