macos: Handle connection close and error

Changes

5 changed files (+75/-4)

• macos/RoonKit/Sources/RoonKit/Connection/Connectable.swift
  • @@ -30,4 +30,11 @@ public protocol Connectable: Actor {
    /// Close the current connection. func disconnect() + + /// Waits for connection to be closed. + /// + /// This method returns when the connection was closed. + /// If the connection is already closed at the time of this method call, + /// this method immediately returns. + func lifetime() async }
• macos/RoonKit/Sources/RoonKit/Connection/Connection.swift
  • @@ -37,6 +37,8 @@ public actor Connection: Connectable, Communicatable {
    private var messageContinuationID: UInt = 0 private var messageContinuations: [UInt: AsyncStream<Moo>.Continuation] = [:] + private var lifetimeContinuations: [CheckedContinuation<Void, Never>] = [] + private var readLoop: Task<Void, any Error>? = nil public enum InitError: Error {
  • @@ -94,6 +96,11 @@ public actor Connection: Connectable, Communicatable {
    self.messageContinuations = [:] + for cont in self.lifetimeContinuations { + cont.resume() + } + self.lifetimeContinuations = [] + if conn.state != .cancelled { conn.cancel() }
  • @@ -226,6 +233,17 @@ public actor Connection: Connectable, Communicatable {
    break } } catch { + switch error { + case NWError.posix(.ENODATA): + if let self = self { + logger.warning("Stream closed, disconnecting") + await self.disconnect() + return + } + default: + break + } + if let logger = self?.logger { logger.warning("Receive failed: \(error)") }
  • @@ -245,11 +263,26 @@ public actor Connection: Connectable, Communicatable {
    self.messageContinuations = [:] + for cont in self.lifetimeContinuations { + cont.resume() + } + self.lifetimeContinuations = [] + if conn.state != .cancelled { conn.cancel() } } + public func lifetime() async { + guard self.conn.state != .cancelled else { + return + } + + await withCheckedContinuation { (cont: CheckedContinuation<Void, Never>) in + self.lifetimeContinuations.append(cont) + } + } + public var messages: AsyncStream<Moo> { let id = messageContinuationID messageContinuationID += 1
• macos/plac/DataModels/ConnectionDataModel.swift
  • @@ -143,6 +143,10 @@ final class ConnectionDataModel {
    serverIp = host serverPort = Int(port) savedToken = await conn.token + + await conn.lifetime() + + state = .closed } catch { state = .error(error) }
• macos/plac/Views/ConnectedScreen.swift
  • @@ -397,6 +397,10 @@ extension MockServer: Connectable {
    func connect() async throws {} func disconnect() {} + func lifetime() async { + await withCheckedContinuation { (_: CheckedContinuation<Void, Never>) in + } + } } #Preview {
• macos/plac/Views/ConnectionScreen.swift
  • @@ -27,8 +27,24 @@ struct ConnectionScreen: View {
    var body: some View { VStack { switch conn.state { - case .loading, .closed: - // TODO: Create view for closed state + case .closed: + ContentUnavailableView { + Label( + "Connection closed", + systemImage: "play.slash" + ) + } description: { + Text("Connection to Roon server closed.") + } actions: { + Button { + Task { + await conn.connect() + } + } label: { + Text("Connect") + } + } + case .loading: ProgressView() case .open(let conn, let (host, port)): ConnectedScreen(conn: conn)
  • @@ -51,8 +67,15 @@ struct ConnectionScreen: View {
    systemImage: "exclamationmark.magnifyingglass" ) } description: { - // TODO: Display error? - Text("Server not found") + Text("Unable to connect to server due to error.") + } actions: { + Button { + Task { + await conn.connect() + } + } label: { + Text("Connect") + } } } }