设备名与令牌解耦 + iOS Broker 应用内登录 / 消息 / 图库 / 记录持久化 + 三端 bug 修复

设备名与令牌解耦(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)
This commit is contained in:
2026-06-27 03:50:04 +08:00
parent 44096069a7
commit 127070e226
51 changed files with 1655 additions and 227 deletions
+182 -8
View File
@@ -9,16 +9,30 @@ import WebKit
// web hub.ts handlePresence
struct DeviceItem: Identifiable, Equatable
{
// deviceID broker meta / /
// name deviceID presence name
let deviceID: String
let name: String
let type: String
let online: Bool
let lastSeen: Double
var id: String { name }
var id: String { deviceID.isEmpty ? name : deviceID }
}
// web store MessageRecord RecordsStore
// app
struct MessageItem: Identifiable, Equatable, Codable
{
let id: String
let direction: String // incoming | outgoing
let peerName: String
let text: String
let sentAt: Double
}
// web engine/main.ts toWire ice*
// P2P TURN
struct TransferItem: Identifiable, Equatable
struct TransferItem: Identifiable, Equatable, Codable
{
let sessionId: String
let direction: String
@@ -52,6 +66,7 @@ final class EngineController: NSObject
var devices: [DeviceItem] = [] // 线 / 线 presence presence
var transfers: [TransferItem] = [] // transfers
var history: [TransferItem] = [] // transferDone 30
var messages: [MessageItem] = [] // message
// SSE / + presence +
// warn/error 401
@@ -80,9 +95,13 @@ final class EngineController: NSObject
return URL(string: "https://drop.commilitia.net/engine.html")!
}
// boot app AppRoot.onAppear
// boot EngineWebView.makeUIView boot #11
var auth: AuthManager?
// idbroker metapresence PATCH
// /api/devices/{device_id}
var selfDeviceID: String { auth?.session?.deviceId ?? "" }
private var webView: WKWebView?
private let downloads = DownloadManager()
@@ -90,10 +109,17 @@ final class EngineController: NSObject
// WKURLSchemeHandler
private var outgoing: [String: URL] = [:]
// /
private static let historyCap = 50
private static let messagesCap = 200
override init()
{
super.init()
PushRegistry.shared.engine = self
// /
history = RecordsStore.load([TransferItem].self, "history") ?? []
messages = RecordsStore.load([MessageItem].self, "messages") ?? []
}
// makeWebView WebView __CDROP_BOOT__device_type:"ios"
@@ -133,6 +159,8 @@ final class EngineController: NSObject
deviceName = currentDeviceName()
//
PushRegistry.shared.requestAuthorizationAndRegister()
// #5使 WKWebView WebRTC host
LocalNetworkPermission.trigger()
return wv
}
@@ -146,6 +174,10 @@ final class EngineController: NSObject
devices = []
transfers = []
history = []
messages = []
//
RecordsStore.clear("history")
RecordsStore.clear("messages")
status = t("ios.engine.disconnected")
deviceName = ""
PushRegistry.shared.reset()
@@ -157,6 +189,32 @@ final class EngineController: NSObject
CDropAPI.clearWidgetDeviceID()
}
// D/
func deleteTransferRecord(_ sessionId: String)
{
history.removeAll { $0.sessionId == sessionId }
RecordsStore.save(history, "history")
}
func clearHistory()
{
history.removeAll()
RecordsStore.clear("history")
}
// H/
func deleteMessage(_ id: String)
{
messages.removeAll { $0.id == id }
RecordsStore.save(messages, "messages")
}
func clearMessages()
{
messages.removeAll()
RecordsStore.clear("messages")
}
// Documents Files app /
func receivedFiles() -> [URL] { downloads.receivedFiles() }
func deleteReceivedFile(_ url: URL) { downloads.deleteReceivedFile(url) }
@@ -193,11 +251,44 @@ final class EngineController: NSObject
sendCommand("clipboardPull", payload: [:])
}
// /
func revokeDevice(_ name: String)
// / device_idDELETE /api/devices/{device_id}
// #2
func revokeDevice(_ deviceID: String)
{
deviceActionStatus = ""
sendCommand("revokeDevice", payload: [ "name": name ])
sendCommand("revokeDevice", payload: [ "device_id": deviceID ])
}
// O CANCELLED transfers / transferDone
func cancelTransfer(_ sessionId: String)
{
sendCommand("cancelTransfer", payload: [ "sessionId": sessionId ])
}
// O ICE relay /
func switchToRelay(_ sessionId: String)
{
sendCommand("switchToRelay", payload: [ "sessionId": sessionId ])
}
// { to=, text } POST /api/message
// store.addMessage message outgoing
func sendMessage(to peerName: String, text: String)
{
let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty, !peerName.isEmpty else { return }
sendCommand("sendMessage", payload: [ "to": peerName, "text": trimmed ])
}
// { device_id=, name } PATCH /api/devices/
// {device_id} token "renamed"
// + Keychain handleNotify device_id
func renameSelf(to name: String)
{
let id = selfDeviceID
let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
guard !id.isEmpty, !trimmed.isEmpty else { return }
sendCommand("renameSelf", payload: [ "device_id": id, "name": trimmed ])
}
// APNs PushRegistry.didRegisterready
@@ -282,6 +373,20 @@ final class EngineController: NSObject
pendingShareFiles = []
}
// #14PhotosPicker PhotosPickerItem loadTransferable
// cdrop-file scheme Range
// URL temporaryDirectory nil
func stagePhotoData(_ data: Data, suggestedName: String) -> URL?
{
let dir = FileManager.default.temporaryDirectory
.appendingPathComponent("PhotoOutbox/\(UUID().uuidString)", isDirectory: true)
try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
let name = suggestedName.isEmpty ? "photo.jpg" : suggestedName
let dest = dir.appendingPathComponent(name)
do { try data.write(to: dest); return dest }
catch { return nil }
}
// cdrop-file://<id> URL
// start...Access
private func stageOutgoingFile(_ url: URL) -> String
@@ -291,6 +396,24 @@ final class EngineController: NSObject
outgoing[id] = url
return "cdrop-file://\(id)"
}
// [start,end) seek base64 bridgeFileSource
// url cdrop-file://<id>id stageOutgoingFile /
fileprivate func readOutgoingSlice(url: String, start: Int, end: Int) throws -> String
{
guard let id = URL(string: url)?.host, let fileURL = outgoing[id]
else
{
throw NSError(domain: "cdrop.engine", code: 404,
userInfo: [NSLocalizedDescriptionKey: "no staged file: \(url)"])
}
let handle = try FileHandle(forReadingFrom: fileURL)
defer { try? handle.close() }
try handle.seek(toOffset: UInt64(max(0, start)))
let count = max(0, end - start)
let data = (try handle.read(upToCount: count)) ?? Data()
return data.base64EncodedString()
}
}
// MARK: - JS RPC +
@@ -337,6 +460,12 @@ extension EngineController: WKScriptMessageHandler
case "abortDownload":
downloads.abort(sessionId: payload["sessionId"] as? String ?? "")
resolve(id: id, ok: true, value: nil)
case "readFileSlice":
// seek [start,end) base64 bridgeFileSource
let b64 = try readOutgoingSlice(url: payload["url"] as? String ?? "",
start: Self.intOf(payload["start"]),
end: Self.intOf(payload["end"]))
resolve(id: id, ok: true, value: b64)
default:
resolve(id: id, ok: false, value: "unknown method: \(method)")
}
@@ -380,6 +509,21 @@ extension EngineController: WKScriptMessageHandler
transfers = raw.compactMap { ($0 as? [String: Any]).flatMap(Self.parseTransfer) }
syncBackgroundTask()
}
case "message":
// + + +
//
if let p = payload as? [String: Any],
let m = p["message"] as? [String: Any],
let item = Self.parseMessage(m)
{
messages.removeAll { $0.id == item.id }
messages.insert(item, at: 0)
if messages.count > Self.messagesCap
{
messages.removeLast(messages.count - Self.messagesCap)
}
RecordsStore.save(messages, "messages")
}
case "transferDone":
// sessionId
if let p = payload as? [String: Any], let item = Self.parseTransfer(p)
@@ -387,8 +531,9 @@ extension EngineController: WKScriptMessageHandler
transfers.removeAll { $0.sessionId == item.sessionId }
history.removeAll { $0.sessionId == item.sessionId }
history.insert(item, at: 0)
if history.count > 30 { history.removeLast(history.count - 30) }
if history.count > Self.historyCap { history.removeLast(history.count - Self.historyCap) }
syncBackgroundTask()
RecordsStore.save(history, "history") //
}
case "sendStarted":
// transfers
@@ -420,6 +565,23 @@ extension EngineController: WKScriptMessageHandler
clipboardStatus = t("ios.clipboard.uploaded")
case "deviceRevoked":
deviceActionStatus = t("ios.devices.revoked")
case "identityUpdated":
// /api/me QR UUID + Keychain
// UUID#12
if let p = payload as? [String: Any], let name = p["name"] as? String, !name.isEmpty
{
auth?.updateIdentity(name: name, avatar: p["avatar"] as? String)
}
case "renamed":
// PATCH /api/devices/{device_id} + 广 presence
// Keychain 使 boot
if let p = payload as? [String: Any], let name = p["name"] as? String, !name.isEmpty
{
DeviceNameStore.value = name
auth?.updateDeviceName(name)
deviceName = name
deviceActionStatus = t("ios.settings.deviceName.success")
}
case "error":
// error /
if let p = payload as? [String: Any]
@@ -580,12 +742,24 @@ extension EngineController
static func parseDevice(_ d: [String: Any]) -> DeviceItem?
{
guard let name = d["name"] as? String, let type = d["type"] as? String else { return nil }
return DeviceItem(name: name,
// web store DeviceInfocamelCasedeviceId / lastSeen
return DeviceItem(deviceID: d["deviceId"] as? String ?? "",
name: name,
type: type,
online: boolOf(d["online"]),
lastSeen: doubleOf(d["lastSeen"]))
}
static func parseMessage(_ m: [String: Any]) -> MessageItem?
{
guard let id = m["id"] as? String, let text = m["text"] as? String else { return nil }
return MessageItem(id: id,
direction: m["direction"] as? String ?? "incoming",
peerName: m["peerName"] as? String ?? "",
text: text,
sentAt: doubleOf(m["sentAt"]))
}
static func parseTransfer(_ t: [String: Any]) -> TransferItem?
{
guard let sessionId = t["sessionId"] as? String else { return nil }