feat(notify): 重构通信内核并补齐 stream/bulk/record/transfer 能力
- 引入 LogicalConn/TransportConn 分层,ClientConn 保留兼容适配层 - 新增 Stream、Bulk、RecordStream 三条数据面能力及对应控制路径 - 完成 transfer/file 传输内核与状态快照、诊断能力 - 补齐 reconnect、inbound dispatcher、modern psk 等基础模块 - 增加大规模回归、并发与基准测试覆盖 - 更新依赖库
This commit is contained in:
+304
@@ -0,0 +1,304 @@
|
||||
package notify
|
||||
|
||||
import "context"
|
||||
|
||||
func (s *ServerCommon) SetBulkHandler(fn func(BulkAcceptInfo) error) {
|
||||
runtime := s.getBulkRuntime()
|
||||
if runtime == nil {
|
||||
return
|
||||
}
|
||||
runtime.setHandler(fn)
|
||||
}
|
||||
|
||||
func (s *ServerCommon) OpenBulkLogical(ctx context.Context, logical *LogicalConn, opt BulkOpenOptions) (Bulk, error) {
|
||||
if s == nil {
|
||||
return nil, errBulkServerNil
|
||||
}
|
||||
if logical == nil {
|
||||
return nil, errBulkLogicalConnNil
|
||||
}
|
||||
runtime := s.getBulkRuntime()
|
||||
if runtime == nil {
|
||||
return nil, errBulkRuntimeNil
|
||||
}
|
||||
req := serverBulkRequest(runtime, opt)
|
||||
scope := serverFileScope(logical)
|
||||
if req.Dedicated {
|
||||
if err := logicalDedicatedBulkSupportError(logical); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
if !validBulkRange(req.Range) {
|
||||
return nil, errBulkRangeInvalid
|
||||
}
|
||||
if _, exists := runtime.lookup(scope, req.BulkID); exists {
|
||||
return nil, errBulkAlreadyExists
|
||||
}
|
||||
if req.Dedicated {
|
||||
if req.DataID == 0 {
|
||||
req.DataID = runtime.nextDataID()
|
||||
}
|
||||
if req.AttachToken == "" {
|
||||
req.AttachToken = newBulkAttachToken()
|
||||
}
|
||||
bulk := newBulkHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, logical.CurrentTransportConn(), logical.transportGenerationSnapshot(), serverBulkCloseSender(s, logical, nil), serverBulkResetSender(s, logical, nil), serverBulkDataSender(s, logical.CurrentTransportConn()), serverBulkWriteSender(s, logical, logical.CurrentTransportConn()), serverBulkReleaseSender(s, logical, logical.CurrentTransportConn()))
|
||||
if err := runtime.register(scope, bulk); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp, err := sendBulkOpenServerLogical(ctx, s, logical, req)
|
||||
if err != nil {
|
||||
runtime.remove(scope, bulk.ID())
|
||||
return nil, err
|
||||
}
|
||||
if resp.TransportGeneration != 0 {
|
||||
bulk.transportGeneration = resp.TransportGeneration
|
||||
}
|
||||
return bulk, nil
|
||||
}
|
||||
resp, err := sendBulkOpenServerLogical(ctx, s, logical, req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.DataID != 0 {
|
||||
req.DataID = resp.DataID
|
||||
}
|
||||
req.Dedicated = resp.Dedicated
|
||||
if resp.AttachToken != "" {
|
||||
req.AttachToken = resp.AttachToken
|
||||
}
|
||||
if req.DataID == 0 {
|
||||
return nil, errBulkDataIDEmpty
|
||||
}
|
||||
transport := logical.CurrentTransportConn()
|
||||
bulk := newBulkHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, resp.TransportGeneration, serverBulkCloseSender(s, logical, nil), serverBulkResetSender(s, logical, nil), serverBulkDataSender(s, transport), serverBulkWriteSender(s, logical, transport), serverBulkReleaseSender(s, logical, transport))
|
||||
if err := runtime.register(scope, bulk); err != nil {
|
||||
_, _ = sendBulkResetServerLogical(context.Background(), s, logical, BulkResetRequest{
|
||||
BulkID: req.BulkID,
|
||||
DataID: req.DataID,
|
||||
Error: err.Error(),
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
return bulk, nil
|
||||
}
|
||||
|
||||
func (s *ServerCommon) OpenBulkTransport(ctx context.Context, transport *TransportConn, opt BulkOpenOptions) (Bulk, error) {
|
||||
if s == nil {
|
||||
return nil, errBulkServerNil
|
||||
}
|
||||
if transport == nil {
|
||||
return nil, errBulkTransportNil
|
||||
}
|
||||
logical := transport.LogicalConn()
|
||||
if logical == nil {
|
||||
return nil, errBulkLogicalConnNil
|
||||
}
|
||||
runtime := s.getBulkRuntime()
|
||||
if runtime == nil {
|
||||
return nil, errBulkRuntimeNil
|
||||
}
|
||||
req := serverBulkRequest(runtime, opt)
|
||||
scope := serverFileScope(logical)
|
||||
if req.Dedicated {
|
||||
if err := transportDedicatedBulkSupportError(transport); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
if !validBulkRange(req.Range) {
|
||||
return nil, errBulkRangeInvalid
|
||||
}
|
||||
if _, exists := runtime.lookup(scope, req.BulkID); exists {
|
||||
return nil, errBulkAlreadyExists
|
||||
}
|
||||
if req.Dedicated {
|
||||
if req.DataID == 0 {
|
||||
req.DataID = runtime.nextDataID()
|
||||
}
|
||||
if req.AttachToken == "" {
|
||||
req.AttachToken = newBulkAttachToken()
|
||||
}
|
||||
bulk := newBulkHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, transport.TransportGeneration(), serverBulkCloseSender(s, logical, transport), serverBulkResetSender(s, logical, transport), serverBulkDataSender(s, transport), serverBulkWriteSender(s, logical, transport), serverBulkReleaseSender(s, logical, transport))
|
||||
if err := runtime.register(scope, bulk); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
resp, err := sendBulkOpenServerTransport(ctx, s, transport, req)
|
||||
if err != nil {
|
||||
runtime.remove(scope, bulk.ID())
|
||||
return nil, err
|
||||
}
|
||||
if resp.TransportGeneration != 0 {
|
||||
bulk.transportGeneration = resp.TransportGeneration
|
||||
}
|
||||
return bulk, nil
|
||||
}
|
||||
resp, err := sendBulkOpenServerTransport(ctx, s, transport, req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.DataID != 0 {
|
||||
req.DataID = resp.DataID
|
||||
}
|
||||
req.Dedicated = resp.Dedicated
|
||||
if resp.AttachToken != "" {
|
||||
req.AttachToken = resp.AttachToken
|
||||
}
|
||||
if req.DataID == 0 {
|
||||
return nil, errBulkDataIDEmpty
|
||||
}
|
||||
bulk := newBulkHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, resp.TransportGeneration, serverBulkCloseSender(s, logical, transport), serverBulkResetSender(s, logical, transport), serverBulkDataSender(s, transport), serverBulkWriteSender(s, logical, transport), serverBulkReleaseSender(s, logical, transport))
|
||||
if err := runtime.register(scope, bulk); err != nil {
|
||||
_, _ = sendBulkResetServerTransport(context.Background(), s, transport, BulkResetRequest{
|
||||
BulkID: req.BulkID,
|
||||
DataID: req.DataID,
|
||||
Error: err.Error(),
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
return bulk, nil
|
||||
}
|
||||
|
||||
func serverBulkRequest(runtime *bulkRuntime, opt BulkOpenOptions) BulkOpenRequest {
|
||||
opt = normalizeBulkOpenOptions(opt)
|
||||
id := opt.ID
|
||||
if id == "" && runtime != nil {
|
||||
id = runtime.nextID()
|
||||
}
|
||||
return normalizeBulkOpenRequest(BulkOpenRequest{
|
||||
BulkID: id,
|
||||
Range: opt.Range,
|
||||
Metadata: cloneBulkMetadata(opt.Metadata),
|
||||
ReadTimeout: opt.ReadTimeout,
|
||||
WriteTimeout: opt.WriteTimeout,
|
||||
Dedicated: opt.Dedicated,
|
||||
ChunkSize: opt.ChunkSize,
|
||||
WindowBytes: opt.WindowBytes,
|
||||
MaxInFlight: opt.MaxInFlight,
|
||||
})
|
||||
}
|
||||
|
||||
func serverBulkCloseSender(s *ServerCommon, logical *LogicalConn, transport *TransportConn) bulkCloseSender {
|
||||
return func(ctx context.Context, bulk *bulkHandle, full bool) error {
|
||||
if bulk != nil && bulk.Dedicated() {
|
||||
if err := bulk.waitDedicatedReady(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.sendDedicatedBulkClose(ctx, bulk.LogicalConn(), bulk, full)
|
||||
}
|
||||
req := BulkCloseRequest{
|
||||
BulkID: bulk.ID(),
|
||||
Full: full,
|
||||
}
|
||||
if logical != nil {
|
||||
_, err := sendBulkCloseServerLogical(ctx, s, logical, req)
|
||||
return err
|
||||
}
|
||||
_, err := sendBulkCloseServerTransport(ctx, s, transport, req)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
func serverBulkResetSender(s *ServerCommon, logical *LogicalConn, transport *TransportConn) bulkResetSender {
|
||||
return func(ctx context.Context, bulk *bulkHandle, message string) error {
|
||||
if bulk != nil && bulk.Dedicated() {
|
||||
if err := bulk.waitDedicatedReady(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.sendDedicatedBulkReset(ctx, bulk.LogicalConn(), bulk, message)
|
||||
}
|
||||
req := BulkResetRequest{
|
||||
BulkID: bulk.ID(),
|
||||
DataID: bulk.dataIDSnapshot(),
|
||||
Error: message,
|
||||
}
|
||||
if logical != nil {
|
||||
_, err := sendBulkResetServerLogical(ctx, s, logical, req)
|
||||
return err
|
||||
}
|
||||
_, err := sendBulkResetServerTransport(ctx, s, transport, req)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
func serverBulkDataSender(s *ServerCommon, transport *TransportConn) bulkDataSender {
|
||||
return func(ctx context.Context, bulk *bulkHandle, chunk []byte) error {
|
||||
if s == nil {
|
||||
return errBulkServerNil
|
||||
}
|
||||
if ctx != nil {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return ctx.Err()
|
||||
default:
|
||||
}
|
||||
}
|
||||
if bulk != nil && bulk.Dedicated() {
|
||||
if err := bulk.waitDedicatedReady(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return s.sendDedicatedBulkData(ctx, bulk.LogicalConn(), bulk, chunk)
|
||||
}
|
||||
if transport == nil {
|
||||
return errBulkTransportNil
|
||||
}
|
||||
if !transport.IsCurrent() {
|
||||
return errTransportDetached
|
||||
}
|
||||
dataID := bulk.dataIDSnapshot()
|
||||
if dataID == 0 {
|
||||
return errBulkDataPathNotReady
|
||||
}
|
||||
return s.sendFastBulkDataTransport(ctx, bulk.LogicalConn(), transport, dataID, bulk.nextOutboundDataSeq(), chunk)
|
||||
}
|
||||
}
|
||||
|
||||
func serverBulkWriteSender(s *ServerCommon, logical *LogicalConn, transport *TransportConn) bulkWriteSender {
|
||||
return func(ctx context.Context, bulk *bulkHandle, payload []byte) (int, error) {
|
||||
if s == nil {
|
||||
return 0, errBulkServerNil
|
||||
}
|
||||
if ctx != nil {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return 0, ctx.Err()
|
||||
default:
|
||||
}
|
||||
}
|
||||
if bulk != nil && bulk.Dedicated() {
|
||||
if err := bulk.waitDedicatedReady(ctx); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return s.sendDedicatedBulkWrite(ctx, bulk.LogicalConn(), bulk, payload)
|
||||
}
|
||||
if transport == nil {
|
||||
return 0, errBulkTransportNil
|
||||
}
|
||||
if !transport.IsCurrent() {
|
||||
return 0, errTransportDetached
|
||||
}
|
||||
return 0, nil
|
||||
}
|
||||
}
|
||||
|
||||
func serverBulkReleaseSender(s *ServerCommon, logical *LogicalConn, transport *TransportConn) bulkReleaseSender {
|
||||
return func(bulk *bulkHandle, bytes int64, chunks int) error {
|
||||
if s == nil || bulk == nil {
|
||||
return errBulkServerNil
|
||||
}
|
||||
if bytes <= 0 && chunks <= 0 {
|
||||
return nil
|
||||
}
|
||||
if bulk.Dedicated() {
|
||||
return s.sendDedicatedBulkRelease(context.Background(), logical, bulk, bytes, chunks)
|
||||
}
|
||||
req := BulkReleaseRequest{
|
||||
BulkID: bulk.ID(),
|
||||
DataID: bulk.dataIDSnapshot(),
|
||||
Bytes: bytes,
|
||||
Chunks: chunks,
|
||||
}
|
||||
if transport != nil && transport.IsCurrent() {
|
||||
return sendBulkReleaseServerTransport(s, transport, req)
|
||||
}
|
||||
return sendBulkReleaseServerLogical(s, logical, req)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user