fix(notify): 修复传输生命周期竞态，完善背压与协议边界

- 完善 stream/bulk DataID 分配、预留和双向命名空间，修复并发打开及 dedicated/shared 回退时的 ID 冲突 - 将收发、回复、恢复任务和 sidecar 绑定原始会话与物理连接，防止重连后的旧消息误操作新连接 - 加强 close/reset 身份校验及实例移除检查，修复 dedicated attach 失败、通道引用和资源回收竞态 - 收紧批量发送器停止准入，确保在途入队完成后统一清理请求、缓冲区和等待者 - 修复 record 满队列死锁、取消时序号消耗及关闭竞态，确保关闭有界并返回真实错误 - 增加协商式 record 逻辑半关闭，保留反向 ACK；通过 reset 传递 RecordFailure，避免背压掩盖原始失败原因 - 补齐帧长度、批次数量、序号溢出和未确认窗口校验，提前拒绝超限数据并按字节预算拆批 - 为入站分发增加全局及单连接的条数、字节预算和阻塞背压，关闭时唤醒等待者，消除正常断连日志噪音 - 完善 bulk 窗口释放失败处理与传输诊断，补充并发、重连、背压、协议边界及真实 TCP 回归覆盖
2026-09-23 15:33:17 +08:00
parent 0826e17063
commit 1f2e74acca
79 changed files with 9190 additions and 1013 deletions
@@ -11,6 +11,64 @@ import (
 	"time"
 )

+func TestFinalizedBulkRejectsDedicatedAttachOperations(t *testing.T) {
+	operations := []struct {
+		name   string
+		attach func(*bulkHandle, net.Conn) error
+	}{
+		{
+			name: "attach-owned",
+			attach: func(bulk *bulkHandle, conn net.Conn) error {
+				return bulk.attachDedicatedConn(conn)
+			},
+		},
+		{
+			name: "attach-shared",
+			attach: func(bulk *bulkHandle, conn net.Conn) error {
+				return bulk.attachDedicatedConnShared(conn)
+			},
+		},
+		{
+			name: "replace-owned",
+			attach: func(bulk *bulkHandle, conn net.Conn) error {
+				_, _, err := bulk.replaceDedicatedConn(conn)
+				return err
+			},
+		},
+		{
+			name: "replace-shared",
+			attach: func(bulk *bulkHandle, conn net.Conn) error {
+				_, _, err := bulk.replaceDedicatedConnShared(conn)
+				return err
+			},
+		},
+	}
+
+	for _, operation := range operations {
+		t.Run(operation.name, func(t *testing.T) {
+			bulk := newBulkHandle(context.Background(), nil, clientFileScope(), BulkOpenRequest{
+				BulkID:    "finalized-dedicated-attach",
+				DataID:    1,
+				Dedicated: true,
+			}, 0, nil, nil, 0, nil, nil, nil, nil, nil)
+			bulk.finalize()
+
+			left, right := net.Pipe()
+			defer left.Close()
+			defer right.Close()
+			if err := operation.attach(bulk, left); !errors.Is(err, io.ErrClosedPipe) {
+				t.Fatalf("attach after finalize error = %v, want %v", err, io.ErrClosedPipe)
+			}
+			if got := bulk.dedicatedConnSnapshot(); got != nil {
+				t.Fatalf("finalized bulk retained dedicated conn %v", got)
+			}
+			if got := bulk.dedicatedAttachStateSnapshot(); got != bulkDedicatedAttachStateClosed {
+				t.Fatalf("dedicated state = %v, want closed", got)
+			}
+		})
+	}
+}
+
 func TestBulkOpenRoundTripTCP(t *testing.T) {
 	server := NewServer().(*ServerCommon)
 	if err := UseModernPSKServer(server, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
@@ -293,6 +351,87 @@ func TestDedicatedBulkOpenUnblocksOnBlockingFirstWrite(t *testing.T) {
 	waitForBulkContextDone(t, bulk.Context(), 2*time.Second)
 }

+func TestSharedBulkOpenRoutesHandlerWriteBeforeOpenReply(t *testing.T) {
+	server := NewServer().(*ServerCommon)
+	if err := UseModernPSKServer(server, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
+		t.Fatalf("UseModernPSKServer failed: %v", err)
+	}
+	payload := "shared-server-first-write"
+	server.SetBulkHandler(func(info BulkAcceptInfo) error {
+		if _, err := io.WriteString(info.Bulk, payload); err != nil {
+			return err
+		}
+		return nil
+	})
+	if err := server.Listen("tcp", "127.0.0.1:0"); err != nil {
+		t.Fatalf("server Listen failed: %v", err)
+	}
+	defer func() { _ = server.Stop() }()
+
+	client := NewClient().(*ClientCommon)
+	if err := UseModernPSKClient(client, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
+		t.Fatalf("UseModernPSKClient failed: %v", err)
+	}
+	if err := client.Connect("tcp", server.listener.Addr().String()); err != nil {
+		t.Fatalf("client Connect failed: %v", err)
+	}
+	defer func() { _ = client.Stop() }()
+
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	bulk, err := client.OpenBulk(ctx, BulkOpenOptions{
+		ID:    "shared-handler-first-write",
+		Range: BulkRange{Length: int64(len(payload))},
+		Mode:  BulkOpenModeShared,
+	})
+	if err != nil {
+		t.Fatalf("client OpenBulk failed: %v", err)
+	}
+	defer bulk.Close()
+	readBulkExactly(t, bulk, payload, 2*time.Second)
+}
+
+func TestServerSharedBulkOpenRoutesHandlerWriteBeforeOpenReply(t *testing.T) {
+	server := NewServer().(*ServerCommon)
+	if err := UseModernPSKServer(server, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
+		t.Fatalf("UseModernPSKServer failed: %v", err)
+	}
+	if err := server.Listen("tcp", "127.0.0.1:0"); err != nil {
+		t.Fatalf("server Listen failed: %v", err)
+	}
+	defer func() { _ = server.Stop() }()
+
+	payload := "shared-client-first-write"
+	client := NewClient().(*ClientCommon)
+	if err := UseModernPSKClient(client, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
+		t.Fatalf("UseModernPSKClient failed: %v", err)
+	}
+	client.SetBulkHandler(func(info BulkAcceptInfo) error {
+		if _, err := io.WriteString(info.Bulk, payload); err != nil {
+			return err
+		}
+		return nil
+	})
+	if err := client.Connect("tcp", server.listener.Addr().String()); err != nil {
+		t.Fatalf("client Connect failed: %v", err)
+	}
+	defer func() { _ = client.Stop() }()
+
+	logical := waitForTransferControlLogicalConn(t, server, 2*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+	defer cancel()
+	bulk, err := server.OpenBulkLogical(ctx, logical, BulkOpenOptions{
+		ID:    "server-shared-handler-first-write",
+		Range: BulkRange{Length: int64(len(payload))},
+		Mode:  BulkOpenModeShared,
+	})
+	if err != nil {
+		t.Fatalf("server OpenBulkLogical failed: %v", err)
+	}
+	defer bulk.Close()
+	readBulkExactly(t, bulk, payload, 2*time.Second)
+}
+
 func TestServerOpenBulkLogicalDedicatedUnblocksOnBlockingFirstRead(t *testing.T) {
 	server := NewServer().(*ServerCommon)
 	if err := UseModernPSKServer(server, integrationSharedSecret, integrationModernPSKOptions()); err != nil {