mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 22:05:21 +00:00
3a35b3acc2
* Extract Tor into a separate module * Add Tor package as a dependency for iOS & macOS targets * Move `tor-nolzma.xcframework` inside Tor * Remove `libz` from Frameworks as its linked in Tor * Remove stray `.gitkeep` from macOS target membership * Fix missing import and access control for modularized Tor - Add import Tor to NetworkActivationService - Make TorManager.shutdownCompletely() public for external access * Fix tor-nolzma.xcframework structure for Xcode builds - Add missing Info.plist files to all framework slices - Restructure macOS framework to use deep bundle format (Versions/) - Keep iOS frameworks as shallow bundles (standard for iOS) This fixes the Xcode build errors while maintaining SPM compatibility. * Remove stale xcframework references from Xcode project Xcode cleaned up old direct references to tor-nolzma.xcframework since it's now managed internally by the Tor Swift package. --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>
64 lines
2.1 KiB
Swift
64 lines
2.1 KiB
Swift
import Foundation
|
|
#if os(macOS)
|
|
import CFNetwork
|
|
#endif
|
|
|
|
/// Provides a shared URLSession that routes traffic via Tor's SOCKS5 proxy
|
|
/// when Tor is enforced/ready. Allows swapping between proxied and direct
|
|
/// sessions so UI can toggle Tor usage at runtime.
|
|
public final class TorURLSession {
|
|
public static let shared = TorURLSession()
|
|
|
|
// Default (no proxy) session for direct Nostr access when Tor is disabled.
|
|
private var defaultSession: URLSession = TorURLSession.makeDefaultSession()
|
|
|
|
// Proxied (SOCKS5) session that routes through Tor.
|
|
private var torSession: URLSession = TorURLSession.makeTorSession()
|
|
private var useTorProxy: Bool = true
|
|
|
|
public var session: URLSession {
|
|
useTorProxy ? torSession : defaultSession
|
|
}
|
|
|
|
// Recreate sessions so new clients bind to the fresh SOCKS/control ports after a Tor restart.
|
|
public func rebuild() {
|
|
defaultSession = TorURLSession.makeDefaultSession()
|
|
torSession = TorURLSession.makeTorSession()
|
|
}
|
|
|
|
public func setProxyMode(useTor: Bool) {
|
|
guard useTorProxy != useTor else { return }
|
|
useTorProxy = useTor
|
|
rebuild()
|
|
}
|
|
|
|
private static func makeTorSession() -> URLSession {
|
|
let cfg = URLSessionConfiguration.ephemeral
|
|
cfg.waitsForConnectivity = true
|
|
// Keep in sync with TorManager defaults
|
|
let host = "127.0.0.1"
|
|
let port = 39050
|
|
#if os(macOS)
|
|
cfg.connectionProxyDictionary = [
|
|
kCFNetworkProxiesSOCKSEnable as String: 1,
|
|
kCFNetworkProxiesSOCKSProxy as String: host,
|
|
kCFNetworkProxiesSOCKSPort as String: port
|
|
]
|
|
#else
|
|
// iOS: CFNetwork SOCKS proxy keys are unavailable at compile time.
|
|
cfg.connectionProxyDictionary = [
|
|
"SOCKSEnable": 1,
|
|
"SOCKSProxy": host,
|
|
"SOCKSPort": port
|
|
]
|
|
#endif
|
|
return URLSession(configuration: cfg)
|
|
}
|
|
|
|
private static func makeDefaultSession() -> URLSession {
|
|
let cfg = URLSessionConfiguration.default
|
|
cfg.waitsForConnectivity = true
|
|
return URLSession(configuration: cfg)
|
|
}
|
|
}
|