fmt & lint

Author: ethanndickson

Diff for: Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift

@@ -38,9 +38,9 @@ public class MutagenDaemon: FileSyncDaemon {
     private let mutagenDaemonSocket: URL
 
     // Non-nil when the daemon is running
+    var client: DaemonClient?
     private var group: MultiThreadedEventLoopGroup?
     private var channel: GRPCChannel?
-    private var client: DaemonClient?
 
     // Protect start & stop transitions against re-entrancy
     private let transition = AsyncSemaphore(value: 1)
@@ -293,59 +293,6 @@ public class MutagenDaemon: FileSyncDaemon {
     }
 }
 
-
-extension MutagenDaemon {
-    typealias PromptStream = GRPCAsyncBidirectionalStreamingCall<Prompting_HostRequest, Prompting_HostResponse>
-
-    func Host(allowPrompts: Bool = true) async throws(DaemonError) -> (PromptStream, identifier: String) {
-        let stream = client!.prompt.makeHostCall()
-
-        do {
-            try await stream.requestStream.send(.with { req in req.allowPrompts = allowPrompts })
-        } catch {
-            throw .grpcFailure(error)
-        }
-
-        // We can't make call `makeAsyncIterator` more than once
-        // (as a for-loop would do implicitly)
-        var iter = stream.responseStream.makeAsyncIterator()
-
-        // "Receive the initialization response, validate it, and extract the prompt identifier"
-        let initResp: Prompting_HostResponse?
-        do {
-            initResp = try await iter.next()
-        } catch {
-            throw .grpcFailure(error)
-        }
-        guard let initResp = initResp else {
-            throw .unexpectedStreamClosure
-        }
-        // TODO: we'll always accept prompts for now
-        try initResp.ensureValid(first: true, allowPrompts: allowPrompts)
-
-        Task.detached(priority: .background) {
-            do {
-                while let resp = try await iter.next() {
-                    debugPrint(resp)
-                    try resp.ensureValid(first: false, allowPrompts: allowPrompts)
-                   switch resp.isPrompt {
-                   case true:
-                       // TODO: Handle prompt
-                       break
-                   case false:
-                       // TODO: Handle message
-                       break
-                   }
-                }
-            } catch {
-                // TODO: Log prompter stream error
-            }
-        }
-        return (stream, identifier: initResp.identifier)
-    }
-}
-
-
 struct DaemonClient {
     let mgmt: Daemon_DaemonAsyncClient
     let sync: Synchronization_SynchronizationAsyncClient

Diff for: Coder-Desktop/VPNLib/FileSync/FileSyncPrompting.swift

@@ -0,0 +1,52 @@
+import GRPC
+
+extension MutagenDaemon {
+    typealias PromptStream = GRPCAsyncBidirectionalStreamingCall<Prompting_HostRequest, Prompting_HostResponse>
+
+    func host(allowPrompts: Bool = true) async throws(DaemonError) -> (PromptStream, identifier: String) {
+        let stream = client!.prompt.makeHostCall()
+
+        do {
+            try await stream.requestStream.send(.with { req in req.allowPrompts = allowPrompts })
+        } catch {
+            throw .grpcFailure(error)
+        }
+
+        // We can't make call `makeAsyncIterator` more than once
+        // (as a for-loop would do implicitly)
+        var iter = stream.responseStream.makeAsyncIterator()
+
+        // "Receive the initialization response, validate it, and extract the prompt identifier"
+        let initResp: Prompting_HostResponse?
+        do {
+            initResp = try await iter.next()
+        } catch {
+            throw .grpcFailure(error)
+        }
+        guard let initResp else {
+            throw .unexpectedStreamClosure
+        }
+        // TODO: we'll always accept prompts for now
+        try initResp.ensureValid(first: true, allowPrompts: allowPrompts)
+
+        Task.detached(priority: .background) {
+            do {
+                while let resp = try await iter.next() {
+                    debugPrint(resp)
+                    try resp.ensureValid(first: false, allowPrompts: allowPrompts)
+                    switch resp.isPrompt {
+                    case true:
+                        // TODO: Handle prompt
+                        break
+                    case false:
+                        // TODO: Handle message
+                        break
+                    }
+                }
+            } catch {
+                // TODO: Log prompter stream error
+            }
+        }
+        return (stream, identifier: initResp.identifier)
+    }
+}

Diff for: Coder-Desktop/VPNLib/FileSync/MutagenConvert.swift

@@ -58,7 +58,6 @@ func humanReadableBytes(_ bytes: UInt64) -> String {
     ByteCountFormatter().string(fromByteCount: Int64(bytes))
 }
 
-
 extension Prompting_HostResponse {
     func ensureValid(first: Bool, allowPrompts: Bool) throws(DaemonError) {
         if first {
@@ -80,4 +79,4 @@ extension Prompting_HostResponse {
             }
         }
     }
-}
+}