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

- 完善 stream/bulk DataID 分配、预留和双向命名空间,修复并发打开及 dedicated/shared 回退时的 ID 冲突
- 将收发、回复、恢复任务和 sidecar 绑定原始会话与物理连接,防止重连后的旧消息误操作新连接
- 加强 close/reset 身份校验及实例移除检查,修复 dedicated attach 失败、通道引用和资源回收竞态
- 收紧批量发送器停止准入,确保在途入队完成后统一清理请求、缓冲区和等待者
- 修复 record 满队列死锁、取消时序号消耗及关闭竞态,确保关闭有界并返回真实错误
- 增加协商式 record 逻辑半关闭,保留反向 ACK;通过 reset 传递 RecordFailure,避免背压掩盖原始失败原因
- 补齐帧长度、批次数量、序号溢出和未确认窗口校验,提前拒绝超限数据并按字节预算拆批
- 为入站分发增加全局及单连接的条数、字节预算和阻塞背压,关闭时唤醒等待者,消除正常断连日志噪音
- 完善 bulk 窗口释放失败处理与传输诊断,补充并发、重连、背压、协议边界及真实 TCP 回归覆盖
This commit is contained in:
2026-09-23 15:33:17 +08:00
parent 0826e17063
commit 1f2e74acca
79 changed files with 9190 additions and 1013 deletions
+42 -10
View File
@@ -49,6 +49,24 @@ func bulkFastBatchPlainLen(frames []bulkFastFrame) int {
return total
}
func bulkFastBatchPlainLenChecked(frames []bulkFastFrame) (int, error) {
if len(frames) == 0 || len(frames) > bulkFastBatchMaxItems {
return 0, errBulkFastPayloadInvalid
}
total := bulkFastBatchHeaderLen
for _, frame := range frames {
itemLen := bulkFastBatchFrameLen(frame)
if itemLen < bulkFastBatchItemHeaderLen || itemLen > bulkFastBatchMaxPlainBytes {
return 0, errBulkFastPayloadInvalid
}
if total > bulkFastBatchMaxPlainBytes-itemLen {
return 0, errBulkFastPayloadInvalid
}
total += itemLen
}
return total, nil
}
func encodeBulkFastFramePayload(frame bulkFastFrame) ([]byte, error) {
return encodeBulkFastControlFrame(frame.Type, frame.Flags, frame.DataID, frame.Seq, frame.Payload)
}
@@ -82,10 +100,11 @@ func encodeBulkFastFramePayloadPooled(runtime *modernPSKCodecRuntime, frame bulk
}
func encodeBulkFastBatchPlain(frames []bulkFastFrame) ([]byte, error) {
if len(frames) == 0 {
return nil, errBulkFastPayloadInvalid
plainLen, err := bulkFastBatchPlainLenChecked(frames)
if err != nil {
return nil, err
}
buf := make([]byte, bulkFastBatchPlainLen(frames))
buf := make([]byte, plainLen)
if err := writeBulkFastBatchPlain(buf, frames); err != nil {
return nil, err
}
@@ -96,7 +115,10 @@ func encodeBulkFastBatchPayloadFast(encode transportFastPlainEncoder, secretKey
if encode == nil {
return nil, errTransportPayloadEncryptFailed
}
plainLen := bulkFastBatchPlainLen(frames)
plainLen, err := bulkFastBatchPlainLenChecked(frames)
if err != nil {
return nil, err
}
return encode(secretKey, plainLen, func(dst []byte) error {
return writeBulkFastBatchPlain(dst, frames)
})
@@ -106,13 +128,21 @@ func encodeBulkFastBatchPayloadPooled(runtime *modernPSKCodecRuntime, frames []b
if runtime == nil {
return nil, nil, errTransportPayloadEncryptFailed
}
return runtime.sealFilledPayloadPooled(bulkFastBatchPlainLen(frames), func(dst []byte) error {
plainLen, err := bulkFastBatchPlainLenChecked(frames)
if err != nil {
return nil, nil, err
}
return runtime.sealFilledPayloadPooled(plainLen, func(dst []byte) error {
return writeBulkFastBatchPlain(dst, frames)
})
}
func writeBulkFastBatchPlain(dst []byte, frames []bulkFastFrame) error {
if len(frames) == 0 || len(dst) != bulkFastBatchPlainLen(frames) {
plainLen, err := bulkFastBatchPlainLenChecked(frames)
if err != nil {
return err
}
if len(dst) != plainLen {
return errBulkFastPayloadInvalid
}
copy(dst[:4], bulkFastBatchMagic)
@@ -145,10 +175,11 @@ func walkBulkFastBatchPlain(payload []byte, fn func(bulkFastFrame) error) (bool,
if payload[4] != bulkFastBatchVersion {
return true, errBulkFastPayloadInvalid
}
count := int(binary.BigEndian.Uint32(payload[8:12]))
if count <= 0 {
wireCount := binary.BigEndian.Uint32(payload[8:12])
if wireCount == 0 || wireCount > bulkFastBatchMaxItems {
return true, errBulkFastPayloadInvalid
}
count := int(wireCount)
offset := bulkFastBatchHeaderLen
for index := 0; index < count; index++ {
if len(payload)-offset < bulkFastBatchItemHeaderLen {
@@ -163,11 +194,12 @@ func walkBulkFastBatchPlain(payload []byte, fn func(bulkFastFrame) error) (bool,
flags := payload[offset+1]
dataID := binary.BigEndian.Uint64(payload[offset+4 : offset+12])
seq := binary.BigEndian.Uint64(payload[offset+12 : offset+20])
payloadLen := int(binary.BigEndian.Uint32(payload[offset+20 : offset+24]))
wirePayloadLen := binary.BigEndian.Uint32(payload[offset+20 : offset+24])
offset += bulkFastBatchItemHeaderLen
if dataID == 0 || payloadLen < 0 || len(payload)-offset < payloadLen {
if dataID == 0 || uint64(wirePayloadLen) > uint64(len(payload)-offset) {
return true, errBulkFastPayloadInvalid
}
payloadLen := int(wirePayloadLen)
if fn != nil {
if err := fn(bulkFastFrame{
Type: frameType,