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:
@@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"commilitia.net/cdrop/internal/apns"
|
||||
"commilitia.net/cdrop/internal/db"
|
||||
"commilitia.net/cdrop/internal/hub"
|
||||
"commilitia.net/cdrop/internal/push"
|
||||
@@ -49,12 +50,13 @@ type Service struct {
|
||||
hub *hub.Hub
|
||||
relay RelayController
|
||||
push *push.Sender // inert when Web Push is unconfigured; nil-safe
|
||||
apns *apns.Sender // inert when APNs is unconfigured; nil-safe
|
||||
|
||||
now func() time.Time
|
||||
newID func() string
|
||||
}
|
||||
|
||||
func NewService(queries *db.Queries, h *hub.Hub, r RelayController, pushSender *push.Sender) *Service {
|
||||
func NewService(queries *db.Queries, h *hub.Hub, r RelayController, pushSender *push.Sender, apnsSender *apns.Sender) *Service {
|
||||
if r == nil {
|
||||
r = nopRelay{}
|
||||
}
|
||||
@@ -63,6 +65,7 @@ func NewService(queries *db.Queries, h *hub.Hub, r RelayController, pushSender *
|
||||
hub: h,
|
||||
relay: r,
|
||||
push: pushSender,
|
||||
apns: apnsSender,
|
||||
now: time.Now,
|
||||
newID: defaultNewID,
|
||||
}
|
||||
@@ -142,13 +145,21 @@ func (s *Service) Init(ctx context.Context, p InitParams) (string, error) {
|
||||
},
|
||||
})
|
||||
// Receiver's page is closed → no SSE → raise a system notification instead.
|
||||
if !delivered && s.push.Enabled() {
|
||||
go s.push.Notify(context.Background(), p.UserID, p.ReceiverName, push.Notification{
|
||||
// Both Web Push (browser/PWA) and APNs (iOS) are attempted; each sender
|
||||
// only fires for its own platform rows, so firing both is always correct.
|
||||
if !delivered {
|
||||
n := push.Notification{
|
||||
Type: push.KindTransferIncoming,
|
||||
Params: map[string]string{"sender": p.SenderName, "filename": p.FileName},
|
||||
Tag: "transfer:" + id,
|
||||
URL: "/",
|
||||
})
|
||||
}
|
||||
if s.push.Enabled() {
|
||||
go s.push.Notify(context.Background(), p.UserID, p.ReceiverName, n)
|
||||
}
|
||||
if s.apns.Enabled() {
|
||||
go s.apns.Notify(context.Background(), p.UserID, p.ReceiverName, n)
|
||||
}
|
||||
}
|
||||
|
||||
return id, nil
|
||||
@@ -219,7 +230,9 @@ func (s *Service) Transition(
|
||||
deliveredReceiver := s.hub.SendTo(userID, sess.ReceiverName, stateEv)
|
||||
|
||||
// Terminal completion/failure → notify any party whose page has closed.
|
||||
if s.push.Enabled() && (target == StateDone || target == StateFailed) {
|
||||
// Both Web Push and APNs are attempted; disjoint platform rows mean
|
||||
// firing both is always correct — each sender no-ops for the other's rows.
|
||||
if (target == StateDone || target == StateFailed) && (s.push.Enabled() || s.apns.Enabled()) {
|
||||
kind := push.KindTransferDone
|
||||
if target == StateFailed {
|
||||
kind = push.KindTransferFailed
|
||||
@@ -230,10 +243,20 @@ func (s *Service) Transition(
|
||||
Tag: "transfer:" + sessionID,
|
||||
}
|
||||
if !deliveredSender {
|
||||
go s.push.Notify(context.Background(), userID, sess.SenderName, n)
|
||||
if s.push.Enabled() {
|
||||
go s.push.Notify(context.Background(), userID, sess.SenderName, n)
|
||||
}
|
||||
if s.apns.Enabled() {
|
||||
go s.apns.Notify(context.Background(), userID, sess.SenderName, n)
|
||||
}
|
||||
}
|
||||
if !deliveredReceiver {
|
||||
go s.push.Notify(context.Background(), userID, sess.ReceiverName, n)
|
||||
if s.push.Enabled() {
|
||||
go s.push.Notify(context.Background(), userID, sess.ReceiverName, n)
|
||||
}
|
||||
if s.apns.Enabled() {
|
||||
go s.apns.Notify(context.Background(), userID, sess.ReceiverName, n)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ func newTestService(t *testing.T) *Service {
|
||||
q := openTestDB(t)
|
||||
h := newTestHub()
|
||||
t.Cleanup(h.Close)
|
||||
return NewService(q, h, nil, nil)
|
||||
return NewService(q, h, nil, nil, nil)
|
||||
}
|
||||
|
||||
// fakeRelay records Register/Release calls and can be primed to fail Register,
|
||||
@@ -78,7 +78,7 @@ func newTestServiceWithRelay(t *testing.T, r RelayController) *Service {
|
||||
q := openTestDB(t)
|
||||
h := newTestHub()
|
||||
t.Cleanup(h.Close)
|
||||
return NewService(q, h, r, nil)
|
||||
return NewService(q, h, r, nil, nil)
|
||||
}
|
||||
|
||||
func TestInit_AllowsZeroByteFile(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user