后台/会话三诉求:子会话(一台设备一会话)+ 离线消息队列 + 被登出推送 + 后台唤醒层

- 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:
2026-06-27 17:42:53 +08:00
parent 1b94df1604
commit a2cad11224
23 changed files with 790 additions and 105 deletions
+26
View File
@@ -38,4 +38,30 @@ enum WidgetSessionStore
guard let url = fileURL() else { return }
try? FileManager.default.removeItem(at: url)
}
// refreshAccess refresh token accessPOST /api/auth/refresh
// app content-available / 使
// refresh#7 no-opCAS-before-clear
// 401 refresh
static func refreshAccess() async
{
guard let session = load() else { return }
var req = URLRequest(url: URL(string: CDropAPI.base + "/api/auth/refresh")!)
req.httpMethod = "POST"
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
req.httpBody = try? JSONSerialization.data(withJSONObject: [ "refresh_token": session.refreshToken ])
guard let (data, resp) = try? await URLSession.shared.data(for: req) else { return }
let code = (resp as? HTTPURLResponse)?.statusCode ?? 0
if code == 200,
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let access = obj["access_token"] as? String
{
let newRefresh = (obj["refresh_token"] as? String) ?? session.refreshToken
save(WidgetSession(accessToken: access, refreshToken: newRefresh, userId: session.userId))
}
else if code == 401, load()?.refreshToken == session.refreshToken
{
clear()
}
}
}
+36
View File
@@ -32,4 +32,40 @@ final class AppDelegate: NSObject, UIApplicationDelegate
{
// Push
}
// content-available apns/sender.go ~30s
// / access使 /
//
// #7
func application(
_ application: UIApplication,
didReceiveRemoteNotification userInfo: [AnyHashable: Any],
fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void
)
{
// session:revoked Keychain +
// UI / / Keychain
// NotificationCenter 401
// push.KindSessionRevoked Go
if (userInfo["type"] as? String) == "session:revoked"
{
AuthManager.clearPersistedSession()
WidgetSessionStore.clear()
NotificationCenter.default.post(name: .cdropSessionRevoked, object: nil)
completionHandler(.newData)
return
}
// content-available #7
Task
{
await WidgetSessionStore.refreshAccess()
completionHandler(.newData)
}
}
}
extension Notification.Name
{
// UI AppRoot.onReceive
static let cdropSessionRevoked = Notification.Name("cdrop.sessionRevoked")
}
+8
View File
@@ -195,6 +195,14 @@ final class AuthManager
Keychain.delete(service: Self.keychainService, account: Self.keychainAccount)
}
// AppDelegate live AuthManager
// logout() Keychain init
// .cdropSessionRevoked logout()
static func clearPersistedSession()
{
Keychain.delete(service: keychainService, account: keychainAccount)
}
// ---- Broker / / ----
private struct AuthConfig { let brokerURL: String; let brokerApp: String }
+16
View File
@@ -6,6 +6,7 @@ import SwiftUI
struct CDropApp: App
{
@UIApplicationDelegateAdaptor(AppDelegate.self) private var appDelegate
@Environment(\.scenePhase) private var scenePhase
@State private var auth = AuthManager()
@State private var engine = EngineController()
@@ -15,6 +16,15 @@ struct CDropApp: App
{
AppRoot(auth: auth, engine: engine)
}
.onChange(of: scenePhase)
{ _, phase in
// / ready
//
if phase == .active, auth.session != nil
{
engine.provisionWidgetSessionIfNeeded()
}
}
}
}
@@ -55,5 +65,11 @@ struct AppRoot: View
guard url.scheme == "cdrop", url.host == "share" else { return }
engine.loadPendingShares()
}
// AppDelegate +
.onReceive(NotificationCenter.default.publisher(for: .cdropSessionRevoked))
{ _ in
engine.reset()
auth.logout()
}
}
}
@@ -7,7 +7,7 @@ import WebKit
// Decodable JS WKWebView bool NSNumber
// / JSONDecoder
// web hub.ts handlePresence
struct DeviceItem: Identifiable, Equatable
struct DeviceItem: Identifiable, Equatable, Codable
{
// deviceID broker meta / /
// name deviceID presence name
@@ -166,6 +166,9 @@ final class EngineController: NSObject
// /
history = RecordsStore.load([TransferItem].self, "history") ?? []
messages = RecordsStore.load([MessageItem].self, "messages") ?? []
// presence / SSE
// SSE presence 线
devices = RecordsStore.load([DeviceItem].self, "devices") ?? []
}
// makeWebView WebView __CDROP_BOOT__device_type:"ios"
@@ -232,6 +235,7 @@ final class EngineController: NSObject
//
RecordsStore.clear("history")
RecordsStore.clear("messages")
RecordsStore.clear("devices")
status = t("ios.engine.disconnected")
deviceName = ""
PushRegistry.shared.reset()
@@ -431,9 +435,16 @@ final class EngineController: NSObject
func provisionWidgetSessionIfNeeded()
{
guard engineReady, WidgetSessionStore.load() == nil else { return }
let id = CDropAPI.widgetDeviceID()
let label = t("ios.control.sessionLabel", [ "name": currentDeviceName() ])
sendCommand("provisionWidgetSession", payload: [ "device_id": id, "device_name": label ])
// meta = device_id+ sub="widget" +
// tier=clipboard dev_widget device_id
// ClipboardClient#7
let id = selfDeviceID
guard !id.isEmpty else { return }
sendCommand("provisionWidgetSession", payload: [
"device_id": id,
"device_name": currentDeviceName(),
"sub": "widget",
])
}
// JSwindow.__cdropEngineEvent
@@ -629,6 +640,7 @@ extension EngineController: WKScriptMessageHandler
if let p = payload as? [String: Any], let raw = p["devices"] as? [Any]
{
devices = raw.compactMap { ($0 as? [String: Any]).flatMap(Self.parseDevice) }
RecordsStore.save(devices, "devices") // presence
}
case "transfers":
if let p = payload as? [String: Any], let raw = p["active"] as? [Any]