@@ -6,15 +6,19 @@ import os
66@MainActor
77public protocol FileSyncDaemon : ObservableObject {
88var state : DaemonState { get }
9- func start( ) async throws ( DaemonError )
10- func stop( ) async throws ( DaemonError )
9+ func start( ) async
10+ func stop( ) async
1111}
1212
1313@MainActor
1414public class MutagenDaemon : FileSyncDaemon {
1515private let logger = Logger ( subsystem: Bundle . main. bundleIdentifier!, category: " mutagen " )
1616
17- @Published public var state : DaemonState = . stopped
17+ @Published public var state : DaemonState = . stopped{
18+ didSet{
19+ logger. info ( " daemon state changed: \( self . state. description) " )
20+ }
21+ }
1822
1923private var mutagenProcess : Process ?
2024private var mutagenPipe : Pipe ?
@@ -47,26 +51,24 @@ public class MutagenDaemon: FileSyncDaemon {
4751}
4852}
4953
50- public func start( ) async throws ( DaemonError ) {
54+ public func start( ) async {
5155if case. unavailable= state{ return }
5256
5357 // Stop an orphaned daemon, if there is one
5458try ? await connect ( )
55- try ? await stop ( )
59+ await stop ( )
5660
5761( mutagenProcess, mutagenPipe) = createMutagenProcess ( )
5862do {
5963try ? . run ( )
6064} catch {
61- state= . failed( " Failed to start file sync daemon: \( error) " )
62- throw DaemonError . daemonStartFailure ( error)
65+ state= . failed( DaemonError . daemonStartFailure ( error) )
6366}
6467
6568do {
6669try await connect ( )
6770} catch {
68- state= . failed( " failed to connect to file sync daemon: \( error) " )
69- throw DaemonError . daemonStartFailure ( error)
71+ state= . failed( DaemonError . daemonStartFailure ( error) )
7072}
7173
7274 state= . running
@@ -105,7 +107,7 @@ public class MutagenDaemon: FileSyncDaemon {
105107 group= nil
106108}
107109
108- public func stop( ) async throws ( DaemonError ) {
110+ public func stop( ) async {
109111if case. unavailable= state{ return }
110112 state= . stopped
111113guard FileManager . default. fileExists ( atPath: mutagenDaemonSocket. path) else {
@@ -155,7 +157,7 @@ public class MutagenDaemon: FileSyncDaemon {
155157return
156158default :
157159 logger. error ( " mutagen daemon exited unexpectedly " )
158- self . state= . failed( " File sync daemon terminated unexpectedly " )
160+ self . state= . failed( . terminatedUnexpectedly )
159161}
160162}
161163}
@@ -170,11 +172,38 @@ public class MutagenDaemon: FileSyncDaemon {
170172public enum DaemonState {
171173case running
172174case stopped
173- case failed( String )
175+ case failed( DaemonError )
174176case unavailable
177+
178+ var description : String {
179+ switch self {
180+ case . running:
181+ " Running "
182+ case . stopped:
183+ " Stopped "
184+ case let . failed( error) :
185+ " Failed: \( error) "
186+ case . unavailable:
187+ " Unavailable "
188+ }
189+ }
175190}
176191
177192public enum DaemonError : Error {
178193case daemonStartFailure( Error )
179194case connectionFailure( Error )
195+ case terminatedUnexpectedly
196+
197+ var description : String {
198+ switch self {
199+ case let . daemonStartFailure( error) :
200+ " Daemon start failure: \( error) "
201+ case let . connectionFailure( error) :
202+ " Connection failure: \( error) "
203+ case . terminatedUnexpectedly:
204+ " Daemon terminated unexpectedly "
205+ }
206+ }
207+
208+ var localizedDescription : String { description}
180209}