a2cad11224
- Req 1 子会话(iOS 多进程在用户视角=一台设备一会话,内部多条独立刷新逻辑会话):brokerclient 加 MintParams.Sub + SessionInfo.Sub + RevokeDeviceSessions(user,meta) 级联;device-session sub!="" 挂在主 device_id 之下、走 tier=clipboard 且不建第二个 device 行;handleSessionsList 按 meta 归并、隐藏 sub!=""(但保留“仅控件会话存活”的设备,不简单丢弃);revokeDevice 改走 meta 级联(移除设备连带吊控件子会话)。iOS provisionWidgetSessionIfNeeded 改用主 device_id + sub="widget"(弃用独立 dev_widget),控件令牌仍隔离持有、独立刷新——不碰引擎主会话,#7 隔离不变。蓝本 auth/docs/子会话方案.md(cdrop 提案 + Broker 评审接受 + cdrop 确认 6 点:用 sub、R1 cdrop 归并、scope 复用 tier=clipboard、级联 DELETE …?meta=)。 - Req 2a 离线消息队列:新增 pending_messages 表(0001_init + sqlc 查询);message.go 收件设备离线即入队(无论是否配推送都入队,恒 202),修“离线消息只随推送横幅一闪、不入收件列表”;GET /api/messages/pending 取即删(DELETE..RETURNING,单次投递);web hub.ts onOpen 每次 SSE 连接 / 重连即拉取补收、逐条 addMessage(全端受益,iOS 经桥推原生 + 累积未读);复用 login-request reaper 清 TTL。 - Req 3 被登出推送:push 加 KindSessionRevoked + 本地化文案,apns/web 双通道;revokeDevice 加 notifyRevoked 参(跨端 revoke=true、自登出=false),跨端移除时推送告知被踢设备;iOS AppDelegate 收 session:revoked 即清 Keychain 主会话 + 控件会话、发 .cdropSessionRevoked,前台经 AppRoot 即时回登录页、关闭态下次启动即登出。 - #6 后台唤醒层:apns apsEnvelope 加 content-available:1(服务端有消息时既弹可点横幅又短暂后台唤醒);iOS DeviceItem 加 Codable、presence 快照持久化(冷启即时显示设备列表,缓解“长时间重连”观感,SSE 一连即整组替换自校正);控件会话回前台补铸(scenePhase active)+ content-available 唤醒时刷新隔离的控件会话(剪贴板保活,绝不碰引擎主会话以免 #7 回归)。 - 测试:qr_test mock broker 加 sub 幂等键 + 级联吊销端点;bootstrap_test 期望表集加 pending_messages。
169 lines
5.0 KiB
Go
169 lines
5.0 KiB
Go
package db
|
|
|
|
import (
|
|
"context"
|
|
"path/filepath"
|
|
"sort"
|
|
"testing"
|
|
)
|
|
|
|
func TestBootstrapCreatesAllTables(t *testing.T) {
|
|
tmp := filepath.Join(t.TempDir(), "test.db")
|
|
d, err := Open(tmp)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
defer d.Close()
|
|
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("bootstrap: %v", err)
|
|
}
|
|
|
|
want := []string{"clipboard_state", "devices", "login_requests", "pending_messages", "push_subscriptions", "transfer_sessions"}
|
|
rows, err := d.Query("SELECT name FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' ORDER BY name")
|
|
if err != nil {
|
|
t.Fatalf("query tables: %v", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var got []string
|
|
for rows.Next() {
|
|
var name string
|
|
if err := rows.Scan(&name); err != nil {
|
|
t.Fatalf("scan: %v", err)
|
|
}
|
|
got = append(got, name)
|
|
}
|
|
sort.Strings(got)
|
|
if len(got) != len(want) {
|
|
t.Fatalf("table count: got %v, want %v", got, want)
|
|
}
|
|
for i := range want {
|
|
if got[i] != want[i] {
|
|
t.Errorf("table[%d]: got %q, want %q", i, got[i], want[i])
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestBootstrapIsIdempotent(t *testing.T) {
|
|
tmp := filepath.Join(t.TempDir(), "test.db")
|
|
d, err := Open(tmp)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
defer d.Close()
|
|
|
|
for i := 0; i < 3; i++ {
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("bootstrap iter %d: %v", i, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestOpenEnablesWALMode(t *testing.T) {
|
|
tmp := filepath.Join(t.TempDir(), "test.db")
|
|
d, err := Open(tmp)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
defer d.Close()
|
|
|
|
var mode string
|
|
if err := d.QueryRow("PRAGMA journal_mode").Scan(&mode); err != nil {
|
|
t.Fatalf("pragma: %v", err)
|
|
}
|
|
if mode != "wal" {
|
|
t.Errorf("journal_mode: got %q, want %q", mode, "wal")
|
|
}
|
|
}
|
|
|
|
// Simulates the prod upgrade: a clipboard_state created before the version
|
|
// column existed must gain it (defaulting to 0) on bootstrap, idempotently.
|
|
func TestBootstrapAddsClipboardVersionToLegacyDB(t *testing.T) {
|
|
tmp := filepath.Join(t.TempDir(), "legacy.db")
|
|
d, err := Open(tmp)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
defer d.Close()
|
|
|
|
_, err = d.Exec(`CREATE TABLE clipboard_state (
|
|
user_id TEXT PRIMARY KEY, content_type TEXT NOT NULL, content TEXT,
|
|
source_device TEXT, updated_at INTEGER NOT NULL)`)
|
|
if err != nil {
|
|
t.Fatalf("legacy schema: %v", err)
|
|
}
|
|
if _, err := d.Exec(`INSERT INTO clipboard_state (user_id, content_type, content, updated_at)
|
|
VALUES ('u', 'text/plain', 'hi', 100)`); err != nil {
|
|
t.Fatalf("seed row: %v", err)
|
|
}
|
|
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("bootstrap: %v", err)
|
|
}
|
|
|
|
var version int64
|
|
if err := d.QueryRow(`SELECT version FROM clipboard_state WHERE user_id='u'`).Scan(&version); err != nil {
|
|
t.Fatalf("select version (column missing?): %v", err)
|
|
}
|
|
if version != 0 {
|
|
t.Errorf("legacy row version: got %d, want 0", version)
|
|
}
|
|
// Second bootstrap must be a no-op (column already present).
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("second bootstrap: %v", err)
|
|
}
|
|
}
|
|
|
|
// Simulates the prod upgrade to the Auth Broker model: a legacy devices table keyed
|
|
// (user_id, name) must be recreated with the device_id primary key. The ephemeral
|
|
// device rows are dropped (re-created on the next request / scan), and the migration
|
|
// is idempotent.
|
|
func TestBootstrapRecreatesLegacyDevices(t *testing.T) {
|
|
tmp := filepath.Join(t.TempDir(), "legacy.db")
|
|
d, err := Open(tmp)
|
|
if err != nil {
|
|
t.Fatalf("open: %v", err)
|
|
}
|
|
defer d.Close()
|
|
|
|
if _, err := d.Exec(`CREATE TABLE devices (
|
|
user_id TEXT NOT NULL, name TEXT NOT NULL, type TEXT NOT NULL,
|
|
last_seen INTEGER NOT NULL, PRIMARY KEY (user_id, name))`); err != nil {
|
|
t.Fatalf("legacy schema: %v", err)
|
|
}
|
|
if _, err := d.Exec(`INSERT INTO devices (user_id, name, type, last_seen) VALUES ('u','old','browser',1)`); err != nil {
|
|
t.Fatalf("seed row: %v", err)
|
|
}
|
|
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("bootstrap: %v", err)
|
|
}
|
|
|
|
// The table now has the device_id-keyed shape (this insert would fail otherwise).
|
|
if _, err := d.Exec(`INSERT INTO devices (device_id, user_id, name, type, tier, broker_sid, created_at, last_seen)
|
|
VALUES ('dev_1','u','New','browser','full','sid',1,1)`); err != nil {
|
|
t.Fatalf("new schema insert (device_id missing?): %v", err)
|
|
}
|
|
// The legacy row was dropped with the table.
|
|
var legacy int
|
|
if err := d.QueryRow(`SELECT COUNT(*) FROM devices WHERE name='old'`).Scan(&legacy); err != nil {
|
|
t.Fatalf("count legacy: %v", err)
|
|
}
|
|
if legacy != 0 {
|
|
t.Errorf("legacy device row should be dropped on recreate; got %d", legacy)
|
|
}
|
|
|
|
// Idempotent: a second bootstrap leaves the new shape and its rows intact.
|
|
if err := Bootstrap(context.Background(), d); err != nil {
|
|
t.Fatalf("second bootstrap: %v", err)
|
|
}
|
|
var kept int
|
|
if err := d.QueryRow(`SELECT COUNT(*) FROM devices WHERE device_id='dev_1'`).Scan(&kept); err != nil {
|
|
t.Fatalf("count after second bootstrap: %v", err)
|
|
}
|
|
if kept != 1 {
|
|
t.Errorf("device row should survive idempotent bootstrap; got %d", kept)
|
|
}
|
|
}
|