set generous timeouts on session requests

ethanndickson · ethanndickson · commit 660e1df83c27 · 2025-03-26T15:48:44.000+11:00
diff --git a/Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift b/Coder-Desktop/VPNLib/FileSync/FileSyncDaemon.swift
@@ -43,6 +43,9 @@ public class MutagenDaemon: FileSyncDaemon {
     private let mutagenDataDirectory: URL
     private let mutagenDaemonSocket: URL
 
+    // Managing sync sessions can take a while, especially with prompting
+    let sessionMgmtReqTimeout: TimeAmount = .seconds(5)
+
     // Non-nil when the daemon is running
     var client: DaemonClient?
     private var group: MultiThreadedEventLoopGroup?
diff --git a/Coder-Desktop/VPNLib/FileSync/FileSyncManagement.swift b/Coder-Desktop/VPNLib/FileSync/FileSyncManagement.swift
@@ -1,3 +1,5 @@
+import NIOCore
+
 public extension MutagenDaemon {
     func refreshSessions() async {
         guard case .running = state else { return }
@@ -49,7 +51,7 @@ public extension MutagenDaemon {
             }
         }
         do {
-            _ = try await client!.sync.create(req)
+            _ = try await client!.sync.create(req, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))
         } catch {
             throw .grpcFailure(error)
         }
@@ -68,7 +70,7 @@ public extension MutagenDaemon {
                 req.selection = .with { selection in
                     selection.specifications = ids
                 }
-            })
+            }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))
         } catch {
             throw .grpcFailure(error)
         }
@@ -87,7 +89,7 @@ public extension MutagenDaemon {
                 req.selection = .with { selection in
                     selection.specifications = ids
                 }
-            })
+            }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))
         } catch {
             throw .grpcFailure(error)
         }
@@ -106,7 +108,7 @@ public extension MutagenDaemon {
                 req.selection = .with { selection in
                     selection.specifications = ids
                 }
-            })
+            }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))
         } catch {
             throw .grpcFailure(error)
         }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+import NIOCore`
	`2`	`+`
`1`	`3`	`public extension MutagenDaemon {`
`2`	`4`	`func refreshSessions() async {`
`3`	`5`	`guard case .running = state else { return }`
`@@ -49,7 +51,7 @@ public extension MutagenDaemon {`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`	`do {`
`52`		`- _ = try await client!.sync.create(req)`
	`54`	`+ _ = try await client!.sync.create(req, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))`
`53`	`55`	`} catch {`
`54`	`56`	`throw .grpcFailure(error)`
`55`	`57`	`}`
`@@ -68,7 +70,7 @@ public extension MutagenDaemon {`
`68`	`70`	`req.selection = .with { selection in`
`69`	`71`	`selection.specifications = ids`
`70`	`72`	`}`
`71`		`- })`
	`73`	`+ }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))`
`72`	`74`	`} catch {`
`73`	`75`	`throw .grpcFailure(error)`
`74`	`76`	`}`
`@@ -87,7 +89,7 @@ public extension MutagenDaemon {`
`87`	`89`	`req.selection = .with { selection in`
`88`	`90`	`selection.specifications = ids`
`89`	`91`	`}`
`90`		`- })`
	`92`	`+ }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))`
`91`	`93`	`} catch {`
`92`	`94`	`throw .grpcFailure(error)`
`93`	`95`	`}`
`@@ -106,7 +108,7 @@ public extension MutagenDaemon {`
`106`	`108`	`req.selection = .with { selection in`
`107`	`109`	`selection.specifications = ids`
`108`	`110`	`}`
`109`		`- })`
	`111`	`+ }, callOptions: .init(timeLimit: .timeout(sessionMgmtReqTimeout)))`
`110`	`112`	`} catch {`
`111`	`113`	`throw .grpcFailure(error)`
`112`	`114`	`}`