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): reliably exchange peer capability announcements
baiyuzeabdb1ed8f0d0
diff --git a/client-core/internal/peers/manager.go b/client-core/internal/peers/manager.goindex 481700a..82a55d7 100644--- a/client-core/internal/peers/manager.go+++ b/client-core/internal/peers/manager.go@@ -91,7 +91,7 @@ type Manager struct {conn map[string]p2p.ConnState // P2P 连接状态(直连/中转)// features 是对端在 PeerFeatures 里声明的功能,见 wire.proto。没收到过的设备没有条目features map[string]map[string]bool- pending map[string]*pendingPair // session -> 待确认配对+ pending map[string]*pendingPair // session -> 待确认配对// stashed 暂存配对确认前到达的信令,按对端 device_id 归集stashed map[string][]*pb.SignalMessageactive *activeCode@@ -285,6 +285,8 @@ func (m *Manager) SetLANEnabled(enabled bool) {func (m *Manager) reconnectLoop(ctx context.Context) {t := time.NewTicker(10 * time.Second)defer t.Stop()+ features := time.NewTicker(time.Minute)+ defer features.Stop()for {select {@@ -292,6 +294,9 @@ func (m *Manager) reconnectLoop(ctx context.Context) {returncase <-t.C:m.connectPending(ctx)+ case <-features.C:+ // 功能声明不能只发一次:早到或切换连接时丢失后也能自行恢复。+ m.BroadcastFeatures()}}}diff --git a/client-core/internal/peers/manager_test.go b/client-core/internal/peers/manager_test.goindex 6164886..94e8793 100644--- a/client-core/internal/peers/manager_test.go+++ b/client-core/internal/peers/manager_test.go@@ -397,3 +397,30 @@ func TestNearbyNeedsBothWindows(t *testing.T) {t.Fatalf("b 不该多出设备: %v", peers)}}++// 两端同版本:功能声明迟到或丢失后,刷新声明恢复接收能力与用户开关。+func TestRefreshPeerFeatures(t *testing.T) {+ network := lan.NewMemoryNetwork()+ a, b := newDevice(t, "a", network, lanOnly()), newDevice(t, "b", network, lanOnly())+ waitLANUp(t, a, b)+ pairDevices(t, a, b, "")+ waitDirect(t, a, b)+ waitFor(t, "双方收到功能声明", func() bool {+ sa, _ := a.m.SendFilesSupport(b.id())+ sb, _ := b.m.SendFilesSupport(a.id())+ return sa && sb+ })+ a.m.mu.Lock()+ delete(a.m.features, b.id()) // 模拟没有收到对方的首条声明+ a.m.mu.Unlock()+ b.m.BroadcastFeatures()+ waitFor(t, "刷新恢复接收能力", func() bool { ok, _ := a.m.SendFilesSupport(b.id()); return ok })+ b.mu.Lock()+ b.cfg.ReceiveDisabled = true+ b.mu.Unlock()+ b.m.BroadcastFeatures()+ waitFor(t, "刷新接收开关", func() bool { ok, off := a.m.SendFilesSupport(b.id()); return ok && off })+ if !a.m.HasFeature(b.id(), FeatureSendFilesTCP) {+ t.Fatal("快速通道能力丢失")+ }+}diff --git a/client-core/internal/transport/p2p/peer.go b/client-core/internal/transport/p2p/peer.goindex 306119a..f9eae6a 100644--- a/client-core/internal/transport/p2p/peer.go+++ b/client-core/internal/transport/p2p/peer.go@@ -1087,18 +1087,6 @@ func (p *Peer) detectConnectionKind(pc *webrtc.PeerConnection) ConnState {}func (p *Peer) bindControl(dc *webrtc.DataChannel) {- p.mu.Lock()- p.control = dc- p.mu.Unlock()-- dc.OnOpen(func() {- p.log.Debug("控制通道已打开")- p.maybeReady()- })- // 应答方绑定控制通道时,传输层可能早已就绪,此时不会再触发 OnOpen- if dc.ReadyState() == webrtc.DataChannelStateOpen {- p.maybeReady()- }dc.OnMessage(func(msg webrtc.DataChannelMessage) {var m pb.PeerMessageif err := proto.Unmarshal(msg.Data, &m); err != nil {@@ -1114,6 +1102,19 @@ func (p *Peer) bindControl(dc *webrtc.DataChannel) {p.onMessage(&m)}})+ // 必须先接住消息,再发布已连接:对端会在就绪回调里立刻发送功能声明。+ p.mu.Lock()+ p.control = dc+ p.mu.Unlock()++ dc.OnOpen(func() {+ p.log.Debug("控制通道已打开")+ p.maybeReady()+ })+ // 应答方绑定控制通道时,传输层可能早已就绪,此时不会再触发 OnOpen+ if dc.ReadyState() == webrtc.DataChannelStateOpen {+ p.maybeReady()+ }}var ErrNotConnected = errors.New("与对端的连接尚未建立")diff --git a/client-core/internal/transport/p2p/peer_test.go b/client-core/internal/transport/p2p/peer_test.goindex 183b9fb..991d1e5 100644--- a/client-core/internal/transport/p2p/peer_test.go+++ b/client-core/internal/transport/p2p/peer_test.go@@ -2,6 +2,7 @@ package p2p_testimport ("context"+ "fmt""sync""testing""time"@@ -271,3 +272,49 @@ func TestConnectFromAnswererSideAlone(t *testing.T) {case <-time.After(1500 * time.Millisecond):}}++// 两端一连上就发送功能声明;上层就绪回调慢一点也不能丢掉首条控制消息。+func TestControlReceivesMessagesDuringReadyCallback(t *testing.T) {+ for round := range 4 {+ t.Run(fmt.Sprint(round), func(t *testing.T) {+ r := newRelay()+ received := map[string]chan *pb.PeerMessage{"alice": make(chan *pb.PeerMessage, 4), "bob": make(chan *pb.PeerMessage, 4)}+ managers := map[string]*p2p.Manager{}+ for _, id := range []string{"alice", "bob"} {+ var m *p2p.Manager+ m = p2p.NewManager(p2p.ManagerOptions{+ SelfID: id, SendSignal: r.send(id),+ OnState: func(peer string, state p2p.ConnState) {+ if state != p2p.StateDirect && state != p2p.StateRelay {+ return+ }+ if err := m.Send(peer, &pb.PeerMessage{Payload: &pb.PeerMessage_Features{Features: &pb.PeerFeatures{Features: []string{"send_files_v1"}}}}); err != nil {+ t.Error(err)+ }+ time.Sleep(200 * time.Millisecond)+ },+ OnMessage: func(_ string, msg *pb.PeerMessage) { received[id] <- msg },+ })+ m.SetICEServers(nil)+ managers[id] = m+ r.register(id, m)+ t.Cleanup(m.Close)+ }+ ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)+ defer cancel()+ if err := managers["alice"].Connect(ctx, "bob"); err != nil {+ t.Fatal(err)+ }+ for _, id := range []string{"alice", "bob"} {+ select {+ case msg := <-received[id]:+ if msg.GetFeatures() == nil {+ t.Fatalf("%s missing features: %v", id, msg)+ }+ case <-ctx.Done():+ t.Fatalf("%s lost the initial feature announcement", id)+ }+ }+ })+ }+}