fixing unit tests

Packages/Ngrokit/Package.swift

@@ -61,9 +61,14 @@ let package = Package(
       ],
       swiftSettings: swiftSettings
     ),
+    .target(
+      name: "NgrokitMocks",
+      dependencies: ["Ngrokit"],
+      swiftSettings: swiftSettings
+    ),
     .testTarget(
       name: "NgrokitTests",
-      dependencies: ["Ngrokit"]
+      dependencies: ["Ngrokit", "NgrokitMocks"]
     )
   ]
 )

Packages/Ngrokit/Sources/NgrokitMocks/MockAPI.swift

@@ -28,7 +28,7 @@
 //
 
 import Foundation
-import NgrokOpenAPIClient
+package import NgrokOpenAPIClient
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking

Packages/Ngrokit/Sources/NgrokitMocks/MockDataHandle.swift

@@ -27,7 +27,7 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import Foundation
+package import Foundation
 import Ngrokit
 
 package struct MockDataHandle: DataHandle {

Packages/Ngrokit/Sources/NgrokitMocks/MockNgrokCLIAPI.swift

@@ -27,8 +27,8 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import Foundation
-import Ngrokit
+package import Foundation
+package import Ngrokit
 
 package final class MockNgrokCLIAPI: NgrokCLIAPI {
   package let process: any NgrokProcess

Packages/Ngrokit/Sources/NgrokitMocks/MockNgrokProcess.swift

@@ -27,10 +27,14 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import Foundation
+package import Foundation
 import Ngrokit
 
 package final class MockNgrokProcess: NgrokProcess {
+  func terminate() {
+
+  }
+
   package let id: UUID
 
   package init(id: UUID) {

Packages/Ngrokit/Sources/NgrokitMocks/MockProcess.swift

@@ -27,10 +27,14 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import Foundation
-import Ngrokit
+package import Foundation
+package import Ngrokit
 
 package final class MockProcess: Processable {
+  package func terminate() {
+
+  }
+
   package typealias PipeType = MockPipe
 
   package let executableFilePath: String

Packages/Ngrokit/Sources/NgrokitMocks/URL.swift

@@ -27,10 +27,10 @@
 //  OTHER DEALINGS IN THE SOFTWARE.
 //
 
-import Foundation
+package import Foundation
 
 #if canImport(FoundationNetworking)
-  import FoundationNetworking
+package import FoundationNetworking
 #endif
 
 extension URL {

Packages/SublimationBonjour/Sources/SublimationBonjour/Client/BindingConfiguration.swift → Packages/SublimationBonjour/Sources/SublimationBonjour/Client/BindingConfiguration+URL.swift

@@ -34,9 +34,9 @@
   internal import Network
 
   extension BindingConfiguration {
-    internal func urls(defaultIsSecure: Bool, defaultPort: Int) -> [URL] {
-      let isSecure = self.hasIsSecure ? self.isSecure : defaultIsSecure
-      let port = self.hasPort ? Int(self.port) : defaultPort
+    internal func urls(defaults : URLDefaultConfiguration) -> [URL] {
+      let isSecure = self.hasIsSecure ? self.isSecure : defaults.isSecure
+      let port = self.hasPort ? Int(self.port) : defaults.port
       return self.hosts.compactMap { host in
         if host.isLocalhost() { return nil }
         if host.isValidIPv6Address() { return nil }

Packages/SublimationBonjour/Sources/SublimationBonjour/Client/BonjourClient.swift

@@ -38,10 +38,21 @@
     public import Logging
   #endif
 
+public struct URLDefaultConfiguration {
+  public init(isSecure: Bool = false, port: Int = 8080) {
+    self.isSecure = isSecure
+    self.port = port
+  }
+
+  public let isSecure: Bool
+  public let port: Int
+}
+
   public actor BonjourClient {
     private let browser: NWBrowser
     private let streams = StreamManager<UUID, URL>()
     private let logger: Logger?
+    private let defaultURLConfiguration: URLDefaultConfiguration
 
     public var urls: AsyncStream<URL> {
       get async {
@@ -63,15 +74,15 @@
       }
     }
 
-    public init(logger: Logger? = nil) {
+    public init(logger: Logger? = nil, defaultURLConfiguration : URLDefaultConfiguration = .init()) {
+
       assert(logger != nil)
       let descriptor: NWBrowser.Descriptor
-      #if os(watchOS)
+
         descriptor = .bonjourWithTXTRecord(type: "_sublimation._tcp", domain: nil)
-      #else
-        descriptor = .bonjour(type: "_sublimation._tcp", domain: nil)
-      #endif
+
       let browser = NWBrowser(for: descriptor, using: .tcp)
+      self.defaultURLConfiguration = defaultURLConfiguration
       self.browser = browser
       self.logger = logger
       browser.browseResultsChangedHandler = { results, _ in self.parseResults(results) }
@@ -100,6 +111,7 @@
       case indexMismatch(Int)
       case base64Decoding
     }
+
     private static func bindingConfiguration(txtRecordDictionary: [String: String]) throws
       -> BindingConfiguration
     {
@@ -126,7 +138,6 @@
       }
       let values = pairs.map(\.1)
       guard let data: Data = .init(base64Encoded: values.joined()) else {
-        // self.logger?.error("Unable to decode Base64 TXT Record for \(result.endpoint.debugDescription)")
         throw TXTRecordError.base64Decoding
       }
       return try .init(serializedData: data)
@@ -146,7 +157,7 @@
           continue
         }
         #warning("Defaults should be passed to connection")
-        let urls = configuration.urls(defaultIsSecure: false, defaultPort: 8_080)
+        let urls = configuration.urls(defaults: self.defaultURLConfiguration)
         self.append(urls: urls)
       }
     }