127070e226
设备名与令牌解耦(presence 按 device_id 键控):
- hub 主键改稳定 device_id(presence / online / kick 用之),peer 路由仍按设备名经 hub 内 clientFor 解析——不动传输核心;Client 加 Name + 连接键,PresenceDevice 加 device_id,sse 传 claims.DeviceID,publishPresence 按 device_id 判在线、name 取自 devices 表
- 改名走已有 PATCH /api/devices/{device_id}(不重铸会话、不换 token、不中断 SSE)+ hub.Rename 更新活跃连接名 + 重广播 presence,全端即时无重复项;sessions 列表 name 用 devices 表覆盖 broker Label;web 改名从重铸迁到 PATCH,iOS 设置页即时改名;DeviceItem / DeviceInfo 按 device_id 键控判本机
- 移除「需移除两次」:publishPresence 不再把「有 device_id 但无 devices 行」的 live 连接当在线(吊销后用未过期 token 重连的僵尸),只显示 code-less 连接;合法重登新建行故正常
- revoke 对无 broker 会话的本地行也清(清掉合成测试 / 幽灵设备);跨端吊销 / 断连一律按 device_id Kick
iOS Broker 应用内登录(免扫码):
- BrokerLogin.swift:ASWebAuthenticationSession 跑 broker /device/authorize + /device/token 的 PKCE 设备授权流(对齐桌面 loopback,自定义 scheme cdrop://auth-callback 回调)→ /api/auth/device-session 代铸出带真名 + 稳定 device_id 的设备会话;DeviceIDStore 跨登录复用 device_id 杜绝重登重复
- LoginView 主登录改 broker 账号登录、扫码降级为可展开备选
iOS 功能补全:
- 设备间消息(引擎 main.ts 单条增量过桥 + onNativeEvent sendMessage;EngineController 消息状态 + 新 MessagesView 会话 UI;后端 /api/message 已就绪)
- 图库发送(PhotosPicker 文件 / 图库菜单 → stagePhotoData → 复用 cdrop-file 发送链路;NSPhotoLibraryUsageDescription)
- 传输历史 / 消息记录持久化(RecordsStore 落 Application Support JSON,跨重启存活)+ 长按删除 + 清空(二次确认)
- 进行中传输主动取消 / 立即切中继(详情页两按钮,复用引擎桥命令)
- 身份愈合(引擎 /api/me 取真实显示名经 identityUpdated 回报 Keychain,修扫码登录「用户显示 UUID」)
- 触发本地网络权限(NWBrowser 浏览 _cdrop._tcp)使 WKWebView WebRTC 取 host 候选
iOS 发送 / 启动修复:
- 发送在读文件即失败:引擎在 https 源下 fetch("cdrop-file://") 跨源 + Range 头触发 CORS 预检被拦 → 改走原生桥 bridgeFileSource / readFileSlice(512 KiB 分块 base64),绕开 CORS、整文件仍不整体进内存
- 冷启重开「missing injected session」:EngineWebView.makeUIView 在 boot 注入前确定性接好 auth,消除注入竞态
桌面 bug 修复:
- 登出静默失败:window.confirm 在 Wails WebView 失效(返回 falsy 致动作被静默跳过)→ 跨平台 DOM 确认弹窗(utils/confirm 的 Promise 式 confirmDialog + ui/ConfirmHost 的 Mantine Modal)取代之;登出改 await 先吊销 broker 会话再清本地(桌面 clearDesktopSession 会丢 Go 侧 refresh 的竞态)
- 扫 iOS 登录二维码被拒「不是本站的码」:wails:// 源永不等 https 站点源 → 桌面放宽 parseLinkApprovalUrl 的 origin 等值校验(仍留 /link 路径 + r/c;批准 r/c 一律发往本端后端、外站码只 404,无开放重定向)
- macOS 本地网络权限触发(localnetwork_darwin NWBrowser + Info.plist 键);相机修复(NSCameraUsageDescription)
web / 跨端:
- presence 透传 device_id + 离线检测按 device_id;会话列表随 presence 防抖重拉(已登出设备自动从列表消失,不再需手动刷新);移除设备 / 清剪贴板 / 撤销令牌 / 登出均改 DOM 确认弹窗
分发 / 签名:
- 真机签名从手动 scaffold 改自动 provisioning(删 Signing.xcconfig,project.yml 去 profile specifier,just ios-device 用 -allowProvisioningUpdates + ASC 团队 key);App Group 改名 group.net.commilitia.Commilitia-Drop(含 entitlements)
- hub 测试加 device_id 键控 + 改名解耦回归(-race)
317 lines
10 KiB
Go
317 lines
10 KiB
Go
package hub
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sync"
|
|
"sync/atomic"
|
|
"testing"
|
|
"time"
|
|
|
|
"commilitia.net/cdrop/internal/db"
|
|
)
|
|
|
|
// fakeLister returns a fixed device list and counts calls.
|
|
type fakeLister struct {
|
|
devices []db.Device
|
|
calls atomic.Int32
|
|
}
|
|
|
|
func (f *fakeLister) ListDevicesByUser(_ context.Context, _ string) ([]db.Device, error) {
|
|
f.calls.Add(1)
|
|
return f.devices, nil
|
|
}
|
|
|
|
func waitForEvent(t *testing.T, c *Client, want string, timeout time.Duration) Event {
|
|
t.Helper()
|
|
select {
|
|
case ev, ok := <-c.Events():
|
|
if !ok {
|
|
t.Fatalf("event channel closed; wanted type=%q", want)
|
|
}
|
|
if want != "" && ev.Type != want {
|
|
t.Fatalf("event type: got %q, want %q", ev.Type, want)
|
|
}
|
|
return ev
|
|
case <-time.After(timeout):
|
|
t.Fatalf("timeout waiting for event type=%q", want)
|
|
}
|
|
return Event{}
|
|
}
|
|
|
|
func TestConnectFiresPresenceEvent(t *testing.T) {
|
|
lister := &fakeLister{
|
|
devices: []db.Device{{UserID: "alice", DeviceID: "dev_1", Name: "tab-1", Type: "browser", LastSeen: 1}},
|
|
}
|
|
h := New(lister)
|
|
defer h.Close()
|
|
|
|
c := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
defer h.Disconnect(c)
|
|
|
|
ev := waitForEvent(t, c, "presence", time.Second)
|
|
data, _ := ev.Data.(map[string]any)
|
|
devs, _ := data["devices"].([]PresenceDevice)
|
|
if len(devs) != 1 || devs[0].Name != "tab-1" || devs[0].DeviceID != "dev_1" || !devs[0].Online {
|
|
t.Errorf("presence devices: %+v", devs)
|
|
}
|
|
}
|
|
|
|
func TestSecondClientSeesFirstAsOnline(t *testing.T) {
|
|
lister := &fakeLister{
|
|
devices: []db.Device{
|
|
{UserID: "alice", DeviceID: "dev_1", Name: "tab-1", Type: "browser", LastSeen: 1},
|
|
{UserID: "alice", DeviceID: "dev_2", Name: "tab-2", Type: "browser", LastSeen: 2},
|
|
},
|
|
}
|
|
h := New(lister)
|
|
defer h.Close()
|
|
|
|
c1 := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
defer h.Disconnect(c1)
|
|
_ = waitForEvent(t, c1, "presence", time.Second)
|
|
|
|
c2 := h.Connect(context.Background(), "alice", "dev_2", "tab-2", "browser")
|
|
defer h.Disconnect(c2)
|
|
|
|
// c2 receives its own presence (announced on Connect).
|
|
ev := waitForEvent(t, c2, "presence", time.Second)
|
|
devs, _ := ev.Data.(map[string]any)["devices"].([]PresenceDevice)
|
|
if len(devs) != 2 {
|
|
t.Fatalf("expected 2 devices in presence, got %+v", devs)
|
|
}
|
|
online := map[string]bool{}
|
|
for _, d := range devs {
|
|
online[d.Name] = d.Online
|
|
}
|
|
if !online["tab-1"] || !online["tab-2"] {
|
|
t.Errorf("both tabs should be online: %+v", online)
|
|
}
|
|
|
|
// c1 also gets presence diff for c2's arrival.
|
|
ev = waitForEvent(t, c1, "presence", time.Second)
|
|
devs, _ = ev.Data.(map[string]any)["devices"].([]PresenceDevice)
|
|
if len(devs) != 2 {
|
|
t.Errorf("c1 presence after tab-2 arrival: got %d devices, want 2", len(devs))
|
|
}
|
|
}
|
|
|
|
// A live device with no devices-table row (global-SSO browser / broker-auth desktop) and no
|
|
// device_id must still appear in presence as online, labelled by its declared name + type.
|
|
func TestLiveOnlyDeviceAppearsInPresence(t *testing.T) {
|
|
h := New(&fakeLister{}) // empty managed-device set
|
|
defer h.Close()
|
|
|
|
c := h.Connect(context.Background(), "alice", "", "macbook", "macos")
|
|
defer h.Disconnect(c)
|
|
|
|
ev := waitForEvent(t, c, "presence", time.Second)
|
|
devs, _ := ev.Data.(map[string]any)["devices"].([]PresenceDevice)
|
|
if len(devs) != 1 || devs[0].Name != "macbook" || devs[0].Type != "macos" || !devs[0].Online {
|
|
t.Errorf("live-only device should appear online in presence: %+v", devs)
|
|
}
|
|
}
|
|
|
|
func TestSendToRoutesEventByName(t *testing.T) {
|
|
lister := &fakeLister{
|
|
devices: []db.Device{{UserID: "alice", DeviceID: "dev_1", Name: "tab-1", Type: "browser"}},
|
|
}
|
|
h := New(lister)
|
|
defer h.Close()
|
|
|
|
c := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
defer h.Disconnect(c)
|
|
_ = waitForEvent(t, c, "presence", time.Second)
|
|
|
|
// Peer addressing is by name; the hub resolves it to the device_id-keyed client.
|
|
if !h.SendTo("alice", "tab-1", Event{Type: "signal", Data: map[string]any{"x": 1}}) {
|
|
t.Fatal("SendTo by name to a live client should report true")
|
|
}
|
|
ev := waitForEvent(t, c, "signal", time.Second)
|
|
if ev.Data.(map[string]any)["x"] != 1 {
|
|
t.Errorf("payload: %+v", ev.Data)
|
|
}
|
|
|
|
// Addressing by the stable device_id also works (direct map hit).
|
|
if !h.SendTo("alice", "dev_1", Event{Type: "signal"}) {
|
|
t.Fatal("SendTo by device_id should report true")
|
|
}
|
|
_ = waitForEvent(t, c, "signal", time.Second)
|
|
}
|
|
|
|
func TestSendToOfflineDeviceReportsFalse(t *testing.T) {
|
|
h := New(&fakeLister{})
|
|
defer h.Close()
|
|
if h.SendTo("ghost-user", "ghost-device", Event{Type: "signal"}) {
|
|
t.Error("SendTo to offline target should report false")
|
|
}
|
|
}
|
|
|
|
// TestRenameKeepsEntryAndUpdatesRouting is the decoupling guarantee: a renamed device keeps
|
|
// its single hub entry (keyed by the stable device_id), so presence shows the new name with no
|
|
// duplicate and the device stays online and reachable by its NEW name — no reconnect, no token.
|
|
func TestRenameKeepsEntryAndUpdatesRouting(t *testing.T) {
|
|
lister := &fakeLister{
|
|
devices: []db.Device{{UserID: "alice", DeviceID: "dev_1", Name: "iPhone", Type: "ios"}},
|
|
}
|
|
h := New(lister)
|
|
defer h.Close()
|
|
|
|
c := h.Connect(context.Background(), "alice", "dev_1", "iPhone", "ios")
|
|
defer h.Disconnect(c)
|
|
_ = waitForEvent(t, c, "presence", time.Second)
|
|
|
|
// Simulate the rename: the DB row's name changes, then the hub is told.
|
|
lister.devices[0].Name = "My iPhone"
|
|
h.Rename("alice", "dev_1", "My iPhone")
|
|
h.PublishPresence(context.Background(), "alice")
|
|
|
|
ev := waitForEvent(t, c, "presence", time.Second)
|
|
devs := ev.Data.(map[string]any)["devices"].([]PresenceDevice)
|
|
if len(devs) != 1 {
|
|
t.Fatalf("rename must not duplicate the device: got %+v", devs)
|
|
}
|
|
if devs[0].Name != "My iPhone" || devs[0].DeviceID != "dev_1" || !devs[0].Online {
|
|
t.Errorf("presence after rename: %+v", devs[0])
|
|
}
|
|
|
|
// Reachable by the new name; the old name no longer resolves.
|
|
if !h.SendTo("alice", "My iPhone", Event{Type: "signal"}) {
|
|
t.Error("renamed device should be reachable by its new name")
|
|
}
|
|
_ = waitForEvent(t, c, "signal", time.Second)
|
|
if h.SendTo("alice", "iPhone", Event{Type: "signal"}) {
|
|
t.Error("old name should no longer resolve after rename")
|
|
}
|
|
}
|
|
|
|
func TestReconnectClosesOldChannel(t *testing.T) {
|
|
h := New(&fakeLister{})
|
|
defer h.Close()
|
|
|
|
old := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
// drain the initial presence so we can detect close
|
|
<-old.Events()
|
|
|
|
_ = h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
|
|
select {
|
|
case _, ok := <-old.Events():
|
|
if ok {
|
|
t.Error("old channel should be closed on reconnect from same device_id")
|
|
}
|
|
case <-time.After(time.Second):
|
|
t.Fatal("timeout waiting for old channel close")
|
|
}
|
|
}
|
|
|
|
// A reconnect of the SAME device under a DIFFERENT name (e.g. mid-rename) still replaces its
|
|
// own entry rather than orphaning the old one — because the key is the stable device_id.
|
|
func TestReconnectAfterRenameReplacesSameEntry(t *testing.T) {
|
|
h := New(&fakeLister{})
|
|
defer h.Close()
|
|
|
|
old := h.Connect(context.Background(), "alice", "dev_1", "iPhone", "ios")
|
|
<-old.Events()
|
|
|
|
_ = h.Connect(context.Background(), "alice", "dev_1", "My iPhone", "ios")
|
|
|
|
select {
|
|
case _, ok := <-old.Events():
|
|
if ok {
|
|
t.Error("old channel should be closed even when the name changed (same device_id)")
|
|
}
|
|
case <-time.After(time.Second):
|
|
t.Fatal("timeout waiting for old channel close")
|
|
}
|
|
}
|
|
|
|
func TestDisconnectRemovesFromOnlineSet(t *testing.T) {
|
|
h := New(&fakeLister{
|
|
devices: []db.Device{{UserID: "alice", DeviceID: "dev_1", Name: "tab-1", Type: "browser"}},
|
|
})
|
|
defer h.Close()
|
|
|
|
c := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
if !h.Online("alice", "dev_1") {
|
|
t.Fatal("client should be online after Connect")
|
|
}
|
|
h.Disconnect(c)
|
|
if h.Online("alice", "dev_1") {
|
|
t.Error("client should not be online after Disconnect")
|
|
}
|
|
}
|
|
|
|
// TestConcurrentKickAndPresenceNoPanic hammers Kick (which closes channels under the write
|
|
// lock) against publishPresence / Broadcast / SendTo (non-blocking sends under the read lock).
|
|
// Before the close-vs-send fix this raced into a "send on closed channel" panic that crashed
|
|
// the whole process; now close and send are mutually exclusive. Run with -race.
|
|
func TestConcurrentKickAndPresenceNoPanic(t *testing.T) {
|
|
h := New(&fakeLister{
|
|
devices: []db.Device{{UserID: "u", DeviceID: "dev_0", Name: "d", Type: "browser"}},
|
|
})
|
|
defer h.Close()
|
|
|
|
const workers = 16
|
|
const iters = 200
|
|
var wg sync.WaitGroup
|
|
for i := 0; i < workers; i += 1 {
|
|
wg.Add(1)
|
|
go func(n int) {
|
|
defer wg.Done()
|
|
id := fmt.Sprintf("dev_%d", n)
|
|
name := fmt.Sprintf("d%d", n)
|
|
for j := 0; j < iters; j += 1 {
|
|
h.Connect(context.Background(), "u", id, name, "browser")
|
|
h.PublishPresence(context.Background(), "u")
|
|
h.Broadcast("u", Event{Type: "x"})
|
|
h.SendTo("u", name, Event{Type: "y"})
|
|
h.Rename("u", id, name+"-r")
|
|
h.Kick("u", id, name)
|
|
}
|
|
}(i)
|
|
}
|
|
wg.Wait()
|
|
}
|
|
|
|
// TestGracePeriod uses a tiny grace so the test runs fast.
|
|
func TestGracePeriodDelaysOfflinePresence(t *testing.T) {
|
|
h := New(&fakeLister{
|
|
devices: []db.Device{
|
|
{UserID: "alice", DeviceID: "dev_1", Name: "tab-1", Type: "browser"},
|
|
{UserID: "alice", DeviceID: "dev_2", Name: "tab-2", Type: "browser"},
|
|
},
|
|
})
|
|
h.grace = 100 * time.Millisecond
|
|
defer h.Close()
|
|
|
|
c1 := h.Connect(context.Background(), "alice", "dev_1", "tab-1", "browser")
|
|
defer h.Disconnect(c1)
|
|
c2 := h.Connect(context.Background(), "alice", "dev_2", "tab-2", "browser")
|
|
// Drain initial presence frames
|
|
_ = waitForEvent(t, c1, "presence", time.Second)
|
|
_ = waitForEvent(t, c1, "presence", time.Second)
|
|
_ = waitForEvent(t, c2, "presence", time.Second)
|
|
|
|
h.Disconnect(c2)
|
|
// Grace 100ms: c1 should receive presence after the grace window with tab-2 offline.
|
|
select {
|
|
case ev := <-c1.Events():
|
|
if ev.Type != "presence" {
|
|
t.Fatalf("expected presence after grace, got %q", ev.Type)
|
|
}
|
|
devs := ev.Data.(map[string]any)["devices"].([]PresenceDevice)
|
|
var tab2Online bool
|
|
for _, d := range devs {
|
|
if d.Name == "tab-2" {
|
|
tab2Online = d.Online
|
|
}
|
|
}
|
|
if tab2Online {
|
|
t.Error("tab-2 should be offline in post-grace presence")
|
|
}
|
|
case <-time.After(time.Second):
|
|
t.Fatal("timeout waiting for post-grace presence")
|
|
}
|
|
}
|