原生 macOS 引擎 + Broker 登录接通(Phase 3a)

- 引擎 / 鉴权跨平台 in-place(iOS 路径 #if 守卫、逐字不变,仅加 macOS/AppKit 分支):EngineController(import 守卫 + 剪贴板 UIPasteboard→NSPasteboard 上下行两处 + device_type 平台条件)、EngineWebView(UIViewRepresentable→typealias 统一后分 NSViewRepresentable)、Theme(动态色 Color(nsColor:dynamicProvider) 同 RGB)、DeviceNameStore(Host.current().localizedName)、PushRegistry(NSApplication.registerForRemoteNotifications)、Auth/BrokerLogin(presentationAnchor→NSApplication.keyWindow)、Auth/AuthManager(死 import UIKit 守卫)
- BackgroundTaskManager:整文件 #if os(iOS)(BGContinuedProcessingTask 为 API_UNAVAILABLE(macos)、编译级拒绝)+ macOS 同签名 no-op stub,使 EngineController.syncBackgroundTask 调用点无须改动
- device_type 修正(非机械):Mac 原生客户端 boot 注入 device_type=macos(与桌面 Wails 客户端一致,后端 / 各端已识别),不再硬编 ios——否则其他端设备列表图标错、且触发其 isWakeable 的 contains("ios") 误判本 Mac 可推送唤醒
- CommilitiaDropMac target 纳入「引擎 + 登录」最小集:Shared + Sources/Engine + Sources/Auth(除 iOS 专属 LoginView)+ RecordsStore / PushRegistry / LocalNetworkPermission / DeviceNameStore / BackgroundTaskManager + Resources/i18n;依赖 WebRTC;Info.plist 加 cdrop:// 回调 scheme(ASWebAuthenticationSession OAuth 回调)+ 本地网络(NSLocalNetworkUsageDescription / NSBonjourServices _cdrop._tcp)
- Mac 壳接引擎:CommilitiaDropMacApp(@State auth + engine,MacAppRoot 登录门 + 会话激活分桶记录)、MacLoginView(Broker 账户登录,免相机)、MacRootView(背景挂离屏引擎 WebView 保活 + 设备真实 presence 列表 + 设置账号/登出/引擎日志)、MacMenuContent(账号 + 在线设备数)。传输/文件/消息详情暂占位,随 Phase 3b 复用 iOS 视图
- 验证:just mac-build(CommilitiaDropMac.app)+ iOS 模拟器(CommilitiaDrop.app)均 BUILD SUCCEEDED。运行期登录 / 引擎联通待真机自测(Broker OAuth 需账号交互)
This commit is contained in:
2026-07-07 22:22:30 +08:00
parent 9d46e26f50
commit 512d7563ee
14 changed files with 378 additions and 20 deletions
+46 -6
View File
@@ -1,18 +1,21 @@
#if os(macOS)
import SwiftUI
// macOS + MacRootView iOS
// + LibWebRtcEngine + WebView
// / / iOS CDropApp
// macOS + MacRootView iOS iOS
// EngineController WKWebView JS + libwebrtc AuthManagerBroker
// WebView MacRootView iOS CDropApp
// / /
@main
struct CommilitiaDropMacApp: App
{
@State private var auth = AuthManager()
@State private var engine = EngineController()
var body: some Scene
{
//
Window("Commilitia Drop", id: "main")
{
MacRootView()
MacAppRoot(auth: auth, engine: engine)
.frame(minWidth: 820, minHeight: 560)
}
.defaultLaunchBehavior(.presented)
@@ -23,10 +26,11 @@ struct CommilitiaDropMacApp: App
CommandGroup(replacing: .newItem) {}
}
// + / Quick Send
MenuBarExtra
{
MacMenuContent()
.environment(engine)
.environment(auth)
}
label:
{
@@ -35,4 +39,40 @@ struct CommilitiaDropMacApp: App
.menuBarExtraStyle(.window)
}
}
// MacRootView WebView Broker
// iOS AppRootCDropApp auth userId
struct MacAppRoot: View
{
let auth: AuthManager
let engine: EngineController
var body: some View
{
Group
{
if auth.session != nil
{
MacRootView()
.environment(engine)
.environment(auth)
}
else
{
MacLoginView()
.environment(auth)
}
}
.onAppear
{
engine.auth = auth
// userId reset
if let uid = auth.session?.user.id { engine.activateRecords(userId: uid) }
}
.onChange(of: auth.session?.user.id)
{ _, uid in
if let uid { engine.activateRecords(userId: uid) }
}
}
}
#endif