feat(client/ios): 实时统计+urltest 延迟与 macOS 对齐 + 修 pbxproj UUID 冲突
把 macOS 已验证的统计架构移植到 iOS,补齐连接页延迟(此前 iOS 同 macOS 根因:扩展没注入
clash_api + app 单 client Status+Group → urltest 恒空):
- 扩展 PacketTunnelProvider:加 injectClashApi(clash_api+cache_file)+ 进程内 StatsCollector
(libbox 取速率 + clash /proxies、/group/delay 取 urltest);handleAppMessage 增 action="stats"。
- app StatsClient:改为每秒 sendProviderMessage("stats") 拉取 → VpnStatsStreamHandler 推送,
去掉直连 socket 的单 client Status+Group 坏写法。
修两处编译阻断(框架补齐后才暴露,此前 iOS 从未编译到这步):
- pbxproj 致命 bug:StatsClient.swift 与 PacketTunnelProvider.swift 复用同一 UUID
(...0002...AA/AB),Xcode 无法区分 → 文件错配 target、全模块 cannot-find 级联。
PacketTunnelProvider.swift 改用独立 ...0007... ID。
- tunFd 的 CTLIOCGINFO 单行 | 链拆成子表达式,避免 Swift 类型检查器超时。
前置:scripts/build-libbox.sh apple ios 生成 client/ios/Frameworks/Libbox.xcframework(gitignore)。
Dart 侧无需改(iOS 同走 VpnNativeBridge,本轮 macOS 的广播流/_onStats 回退/连接态跳直连实测已共享)。
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -1,108 +1,47 @@
|
||||
// StatsClient.swift — 主 App 侧实时统计生产者
|
||||
// StatsClient.swift — 主 App 侧实时统计消费者(iOS)
|
||||
//
|
||||
// iOS 的隧道跑在独立的 PacketTunnel 扩展进程里,扩展已 LibboxSetup 到 App Group 容器
|
||||
// 并起了 LibboxCommandServer。要拿实时上/下行 + 延迟,主 App 用 LibboxCommandClient
|
||||
// 连接「同一个 group 容器路径」下的 CommandServer socket,订阅 status/group 命令——
|
||||
// 对齐 sing-box-for-apple(SFI) 与 Android 的 StatsHandler 模型。
|
||||
// 隧道跑在 PacketTunnel 扩展进程里;扩展用 StatsCollector 采集上/下行(libbox command.sock)
|
||||
// + urltest 延迟(注入的 clash API)并缓存最新 JSON。主 App 经
|
||||
// NETunnelProviderSession.sendProviderMessage(action="stats")每秒拉一次,解析后推到
|
||||
// pangolin/vpn/stats EventChannel——与 macOS 同架构(扩展产出、app 经 NE 跨进程拉取)。
|
||||
//
|
||||
// CommandServer 会按 statusInterval 自动向已连接的 client 广播 box 统计;client 的
|
||||
// writeStatus/writeGroups 回调拿到数据后映射成 pangolin/vpn/stats 契约字典
|
||||
// (见 lib/bridge/vpn_bridge.dart),经 VpnStatsStreamHandler 推到 Dart 侧。
|
||||
// 之前的做法(主 App 用 LibboxCommandClient 直连共享容器 socket)有两个坑:① 单 client 同时
|
||||
// 订 Status+Group → Group 永不回调(libbox 一连接一命令);② 配置无 clash_api → 内核不暴露
|
||||
// urltest。改走扩展 StatsCollector + sendProviderMessage 后两坑同解,与 macOS 一致。
|
||||
//
|
||||
// 生命周期:VPN 进入 connected → start();断开/失效 → stop()。由 VpnManager 驱动。
|
||||
|
||||
import Foundation
|
||||
import Libbox
|
||||
|
||||
/// 把 LibboxCommandClient 的实时回调映射成 stats 契约字典并推到 EventChannel。
|
||||
final class StatsClient: NSObject {
|
||||
|
||||
static let shared = StatsClient()
|
||||
|
||||
// iOS App Group:必须与 PacketTunnelProvider 的 setup 路径一致。
|
||||
private let appGroup = "group.com.pangolin.pangolinVpn"
|
||||
|
||||
private let queue = DispatchQueue(label: "pangolin.stats.client")
|
||||
private var client: LibboxCommandClient?
|
||||
private var started = false
|
||||
// libbox 全局 setup 每进程一次即可。
|
||||
private static var didSetup = false
|
||||
|
||||
/// 缓存最近一次 writeGroups 解析出的 urltest 延迟(tag → delayMs),
|
||||
/// 在 writeStatus 时一并打包(对齐 Android:status 与 group 是两个命令流)。
|
||||
private var latestUrltest: [(tag: String, delayMs: Int)] = []
|
||||
|
||||
/// writeGroups 捕获的出口组 tag(如 urltest 的 "auto"),用于主动触发延迟探测。
|
||||
private var groupTags: [String] = []
|
||||
/// 周期主动 urltest:sing-box urltest 默认惰性探测(首个 interval 前 history 为空),
|
||||
/// 这里每 12s 主动触发一次,让延迟稳定、及时刷新。
|
||||
private var urlTestTimer: DispatchSourceTimer?
|
||||
private var timer: DispatchSourceTimer?
|
||||
|
||||
// ── 生命周期 ────────────────────────────────────────────────
|
||||
|
||||
/// 隧道已连接后调用:建立并连接 CommandClient。幂等。
|
||||
/// 隧道已连接后调用:每秒向扩展拉一次统计。幂等。
|
||||
func start() {
|
||||
queue.async { [weak self] in
|
||||
guard let self, !self.started else { return }
|
||||
guard self.ensureSetup() else { return }
|
||||
|
||||
let options = LibboxCommandClientOptions()
|
||||
options.statusInterval = 1_000_000_000 // 1s(纳秒)
|
||||
options.addCommand(LibboxCommandStatus) // 实时上/下行 + 累计
|
||||
options.addCommand(LibboxCommandGroup) // 出口组 → urltest 延迟
|
||||
|
||||
guard let c = LibboxNewCommandClient(self, options) else {
|
||||
NSLog("StatsClient: LibboxNewCommandClient returned nil")
|
||||
return
|
||||
}
|
||||
// CommandServer 在扩展刚起时可能还没 ready,连不上时重试几次。
|
||||
for attempt in 0..<10 {
|
||||
do {
|
||||
try c.connect()
|
||||
self.client = c
|
||||
self.started = true
|
||||
NSLog("StatsClient: connected (attempt %d)", attempt + 1)
|
||||
self.startUrlTestTimer()
|
||||
return
|
||||
} catch {
|
||||
NSLog("StatsClient: connect failed (attempt %d): %@", attempt + 1,
|
||||
error.localizedDescription)
|
||||
Thread.sleep(forTimeInterval: 0.5)
|
||||
}
|
||||
}
|
||||
NSLog("StatsClient: gave up connecting after retries")
|
||||
guard let self else { return }
|
||||
self.timer?.cancel()
|
||||
let t = DispatchSource.makeTimerSource(queue: self.queue)
|
||||
t.schedule(deadline: .now() + 0.2, repeating: 1.0)
|
||||
t.setEventHandler { [weak self] in self?.poll() }
|
||||
t.resume()
|
||||
self.timer = t
|
||||
NSLog("StatsClient: polling via sendProviderMessage started")
|
||||
}
|
||||
}
|
||||
|
||||
/// 隧道断开后调用:断开并释放 CommandClient。幂等。
|
||||
/// 周期主动触发 urltest 探测(在 queue 上)。
|
||||
private func startUrlTestTimer() {
|
||||
urlTestTimer?.cancel()
|
||||
let timer = DispatchSource.makeTimerSource(queue: queue)
|
||||
timer.schedule(deadline: .now() + 2, repeating: 12)
|
||||
timer.setEventHandler { [weak self] in
|
||||
guard let self, let c = self.client else { return }
|
||||
for tag in self.groupTags {
|
||||
try? c.urlTest(tag)
|
||||
}
|
||||
}
|
||||
timer.resume()
|
||||
urlTestTimer = timer
|
||||
}
|
||||
|
||||
/// 隧道断开后调用:停定时器并推零帧,避免 UI 残留上一次连接的速率。幂等。
|
||||
func stop() {
|
||||
queue.async { [weak self] in
|
||||
guard let self else { return }
|
||||
self.urlTestTimer?.cancel()
|
||||
self.urlTestTimer = nil
|
||||
if let c = self.client {
|
||||
try? c.disconnect()
|
||||
}
|
||||
self.client = nil
|
||||
self.started = false
|
||||
self.latestUrltest = []
|
||||
self.groupTags = []
|
||||
// 断开后清零,避免 UI 残留上一次连接的速率。
|
||||
self.timer?.cancel()
|
||||
self.timer = nil
|
||||
VpnStatsStreamHandler.shared.push([
|
||||
"uploadBytes": 0, "downloadBytes": 0,
|
||||
"uploadSpeed": 0.0, "downloadSpeed": 0.0,
|
||||
@@ -111,68 +50,12 @@ final class StatsClient: NSObject {
|
||||
}
|
||||
}
|
||||
|
||||
// ── libbox 全局 setup(与扩展同一 group 容器路径)─────────────
|
||||
|
||||
private func ensureSetup() -> Bool {
|
||||
if Self.didSetup { return true }
|
||||
guard let base = FileManager.default
|
||||
.containerURL(forSecurityApplicationGroupIdentifier: appGroup) else {
|
||||
NSLog("StatsClient: no app group container")
|
||||
return false
|
||||
private func poll() {
|
||||
let req = (try? JSONSerialization.data(withJSONObject: ["action": "stats"])) ?? Data()
|
||||
VpnManager.shared.sendProviderMessage(req) { resp, _ in
|
||||
guard let resp, !resp.isEmpty,
|
||||
let obj = (try? JSONSerialization.jsonObject(with: resp)) as? [String: Any] else { return }
|
||||
VpnStatsStreamHandler.shared.push(obj)
|
||||
}
|
||||
let work = base.appendingPathComponent("work", isDirectory: true)
|
||||
let setup = LibboxSetupOptions()
|
||||
setup.basePath = base.path
|
||||
setup.workingPath = work.path
|
||||
setup.tempPath = NSTemporaryDirectory()
|
||||
var err: NSError?
|
||||
LibboxSetup(setup, &err)
|
||||
if let err {
|
||||
NSLog("StatsClient: LibboxSetup failed: %@", err.localizedDescription)
|
||||
return false
|
||||
}
|
||||
Self.didSetup = true
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
// ── LibboxCommandClientHandler:实时回调 ─────────────────────────────
|
||||
extension StatsClient: LibboxCommandClientHandlerProtocol {
|
||||
func connected() { NSLog("StatsClient: server connected") }
|
||||
func disconnected(_ message: String?) { NSLog("StatsClient: server disconnected: %@", message ?? "") }
|
||||
func clearLogs() {}
|
||||
func writeLogs(_ messageList: (any LibboxLogIteratorProtocol)?) {}
|
||||
func setDefaultLogLevel(_ level: Int32) {}
|
||||
func initializeClashMode(_ modeList: (any LibboxStringIteratorProtocol)?, currentMode: String?) {}
|
||||
func updateClashMode(_ newMode: String?) {}
|
||||
func write(_ events: LibboxConnectionEvents?) {}
|
||||
|
||||
func writeStatus(_ message: LibboxStatusMessage?) {
|
||||
guard let m = message else { return }
|
||||
let stats: [String: Any] = [
|
||||
"uploadBytes": m.uplinkTotal,
|
||||
"downloadBytes": m.downlinkTotal,
|
||||
"uploadSpeed": Double(m.uplink),
|
||||
"downloadSpeed": Double(m.downlink),
|
||||
"urltestResults": latestUrltest.map { ["tag": $0.tag, "delayMs": $0.delayMs] },
|
||||
]
|
||||
VpnStatsStreamHandler.shared.push(stats)
|
||||
}
|
||||
|
||||
func writeGroups(_ message: (any LibboxOutboundGroupIteratorProtocol)?) {
|
||||
guard let groups = message else { return }
|
||||
var urltest: [(tag: String, delayMs: Int)] = []
|
||||
var tags: [String] = []
|
||||
while groups.hasNext() {
|
||||
guard let group = groups.next() else { break }
|
||||
tags.append(group.tag)
|
||||
guard let items = group.getItems() else { continue }
|
||||
while items.hasNext() {
|
||||
guard let item = items.next() else { break }
|
||||
urltest.append((tag: item.tag, delayMs: Int(item.urlTestDelay)))
|
||||
}
|
||||
}
|
||||
latestUrltest = urltest
|
||||
queue.async { [weak self] in self?.groupTags = tags }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user