Skip to content

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.

fix(core): keep transfer streams open until receipt is confirmed

baiyuze76f2bb68eda3
diff --git a/client-core/internal/send/ack_test.go b/client-core/internal/send/ack_test.go
new file mode 100644
index 0000000..7816a8b
--- /dev/null
+++ b/client-core/internal/send/ack_test.go
@@ -0,0 +1,50 @@
+package send
+
+import (
+ "path/filepath"
+ "testing"
+ "time"
+
+ "github.com/pion/webrtc/v4"
+
+ "github.com/baiyuze/pasteferry/client-core/internal/store"
+ pb "github.com/baiyuze/pasteferry/proto/gen/pasteferry/v1"
+)
+
+func TestSenderKeepsStreamUntilReceiverResult(t *testing.T) {
+ p := newPair(t)
+ p.b.mu.Lock()
+ p.b.dropResult = true
+ p.b.mu.Unlock()
+ opened := make(chan *webrtc.DataChannel, 1)
+ open := p.a.eng.opts.OpenStream
+ p.a.eng.opts.OpenStream = func(device, label string) (*webrtc.DataChannel, error) {
+ dc, err := open(device, label)
+ if err == nil {
+ opened <- dc
+ }
+ return dc, err
+ }
+ path := filepath.Join(t.TempDir(), "ack.txt")
+ writeFile(t, path, []byte("wait for the receiver"))
+ tr, err := p.a.eng.SendFiles("bob", []string{path}, false, "")
+ if err != nil {
+ t.Fatal(err)
+ }
+ waitStatus(t, p.b, tr.Id, store.TransferDone)
+ dc := <-opened
+ // The result is deliberately withheld after the remote file is complete.
+ // Local buffering must not make the sender tear down this stream early.
+ waitFor(t, time.Second, func() bool { return dc.BufferedAmount() == 0 })
+ time.Sleep(100 * time.Millisecond)
+ if dc.ReadyState() != webrtc.DataChannelStateOpen {
+ t.Fatalf("stream closed before receiver acknowledgement: %v", dc.ReadyState())
+ }
+ if err := p.b.mgr.Send("alice", &pb.PeerMessage{Payload: &pb.PeerMessage_SendResult{
+ SendResult: &pb.SendResult{TransferId: tr.Id, Attempt: 1, Ok: true},
+ }}); err != nil {
+ t.Fatal(err)
+ }
+ waitStatus(t, p.a, tr.Id, store.TransferDone)
+ waitFor(t, time.Second, func() bool { return dc.ReadyState() != webrtc.DataChannelStateOpen })
+}
diff --git a/client-core/internal/send/ask_test.go b/client-core/internal/send/ask_test.go
index 7e3787e..a25ef79 100644
--- a/client-core/internal/send/ask_test.go
+++ b/client-core/internal/send/ask_test.go
@@ -176,6 +176,13 @@ func TestFriendAskCancelledBySender(t *testing.T) {
// 好友接受后仍能取消正在发送的文件,清掉临时数据,后续发送照常。
func TestFriendActiveSendCancelledBySender(t *testing.T) {
p := friendPair(t)
+ t.Cleanup(func() {
+ if t.Failed() {
+ a, _ := p.a.db.ListTransfers(store.Outgoing, 20, time.Time{})
+ b, _ := p.b.db.ListTransfers(store.Incoming, 20, time.Time{})
+ t.Logf("sender: %+v; receiver: %+v", a, b)
+ }
+ })
path := filepath.Join(t.TempDir(), "big.bin")
writeFile(t, path, randomBytes(t, 60<<20))
tr, err := p.a.eng.SendFiles("bob", []string{path}, false, "")
diff --git a/client-core/internal/send/outgoing.go b/client-core/internal/send/outgoing.go
index 884dfbe..4df7314 100644
--- a/client-core/internal/send/outgoing.go
+++ b/client-core/internal/send/outgoing.go
@@ -31,8 +31,13 @@ type outgoing struct {
func (o *outgoing) abort(cause error) {
o.cancel(cause)
+ o.closePipe()
+}
+
+func (o *outgoing) closePipe() {
o.mu.Lock()
p := o.pipe
+ o.pipe = nil
o.mu.Unlock()
if p != nil {
_ = p.Close() // 让卡在发送缓冲上的写入立刻返回
@@ -249,6 +254,7 @@ func (e *Engine) runOutgoing(t store.Transfer) {
defer cancel(nil)
o := &outgoing{id: t.ID, device: t.DeviceID, ctx: ctx, cancel: cancel,
answer: make(chan *pb.SendAnswer, 2), result: make(chan *pb.SendResult, 1), done: make(chan struct{})}
+ defer o.closePipe()
e.mu.Lock()
e.out[t.ID] = o
e.mu.Unlock()
@@ -374,6 +380,7 @@ func (e *Engine) runOutgoing(t store.Transfer) {
e.interrupt(e.withProgress(t))
return
}
+ o.closePipe()
if result.GetOk() {
t.DoneBytes = t.TotalBytes
e.finish(t, store.TransferDone, "")
@@ -407,7 +414,8 @@ func (e *Engine) stream(ctx context.Context, o *outgoing, t store.Transfer, inde
o.mu.Lock()
o.pipe = p
o.mu.Unlock()
- defer p.Close()
+ // Keep the stream alive until the receiver acknowledges the end frame.
+ // An empty local send buffer alone does not confirm remote consumption.
m := e.meterFor(t)
m.start(t.DoneBytes)