@Observable NetworkMonitor

README.md

@@ -12,7 +12,7 @@
 # OAuthKit
 <img src="https://github.com/user-attachments/assets/039ee445-42af-433d-9793-56fc36330952" height="100" align="left"/>
 
-OAuthKit is a contemporary, event-driven Swift Package that utilizes the [Observation](https://developer.apple.com/documentation/observation) and [Combine](https://developer.apple.com/documentation/combine) Frameworks to implement the observer design pattern and publish [OAuth 2.0](https://oauth.net/2/) events. This enables application developers to effortlessly configure OAuth Providers and concentrate on developing exceptional applications rather than being preoccupied with the intricacies of authorization flows.
+OAuthKit is a contemporary, event-driven Swift Package that utilizes the [Observation](https://developer.apple.com/documentation/observation) Framework to implement the observer design pattern and publish [OAuth 2.0](https://oauth.net/2/) events. This enables application developers to effortlessly configure OAuth Providers and concentrate on developing exceptional applications rather than being preoccupied with the intricacies of authorization flows.
 <br clear="left"/>
 
 ## OAuthKit Usage

Sources/OAuthKit/Network/NetworkMonitor.swift

@@ -5,43 +5,46 @@
 //  Created by Kevin McKee on 5/30/24.
 //
 
-import Combine
 import Network
+import Observation
 
 private let queueLabel = "oauthkit.NetworkMonitor"
 
 /// A type that broadcasts network reachability via Combine event publishing.
-@MainActor final class NetworkMonitor {
-
-    /// The private pass through publisher.
-    private var publisher = PassthroughSubject<Bool, Never>()
-
-    /// Provides a pass through subject used to broadcast events to downstream subscribers.
-    /// The subject will automatically drop events if there are no subscribers, or its current demand is zero.
-    public lazy var networkStatus = publisher.eraseToAnyPublisher()
+@MainActor
+@Observable
+final class NetworkMonitor {
 
+    @ObservationIgnored
     private let pathMonitor = NWPathMonitor()
-    private let queue = DispatchQueue(label: queueLabel)
 
     /// Returns true if the network has an available wifi interface.
     var onWifi = false
     /// Returns true if the network has an available cellular interface.
     var onCellular = false
+    /// Returns true if the network has an wired ethernet interface.
+    var onWiredEthernet = false
+
+    /// Returns true if the network is online with any available interface.
+    var isOnline: Bool {
+        onWifi || onCellular || onWiredEthernet
+    }
+
+    /// Initializer.
+    init() { }
 
-    /// Initializer that starts the network monitor and begins publishing updates.
-    init() {
-        pathMonitor.pathUpdateHandler = { [weak self] path in
-            guard let self else { return }
-            Task { @MainActor in
-                self.handle(path: path)
-            }
+    /// Starts the network monitor (conforms to AsyncSequence).
+    func start() async {
+        for await path in pathMonitor {
+            handle(path: path)
         }
-        pathMonitor.start(queue: queue)
     }
 
-    func handle(path: NWPath) {
+    /// Handles the snapshot view of the network path state.
+    /// - Parameter path: the snapshot view of the network path state
+    private func handle(path: NWPath) {
         onWifi = path.usesInterfaceType(.wifi)
         onCellular = path.usesInterfaceType(.cellular)
-        publisher.send(path.status == .satisfied)
+        onWiredEthernet = path.usesInterfaceType(.wiredEthernet)
     }
 }

Sources/OAuthKit/OAuth.swift

@@ -4,7 +4,6 @@
 //
 //  Created by Kevin McKee on 5/14/24.
 //
-import Combine
 import Foundation
 #if canImport(LocalAuthentication)
 import LocalAuthentication
@@ -74,10 +73,6 @@ public final class OAuth {
     @ObservationIgnored
     var requireAuthenticationWithBiometricsOrCompanion: Bool = false
 
-    /// Combine subscribers.
-    @ObservationIgnored
-    private var subscribers = Set<AnyCancellable>()
-
     /// The json decoder
     @ObservationIgnored
     private let decoder: JSONDecoder = .init()
@@ -229,7 +224,7 @@ private extension OAuth {
                 self.keychain = .init(applicationTag)
             }
         }
-        subscribe()
+        monitor()
         restore()
     }
 
@@ -270,12 +265,11 @@ private extension OAuth {
         #endif
     }
 
-    /// Subsribes to event publishers.
-    func subscribe() {
-        // Subscribe to network status events
-        networkMonitor.networkStatus.sink { (_) in
-            // TODO: Add Handler
-        }.store(in: &subscribers)
+    /// Starts the network monitor.
+    func monitor() {
+        Task {
+            await networkMonitor.start()
+        }
     }
 
     /// Publishes state on the main thread.

Sources/OAuthKit/Views/OAWebViewCoordinator.swift

@@ -6,7 +6,6 @@
 //
 
 #if canImport(WebKit)
-import Combine
 import SwiftUI
 import WebKit