iOS 计划完成:流式发送 / 后台续传 / APNs / Share Extension / 控制中心控件 + 真机分发预备
- 发送端流式(R-iOS-4):新增 FileSource 抽象(web/src/features/transfer/source.ts),iOS 经 HTTP Range 惰性拉取(原生 WKURLSchemeHandler 认 Range 头 seek 回 206),整文件不进 WebView 内存;web/桌面经 fileSource 包装字节不变。p2p/relay/transfer 改吃 FileSource - 后台续传:iOS 26 BGContinuedProcessingTask(BackgroundTaskManager + AppDelegate 注册 + BGTaskSchedulerPermittedIdentifiers),引擎传输进度驱动系统进度 UI - APNs:后端 internal/apns(ES256 .p8 JWT + HTTP/2,仿 internal/push)+ push_subscriptions.platform 列 + POST /api/push/apns/register + transfer/message 未投递分支分流;原生 PushRegistry 授权 + 设备令牌经引擎桥 registerPush 上报;aps-environment + remote-notification 后台模式 - Share Extension:CDropShare appex 抓文件 → App Group 收件箱 → cdrop://share 深链唤主程序选设备发送(只交接、不跑引擎) - 控制中心剪贴板两控件:CDropWidgets widgetkit appex(ControlWidget + AppIntent + 纯原生 ClipboardClient REST);用专用 broker 设备会话(主程序经引擎 provisionWidgetSession 代铸独立 device_id 会话存 App Group,控件自刷不与引擎抢 refresh 轮换) - 真机分发预备:committed 签名改 ad-hoc 使模拟器 entitlement 生效;真机手动签名 scaffold(Signing.xcconfig 仅 device SDK 套 Manual + gitignore 的 Local.xcconfig 填 Team/profile)+ just ios-device / ios-devices 全 CLI 装机;包名改 net.commilitia.Commilitia-Drop(含 .share/.widgets,BG task 前缀同改);REALDEVICE.md 重写为门户 + CLI 装机手册 - I18n.swift 移 Shared/ 供三 target 共用;i18n 加 ios.bg/share/control.* 键 - ultracode 多 agent 审查修复(0 HIGH,2 MED + 7 LOW):分享 send 后留收件箱致重发→move 私有暂存;WidgetSession 锁屏文件保护→UntilFirstUserAuthentication;outgoing/安全作用域登出释放;控件 device_id 登出清理;并发控件 refresh CAS-before-clear;APNs 读 reason + prune bad token + bust 过期 JWT;APNSEnv 大小写归一;Share-ext completeRequest 挪进 open 回调
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<!-- 与主 app 共享的 App Group:控件读取 widget_session.json(主 app 代铸的控件会话)。 -->
|
||||
<key>com.apple.security.application-groups</key>
|
||||
<array>
|
||||
<string>group.net.commilitia.cdrop</string>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,89 @@
|
||||
import Foundation
|
||||
|
||||
// 控制中心控件用的原生剪贴板客户端:用控件专用设备会话(WidgetSessionStore)直连
|
||||
// /api/clipboard 读写,access 过期(401)即调 /api/auth/refresh 自刷并写回。控件在独立进程
|
||||
// 运行、不开主 app,故不能复用引擎桥——这里走纯原生 REST(PLAN §I4)。独立会话使自刷不与
|
||||
// 引擎抢 refresh 轮换。
|
||||
enum ClipboardClient
|
||||
{
|
||||
enum ClientError: Error { case noSession, http(Int) }
|
||||
|
||||
// 上传本机剪贴板文本到云剪贴板(PUT /api/clipboard)。
|
||||
static func upload(_ text: String) async throws
|
||||
{
|
||||
let body = try JSONSerialization.data(withJSONObject: [
|
||||
"content": text,
|
||||
"content_type": "text/plain",
|
||||
"origin_ts": Int(Date().timeIntervalSince1970 * 1000),
|
||||
])
|
||||
_ = try await authed(method: "PUT", path: "/api/clipboard", body: body)
|
||||
}
|
||||
|
||||
// 拉取云剪贴板文本(GET /api/clipboard)。
|
||||
static func pull() async throws -> String
|
||||
{
|
||||
let data = try await authed(method: "GET", path: "/api/clipboard", body: nil)
|
||||
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
|
||||
return (obj?["content"] as? String) ?? ""
|
||||
}
|
||||
|
||||
// 带鉴权 + 401 自刷重试一次的请求。
|
||||
private static func authed(method: String, path: String, body: Data?) async throws -> Data
|
||||
{
|
||||
guard var session = WidgetSessionStore.load() else { throw ClientError.noSession }
|
||||
do
|
||||
{
|
||||
return try await send(method: method, path: path, body: body, token: session.accessToken)
|
||||
}
|
||||
catch ClientError.http(401)
|
||||
{
|
||||
session = try await refresh(session)
|
||||
WidgetSessionStore.save(session)
|
||||
return try await send(method: method, path: path, body: body, token: session.accessToken)
|
||||
}
|
||||
}
|
||||
|
||||
private static func send(method: String, path: String, body: Data?, token: String) async throws -> Data
|
||||
{
|
||||
var req = URLRequest(url: URL(string: CDropAPI.base + path)!)
|
||||
req.httpMethod = method
|
||||
req.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
|
||||
if let body
|
||||
{
|
||||
req.httpBody = body
|
||||
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
||||
}
|
||||
let (data, resp) = try await URLSession.shared.data(for: req)
|
||||
let code = (resp as? HTTPURLResponse)?.statusCode ?? 0
|
||||
// 200 与 409(PUT 时云端有更新的 LWW 冲突)都算成功;其余抛对应码(401 触发自刷)。
|
||||
guard code == 200 || code == 409 else { throw ClientError.http(code) }
|
||||
return data
|
||||
}
|
||||
|
||||
private static func refresh(_ session: WidgetSession) async throws -> WidgetSession
|
||||
{
|
||||
let body = try JSONSerialization.data(withJSONObject: [ "refresh_token": session.refreshToken ])
|
||||
var req = URLRequest(url: URL(string: CDropAPI.base + "/api/auth/refresh")!)
|
||||
req.httpMethod = "POST"
|
||||
req.httpBody = body
|
||||
req.setValue("application/json", forHTTPHeaderField: "Content-Type")
|
||||
let (data, resp) = try await URLSession.shared.data(for: req)
|
||||
let code = (resp as? HTTPURLResponse)?.statusCode ?? 0
|
||||
guard code == 200,
|
||||
let obj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
|
||||
let access = obj["access_token"] as? String
|
||||
else
|
||||
{
|
||||
// 刷新被拒(refresh 过期 / 吊销)→ 清掉控件会话,待主 app 下次启动重铸。
|
||||
// CAS-before-clear:仅当磁盘上的 refresh 仍是本次所用那条时才清——否则说明另一个并发
|
||||
// 控件 intent 已轮换出新会话,别把它刚写入的新令牌误删(审查 L3)。
|
||||
if WidgetSessionStore.load()?.refreshToken == session.refreshToken
|
||||
{
|
||||
WidgetSessionStore.clear()
|
||||
}
|
||||
throw ClientError.http(401)
|
||||
}
|
||||
let newRefresh = (obj["refresh_token"] as? String) ?? session.refreshToken
|
||||
return WidgetSession(accessToken: access, refreshToken: newRefresh, userId: session.userId)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
import AppIntents
|
||||
import SwiftUI
|
||||
import WidgetKit
|
||||
|
||||
// 控制中心两控件(iOS 18+ ControlWidget,PLAN 决策 C / §I4):上传 / 拉取云剪贴板,零推送、
|
||||
// 用户主动触发。控件标签经 t() 跟随设备语言(i18n 单一真源,随扩展 bundle 一并打包)。
|
||||
@main
|
||||
struct CDropWidgetBundle: WidgetBundle
|
||||
{
|
||||
var body: some Widget
|
||||
{
|
||||
UploadClipboardControl()
|
||||
PullClipboardControl()
|
||||
}
|
||||
}
|
||||
|
||||
struct UploadClipboardControl: ControlWidget
|
||||
{
|
||||
var body: some ControlWidgetConfiguration
|
||||
{
|
||||
StaticControlConfiguration(kind: "net.commilitia.cdrop.control.upload")
|
||||
{
|
||||
ControlWidgetButton(action: UploadClipboardIntent())
|
||||
{
|
||||
Label(t("ios.control.upload"), systemImage: "square.and.arrow.up")
|
||||
}
|
||||
}
|
||||
.displayName("上传剪贴板")
|
||||
}
|
||||
}
|
||||
|
||||
struct PullClipboardControl: ControlWidget
|
||||
{
|
||||
var body: some ControlWidgetConfiguration
|
||||
{
|
||||
StaticControlConfiguration(kind: "net.commilitia.cdrop.control.pull")
|
||||
{
|
||||
ControlWidgetButton(action: PullClipboardIntent())
|
||||
{
|
||||
Label(t("ios.control.pull"), systemImage: "square.and.arrow.down")
|
||||
}
|
||||
}
|
||||
.displayName("拉取剪贴板")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
import AppIntents
|
||||
import UIKit
|
||||
|
||||
// 「上传剪贴板」控件动作:读本机剪贴板文本,经控件专用会话推到云剪贴板。
|
||||
struct UploadClipboardIntent: AppIntent
|
||||
{
|
||||
static var title: LocalizedStringResource = "上传剪贴板"
|
||||
static var description = IntentDescription("把本机剪贴板内容上传到 Commilitia Drop 云剪贴板")
|
||||
|
||||
func perform() async throws -> some IntentResult
|
||||
{
|
||||
let text = await MainActor.run { UIPasteboard.general.string ?? "" }
|
||||
if !text.isEmpty { try? await ClipboardClient.upload(text) }
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
|
||||
// 「拉取剪贴板」控件动作:拉云剪贴板内容写入本机剪贴板。
|
||||
struct PullClipboardIntent: AppIntent
|
||||
{
|
||||
static var title: LocalizedStringResource = "拉取剪贴板"
|
||||
static var description = IntentDescription("把 Commilitia Drop 云剪贴板内容写入本机剪贴板")
|
||||
|
||||
func perform() async throws -> some IntentResult
|
||||
{
|
||||
if let text = try? await ClipboardClient.pull(), !text.isEmpty
|
||||
{
|
||||
await MainActor.run { UIPasteboard.general.string = text }
|
||||
}
|
||||
return .result()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Commilitia Drop</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>$(PRODUCT_NAME)</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>XPC!</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1</string>
|
||||
<key>NSExtension</key>
|
||||
<dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.widgetkit-extension</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
Reference in New Issue
Block a user