fix: deadlock on incrementalSync - WPB-21010 🍒 (#3747)

Co-authored-by: François Benaiteau <[email protected]>
Co-authored-by: François Benaiteau <[email protected]>

Author: github-actions[bot]

WireDomain/Sources/WireDomain/Synchronization/IncrementalSync.swift

@@ -20,6 +20,7 @@ import Combine
 import Foundation
 import WireLogging
 import WireNetwork
+import WireSystem
 
 public struct IncrementalSync: IncrementalSyncProtocol {
 
@@ -123,10 +124,23 @@ public struct IncrementalSync: IncrementalSyncProtocol {
                 logger.debug("handling live event stream", attributes: .incrementalSyncV2)
                 syncStateSubject.send(.liveSyncing(.ongoing))
 
-                await processLiveEvents(
-                    liveEventStream: liveEventStream,
-                    processedEnvelopeIDs: processedEnvelopeIDs
-                )
+                do {
+                    // because we might be interrupted when in background, we wrap the sync in an expiringActivity that
+                    // will cancel the task - not keeping any db operation (sqlite file opened) in suspend mode
+                    try await withExpiringActivity(reason: "processLiveStream IncrementalSync") {
+                        await processLiveEvents(
+                            liveEventStream: liveEventStream,
+                            processedEnvelopeIDs: processedEnvelopeIDs
+                        )
+                    }
+                } catch {
+                    // if we expire, close everything
+                    WireLogger.sync.debug(
+                        "Error while processing live stream, close push channel",
+                        attributes: .incrementalSyncV2
+                    )
+                    await pushChannel.close()
+                }
 
                 logger.debug("live event stream did finish", attributes: .incrementalSyncV2)
                 syncStateSubject.send(.liveSyncing(.finished))

WireDomain/Sources/WireDomain/Synchronization/IncrementalSyncV2.swift

@@ -146,6 +146,9 @@ public struct IncrementalSyncV2: LiveSyncProtocol {
         await mlsGroupRepairAgent.repairConversations()
 
         let task = Task { @Sendable [self] in
+            logger.debug("handling live event stream", attributes: logAttributes)
+            syncStateSubject.send(.liveSyncing(.ongoing))
+
             do {
                 // because we might be interrupted when in background, we wrap the sync in an expiringActivity that will
                 // cancel the task (not keeping any file lock in suspend mode)
@@ -156,13 +159,16 @@ public struct IncrementalSyncV2: LiveSyncProtocol {
                         syncMarker: syncMarker
                     )
 
-                    WireLogger.sync.debug("Live stream ended, close push channel")
+                    WireLogger.sync.debug("Live stream ended, close push channel", attributes: logAttributes)
                     await pushChannel.close()
                     await pushChannelState.markAsClosed()
                 }
             } catch {
                 // if we expire, close everything
-                WireLogger.sync.debug("Error while processing live stream, close push channel")
+                WireLogger.sync.debug(
+                    "Error while processing live stream, close push channel",
+                    attributes: logAttributes
+                )
                 await pushChannel.close()
                 await pushChannelState.markAsClosed()
             }