Browse Source

feat(v3.3): 150ms accidental single-tap & combo guard + smart Iran Direct (2.180.3.35:8097) auto-routing

main
Ali Alavi 13 hours ago
parent
commit
7b8e473d28
  1. 2
      Info.plist
  2. 39
      src/AppDelegate.swift
  3. 28
      src/HotkeyManager.swift
  4. 212
      src/PingMonitor.swift
  5. 30
      src/SonioxClient.swift
  6. 32
      src/SonioxSettings.swift
  7. 21
      src/StatusBarController.swift

2
Info.plist

@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.2</string>
<string>3.3</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>

39
src/AppDelegate.swift

@ -13,7 +13,9 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
private var recordingStartTime = Date()
private var lastVoiceDetectedTime = Date()
private var hasSpokenInCurrentSession = false
private var didReceiveTranscriptInSession = false
private var handsFreeSilenceTimer: Timer?
private var pttActivationWorkItem: DispatchWorkItem?
private var pendingStopWorkItem: DispatchWorkItem?
private var finalizeWatchdogWorkItem: DispatchWorkItem?
@ -72,26 +74,51 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
self?.toggleRecording()
}
// Setup Hotkey manager callbacks (Push-To-Talk, Toggle, and Escape Cancel)
// Setup Hotkey manager callbacks (Push-To-Talk with 150ms accidental-tap & combo guard, Toggle, and Escape Cancel)
HotkeyManager.shared.onHotkeyPressed = { [weak self] in
guard let self = self else { return }
self.pendingStopWorkItem?.cancel()
self.pendingStopWorkItem = nil
if HotkeyManager.shared.currentMode == .pushToTalk {
if !self.audioRecorder.isRecording {
guard !self.audioRecorder.isRecording else { return }
self.pttActivationWorkItem?.cancel()
let activateWork = DispatchWorkItem { [weak self] in
guard let self = self else { return }
self.pttActivationWorkItem = nil
guard HotkeyManager.shared.currentMode == .pushToTalk,
HotkeyManager.shared.isPhysicalKeyDown,
!self.audioRecorder.isRecording else { return }
self.startRecording()
}
self.pttActivationWorkItem = activateWork
// 150ms hold threshold completely ignores accidental single taps and Option+<key> shortcuts!
DispatchQueue.main.asyncAfter(deadline: .now() + 0.15, execute: activateWork)
} else {
self.toggleRecording()
}
}
HotkeyManager.shared.onOtherKeyPressedWhileModifierDown = { [weak self] in
guard let self = self else { return }
if let pending = self.pttActivationWorkItem {
pending.cancel()
self.pttActivationWorkItem = nil
print("AppDelegate: Cancelled pending Option Push-To-Talk (modifier combo shortcut detected).")
}
}
HotkeyManager.shared.onHotkeyReleased = { [weak self] in
guard let self = self else { return }
if HotkeyManager.shared.currentMode == .pushToTalk {
// If user released within <150ms (accidental single tap), cancel silently before mic/HUD/WS ever start!
if let pending = self.pttActivationWorkItem {
pending.cancel()
self.pttActivationWorkItem = nil
return
}
if self.audioRecorder.isRecording {
let holdDuration = Date().timeIntervalSince(self.recordingStartTime)
if holdDuration < 0.25 && !self.hasSpokenInCurrentSession {
if holdDuration < 0.25 && !self.didReceiveTranscriptInSession {
self.cancelShortTapRecording()
return
}
@ -218,6 +245,8 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
print("AppDelegate: 🛑 ESCAPE pressed! Aborting all active recording, transcription, and recovery immediately.")
bumpGeneration()
pttActivationWorkItem?.cancel()
pttActivationWorkItem = nil
pendingStopWorkItem?.cancel()
pendingStopWorkItem = nil
finalizeWatchdogWorkItem?.cancel()
@ -228,6 +257,7 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
isBusyFinalizing = false
isNetworkDegraded = false
hasSpokenInCurrentSession = false
didReceiveTranscriptInSession = false
lastRecordedAudio.removeAll()
activeSession?.abort()
@ -281,6 +311,7 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
recordingStartTime = Date()
lastVoiceDetectedTime = Date()
hasSpokenInCurrentSession = false
didReceiveTranscriptInSession = false
// 1. Reset input state & spin up non-blocking session + microphone IMMEDIATELY (t ≈ 0ms, before UI/Menu/Sound!)
InputBoxManager.shared.ensureFocusedInputBox()
@ -319,6 +350,7 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
session.onLiveTranscriptUpdate = { [weak self] fullCandidate, confirmedPrefix in
guard let self = self, self.currentGeneration() == myGen else { return }
self.hasSpokenInCurrentSession = true
self.didReceiveTranscriptInSession = true
self.lastVoiceDetectedTime = Date()
InputBoxManager.shared.updateLiveTranscript(fullCandidate: fullCandidate, confirmedPrefix: confirmedPrefix)
}
@ -328,6 +360,7 @@ public final class AppDelegate: NSObject, NSApplicationDelegate {
let trimmed = partial.trimmingCharacters(in: .whitespacesAndNewlines)
if !trimmed.isEmpty {
self.hasSpokenInCurrentSession = true
self.didReceiveTranscriptInSession = true
self.lastVoiceDetectedTime = Date()
}
}

28
src/HotkeyManager.swift

@ -63,6 +63,7 @@ public final class HotkeyManager {
public var onHotkeyPressed: (() -> Void)?
public var onHotkeyReleased: (() -> Void)?
public var onOtherKeyPressedWhileModifierDown: (() -> Void)?
public var onEscapePressed: (() -> Void)? // Non-exclusive: both Soniox and active app (Telegram, etc.) receive Escape!
private let stateLock = NSLock()
@ -281,12 +282,25 @@ public final class HotkeyManager {
let keyCode = event.getIntegerValueField(.keyboardEventKeycode)
// 0. Escape Key (kVK_Escape = 53): Non-blocking pass-through!
// Both Soniox Voice AND the active app (Telegram, Chrome, etc.) execute their Escape action simultaneously!
// Both Soniox Voice AND the active app (Telegram, etc.) execute their Escape action simultaneously!
if keyCode == 53 && type == .keyDown {
manager.triggerEscape()
return Unmanaged.passRetained(event) // NEVER swallow Escape so Telegram/apps also receive it!
}
// 0.5. If user presses ANY regular key while holding Option in Push-To-Talk (e.g. Option+Backspace, Option+Left, Option+C),
// notify AppDelegate to cancel pending PTT activation so macOS shortcuts never trigger dictation!
if type == .keyDown && manager.currentPreset == .option && manager.currentMode == .pushToTalk && keyCode != 58 && keyCode != 61 {
manager.stateLock.lock()
let altDown = manager.isOptionPhysicallyDown
manager.stateLock.unlock()
if altDown {
DispatchQueue.main.async {
manager.onOtherKeyPressedWhileModifierDown?()
}
}
}
// 1. Microphone Key (🎙️ / F5)
if manager.currentPreset == .micKey {
if keyCode == 96 { // 96 = kVK_F5
@ -463,6 +477,18 @@ public final class HotkeyManager {
return
}
// Cancel pending Option Push-To-Talk if user pressed a combo key (Option+Backspace, Option+Left, etc.)
if event.type == .keyDown && self.currentPreset == .option && self.currentMode == .pushToTalk && keyCode != 58 && keyCode != 61 {
self.stateLock.lock()
let altDown = self.isOptionPhysicallyDown
self.stateLock.unlock()
if altDown {
DispatchQueue.main.async {
self.onOtherKeyPressedWhileModifierDown?()
}
}
}
if self.currentPreset == .option {
if keyCode == 58 || keyCode == 61 {
let isAlt = flags.contains(.option)

212
src/PingMonitor.swift

@ -2,6 +2,65 @@ import Foundation
import AppKit
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 {
case good(ms: Int) // < 450 ms -> Emerald Green
case medium(ms: Int) // 450 - 750 ms -> Warm Yellow/Lime
@ -31,12 +90,28 @@ public enum PingQuality {
public final class PingMonitor {
public static let shared = PingMonitor()
private let targetURL = URL(string: "https://stt.newhorizonco.uk/health")!
private var session: URLSession!
private var timer: Timer?
private var isRunning = false
private var isMeasuring = 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 monitorQueue = DispatchQueue(label: "com.soniox.pathmonitor", qos: .utility)
@ -46,18 +121,132 @@ public final class PingMonitor {
public var onPingUpdate: ((PingQuality) -> Void)?
public var onNetworkRestored: (() -> Void)?
public var onInterfaceChanged: (() -> Void)?
public var onRouteChanged: ((GatewayEdge) -> Void)?
public private(set) var currentQuality: PingQuality = .medium(ms: 380)
private init() {
let config = URLSessionConfiguration.ephemeral
config.timeoutIntervalForRequest = 2.2
config.timeoutIntervalForResource = 2.2
config.timeoutIntervalForRequest = 2.5
config.timeoutIntervalForResource = 2.5
config.waitsForConnectivity = false
config.requestCachePolicy = .reloadIgnoringLocalCacheData
self.session = URLSession(configuration: config)
setupPathMonitor()
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() {
@ -78,12 +267,12 @@ public final class PingMonitor {
self.onPingUpdate?(.disconnected(ms: nil))
} else {
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?()
} 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?()
}
}
@ -99,8 +288,9 @@ public final class PingMonitor {
}
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) {
self?.refreshGatewayRoute()
self?.start()
}
}
@ -162,8 +352,12 @@ public final class PingMonitor {
}
isMeasuring = true
var req = URLRequest(url: targetURL)
let edge = activePrimaryEdge
var req = URLRequest(url: edge.healthURL)
req.httpMethod = "GET"
if let host = edge.hostHeader {
req.setValue(host, forHTTPHeaderField: "Host")
}
let t0 = Date()
let task = session.dataTask(with: req) { [weak self] _, resp, _ in

30
src/SonioxClient.swift

@ -2,13 +2,27 @@ import Foundation
import AppKit
public final class SonioxLiveSession {
public static let primaryWsBase = "wss://stt.newhorizonco.uk/ws/live-stt"
public static let fallbackWsBase = "wss://stt.newhorizonco.uk/ws/live-translate"
public static var primaryWsBase: String {
return PingMonitor.shared.activePrimaryEdge.wsLiveSTT
}
public static var fallbackWsBase: String {
return PingMonitor.shared.activeFallbackEdge.wsLiveSTT
}
private static let apiKey = "nwh_live_Y54Zfil6MdYZEOu4IHlBzTWhGputnVbJ"
private static let userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
public static func origin(for endpoint: String) -> String {
if endpoint.contains("2.180.3.35") || endpoint.contains("stt2.nwhco.ir") {
return "https://stt2.nwhco.ir"
}
return "https://stt.newhorizonco.uk"
}
private static func applyEndpointHeaders(to request: inout URLRequest, endpoint: String) {
request.setValue(userAgent, forHTTPHeaderField: "User-Agent")
request.setValue(origin(for: endpoint), forHTTPHeaderField: "Origin")
if endpoint.contains("2.180.3.35") {
request.setValue("stt2.nwhco.ir", forHTTPHeaderField: "Host")
}
}
private static func baseQuery(withHints hints: [String], targetLanguage: String?) -> String {
var parts: [String] = []
let hintStr = hints.map { "language_hints=\($0)" }.joined(separator: "&")
@ -193,8 +207,7 @@ public final class SonioxLiveSession {
guard let url = URL(string: urlStr) else { return }
var request = URLRequest(url: url)
request.setValue(SonioxLiveSession.userAgent, forHTTPHeaderField: "User-Agent")
request.setValue(SonioxLiveSession.origin(for: endpoint), forHTTPHeaderField: "Origin")
SonioxLiveSession.applyEndpointHeaders(to: &request, endpoint: endpoint)
request.timeoutInterval = 12.0
let config = URLSessionConfiguration.default
@ -265,8 +278,7 @@ public final class SonioxLiveSession {
}
var request = URLRequest(url: url)
request.setValue(SonioxLiveSession.userAgent, forHTTPHeaderField: "User-Agent")
request.setValue(SonioxLiveSession.origin(for: endpoint), forHTTPHeaderField: "Origin")
SonioxLiveSession.applyEndpointHeaders(to: &request, endpoint: endpoint)
request.timeoutInterval = 10.0
let newTask = session.webSocketTask(with: request)
@ -397,8 +409,7 @@ public final class SonioxLiveSession {
}
var request = URLRequest(url: url)
request.setValue(SonioxLiveSession.userAgent, forHTTPHeaderField: "User-Agent")
request.setValue(SonioxLiveSession.origin(for: endpoint), forHTTPHeaderField: "Origin")
SonioxLiveSession.applyEndpointHeaders(to: &request, endpoint: endpoint)
request.timeoutInterval = 6.0
let config = URLSessionConfiguration.default
@ -1182,8 +1193,7 @@ public final class SonioxLiveSession {
}
var request = URLRequest(url: url)
request.setValue(userAgent, forHTTPHeaderField: "User-Agent")
request.setValue(origin(for: endpoint), forHTTPHeaderField: "Origin")
applyEndpointHeaders(to: &request, endpoint: endpoint)
let durationSec = Double(pcmData.count) / 32000.0
let watchdogTimeout = max(10.0, min(65.0, durationSec * 0.90 + 10.0))

32
src/SonioxSettings.swift

@ -179,6 +179,26 @@ public enum MicStandbyMode: String, CaseIterable {
}
}
public enum GatewayRouteMode: String, CaseIterable {
case autoSmart = "autoSmart"
case iranDirect = "iranDirect"
case iranArvan = "iranArvan"
case germany = "germany"
public var displayName: String {
switch self {
case .autoSmart:
return "🤖 Auto (Iran 2.180.3.35 on IR IP / Germany Outside)"
case .iranDirect:
return "🇮🇷 Iran Direct (2.180.3.35:8097)"
case .iranArvan:
return "🇮🇷 Iran Edge TLS (stt2.nwhco.ir)"
case .germany:
return "🇩🇪 Germany Edge (stt.newhorizonco.uk)"
}
}
}
public final class SonioxSettings {
public static let shared = SonioxSettings()
@ -322,6 +342,17 @@ public final class SonioxSettings {
}
}
public var gatewayRouteMode: GatewayRouteMode {
get {
let val = defaults.string(forKey: "SonioxGatewayRouteMode") ?? GatewayRouteMode.autoSmart.rawValue
return GatewayRouteMode(rawValue: val) ?? .autoSmart
}
set {
defaults.set(newValue.rawValue, forKey: "SonioxGatewayRouteMode")
PingMonitor.shared.refreshGatewayRoute()
}
}
public var playSounds: Bool {
get {
if defaults.object(forKey: "SonioxPlaySounds") == nil { return true }
@ -369,6 +400,7 @@ public final class SonioxSettings {
defaults.removeObject(forKey: "SonioxLiveStreamEngineMode")
defaults.removeObject(forKey: "SonioxClipboardBehavior")
defaults.removeObject(forKey: "SonioxMicStandbyMode")
defaults.removeObject(forKey: "SonioxGatewayRouteMode")
defaults.removeObject(forKey: "SonioxPlaySounds")
defaults.removeObject(forKey: "SonioxLaunchAtLogin")
defaults.removeObject(forKey: "SonioxPreferredAudioDevice")

21
src/StatusBarController.swift

@ -122,6 +122,20 @@ public final class StatusBarController: NSObject, NSMenuDelegate {
clipboardMenuItem.submenu = clipboardMenu
menu.addItem(clipboardMenuItem)
// 2.7. Server Route Submenu (Auto Iran 2.180.3.35 / Germany)
let routeMenu = NSMenu()
for route in GatewayRouteMode.allCases {
let item = NSMenuItem(title: route.displayName, action: #selector(selectGatewayRouteAction(_:)), keyEquivalent: "")
item.target = self
item.representedObject = route
item.state = (SonioxSettings.shared.gatewayRouteMode == route) ? .on : .off
routeMenu.addItem(item)
}
let activeEdgeLabel = PingMonitor.shared.activePrimaryEdge.shortLabel
let routeMenuItem = NSMenuItem(title: "🌐 Server (\(activeEdgeLabel))", action: nil, keyEquivalent: "")
routeMenuItem.submenu = routeMenu
menu.addItem(routeMenuItem)
// 3. Hotkey Preset Submenu
let hotkeyMenu = NSMenu()
for preset in HotkeyPreset.allCases {
@ -431,6 +445,13 @@ public final class StatusBarController: NSObject, NSMenuDelegate {
}
}
@objc private func selectGatewayRouteAction(_ sender: NSMenuItem) {
if let route = sender.representedObject as? GatewayRouteMode {
SonioxSettings.shared.gatewayRouteMode = route
buildMenu()
}
}
@objc private func selectLiveStreamEngineAction(_ sender: NSMenuItem) {
if let eng = sender.representedObject as? LiveStreamEngineMode {
SonioxSettings.shared.liveStreamEngineMode = eng

Loading…
Cancel
Save