Force Proxy to any Windows/MacOS/Linux Application TCP and UDP traffic
C ccybersecurityhttp3httpproxylinuxlinux-proxymacosmacos-appmacos-proxyproxifierproxifier-alternativeproxyclienttcpthick-clientudpwindivertwindows
Refactor connection and activity log views for improved search functionality and performance; replace list views with attributed string representation
AnoF-Cyberb0cd2115392a
diff --git a/MacOS/ProxyBridge/ProxyBridge/ContentView.swift b/MacOS/ProxyBridge/ProxyBridge/ContentView.swiftindex cb4f14a..862e503 100644--- a/MacOS/ProxyBridge/ProxyBridge/ContentView.swift+++ b/MacOS/ProxyBridge/ProxyBridge/ContentView.swift@@ -1,4 +1,5 @@import SwiftUI+import AppKitstruct ContentView: View {@ObservedObject var viewModel: ProxyBridgeViewModel@@ -61,23 +62,30 @@ struct ContentView: View {}private var filteredConnections: [ProxyBridgeViewModel.ConnectionLog] {- if connectionSearchText.isEmpty {+ let q = connectionSearchText+ if q.isEmpty {return viewModel.connections}+ // match against every field so a search finds protocol, ip, port, process, proxy or timereturn viewModel.connections.filter {- $0.process.localizedCaseInsensitiveContains(connectionSearchText) ||- $0.destination.localizedCaseInsensitiveContains(connectionSearchText) ||- $0.proxy.localizedCaseInsensitiveContains(connectionSearchText)+ $0.timestamp.localizedCaseInsensitiveContains(q) ||+ $0.connectionProtocol.localizedCaseInsensitiveContains(q) ||+ $0.process.localizedCaseInsensitiveContains(q) ||+ $0.destination.localizedCaseInsensitiveContains(q) ||+ $0.port.localizedCaseInsensitiveContains(q) ||+ $0.proxy.localizedCaseInsensitiveContains(q)}}-+private var filteredActivityLogs: [ProxyBridgeViewModel.ActivityLog] {- if activitySearchText.isEmpty {+ let q = activitySearchText+ if q.isEmpty {return viewModel.activityLogs}return viewModel.activityLogs.filter {- $0.message.localizedCaseInsensitiveContains(activitySearchText) ||- $0.level.localizedCaseInsensitiveContains(activitySearchText)+ $0.timestamp.localizedCaseInsensitiveContains(q) ||+ $0.level.localizedCaseInsensitiveContains(q) ||+ $0.message.localizedCaseInsensitiveContains(q)}}}@@ -108,10 +116,10 @@ struct ConnectionsView: View {VStack(spacing: 0) {searchBarDivider()- connectionsList+ LogTextView(text: connectionsText)}}-+private var searchBar: some View {HStack {Image(systemName: "magnifyingglass")@@ -124,45 +132,20 @@ struct ConnectionsView: View {.padding().background(Color(NSColor.controlBackgroundColor))}-- private var connectionsList: some View {- ScrollViewReader { proxy in- ScrollView {- LazyVStack(alignment: .leading, spacing: 4) {- ForEach(connections) { connection in- connectionRow(connection)- .id(connection.id)- }- }- .onChange(of: connections.count) { _ in- scrollToLast(proxy: proxy)- }- }- }- }-- private func connectionRow(_ connection: ProxyBridgeViewModel.ConnectionLog) -> some View {- // one concatenated Text instead of an HStack of seven, far fewer view- // nodes to build and diff while the list streams. split into locals so- // the type checker doesn't choke on one giant expression- let ts = Text(verbatim: "[\(connection.timestamp)] ").foregroundColor(.gray)- let proto = Text(verbatim: "[\(connection.connectionProtocol)] ").foregroundColor(.blue)- let proc = Text(verbatim: connection.process).foregroundColor(.green)- let arrow1 = Text(verbatim: " → ").foregroundColor(.gray)- let dest = Text(verbatim: "\(connection.destination):\(connection.port)").foregroundColor(.orange)- let arrow2 = Text(verbatim: " → ").foregroundColor(.gray)- let proxy = Text(verbatim: connection.proxy).foregroundColor(connection.proxy == "Direct" ? .gray : .purple)- return (ts + proto + proc + arrow1 + dest + arrow2 + proxy)- .font(.system(.body, design: .monospaced))- .padding(.horizontal)- .padding(.vertical, 4)- }-- private func scrollToLast(proxy: ScrollViewProxy) {- // no animation, this fires on every poll and animating a long list burns cpu- if let last = connections.last {- proxy.scrollTo(last.id, anchor: .bottom)- }++ private var connectionsText: NSAttributedString {+ let out = NSMutableAttributedString()+ for c in connections {+ out.append(LogText.seg("[\(c.timestamp)] ", .secondaryLabelColor))+ out.append(LogText.seg("[\(c.connectionProtocol)] ", .systemBlue))+ out.append(LogText.seg(c.process, .systemGreen))+ out.append(LogText.seg(" → ", .secondaryLabelColor))+ out.append(LogText.seg("\(c.destination):\(c.port)", .systemOrange))+ out.append(LogText.seg(" → ", .secondaryLabelColor))+ out.append(LogText.seg(c.proxy, c.proxy == "Direct" ? .secondaryLabelColor : .systemPurple))+ out.append(LogText.seg("\n", .labelColor))+ }+ return out}}@@ -175,10 +158,10 @@ struct ActivityLogsView: View {VStack(spacing: 0) {searchBarDivider()- logsList+ LogTextView(text: logsText)}}-+private var searchBar: some View {HStack {Image(systemName: "magnifyingglass")@@ -191,38 +174,78 @@ struct ActivityLogsView: View {.padding().background(Color(NSColor.controlBackgroundColor))}-- private var logsList: some View {- ScrollViewReader { proxy in- ScrollView {- LazyVStack(alignment: .leading, spacing: 4) {- ForEach(logs) { log in- logRow(log)- .id(log.id)- }- }- .onChange(of: logs.count) { _ in- scrollToLast(proxy: proxy)- }- }++ private var logsText: NSAttributedString {+ let out = NSMutableAttributedString()+ for log in logs {+ out.append(LogText.seg("[\(log.timestamp)] ", .secondaryLabelColor))+ out.append(LogText.seg("[\(log.level)] ", log.level == "ERROR" ? .systemRed : .systemBlue))+ out.append(LogText.seg(log.message, .labelColor))+ out.append(LogText.seg("\n", .labelColor))}+ return out}-- private func logRow(_ log: ProxyBridgeViewModel.ActivityLog) -> some View {- (- Text(verbatim: "[\(log.timestamp)] ").foregroundColor(.gray)- + Text(verbatim: "[\(log.level)] ").foregroundColor(log.level == "ERROR" ? .red : .blue)- + Text(verbatim: log.message).foregroundColor(.primary)- )- .font(.system(.body, design: .monospaced))- .padding(.horizontal)- .padding(.vertical, 4)- }-- private func scrollToLast(proxy: ScrollViewProxy) {- // no animation, this fires on every poll and animating a long list burns cpu- if let last = logs.last {- proxy.scrollTo(last.id, anchor: .bottom)+}++// builds the colored, monospaced segments shared by both log views+enum LogText {+ static let font = NSFont.monospacedSystemFont(ofSize: NSFont.systemFontSize, weight: .regular)++ static func seg(_ string: String, _ color: NSColor) -> NSAttributedString {+ NSAttributedString(string: string, attributes: [.foregroundColor: color, .font: font])+ }+}++// read-only NSTextView so the whole log behaves like a text area, multi-row+// drag select, select all and copy all work like any text box+struct LogTextView: NSViewRepresentable {+ let text: NSAttributedString++ func makeNSView(context: Context) -> NSScrollView {+ let scrollView = NSTextView.scrollableTextView()+ scrollView.hasVerticalScroller = true+ scrollView.drawsBackground = false++ if let textView = scrollView.documentView as? NSTextView {+ textView.isEditable = false+ textView.isSelectable = true+ textView.drawsBackground = false+ textView.textContainerInset = NSSize(width: 8, height: 8)+ textView.font = LogText.font+ }+ return scrollView+ }++ func updateNSView(_ scrollView: NSScrollView, context: Context) {+ guard let textView = scrollView.documentView as? NSTextView,+ let storage = textView.textStorage else { return }++ // nothing changed, leave the current selection and scroll position alone+ if storage.string == text.string { return }++ // keep the user's selection if it still fits (holds while not trimming),+ // otherwise stick to the bottom so new lines stay in view+ let previousSelection = textView.selectedRanges+ let wasAtBottom = isScrolledToBottom(scrollView)++ storage.setAttributedString(text)++ let length = (text.string as NSString).length+ let validSelection = previousSelection.filter { value in+ let r = value.rangeValue+ return r.location + r.length <= length}++ if let sel = validSelection.first, sel.rangeValue.length > 0 {+ textView.selectedRanges = validSelection+ } else if wasAtBottom {+ textView.scrollToEndOfDocument(nil)+ }+ }++ private func isScrolledToBottom(_ scrollView: NSScrollView) -> Bool {+ let docHeight = scrollView.documentView?.bounds.height ?? 0+ let visible = scrollView.contentView.bounds+ return visible.maxY >= docHeight - 24}}