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): drop a nearby device as soon as it closes the window
baiyuzec39a5135eb49
diff --git a/client-core/internal/transport/lan/lan.go b/client-core/internal/transport/lan/lan.goindex 597c493..9e791ff 100644--- a/client-core/internal/transport/lan/lan.go+++ b/client-core/internal/transport/lan/lan.go@@ -133,6 +133,8 @@ type peerState struct {type seenInstance struct {inst Instanceseen time.Time+ // hidden 是 mDNS 报告对方关掉「搜索附近设备」窗口的时间,见 handleNearbyPing+ hidden time.Time}type Transport struct {@@ -919,7 +921,14 @@ func (t *Transport) found(inst Instance) {return}prev, had := t.instances[inst.Name]- t.instances[inst.Name] = seenInstance{inst: inst, seen: now}+ si := seenInstance{inst: inst, seen: now}+ if _, shown := nearbyName(inst.Text); !shown {+ si.hidden = prev.hidden+ if _, was := nearbyName(prev.inst.Text); had && was {+ si.hidden = now+ }+ }+ t.instances[inst.Name] = si// pion 每秒都会报一次同样的结果,只在有新信息时行动fresh := !had || prev.inst.Addr != inst.Addr || prev.inst.Text["t"] != inst.Text["t"] ||now.Sub(prev.seen) > 30*time.Seconddiff --git a/client-core/internal/transport/lan/nearby.go b/client-core/internal/transport/lan/nearby.goindex 320aa33..2b869ee 100644--- a/client-core/internal/transport/lan/nearby.go+++ b/client-core/internal/transport/lan/nearby.go@@ -28,9 +28,11 @@ import (const (// 这么久没收到对方的 ping、mDNS 也没有它的新消息,就从列表里拿掉。对方每 2 秒(tick)发一次- nearbyStale = 7 * time.Second- maxNearbyName = 60 // 设备名在广播里最多占的字节数(编码前)- maxNearbyAddrs = 4+ nearbyStale = 7 * time.Second+ // mDNS 报告对方关掉窗口后,这么久内不理它的 ping+ nearbyHideGrace = time.Second+ maxNearbyName = 60 // 设备名在广播里最多占的字节数(编码前)+ maxNearbyAddrs = 4)// NearbyInstance 是附近一台打开了「搜索附近设备」窗口的设备。@@ -159,6 +161,10 @@ func (t *Transport) handleNearbyPing(p *pb.LanNearbyPing, src netip.AddrPort) {return}si, ok := t.instances[id]+ if ok && now.Sub(si.hidden) < nearbyHideGrace {+ // 对方关窗口之前刚发出的 ping,比 mDNS 的撤下消息晚到:不能让它重新出现在列表里+ return+ }if !ok {// mDNS 只在实例有变化时才报:本机可能早把它过期丢掉了,或者还没收到它的广播si = seenInstance{inst: Instance{Name: id, Addr: src}}diff --git a/client-core/internal/transport/lan/nearby_test.go b/client-core/internal/transport/lan/nearby_test.goindex 147561c..f093f52 100644--- a/client-core/internal/transport/lan/nearby_test.go+++ b/client-core/internal/transport/lan/nearby_test.go@@ -3,8 +3,11 @@ package lanimport ("context""errors"+ "net/netip""testing""time"++ pb "github.com/baiyuze/pasteferry/proto/gen/pasteferry/v1")// waitNearby 等到 n 的「附近的设备」里正好有 want 台。@@ -55,6 +58,31 @@ func TestNearbyOnlyWhileShown(t *testing.T) {waitNearby(t, a, 0)}+// 对方关窗口前刚发出的 ping 比 mDNS 的撤下消息晚到时,不能让它重新出现;过一会儿再收到 ping 才算它又打开了。+func TestNearbyIgnoresPingRightAfterHide(t *testing.T) {+ a := newNode(t, nil)+ defer a.t.ShowNearby()()+ addr := netip.MustParseAddrPort("127.0.0.1:9")+ shown := Instance{Name: "other", Addr: addr, Text: map[string]string{"v": "1", "n": encodeNearbyName("other"), "o": "test"}}+ a.t.found(shown)+ waitNearby(t, a, 1)++ a.t.found(Instance{Name: "other", Addr: addr, Text: map[string]string{"v": "1"}})+ ping := &pb.LanNearbyPing{Instance: "other", Name: "other", Platform: "test"}+ a.t.handleNearbyPing(ping, addr)+ if got := a.t.Nearby(); len(got) != 0 {+ t.Fatalf("刚撤下的设备不该因为晚到的 ping 重新出现: %+v", got)+ }++ a.t.mu.Lock()+ si := a.t.instances["other"]+ si.hidden = time.Now().Add(-nearbyHideGrace)+ a.t.instances["other"] = si+ a.t.mu.Unlock()+ a.t.handleNearbyPing(ping, addr)+ waitNearby(t, a, 1)+}+// 已配对的设备也显示,按令牌认出来是谁。func TestNearbyRecognizesPairedDevice(t *testing.T) {net := NewMemoryNetwork()