PasteFerry (隔空贴): clipboard and file sync across macOS, Windows and Linux. Direct-first, end-to-end encrypted. Optional official access: no server to host. Independent self-hosting remains available.
Dart airdrop-alternativeclipboardclipboard-sharingclipboard-synccopy-pastecross-platformend-to-end-encryptionfile-syncfile-transferfluttergolanglinuxmacosnat-traversalp2pself-hostedtailscaleuniversal-clipboardwebrtcwindows
fix(core): serialize file stream writes with cancellation
baiyuzedfdac21fb7c7
diff --git a/client-core/internal/send/ask_test.go b/client-core/internal/send/ask_test.goindex a25ef79..cad27ce 100644--- a/client-core/internal/send/ask_test.go+++ b/client-core/internal/send/ask_test.go@@ -175,6 +175,15 @@ func TestFriendAskCancelledBySender(t *testing.T) {// 好友接受后仍能取消正在发送的文件,清掉临时数据,后续发送照常。func TestFriendActiveSendCancelledBySender(t *testing.T) {+ testFriendSendCancelledBySender(t, true)+}++func TestFriendSendCancelledDuringStreamSetup(t *testing.T) {+ testFriendSendCancelledBySender(t, false)+}++func testFriendSendCancelledBySender(t *testing.T, waitForData bool) {+ t.Helper()p := friendPair(t)t.Cleanup(func() {if t.Failed() {@@ -194,6 +203,12 @@ func TestFriendActiveSendCancelledBySender(t *testing.T) {t.Fatal(err)}waitStatus(t, p.a, tr.Id, store.TransferActive)+ if waitForData {+ waitFor(t, 30*time.Second, func() bool {+ tr, _ := p.b.db.GetTransfer(got.ID)+ return p.b.eng.withProgress(tr).DoneBytes > 256<<10+ })+ }if err := p.a.eng.Cancel(tr.Id); err != nil {t.Fatal(err)}diff --git a/client-core/internal/send/pipe.go b/client-core/internal/send/pipe.goindex f4384ee..f2a1e18 100644--- a/client-core/internal/send/pipe.go+++ b/client-core/internal/send/pipe.go@@ -42,7 +42,7 @@ func (p *dcPipe) finish(ctx context.Context) error {return p.cw.WaitDrained(ctx, time.Minute)}-func (p *dcPipe) Close() error { return p.dc.Close() }+func (p *dcPipe) Close() error { return p.cw.Close() }// tcpPipe 是局域网 TCP:内核负责送达,写完以后关掉写方向即可。type tcpPipe struct {diff --git a/client-core/internal/transport/p2p/chunkwriter.go b/client-core/internal/transport/p2p/chunkwriter.goindex ead4b05..e3b0f86 100644--- a/client-core/internal/transport/p2p/chunkwriter.go+++ b/client-core/internal/transport/p2p/chunkwriter.go@@ -34,6 +34,12 @@ type ChunkWriter struct {mu sync.Mutexerr error++ // SCTP reset must follow the last Send. Closing concurrently with Send+ // can leave late chunks on a reset stream and stall acceptance of later+ // data channels while their DCEP opener waits behind that orphan stream.+ sendMu sync.Mutex+ closed bool}// NewChunkWriter 包住一条刚打开的数据通道。onProgress 在每发出一个分片后收到累计字节数,可以为 nil。@@ -79,7 +85,9 @@ func (w *ChunkWriter) flushChunk() error {if err := w.waitForBuffer(); err != nil {return err}- if w.dc.ReadyState() != webrtc.DataChannelStateOpen {+ w.sendMu.Lock()+ defer w.sendMu.Unlock()+ if w.closed || w.dc.ReadyState() != webrtc.DataChannelStateOpen {return errors.New("数据通道已关闭")}if err := w.dc.Send(w.buf); err != nil {@@ -94,6 +102,15 @@ func (w *ChunkWriter) flushChunk() error {return nil}+// Close stops writes before resetting the data channel, without waiting for+// buffered data or a writer that is paused by backpressure.+func (w *ChunkWriter) Close() error {+ w.sendMu.Lock()+ defer w.sendMu.Unlock()+ w.closed = true+ return w.dc.Close()+}+// waitForBuffer 在发送缓冲积压过多时等待它回落。//// 刻意用轮询而非 OnBufferedAmountLow 回调:那个回调是边沿触发的,