后台/会话三诉求:子会话(一台设备一会话)+ 离线消息队列 + 被登出推送 + 后台唤醒层
- 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。
This commit is contained in:
@@ -0,0 +1,98 @@
|
||||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.31.1
|
||||
// source: pending_messages.sql
|
||||
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
)
|
||||
|
||||
const deleteExpiredPendingMessages = `-- name: DeleteExpiredPendingMessages :exec
|
||||
DELETE FROM pending_messages
|
||||
WHERE expires_at < ?
|
||||
`
|
||||
|
||||
func (q *Queries) DeleteExpiredPendingMessages(ctx context.Context, expiresAt int64) error {
|
||||
_, err := q.db.ExecContext(ctx, deleteExpiredPendingMessages, expiresAt)
|
||||
return err
|
||||
}
|
||||
|
||||
const insertPendingMessage = `-- name: InsertPendingMessage :exec
|
||||
|
||||
INSERT INTO pending_messages (id, user_id, to_device, from_device, text, sent_at, created_at, expires_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
||||
`
|
||||
|
||||
type InsertPendingMessageParams struct {
|
||||
ID string `json:"id"`
|
||||
UserID string `json:"user_id"`
|
||||
ToDevice string `json:"to_device"`
|
||||
FromDevice string `json:"from_device"`
|
||||
Text string `json:"text"`
|
||||
SentAt int64 `json:"sent_at"`
|
||||
CreatedAt int64 `json:"created_at"`
|
||||
ExpiresAt int64 `json:"expires_at"`
|
||||
}
|
||||
|
||||
// pending_messages: offline message queue. A text message to a device with no live
|
||||
// SSE connection is queued here and delivered once when that device next polls.
|
||||
// NOTE: keep this file pure ASCII; sqlc v1.31.1 drifts byte offsets on multibyte
|
||||
// runes in query files, corrupting the generated SQL.
|
||||
func (q *Queries) InsertPendingMessage(ctx context.Context, arg InsertPendingMessageParams) error {
|
||||
_, err := q.db.ExecContext(ctx, insertPendingMessage,
|
||||
arg.ID,
|
||||
arg.UserID,
|
||||
arg.ToDevice,
|
||||
arg.FromDevice,
|
||||
arg.Text,
|
||||
arg.SentAt,
|
||||
arg.CreatedAt,
|
||||
arg.ExpiresAt,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
const popPendingMessages = `-- name: PopPendingMessages :many
|
||||
DELETE FROM pending_messages
|
||||
WHERE user_id = ? AND to_device = ?
|
||||
RETURNING id, user_id, to_device, from_device, text, sent_at, created_at, expires_at
|
||||
`
|
||||
|
||||
type PopPendingMessagesParams struct {
|
||||
UserID string `json:"user_id"`
|
||||
ToDevice string `json:"to_device"`
|
||||
}
|
||||
|
||||
func (q *Queries) PopPendingMessages(ctx context.Context, arg PopPendingMessagesParams) ([]PendingMessage, error) {
|
||||
rows, err := q.db.QueryContext(ctx, popPendingMessages, arg.UserID, arg.ToDevice)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
var items []PendingMessage
|
||||
for rows.Next() {
|
||||
var i PendingMessage
|
||||
if err := rows.Scan(
|
||||
&i.ID,
|
||||
&i.UserID,
|
||||
&i.ToDevice,
|
||||
&i.FromDevice,
|
||||
&i.Text,
|
||||
&i.SentAt,
|
||||
&i.CreatedAt,
|
||||
&i.ExpiresAt,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, i)
|
||||
}
|
||||
if err := rows.Close(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
Reference in New Issue
Block a user