int

Gopkg.lock

@@ -30,23 +30,24 @@
   packages = [
     ".",
     "client",
+    "codec",
     "protocol",
     "protocol/json",
     "registry"
   ]
-  revision = "dcc3af07239b3f6fcbae3529bcb52c522b02053d"
+  revision = "b834f36e2bdb7e5ff93e83ab165ee0310895f6e7"
 
 [[projects]]
   branch = "master"
   name = "git.loafle.net/commons/server-go"
   packages = [
     ".",
-    "client",
     "socket",
+    "socket/client",
     "socket/web",
     "socket/web/client"
   ]
-  revision = "1cae23cf7819d56fd399346a1dc30af6a82d1a93"
+  revision = "20a63b3de6efdc0942bfb4be21ddc64e2b76f59d"
 
 [[projects]]
   branch = "master"
@@ -122,8 +123,8 @@
     "gzip",
     "zlib"
   ]
-  revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"
+  revision = "5fb1f31b0a61e9858f12f39266e059848a5f1cea"
-  version = "v1.2.1"
+  version = "v1.3.0"
 
 [[projects]]
   name = "github.com/klauspost/cpuid"
@@ -131,30 +132,15 @@
   revision = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"
   version = "v1.1"
 
-[[projects]]
-  name = "github.com/klauspost/crc32"
-  packages = ["."]
-  revision = "cb6bfca970f6908083f26f39a79009d608efd5cd"
-  version = "v1.1"
-
 [[projects]]
   branch = "master"
   name = "github.com/shirou/gopsutil"
   packages = [
-    "cpu",
     "host",
     "internal/common",
-    "mem",
-    "net",
     "process"
   ]
-  revision = "b488b2747e2ee0b28e804ec1ea96c82edc5d9bb9"
+  revision = "4a180b209f5f494e5923cfce81ea30ba23915877"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/shirou/w32"
-  packages = ["."]
-  revision = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"
 
 [[projects]]
   name = "github.com/valyala/fasthttp"
@@ -197,7 +183,7 @@
     "unix",
     "windows"
   ]
-  revision = "ad87a3a340fa7f3bed189293fbfa7a9b7e021ae1"
+  revision = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"
 
 [[projects]]
   name = "gopkg.in/yaml.v2"
@@ -208,6 +194,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "92fe4d545852654ea83ba10ade4e3a06f2df9fddea268c256c5e706949ff268b"
+  inputs-digest = "17fc7b398d69554c382198312a20efed3c3d2e5a85eb097cba2d3aa8ae857e10"
   solver-name = "gps-cdcl"
   solver-version = 1

_build/bin/config.json

@@ -13,9 +13,11 @@
 			"writeBufferSize": 4096,
 			"pongTimeout": 60,
 			"pingTimeout": 10,
-			"pingPeriod": 9
+			"pingPeriod": 9,
+			"compressionThreshold": 8192
 		}
 	},
 	"probe": {
+		"key": "b04f6809754411e8b5f2367a389c8dcd"
 	}
 }

client/auth/auth.go

@@ -8,7 +8,7 @@ import (
 	cdr "git.loafle.net/commons/di-go/registry"
 	logging "git.loafle.net/commons/logging-go"
 	crc "git.loafle.net/commons/rpc-go/client"
-	csc "git.loafle.net/commons/server-go/client"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 	cur "git.loafle.net/commons/util-go/reflect"
 	occn "git.loafle.net/overflow/commons-go/config/noauthprobe"
 	"git.loafle.net/overflow/probe/auth/info"
@@ -57,7 +57,7 @@ func New(responseHandler func(method string, param string), services ...interfac
 		}
 	}
 
-	connector.OnDisconnected = func(connector csc.Connector) {
+	connector.OnDisconnected = func(connector cssc.Connector) {
 		logging.Logger().Debugf("Client[%s] has been disconnected", connector.GetName())
 	}
 

client/client-handler.go

@@ -4,7 +4,7 @@ import (
 	"sync/atomic"
 
 	crc "git.loafle.net/commons/rpc-go/client"
-	csc "git.loafle.net/commons/server-go/client"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 )
 
 type ClientHandler interface {
@@ -17,7 +17,7 @@ type ClientHandlers struct {
 	validated atomic.Value
 }
 
-func (ch *ClientHandlers) Init(clientCtx csc.ClientCtx) error {
+func (ch *ClientHandlers) Init(clientCtx cssc.ClientCtx) error {
 	if err := ch.ClientHandlers.Init(clientCtx); nil != err {
 		return err
 	}
@@ -25,7 +25,7 @@ func (ch *ClientHandlers) Init(clientCtx csc.ClientCtx) error {
 	return nil
 }
 
-func (ch *ClientHandlers) OnStart(clientCtx csc.ClientCtx) error {
+func (ch *ClientHandlers) OnStart(clientCtx cssc.ClientCtx) error {
 	if err := ch.ClientHandlers.OnStart(clientCtx); nil != err {
 		return err
 	}
@@ -33,12 +33,12 @@ func (ch *ClientHandlers) OnStart(clientCtx csc.ClientCtx) error {
 	return nil
 }
 
-func (ch *ClientHandlers) OnStop(clientCtx csc.ClientCtx) {
+func (ch *ClientHandlers) OnStop(clientCtx cssc.ClientCtx) {
 
 	ch.ClientHandlers.OnStop(clientCtx)
 }
 
-func (ch *ClientHandlers) Destroy(clientCtx csc.ClientCtx) {
+func (ch *ClientHandlers) Destroy(clientCtx cssc.ClientCtx) {
 
 	ch.ClientHandlers.Destroy(clientCtx)
 }

client/client.go

@@ -4,10 +4,10 @@ import (
 	crc "git.loafle.net/commons/rpc-go/client"
 	crpj "git.loafle.net/commons/rpc-go/protocol/json"
 	crr "git.loafle.net/commons/rpc-go/registry"
-	csc "git.loafle.net/commons/server-go/client"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 )
 
-func New(name string, connector csc.Connector, services []interface{}) *crc.Client {
+func New(name string, connector cssc.Connector, services []interface{}) *crc.Client {
 	codec := crpj.NewClientCodec()
 
 	var rpcRegistry crr.RPCRegistry

client/data/data.go

@@ -8,13 +8,13 @@ import (
 	"strings"
 
 	logging "git.loafle.net/commons/logging-go"
-	csc "git.loafle.net/commons/server-go/client"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 	occp "git.loafle.net/overflow/commons-go/config/probe"
 	"git.loafle.net/overflow/probe/client"
 	"git.loafle.net/overflow/probe/config"
 )
 
-func New() (csc.Connector, error) {
+func New() (cssc.Connector, error) {
 	_config := config.GetConfig()
 	if nil == _config {
 		return nil, fmt.Errorf("Config is not available")
@@ -42,7 +42,7 @@ func New() (csc.Connector, error) {
 	}
 	connector.ResponseHandler = func(res *http.Response) {
 	}
-	connector.OnDisconnected = func(connector csc.Connector) {
+	connector.OnDisconnected = func(connector cssc.Connector) {
 		logging.Logger().Debugf("Client[%s] has been disconnected", connector.GetName())
 	}
 

client/probe/probe.go

@@ -6,7 +6,7 @@ import (
 
 	logging "git.loafle.net/commons/logging-go"
 	crc "git.loafle.net/commons/rpc-go/client"
-	csc "git.loafle.net/commons/server-go/client"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 	occp "git.loafle.net/overflow/commons-go/config/probe"
 	"git.loafle.net/overflow/probe/client"
 	"git.loafle.net/overflow/probe/config"
@@ -38,7 +38,7 @@ func New(responseHandler func(method string, param string), services ...interfac
 		}
 	}
 
-	connector.OnDisconnected = func(connector csc.Connector) {
+	connector.OnDisconnected = func(connector cssc.Connector) {
 		logging.Logger().Debugf("Client[%s] has been disconnected", connector.GetName())
 	}
 

container/container-session.go

@@ -8,20 +8,21 @@ import (
 	"time"
 
 	logging "git.loafle.net/commons/logging-go"
+	css "git.loafle.net/commons/server-go/socket"
 	occp "git.loafle.net/overflow/commons-go/config/probe"
 	"git.loafle.net/overflow/probe/config"
 )
 
 type OnConnectInfo struct {
 	ContainerType occp.ContainerType
-	WriteChan     chan<- []byte
+	WriteChan     chan<- css.SocketMessage
 }
 
 func NewContainerSession(containerType occp.ContainerType) *ContainerSession {
 
 	cs := &ContainerSession{
 		containerType: containerType,
-		writeChan:     make(chan []byte, 256),
+		writeChan:     make(chan css.SocketMessage, 256),
 	}
 
 	return cs
@@ -30,8 +31,8 @@ func NewContainerSession(containerType occp.ContainerType) *ContainerSession {
 type ContainerSession struct {
 	containerType      occp.ContainerType
 	cmd                *exec.Cmd
-	writeChan          chan []byte
+	writeChan          chan css.SocketMessage
-	containerWriteChan chan<- []byte
+	containerWriteChan chan<- css.SocketMessage
 
 	writeStopChan chan struct{}
 	stopWg        sync.WaitGroup
@@ -59,7 +60,7 @@ func (cs *ContainerSession) Stop() {
 	cs.stopWg.Wait()
 }
 
-func (cs *ContainerSession) Connected(writeChan chan<- []byte) {
+func (cs *ContainerSession) Connected(writeChan chan<- css.SocketMessage) {
 	logging.Logger().Debugf("Container[%s] has been connected", cs.containerType.String())
 	cs.containerWriteChan = writeChan
 }
@@ -69,10 +70,10 @@ func (cs *ContainerSession) Disconnected() {
 	cs.refreshContainer()
 }
 
-func (cs *ContainerSession) Send(buff []byte) error {
+func (cs *ContainerSession) Send(messageType int, message []byte) error {
 	select {
-	case cs.writeChan <- buff:
+	case cs.writeChan <- css.MakeSocketMessage(messageType, message):
-		logging.Logger().Debugf("send buffer of Container[%s] has been queued %s", cs.containerType.String(), string(buff))
+		logging.Logger().Debugf("send buffer of Container[%s] has been queued %s", cs.containerType.String(), string(message))
 		return nil
 	default:
 		return fmt.Errorf("Buffer of Container[%s] is full", cs.containerType.String())
@@ -84,22 +85,26 @@ func (cs *ContainerSession) handleWrite() {
 		cs.stopWg.Done()
 	}()
 	var (
-		message []byte
+		socketMessage css.SocketMessage
-		ok      bool
+		messageType   int
+		message       []byte
+		ok            bool
 	)
 
 	for {
 		select {
-		case message, ok = <-cs.writeChan:
+		case socketMessage, ok = <-cs.writeChan:
 			if !ok {
 				logging.Logger().Debugf("WriteChan of Container[%s] has been closed", cs.containerType.String())
 				return
 			}
 
+			messageType, message = socketMessage()
+
 		LOOP_WRITE:
 			for {
 				select {
-				case cs.containerWriteChan <- message:
+				case cs.containerWriteChan <- css.MakeSocketMessage(messageType, message):
 					logging.Logger().Debugf("message of Container[%s] has been sended %s", cs.containerType.String(), string(message))
 					break LOOP_WRITE
 				case <-cs.writeStopChan:

probe/container-servlet.go

@@ -7,7 +7,7 @@ import (
 	crp "git.loafle.net/commons/rpc-go/protocol"
 	crr "git.loafle.net/commons/rpc-go/registry"
 	"git.loafle.net/commons/server-go"
-	"git.loafle.net/commons/server-go/socket"
+	css "git.loafle.net/commons/server-go/socket"
 	cssw "git.loafle.net/commons/server-go/socket/web"
 	cuc "git.loafle.net/commons/util-go/context"
 	occc "git.loafle.net/overflow/commons-go/config/container"
@@ -84,7 +84,7 @@ func (s *ContainerServlets) Handshake(servletCtx server.ServletCtx, ctx *fasthtt
 	return nil, nil
 }
 
-func (s *ContainerServlets) OnConnect(servletCtx server.ServletCtx, conn socket.Conn) {
+func (s *ContainerServlets) OnConnect(servletCtx server.ServletCtx, conn css.Conn) {
 	s.Servlets.OnConnect(servletCtx, conn)
 
 }
@@ -96,7 +96,7 @@ func (s *ContainerServlets) OnDisconnect(servletCtx server.ServletCtx) {
 
 func (s *ContainerServlets) Handle(servletCtx server.ServletCtx,
 	stopChan <-chan struct{}, doneChan chan<- struct{},
-	readChan <-chan []byte, writeChan chan<- []byte) {
+	readChan <-chan css.SocketMessage, writeChan chan<- css.SocketMessage) {
 
 	_containerType := servletCtx.GetAttribute(ContainerTypeKey)
 
@@ -126,7 +126,7 @@ func (s *ContainerServlets) Handle(servletCtx server.ServletCtx,
 
 	for {
 		select {
-		case msg, ok := <-readChan:
+		case socketMessage, ok := <-readChan:
 			if !ok {
 				return
 			}

service/ContainerService.go

@@ -110,12 +110,12 @@ func (s *ContainerService) Send(containerType occp.ContainerType, method string,
 	}
 	containerSession := _containerSession.(*container.ContainerSession)
 
-	buff, err := s.RPCServerCodec.NewNotification(method, params)
+	messageType, message, err := s.RPCServerCodec.NewNotification(method, params)
 	if nil != err {
 		return err
 	}
 
-	return containerSession.Send(buff)
+	return containerSession.Send(messageType, message)
 }
 
 func (s *ContainerService) RunContainer(containerType occp.ContainerType) error {

service/MetricService.go

@@ -8,7 +8,8 @@ import (
 	cda "git.loafle.net/commons/di-go/annotation"
 	cdr "git.loafle.net/commons/di-go/registry"
 	logging "git.loafle.net/commons/logging-go"
-	csc "git.loafle.net/commons/server-go/client"
+	css "git.loafle.net/commons/server-go/socket"
+	cssc "git.loafle.net/commons/server-go/socket/client"
 	ocmd "git.loafle.net/overflow/commons-go/model/data"
 	ocsp "git.loafle.net/overflow/commons-go/service/probe"
 	"git.loafle.net/overflow/probe/client/data"
@@ -28,9 +29,9 @@ type MetricService struct {
 
 	cda.TypeAnnotation `annotation:"@overflow:RPCService()"`
 
-	connector csc.Connector
+	connector cssc.Connector
-	readChan  <-chan []byte
+	readChan  <-chan css.SocketMessage
-	writeChan chan<- []byte
+	writeChan chan<- css.SocketMessage
 }
 
 func (s *MetricService) InitService() error {
@@ -77,7 +78,7 @@ func (s *MetricService) Send(metric *ocmd.Metric) error {
 	}
 	// s.MetricService.Send("MS", sensorConfigID, metric)
 	// logging.Logger().Debugf("Metric: %v", metric)
-	s.writeChan <- buff
+	s.writeChan <- css.MakeSocketMessage(css.TextMessage, buff)
 
 	return nil
 }