refactored LoggerType

Package.resolved

@@ -1,22 +1,13 @@
 {
-  "originHash" : "2b9f814946e4952387f6691929b3d5d9a95ddbf99f1704f4beaab390f06560d6",
+  "originHash" : "eb6d44461edfa318c7714318cbf366fdaa85477ce7d75eb7670439f78984597b",
   "pins" : [
     {
       "identity" : "sublimation",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/brightdigit/Sublimation",
+      "location" : "https://github.com/brightdigit/Sublimation.git",
       "state" : {
-        "revision" : "99d0da9f907d27deb180582b274c5f83e6732921",
-        "version" : "2.0.0-beta.1"
-      }
-    },
-    {
-      "identity" : "swift-log",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log.git",
-      "state" : {
-        "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
-        "version" : "1.6.1"
+        "branch" : "remove-logging",
+        "revision" : "a342f5c67827329a7db1caa1c700da79fa40cc7d"
       }
     },
     {

Package.swift

@@ -41,7 +41,7 @@ let package = Package(
     .library(name: "SublimationBonjour", targets: ["SublimationBonjour"])
   ],
   dependencies: [
-    .package(path: "../Sublimation"),
+    .package(url: "https://github.com/brightdigit/Sublimation.git", branch: "remove-logging"),
     .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.26.0")
   ],
   targets: [

Sources/SublimationBonjour/Client/BonjourClient.swift

@@ -29,14 +29,7 @@
 
 #if canImport(Network)
   public import Foundation
-
-internal import Network
-
-  #if canImport(os)
-    public import os
-  #elseif canImport(Logging)
-    public import Logging
-  #endif
+  internal import Network
 
   /// Client for fetching the url of the host server.
   ///
@@ -46,9 +39,10 @@ internal import Network
   /// let hostURL = await depositor.first()
   /// ```
   public actor BonjourClient {
+
     private let browser: NWBrowser
     private let streams = StreamManager<UUID, URL>()
-    private let logger: Logger?
+    private let logger: LoggerType?
     private let defaultURLConfiguration: URLDefaultConfiguration
 
     /// AsyncStream of `URL` from the network.
@@ -76,7 +70,10 @@ internal import Network
     /// - Parameters:
     ///   - logger: Logger
     ///   - defaultURLConfiguration: default ``URL`` configuration for missing properties.
-    public init(logger: Logger? = nil, defaultURLConfiguration: URLDefaultConfiguration = .init()) {
+    public init(
+      logger: LoggerType? = nil,
+      defaultURLConfiguration: URLDefaultConfiguration = .init()
+    ) {
       assert(logger != nil)
       let descriptor: NWBrowser.Descriptor
       descriptor = .bonjourWithTXTRecord(type: "_sublimation._tcp", domain: nil)

Sources/SublimationBonjour/Client/LoggerType.swift

@@ -0,0 +1,41 @@
+//
+//  LoggerType.swift
+//  SublimationBonjour
+//
+//  Created by Leo Dion.
+//  Copyright © 2024 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if canImport(os)
+  public import os
+#elseif canImport(Logging)
+  public import Logging
+#endif
+
+#if canImport(os) || canImport(Logging)
+  public typealias LoggerType = Logger
+#else
+  public typealias LoggerType = any NilLoggerType
+  public protocol NilLoggerType { func debug(_ message: String) }
+#endif

Sources/SublimationBonjour/Client/StreamManager.swift

@@ -29,12 +29,6 @@
 
 internal import Foundation
 
-#if canImport(os)
-  internal import os
-#elseif canImport(Logging)
-  internal import Logging
-#endif
-
 internal actor StreamManager<Key: Hashable & Sendable, Value: Sendable> {
   private var streamContinuations: [Key: AsyncStream<Value>.Continuation] = [:]
 
@@ -44,7 +38,7 @@ internal actor StreamManager<Key: Hashable & Sendable, Value: Sendable> {
 
   internal init(newID: @escaping @Sendable () -> Key) { self.newID = newID }
 
-  internal func yield(_ urls: [Value], logger: Logger?) {
+  internal func yield(_ urls: [Value], logger: LoggerType?) {
     if streamContinuations.isEmpty { logger?.debug("Missing Continuations.") }
     for streamContinuation in streamContinuations {
       for url in urls { streamContinuation.value.yield(url) }

Sources/SublimationBonjour/Extensions/NWConnection.swift

@@ -1,5 +1,5 @@
 //
-//  NWListener.swift
+//  NWConnection.swift
 //  SublimationBonjour
 //
 //  Created by Leo Dion.
@@ -28,27 +28,18 @@
 //
 
 #if canImport(Network)
-public import Foundation
+  import Foundation
   public import Network
 
-extension NWConnection.State: @retroactive CustomDebugStringConvertible {
+  extension NWConnection.State: @retroactive CustomDebugStringConvertible {
     @_documentation(visibility: internal) public var debugDescription: String {
-      switch self {
-
-      case .setup:
-        return "setup"
-      case .waiting(let error):
+      switch self { case .setup: return "setup" case .waiting(let error):
         return "waiting: \(error.debugDescription)"
-      case .preparing:
-        return "preparing"
-      case .ready:
-        return "ready"
-      case .failed(let error):
-        return "failed:  \(error.debugDescription)"
-      case .cancelled:
-        return  "cancelled"
-      @unknown default:
-        return "unknown state"
+        case .preparing: return "preparing"
+        case .ready: return "ready"
+        case .failed(let error): return "failed:  \(error.debugDescription)"
+        case .cancelled: return "cancelled"
+        @unknown default: return "unknown state"
       }
     }
   }

Sources/SublimationBonjour/Extensions/NWListener.swift

@@ -28,7 +28,7 @@
 //
 
 #if canImport(Network)
-  public import Foundation
+  import Foundation
   public import Network
 
   extension NWListener.State: @retroactive CustomDebugStringConvertible {

Sources/SublimationBonjour/Server/BonjourSublimatory.swift

@@ -34,7 +34,7 @@
   public import Network
 
   public import SublimationCore
-public import Logging
+  public import Logging
 
   /// Sublimatory for using Bonjour auto-discovery.
   public struct BonjourSublimatory: Sublimatory {
@@ -169,7 +169,6 @@ public import Logging
         connection.stateUpdateHandler = { state in
           switch state { case .waiting(let error):
 
-
             logger.debug("Connection Waiting error: \(error.localizedDescription)")
 
             case .ready:
@@ -184,7 +183,7 @@ public import Logging
               )
             case .failed(let error): logger.debug("Connection Failure: \(error)")
 
-          default: logger.debug("Connection state updated: \(state.debugDescription)")
+            default: logger.debug("Connection state updated: \(state.debugDescription)")
           }
         }
         connection.start(queue: connectionQueue)