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:
wangjia
2026-06-30 19:12:28 +08:00
parent 7add0259b4
commit ae5d497f0b
3 changed files with 271 additions and 153 deletions
+27 -144
View File
@@ -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 ( Androidstatus group )
private var latestUrltest: [(tag: String, delayMs: Int)] = []
/// writeGroups tag urltest "auto"
private var groupTags: [String] = []
/// urltestsing-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 }
}
}