Starting to move to async/await model so the client code is no longer burdoned by observation and isn't bound to this app.

8 files changed, 114 insertions, 6 deletions

diff --git a/Hotline.xcodeproj/project.pbxproj b/Hotline.xcodeproj/project.pbxproj
index 10bf487..90b2f4d 100644
--- a/Hotline.xcodeproj/project.pbxproj
+++ b/Hotline.xcodeproj/project.pbxproj
@@ -26,6 +26,9 @@
 		DA9CAFCB2B126E3300CDA197 /* HotlineTrackerClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9CAFCA2B126E3300CDA197 /* HotlineTrackerClient.swift */; };
 		DABFCC292B1530DC009F40D2 /* FoundationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DABFCC282B1530DC009F40D2 /* FoundationExtensions.swift */; };
 		DAC002192B21630900A6C290 /* SwiftUIExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAC002182B21630900A6C290 /* SwiftUIExtensions.swift */; };
+		DADDB28B2B22B31F0024040D /* Tracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = DADDB28A2B22B31F0024040D /* Tracker.swift */; };
+		DADDB28D2B22B5920024040D /* Server.swift in Sources */ = {isa = PBXBuildFile; fileRef = DADDB28C2B22B5920024040D /* Server.swift */; };
+		DADDB28F2B238D850024040D /* Hotline.swift in Sources */ = {isa = PBXBuildFile; fileRef = DADDB28E2B238D850024040D /* Hotline.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -49,6 +52,9 @@
 		DA9CAFCA2B126E3300CDA197 /* HotlineTrackerClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HotlineTrackerClient.swift; sourceTree = "<group>"; };
 		DABFCC282B1530DC009F40D2 /* FoundationExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FoundationExtensions.swift; sourceTree = "<group>"; };
 		DAC002182B21630900A6C290 /* SwiftUIExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIExtensions.swift; sourceTree = "<group>"; };
+		DADDB28A2B22B31F0024040D /* Tracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tracker.swift; sourceTree = "<group>"; };
+		DADDB28C2B22B5920024040D /* Server.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Server.swift; sourceTree = "<group>"; };
+		DADDB28E2B238D850024040D /* Hotline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hotline.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -99,6 +105,7 @@
 				DA9CAFBA2B126D5700CDA197 /* HotlineApp.swift */,
 				DA0D698A2B1E5A5200C71DF5 /* HotlineState.swift */,
 				DA4F2BF92B1A516F00D8ADDC /* Views */,
+				DADDB2892B22B2C60024040D /* Models */,
 				DABFCC262B1530AE009F40D2 /* Hotline */,
 				DABFCC272B1530BE009F40D2 /* Utility */,
 				DA9CAFC02B126D5800CDA197 /* Assets.xcassets */,
@@ -136,6 +143,16 @@
 			path = Utility;
 			sourceTree = "<group>";
 		};
+		DADDB2892B22B2C60024040D /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				DADDB28C2B22B5920024040D /* Server.swift */,
+				DADDB28E2B238D850024040D /* Hotline.swift */,
+				DADDB28A2B22B31F0024040D /* Tracker.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -212,6 +229,8 @@
 				DA0D698B2B1E5A5200C71DF5 /* HotlineState.swift in Sources */,
 				DA7725412B21435B006C5ABB /* ObservableScrollView.swift in Sources */,
 				DAC002192B21630900A6C290 /* SwiftUIExtensions.swift in Sources */,
+				DADDB28F2B238D850024040D /* Hotline.swift in Sources */,
+				DADDB28D2B22B5920024040D /* Server.swift in Sources */,
 				DA9CAFBD2B126D5700CDA197 /* TrackerView.swift in Sources */,
 				DA9CAFCB2B126E3300CDA197 /* HotlineTrackerClient.swift in Sources */,
 				DA9CAFBB2B126D5700CDA197 /* HotlineApp.swift in Sources */,
@@ -222,6 +241,7 @@
 				DA77253F2B21176D006C5ABB /* NewsView.swift in Sources */,
 				DA4F2BF82B16A17200D8ADDC /* HotlineProtocol.swift in Sources */,
 				DA0D698D2B1E7CF700C71DF5 /* UserListView.swift in Sources */,
+				DADDB28B2B22B31F0024040D /* Tracker.swift in Sources */,
 				DA4F2C012B1A558E00D8ADDC /* ChatView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Hotline/Hotline/HotlineClient.swift b/Hotline/Hotline/HotlineClient.swift
index 36872cb..f545c3c 100644
--- a/Hotline/Hotline/HotlineClient.swift
+++ b/Hotline/Hotline/HotlineClient.swift
@@ -377,7 +377,6 @@ class HotlineClient {
       
       DispatchQueue.main.async {
         if var pf = parentFile {
-          print("\(pf.name) <= \(files.count) files")
           pf.files = files
         }
         else {
diff --git a/Hotline/Hotline/HotlineTrackerClient.swift b/Hotline/Hotline/HotlineTrackerClient.swift
index c437ee6..f93949e 100644
--- a/Hotline/Hotline/HotlineTrackerClient.swift
+++ b/Hotline/Hotline/HotlineTrackerClient.swift
@@ -28,8 +28,8 @@ class HotlineTrackerClient {
     0x00, 0x01 // Version
   ])
   
-  @ObservationIgnored private let serverAddress: NWEndpoint.Host
-  @ObservationIgnored private let serverPort: NWEndpoint.Port
+  @ObservationIgnored private var serverAddress: NWEndpoint.Host
+  @ObservationIgnored private var serverPort: NWEndpoint.Port
   @ObservationIgnored private var connection: NWConnection?
   @ObservationIgnored private var bytes = Data()
   @ObservationIgnored private var maxDataLength: Int = 0
@@ -39,17 +39,45 @@ class HotlineTrackerClient {
   var connectionStatus: HotlineTrackerStatus = .disconnected
   var servers: [HotlineServer] = []
   
+  init() {
+    let t = HotlineTracker("hltracker.com")
+    self.tracker = t
+    self.serverAddress = NWEndpoint.Host(t.address)
+    self.serverPort = NWEndpoint.Port(rawValue: t.port)!
+  }
+  
   init(tracker: HotlineTracker) {
     self.tracker = tracker
     self.serverAddress = NWEndpoint.Host(tracker.address)
     self.serverPort = NWEndpoint.Port(rawValue: tracker.port)!
   }
   
-  func fetch(_ callback: (() -> Void)? = nil) {
+  func fetch(callback: (() -> Void)? = nil) {
     self.reset()
     self.connect(callback)
   }
   
+  func fetch2(address: String, port: Int, callback: (([Server]) -> Void)? = nil) {
+    self.serverAddress = NWEndpoint.Host(address)
+    self.serverPort = NWEndpoint.Port(rawValue: UInt16(port))!
+    
+    self.reset()
+    self.connect { [weak self] in
+      var allServers: [Server] = []
+      
+      if let servers = self?.servers {
+        for server in servers {
+          let s = Server(name: server.name!, description: server.description, address: server.address, port: Int(server.port))
+          allServers.append(s)
+        }
+      }
+      
+      DispatchQueue.main.async {
+        callback?(allServers)
+      }
+    }
+  }
+  
   private func reset() {
     self.maxDataLength = 0
     self.serverCount = 0
diff --git a/Hotline/HotlineApp.swift b/Hotline/HotlineApp.swift
index 3e714d8..82fa7d4 100644
--- a/Hotline/HotlineApp.swift
+++ b/Hotline/HotlineApp.swift
@@ -20,6 +20,8 @@ struct HotlineApp: App {
   @State private var hotline = HotlineClient()
   @State private var tracker = HotlineTrackerClient(tracker: HotlineTracker("hltracker.com"))
   
+  private var model = Hotline(trackerClient: HotlineTrackerClient())
+  
   var body: some Scene {
     
     WindowGroup {
diff --git a/Hotline/Models/Hotline.swift b/Hotline/Models/Hotline.swift
new file mode 100644
index 0000000..70f68a9
--- /dev/null
+++ b/Hotline/Models/Hotline.swift
@@ -0,0 +1,21 @@
+import SwiftUI
+
+@Observable final class Hotline {
+  let trackerClient: HotlineTrackerClient
+  
+  
+  
+  init(trackerClient: HotlineTrackerClient) {
+    self.trackerClient = trackerClient
+  }
+  
+  @MainActor func getServers(address: String, port: Int) async {
+    let fetchedServers = await withCheckedContinuation { [weak self] continuation in
+      self?.trackerClient.fetch() {
+        continuation.resume(returning: [])
+      }
+    }
+    
+    
+  }
+}
diff --git a/Hotline/Models/Server.swift b/Hotline/Models/Server.swift
new file mode 100644
index 0000000..c2063ea
--- /dev/null
+++ b/Hotline/Models/Server.swift
@@ -0,0 +1,16 @@
+import SwiftUI
+
+@Observable final class Server {
+  let name: String
+  let description: String?
+  let users: Int = 0
+  let address: String
+  let port: Int
+  
+  init(name: String, description: String?, address: String, port: Int) {
+    self.name = name
+    self.description = description
+    self.address = address
+    self.port = port
+  }
+}
diff --git a/Hotline/Models/Tracker.swift b/Hotline/Models/Tracker.swift
new file mode 100644
index 0000000..c9dfb5c
--- /dev/null
+++ b/Hotline/Models/Tracker.swift
@@ -0,0 +1,20 @@
+import SwiftUI
+
+@Observable final class Tracker {
+  let service: HotlineTrackerClient
+  let address: String
+  let port: Int
+  var servers: [Server] = []
+  
+  init(address: String, port: Int = 5498, service: HotlineTrackerClient) {
+    self.address = address
+    self.port = port
+    self.service = service
+  }
+  
+  func fetchServers() {
+    self.service.fetch2(address: self.address, port: self.port) { servers in
+      self.servers = servers
+    }
+  }
+}
diff --git a/Hotline/Views/TrackerView.swift b/Hotline/Views/TrackerView.swift
index c8d0f2e..1c61cf4 100644
--- a/Hotline/Views/TrackerView.swift
+++ b/Hotline/Views/TrackerView.swift
@@ -7,9 +7,12 @@ struct TrackerView: View {
   
   @Environment(HotlineState.self) private var appState
   @Environment(HotlineClient.self) private var hotline
-  @Environment(HotlineTrackerClient.self) private var tracker
+  @Environment(HotlineTrackerClient.self) private var trackerClient
+  @Environment(Hotline.self) private var model: Hotline
   @Environment(\.colorScheme) var colorScheme
   
+//  @State private var tracker = Tracker(address: "hltracker.com", service: trackerService)
+  
   @State private var selectedServer: HotlineServer?
   @State var scrollOffset: CGFloat = CGFloat.zero
   
@@ -32,7 +35,6 @@ struct TrackerView: View {
     case .loggingIn:
       return 0.5
     case .loggedIn:
-      
       return 1.0
     }
   }