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)
165 lines
6.1 KiB
Swift
165 lines
6.1 KiB
Swift
import SwiftUI
|
||
|
||
// 设备间文本消息(#13):聊天式列表 + 底部撰写栏。消息由引擎经桥推来(in-memory,关 app 即清,
|
||
// 对齐 web 语义),收发都经 POST /api/message(hub SendTo 实时转发;对端离线则后端发推送)。
|
||
// 可发给任意非本机设备(在线即时达、离线走推送),故目标取全部非本机设备而非仅在线。
|
||
struct MessagesView: View
|
||
{
|
||
@Environment(EngineController.self) private var engine
|
||
@State private var draft = ""
|
||
@State private var target = ""
|
||
@State private var showClearConfirm = false
|
||
|
||
// 可发消息的目标:全部非本机设备(按 device_id 判本机,与设备名解耦)。
|
||
private var targets: [DeviceItem]
|
||
{
|
||
let selfID = engine.selfDeviceID
|
||
return engine.devices.filter
|
||
{ d in
|
||
if !selfID.isEmpty, !d.deviceID.isEmpty { return d.deviceID != selfID }
|
||
return d.name != engine.deviceName
|
||
}
|
||
}
|
||
|
||
// store 是最新在前;聊天式从上到下需旧→新。
|
||
private var ordered: [MessageItem] { engine.messages.reversed() }
|
||
|
||
var body: some View
|
||
{
|
||
VStack(spacing: 0)
|
||
{
|
||
if engine.messages.isEmpty
|
||
{
|
||
ContentUnavailableView(t("ios.messages.empty"), systemImage: "message")
|
||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||
}
|
||
else
|
||
{
|
||
ScrollViewReader
|
||
{ proxy in
|
||
ScrollView
|
||
{
|
||
LazyVStack(alignment: .leading, spacing: 10)
|
||
{
|
||
ForEach(ordered)
|
||
{ msg in
|
||
messageRow(msg)
|
||
.id(msg.id)
|
||
.contextMenu
|
||
{
|
||
Button(role: .destructive) { engine.deleteMessage(msg.id) }
|
||
label: { Label(t("transfer.action.delete"), systemImage: "trash") }
|
||
}
|
||
}
|
||
}
|
||
.padding()
|
||
}
|
||
.onChange(of: engine.messages.count) { scrollToLast(proxy) }
|
||
.onAppear { scrollToLast(proxy) }
|
||
}
|
||
}
|
||
composeBar
|
||
}
|
||
.navigationTitle(t("ios.tab.messages"))
|
||
.toolbar
|
||
{
|
||
if !engine.messages.isEmpty
|
||
{
|
||
ToolbarItem(placement: .topBarTrailing)
|
||
{
|
||
Button(role: .destructive) { showClearConfirm = true }
|
||
label: { Label(t("ios.records.clear"), systemImage: "trash") }
|
||
}
|
||
}
|
||
}
|
||
.confirmationDialog(t("ios.records.clearConfirm"), isPresented: $showClearConfirm, titleVisibility: .visible)
|
||
{
|
||
Button(t("ios.records.clear"), role: .destructive) { engine.clearMessages() }
|
||
Button(t("common.cancel"), role: .cancel) { }
|
||
}
|
||
.onAppear { if target.isEmpty { target = targets.first?.name ?? "" } }
|
||
}
|
||
|
||
private func scrollToLast(_ proxy: ScrollViewProxy)
|
||
{
|
||
guard let last = ordered.last else { return }
|
||
withAnimation { proxy.scrollTo(last.id, anchor: .bottom) }
|
||
}
|
||
|
||
private func messageRow(_ msg: MessageItem) -> some View
|
||
{
|
||
let outgoing = msg.direction == "outgoing"
|
||
return HStack
|
||
{
|
||
if outgoing { Spacer(minLength: 48) }
|
||
VStack(alignment: outgoing ? .trailing : .leading, spacing: 2)
|
||
{
|
||
Text(msg.peerName)
|
||
.font(.caption2)
|
||
.foregroundStyle(.secondary)
|
||
Text(msg.text)
|
||
.padding(.horizontal, 12)
|
||
.padding(.vertical, 8)
|
||
.background(outgoing ? Color.cdropAccent.opacity(0.18) : Color(.secondarySystemBackground),
|
||
in: RoundedRectangle(cornerRadius: 14))
|
||
.textSelection(.enabled)
|
||
}
|
||
if !outgoing { Spacer(minLength: 48) }
|
||
}
|
||
.frame(maxWidth: .infinity, alignment: outgoing ? .trailing : .leading)
|
||
}
|
||
|
||
@ViewBuilder
|
||
private var composeBar: some View
|
||
{
|
||
VStack(spacing: 6)
|
||
{
|
||
if targets.isEmpty
|
||
{
|
||
Text(t("ios.messages.noPeers"))
|
||
.font(.caption)
|
||
.foregroundStyle(.secondary)
|
||
.frame(maxWidth: .infinity, alignment: .leading)
|
||
}
|
||
else
|
||
{
|
||
HStack(spacing: 10)
|
||
{
|
||
Menu
|
||
{
|
||
ForEach(targets)
|
||
{ dev in
|
||
Button(dev.name) { target = dev.name }
|
||
}
|
||
}
|
||
label:
|
||
{
|
||
Label(target.isEmpty ? t("ios.send.pickDevice") : target,
|
||
systemImage: "chevron.up.chevron.down")
|
||
.font(.caption)
|
||
.lineLimit(1)
|
||
}
|
||
TextField(t("ios.messages.placeholder"), text: $draft, axis: .vertical)
|
||
.textFieldStyle(.roundedBorder)
|
||
.lineLimit(1...4)
|
||
.submitLabel(.send)
|
||
.onSubmit { send() }
|
||
Button { send() }
|
||
label: { Image(systemName: "paperplane.fill").font(.title3) }
|
||
.disabled(draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || target.isEmpty)
|
||
}
|
||
}
|
||
}
|
||
.padding()
|
||
.background(.bar)
|
||
}
|
||
|
||
private func send()
|
||
{
|
||
let text = draft.trimmingCharacters(in: .whitespacesAndNewlines)
|
||
guard !text.isEmpty, !target.isEmpty else { return }
|
||
engine.sendMessage(to: target, text: text)
|
||
draft = ""
|
||
}
|
||
}
|