|
|
@ -2,6 +2,65 @@ import Foundation |
|
|
import AppKit |
|
|
import AppKit |
|
|
import Network |
|
|
import Network |
|
|
|
|
|
|
|
|
|
|
|
public enum GatewayEdge: String { |
|
|
|
|
|
case iranDirect |
|
|
|
|
|
case iranArvan |
|
|
|
|
|
case germany |
|
|
|
|
|
|
|
|
|
|
|
public var wsLiveSTT: String { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect: return "ws://2.180.3.35:8097/ws/live-stt" |
|
|
|
|
|
case .iranArvan: return "wss://stt2.nwhco.ir/ws/live-stt" |
|
|
|
|
|
case .germany: return "wss://stt.newhorizonco.uk/ws/live-stt" |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var wsLiveTranslate: String { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect: return "ws://2.180.3.35:8097/ws/live-translate" |
|
|
|
|
|
case .iranArvan: return "wss://stt2.nwhco.ir/ws/live-translate" |
|
|
|
|
|
case .germany: return "wss://stt.newhorizonco.uk/ws/live-translate" |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var healthURL: URL { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect: return URL(string: "http://2.180.3.35:8097/health")! |
|
|
|
|
|
case .iranArvan: return URL(string: "https://stt2.nwhco.ir/health")! |
|
|
|
|
|
case .germany: return URL(string: "https://stt.newhorizonco.uk/health")! |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var hostHeader: String? { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect: return "stt2.nwhco.ir" |
|
|
|
|
|
case .iranArvan, .germany: return nil |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var origin: String { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect, .iranArvan: return "https://stt2.nwhco.ir" |
|
|
|
|
|
case .germany: return "https://stt.newhorizonco.uk" |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var shortLabel: String { |
|
|
|
|
|
switch self { |
|
|
|
|
|
case .iranDirect: return "🇮🇷 2.180.3.35" |
|
|
|
|
|
case .iranArvan: return "🇮🇷 stt2" |
|
|
|
|
|
case .germany: return "🇩🇪 Germany" |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public func applyHeaders(to request: inout URLRequest) { |
|
|
|
|
|
if let host = hostHeader { |
|
|
|
|
|
request.setValue(host, forHTTPHeaderField: "Host") |
|
|
|
|
|
} |
|
|
|
|
|
request.setValue(origin, forHTTPHeaderField: "Origin") |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
public enum PingQuality { |
|
|
public enum PingQuality { |
|
|
case good(ms: Int) // < 450 ms -> Emerald Green |
|
|
case good(ms: Int) // < 450 ms -> Emerald Green |
|
|
case medium(ms: Int) // 450 - 750 ms -> Warm Yellow/Lime |
|
|
case medium(ms: Int) // 450 - 750 ms -> Warm Yellow/Lime |
|
|
@ -31,12 +90,28 @@ public enum PingQuality { |
|
|
public final class PingMonitor { |
|
|
public final class PingMonitor { |
|
|
public static let shared = PingMonitor() |
|
|
public static let shared = PingMonitor() |
|
|
|
|
|
|
|
|
private let targetURL = URL(string: "https://stt.newhorizonco.uk/health")! |
|
|
|
|
|
private var session: URLSession! |
|
|
private var session: URLSession! |
|
|
private var timer: Timer? |
|
|
private var timer: Timer? |
|
|
private var isRunning = false |
|
|
private var isRunning = false |
|
|
private var isMeasuring = false |
|
|
private var isMeasuring = false |
|
|
private var isActiveCadence = false |
|
|
private var isActiveCadence = false |
|
|
|
|
|
private let routeLock = NSLock() |
|
|
|
|
|
private var _activePrimaryEdge: GatewayEdge = .germany |
|
|
|
|
|
|
|
|
|
|
|
public var activePrimaryEdge: GatewayEdge { |
|
|
|
|
|
routeLock.lock() |
|
|
|
|
|
defer { routeLock.unlock() } |
|
|
|
|
|
return _activePrimaryEdge |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public var activeFallbackEdge: GatewayEdge { |
|
|
|
|
|
switch activePrimaryEdge { |
|
|
|
|
|
case .iranDirect, .iranArvan: |
|
|
|
|
|
return .germany |
|
|
|
|
|
case .germany: |
|
|
|
|
|
return .iranDirect |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private let pathMonitor = NWPathMonitor() |
|
|
private let pathMonitor = NWPathMonitor() |
|
|
private let monitorQueue = DispatchQueue(label: "com.soniox.pathmonitor", qos: .utility) |
|
|
private let monitorQueue = DispatchQueue(label: "com.soniox.pathmonitor", qos: .utility) |
|
|
@ -46,18 +121,132 @@ public final class PingMonitor { |
|
|
public var onPingUpdate: ((PingQuality) -> Void)? |
|
|
public var onPingUpdate: ((PingQuality) -> Void)? |
|
|
public var onNetworkRestored: (() -> Void)? |
|
|
public var onNetworkRestored: (() -> Void)? |
|
|
public var onInterfaceChanged: (() -> Void)? |
|
|
public var onInterfaceChanged: (() -> Void)? |
|
|
|
|
|
public var onRouteChanged: ((GatewayEdge) -> Void)? |
|
|
public private(set) var currentQuality: PingQuality = .medium(ms: 380) |
|
|
public private(set) var currentQuality: PingQuality = .medium(ms: 380) |
|
|
|
|
|
|
|
|
private init() { |
|
|
private init() { |
|
|
let config = URLSessionConfiguration.ephemeral |
|
|
let config = URLSessionConfiguration.ephemeral |
|
|
config.timeoutIntervalForRequest = 2.2 |
|
|
|
|
|
config.timeoutIntervalForResource = 2.2 |
|
|
|
|
|
|
|
|
config.timeoutIntervalForRequest = 2.5 |
|
|
|
|
|
config.timeoutIntervalForResource = 2.5 |
|
|
config.waitsForConnectivity = false |
|
|
config.waitsForConnectivity = false |
|
|
config.requestCachePolicy = .reloadIgnoringLocalCacheData |
|
|
config.requestCachePolicy = .reloadIgnoringLocalCacheData |
|
|
self.session = URLSession(configuration: config) |
|
|
self.session = URLSession(configuration: config) |
|
|
|
|
|
|
|
|
setupPathMonitor() |
|
|
setupPathMonitor() |
|
|
setupSleepWakeObservers() |
|
|
setupSleepWakeObservers() |
|
|
|
|
|
refreshGatewayRoute() |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// Selects the optimal gateway edge: |
|
|
|
|
|
/// - In `.autoSmart` mode: probes Iran Direct (`2.180.3.35:8097` with `Host: stt2.nwhco.ir`, requiring Gateway v2) |
|
|
|
|
|
/// and Germany (`stt.newhorizonco.uk`) in parallel. On Iranian IPs (including split-tunnel VPNs!), Iran Direct |
|
|
|
|
|
/// responds in ~15–150ms (vs ~450–750ms for Germany) and is automatically chosen as Primary, with Germany as Fallback. |
|
|
|
|
|
public func refreshGatewayRoute() { |
|
|
|
|
|
let mode = SonioxSettings.shared.gatewayRouteMode |
|
|
|
|
|
switch mode { |
|
|
|
|
|
case .iranDirect: |
|
|
|
|
|
setActivePrimaryEdge(.iranDirect) |
|
|
|
|
|
return |
|
|
|
|
|
case .iranArvan: |
|
|
|
|
|
setActivePrimaryEdge(.iranArvan) |
|
|
|
|
|
return |
|
|
|
|
|
case .germany: |
|
|
|
|
|
setActivePrimaryEdge(.germany) |
|
|
|
|
|
return |
|
|
|
|
|
case .autoSmart: |
|
|
|
|
|
break |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let group = DispatchGroup() |
|
|
|
|
|
var iranDirectMs: Int? = nil |
|
|
|
|
|
var germanyMs: Int? = nil |
|
|
|
|
|
let probeLock = NSLock() |
|
|
|
|
|
|
|
|
|
|
|
// 1. Probe Iran Direct (2.180.3.35:8097, Host: stt2.nwhco.ir) — must confirm v2.0 live-WS support! |
|
|
|
|
|
group.enter() |
|
|
|
|
|
probeEdge(.iranDirect, requireV2: true) { ms in |
|
|
|
|
|
probeLock.lock() |
|
|
|
|
|
iranDirectMs = ms |
|
|
|
|
|
probeLock.unlock() |
|
|
|
|
|
group.leave() |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 2. Probe Germany Edge (stt.newhorizonco.uk) |
|
|
|
|
|
group.enter() |
|
|
|
|
|
probeEdge(.germany, requireV2: false) { ms in |
|
|
|
|
|
probeLock.lock() |
|
|
|
|
|
germanyMs = ms |
|
|
|
|
|
probeLock.unlock() |
|
|
|
|
|
group.leave() |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
group.notify(queue: .main) { [weak self] in |
|
|
|
|
|
guard let self = self else { return } |
|
|
|
|
|
guard SonioxSettings.shared.gatewayRouteMode == .autoSmart else { return } |
|
|
|
|
|
|
|
|
|
|
|
let chosen: GatewayEdge |
|
|
|
|
|
if let ir = iranDirectMs { |
|
|
|
|
|
if let de = germanyMs { |
|
|
|
|
|
// Prefer Iran Direct whenever on Iranian routing (<= 320ms) or faster than Germany |
|
|
|
|
|
chosen = (ir <= 320 || ir <= de) ? .iranDirect : .germany |
|
|
|
|
|
} else { |
|
|
|
|
|
chosen = .iranDirect |
|
|
|
|
|
} |
|
|
|
|
|
} else if germanyMs != nil { |
|
|
|
|
|
chosen = .germany |
|
|
|
|
|
} else { |
|
|
|
|
|
chosen = .iranDirect |
|
|
|
|
|
} |
|
|
|
|
|
print("PingMonitor: Smart route probe -> IranDirect(2.180.3.35)=\(iranDirectMs.map { "\($0)ms" } ?? "fail"), Germany=\(germanyMs.map { "\($0)ms" } ?? "fail") => Selected: \(chosen.shortLabel)") |
|
|
|
|
|
self.setActivePrimaryEdge(chosen) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func probeEdge(_ edge: GatewayEdge, requireV2: Bool, completion: @escaping (Int?) -> Void) { |
|
|
|
|
|
var req = URLRequest(url: edge.healthURL) |
|
|
|
|
|
req.httpMethod = "GET" |
|
|
|
|
|
req.timeoutInterval = 2.2 |
|
|
|
|
|
if let host = edge.hostHeader { |
|
|
|
|
|
req.setValue(host, forHTTPHeaderField: "Host") |
|
|
|
|
|
} |
|
|
|
|
|
let t0 = Date() |
|
|
|
|
|
let task = session.dataTask(with: req) { data, resp, _ in |
|
|
|
|
|
guard let http = resp as? HTTPURLResponse, (200...299).contains(http.statusCode) else { |
|
|
|
|
|
completion(nil) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
if requireV2 { |
|
|
|
|
|
let body = data.flatMap { String(data: $0, encoding: .utf8) } ?? "" |
|
|
|
|
|
if !body.contains("\"version\"") { |
|
|
|
|
|
completion(nil) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
let ms = Int(Date().timeIntervalSince(t0) * 1000.0) |
|
|
|
|
|
completion(ms) |
|
|
|
|
|
} |
|
|
|
|
|
task.resume() |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private func setActivePrimaryEdge(_ edge: GatewayEdge) { |
|
|
|
|
|
routeLock.lock() |
|
|
|
|
|
let changed = (_activePrimaryEdge != edge) |
|
|
|
|
|
_activePrimaryEdge = edge |
|
|
|
|
|
routeLock.unlock() |
|
|
|
|
|
|
|
|
|
|
|
if changed { |
|
|
|
|
|
print("PingMonitor: 🌐 Active STT Gateway Edge switched to \(edge.shortLabel) (\(edge.wsLiveSTT))") |
|
|
|
|
|
DispatchQueue.main.async { [weak self] in |
|
|
|
|
|
guard let self = self else { return } |
|
|
|
|
|
self.onRouteChanged?(edge) |
|
|
|
|
|
SonioxSessionPool.shared.reconnectAll() |
|
|
|
|
|
self.measurePing() |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
DispatchQueue.main.async { [weak self] in |
|
|
|
|
|
self?.measurePing() |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private func setupPathMonitor() { |
|
|
private func setupPathMonitor() { |
|
|
@ -78,12 +267,12 @@ public final class PingMonitor { |
|
|
self.onPingUpdate?(.disconnected(ms: nil)) |
|
|
self.onPingUpdate?(.disconnected(ms: nil)) |
|
|
} else { |
|
|
} else { |
|
|
if !wasSatisfied { |
|
|
if !wasSatisfied { |
|
|
print("PingMonitor: NWPathMonitor detected network RESTORED!") |
|
|
|
|
|
self.measurePing() |
|
|
|
|
|
|
|
|
print("PingMonitor: NWPathMonitor detected network RESTORED! Re-probing best gateway edge...") |
|
|
|
|
|
self.refreshGatewayRoute() |
|
|
self.onNetworkRestored?() |
|
|
self.onNetworkRestored?() |
|
|
} else if !prevSig.isEmpty && prevSig != sig { |
|
|
} else if !prevSig.isEmpty && prevSig != sig { |
|
|
print("PingMonitor: Network interface changed (\(prevSig) -> \(sig)). Re-measuring...") |
|
|
|
|
|
self.measurePing() |
|
|
|
|
|
|
|
|
print("PingMonitor: Network interface changed (\(prevSig) -> \(sig)). Re-probing best gateway edge...") |
|
|
|
|
|
self.refreshGatewayRoute() |
|
|
self.onInterfaceChanged?() |
|
|
self.onInterfaceChanged?() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -99,8 +288,9 @@ public final class PingMonitor { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
NSWorkspace.shared.notificationCenter.addObserver(forName: NSWorkspace.didWakeNotification, object: nil, queue: .main) { [weak self] _ in |
|
|
NSWorkspace.shared.notificationCenter.addObserver(forName: NSWorkspace.didWakeNotification, object: nil, queue: .main) { [weak self] _ in |
|
|
print("PingMonitor: Mac woke from sleep. Resuming ping in 2.0s after network settles...") |
|
|
|
|
|
|
|
|
print("PingMonitor: Mac woke from sleep. Resuming ping & route check in 2.0s...") |
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { |
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { |
|
|
|
|
|
self?.refreshGatewayRoute() |
|
|
self?.start() |
|
|
self?.start() |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -162,8 +352,12 @@ public final class PingMonitor { |
|
|
} |
|
|
} |
|
|
isMeasuring = true |
|
|
isMeasuring = true |
|
|
|
|
|
|
|
|
var req = URLRequest(url: targetURL) |
|
|
|
|
|
|
|
|
let edge = activePrimaryEdge |
|
|
|
|
|
var req = URLRequest(url: edge.healthURL) |
|
|
req.httpMethod = "GET" |
|
|
req.httpMethod = "GET" |
|
|
|
|
|
if let host = edge.hostHeader { |
|
|
|
|
|
req.setValue(host, forHTTPHeaderField: "Host") |
|
|
|
|
|
} |
|
|
let t0 = Date() |
|
|
let t0 = Date() |
|
|
|
|
|
|
|
|
let task = session.dataTask(with: req) { [weak self] _, resp, _ in |
|
|
let task = session.dataTask(with: req) { [weak self] _, resp, _ in |
|
|
|