Revert "Fix two-way stream cancelation and pings (#19763)"

This reverts commit 4d698841f4.

internal/grid/connection.go

@@ -123,11 +123,10 @@ type Connection struct {
 	baseFlags     Flags
 
 	// For testing only
-	debugInConn   net.Conn
-	debugOutConn  net.Conn
-	blockMessages atomic.Pointer[<-chan struct{}]
-	addDeadline   time.Duration
-	connMu        sync.Mutex
+	debugInConn  net.Conn
+	debugOutConn net.Conn
+	addDeadline  time.Duration
+	connMu       sync.Mutex
 }
 
 // Subroute is a connection subroute that can be used to route to a specific handler with the same handler ID.
@@ -976,11 +975,6 @@ func (c *Connection) handleMessages(ctx context.Context, conn net.Conn) {
 				gridLogIfNot(ctx, fmt.Errorf("ws read: %w", err), net.ErrClosed, io.EOF)
 				return
 			}
-			block := c.blockMessages.Load()
-			if block != nil && *block != nil {
-				<-*block
-			}
-
 			if c.incomingBytes != nil {
 				c.incomingBytes(int64(len(msg)))
 			}
@@ -1369,10 +1363,6 @@ func (c *Connection) handleRequest(ctx context.Context, m message, subID *subHan
 }
 
 func (c *Connection) handlePong(ctx context.Context, m message) {
-	if m.MuxID == 0 && m.Payload == nil {
-		atomic.StoreInt64(&c.LastPong, time.Now().Unix())
-		return
-	}
 	var pong pongMsg
 	_, err := pong.UnmarshalMsg(m.Payload)
 	PutByteBuffer(m.Payload)
@@ -1392,9 +1382,7 @@ func (c *Connection) handlePong(ctx context.Context, m message) {
 
 func (c *Connection) handlePing(ctx context.Context, m message) {
 	if m.MuxID == 0 {
-		m.Flags.Clear(FlagPayloadIsZero)
-		m.Op = OpPong
-		gridLogIf(ctx, c.queueMsg(m, nil))
+		gridLogIf(ctx, c.queueMsg(m, &pongMsg{}))
 		return
 	}
 	// Single calls do not support pinging.
@@ -1611,12 +1599,7 @@ func (c *Connection) debugMsg(d debugMsg, args ...any) {
 		c.connMu.Lock()
 		defer c.connMu.Unlock()
 		c.connPingInterval = args[0].(time.Duration)
-		if c.connPingInterval < time.Second {
-			panic("CONN ping interval too low")
-		}
 	case debugSetClientPingDuration:
-		c.connMu.Lock()
-		defer c.connMu.Unlock()
 		c.clientPingInterval = args[0].(time.Duration)
 	case debugAddToDeadline:
 		c.addDeadline = args[0].(time.Duration)
@@ -1632,11 +1615,6 @@ func (c *Connection) debugMsg(d debugMsg, args ...any) {
 		mid.respMu.Lock()
 		resp(mid.closed)
 		mid.respMu.Unlock()
-	case debugBlockInboundMessages:
-		c.connMu.Lock()
-		block := (<-chan struct{})(args[0].(chan struct{}))
-		c.blockMessages.Store(&block)
-		c.connMu.Unlock()
 	}
 }