修复bug

Author: injoyai

io_client_manage.go

@@ -10,11 +10,10 @@ import (
 	"time"
 )
 
-func NewClientManage(ctx context.Context, key string) *ClientManage {
-	Log := defaultLogger()
+func NewClientManage(ctx context.Context, key string, log *logger) *ClientManage {
 	e := &ClientManage{
 		Key:             Key(key),
-		Logger:          Log,
+		Logger:          log,
 		m:               make(map[string]*Client),
 		mu:              sync.RWMutex{},
 		ctx:             ctx,
@@ -23,7 +22,7 @@ func NewClientManage(ctx context.Context, key string) *ClientManage {
 		timeoutInterval: DefaultTimeoutInterval,
 		ClientOptions: ClientOptions{
 			beforeFunc: func(client *Client) error {
-				Log.Infof("[%s] 新的客户端连接...\n", key)
+				log.Infof("[%s] 新的客户端连接...\n", key)
 				return nil
 			},
 			closeFunc: nil,
@@ -221,7 +220,8 @@ func (this *ClientManage) SetClient(c *Client) {
 		if this.beforeFunc != nil {
 			if err := this.beforeFunc(c); err != nil {
 				this.Logger.Errorf("[%s] %v\n", c.GetKey(), err)
-				_ = c.CloseAll()
+				//丢弃连接,防止重复连接断开
+				//_ = c.CloseAll()
 				return
 			}
 		}
@@ -467,29 +467,3 @@ func (this *ClientManage) _closeFunc(ctx context.Context, c *Client, msg Message
 	this.mid.Delete(c.Pointer())
 	delete(this.m, c.GetKey())
 }
-
-//func (this *ClientManage) _closeFunc(closeFunc ...func(ctx context.Context, msg Message)) func(ctx context.Context, c *Client, msg Message) {
-//	return func(ctx context.Context, c *Client, msg Message) {
-//		defer func() {
-//			c.CloseAll()
-//			for _, f := range closeFunc {
-//				if f != nil {
-//					f(ctx, msg)
-//				}
-//			}
-//		}()
-//		if this.closeFunc != nil {
-//			defer this.closeFunc(c, msg)
-//		}
-//		this.mid.Delete(c.Pointer())
-//		this.mu.Lock()
-//		defer this.mu.Unlock()
-//		//获取老的连接
-//		oldConn := this.m[c.GetKey()]
-//		//存在新连接上来被关闭的情况,判断是否是老的连接
-//		if oldConn == nil || oldConn.Pointer() != c.Pointer() {
-//			return
-//		}
-//		delete(this.m, c.GetKey())
-//	}
-//}

io_const.go

@@ -65,6 +65,7 @@ const (
 	FliedCode    = "code"
 	FliedData    = "data"
 	FliedMsg     = "msg"
+	FliedUID     = "uid"
 	FliedAddress = "address"
 	FliedError   = "error"
 )

io_pkg_simple.go

@@ -95,6 +95,7 @@ func (this *Simple) sum(bs []byte) byte {
 	return sum
 }
 
+// SimpleData key和value的长度不能超过255
 type SimpleData map[string][]byte
 
 func (this SimpleData) Bytes() g.Bytes {

io_server.go

@@ -29,12 +29,13 @@ func NewServerWithContext(ctx context.Context, newListen func() (Listener, error
 		return nil, err
 	}
 	key := fmt.Sprintf("%p", listener)
+	logger := defaultLogger()
 	//新建实例
 	s := &Server{
 		Key:          Key(key),
-		logger:       defaultLogger(),
+		logger:       logger,
 		Closer:       safe.NewCloser(),
-		ClientManage: NewClientManage(ctx, key),
+		ClientManage: NewClientManage(ctx, key, logger),
 		tag:          maps.NewSafe(),
 		listener:     listener,
 	}

testdata/testrefuse/main.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"github.com/injoyai/logs"
+	"net"
+	"syscall"
+)
+
+func main() {
+
+	listen, err := net.ListenTCP("tcp", &net.TCPAddr{
+		Port: 10086,
+	})
+	logs.PanicErr(err)
+	for {
+		c, err := listen.AcceptTCP()
+		if !logs.PrintErr(err) {
+			fd, err := c.File()
+			if !logs.PrintErr(err) {
+				syscall.Shutdown(syscall.Handle(fd.Fd()), syscall.SHUT_RDWR)
+				fd.Close()
+			}
+		}
+	}
+}