Merge branch 'v2-feature-main'

Author: dobyte

internal/link/node.go

@@ -187,7 +187,8 @@ func (l *NodeLinker) Deliver(ctx context.Context, args *DeliverArgs) error {
 	}
 
 	if args.NID != "" {
-		if client, err := l.doBuildClient(args.NID); err != nil {
+		client, err := l.doBuildClient(args.NID)
+		if err != nil {
 			buf.Release()
 			return err
 		} else {
@@ -197,11 +198,7 @@ func (l *NodeLinker) Deliver(ctx context.Context, args *DeliverArgs) error {
 		if _, err = l.doRPC(ctx, args.Route, args.UID, func(ctx context.Context, client *node.Client) (bool, any, error) {
 			isDeliver = true
 
-			if err = client.Deliver(ctx, args.CID, args.UID, buf); err != nil {
-				return false, nil, err
-			} else {
-				return true, nil, nil
-			}
+			return false, nil, client.Deliver(ctx, args.CID, args.UID, buf)
 		}); err != nil {
 			if !isDeliver {
 				buf.Release()

internal/transporter/internal/client/conn.go

@@ -121,17 +121,19 @@ func (c *Conn) handshake(conn net.Conn) error {
 		call = make(chan buffer.Buffer)
 	)
 
-	buf1 := protocol.EncodeHandshakeReq(seq, c.cli.opts.InsKind, c.cli.opts.InsID)
-	defer buf1.Release()
+	buf := protocol.EncodeHandshakeReq(seq, c.cli.opts.InsKind, c.cli.opts.InsID)
+	defer buf.Release()
 
 	c.pending.store(seq, call)
 
-	if _, err := conn.Write(buf1.Bytes()); err != nil {
+	if _, err := conn.Write(buf.Bytes()); err != nil {
 		close(call)
 
 		c.pending.delete(seq)
 
 		return err
+	} else {
+		buf.Release()
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
@@ -140,13 +142,7 @@ func (c *Conn) handshake(conn net.Conn) error {
 	select {
 	case <-ctx.Done():
 		return ctx.Err()
-	case buf2, ok := <-call:
-		if !ok {
-			return errors.ErrConnectionClosed
-		}
-
-		buf2.Release()
-
+	case <-call:
 		return nil
 	}
 }