Adjust group refresh timeout behavior

Author: max-signal

SignalServiceKit/Groups/GroupV2UpdatesImpl.swift

@@ -335,16 +335,12 @@ private extension GroupV2UpdatesImpl {
 
         do {
             // Try to use individual changes.
-            try await Promise.wrapAsync {
-                try await self.fetchAndApplyChangeActionsFromService(
-                    secretParams: secretParams,
-                    spamReportingMetadata: spamReportingMetadata,
-                    source: source,
-                    options: options
-                )
-            }.timeout(seconds: GroupManager.groupUpdateTimeoutDuration, description: "Update via changes") {
-                return GroupsV2Error.timeout
-            }.awaitable()
+            try await self.fetchAndApplyChangeActionsFromService(
+                secretParams: secretParams,
+                spamReportingMetadata: spamReportingMetadata,
+                source: source,
+                options: options
+            )
         } catch {
             let shouldTrySnapshot = { () -> Bool in
                 // This should not fail over in the case of networking problems.
@@ -379,15 +375,11 @@ private extension GroupV2UpdatesImpl {
             }
 
             // Failover to applying latest snapshot.
-            try await Promise.wrapAsync {
-                try await self.fetchAndApplyCurrentGroupV2SnapshotFromService(
-                    secretParams: secretParams,
-                    spamReportingMetadata: spamReportingMetadata,
-                    options: options
-                )
-            }.timeout(seconds: GroupManager.groupUpdateTimeoutDuration, description: "Update via snapshot") {
-                return GroupsV2Error.timeout
-            }.awaitable()
+            try await self.fetchAndApplyCurrentGroupV2SnapshotFromService(
+                secretParams: secretParams,
+                spamReportingMetadata: spamReportingMetadata,
+                options: options
+            )
         }
     }
 

SignalServiceKit/Groups/GroupsV2Impl.swift

@@ -49,6 +49,18 @@ public class GroupsV2Impl: GroupsV2 {
         observeNotifications()
     }
 
+    private func refreshGroupWithTimeout(secretParams: GroupSecretParams) async throws {
+        do {
+            // Ignore the result after the timeout. However, keep refreshing the group
+            // in the background since the result is still useful/reusable.
+            try await withUncooperativeTimeout(seconds: GroupManager.groupUpdateTimeoutDuration) {
+                try await SSKEnvironment.shared.groupV2UpdatesRef.refreshGroup(secretParams: secretParams)
+            }
+        } catch is UncooperativeTimeoutError {
+            throw GroupsV2Error.timeout
+        }
+    }
+
     // MARK: - Notifications
 
     private func observeNotifications() {
@@ -223,7 +235,7 @@ public class GroupsV2Impl: GroupsV2 {
                 // committed to the service, we should refresh our local state
                 // for the group and try again to apply our changes.
 
-                try await SSKEnvironment.shared.groupV2UpdatesRef.refreshGroup(secretParams: groupV2Params.groupSecretParams)
+                try await refreshGroupWithTimeout(secretParams: groupV2Params.groupSecretParams)
 
                 (messageBehavior, httpResponse) = try await buildGroupChangeProtoAndTryToUpdateGroupOnService(
                     groupId: groupId,
@@ -1587,7 +1599,7 @@ public class GroupsV2Impl: GroupsV2 {
         // First try to fetch latest group state from service.
         // This will fail for users trying to join via group link
         // who are not yet in the group.
-        try await SSKEnvironment.shared.groupV2UpdatesRef.refreshGroup(secretParams: secretParams)
+        try await refreshGroupWithTimeout(secretParams: secretParams)
 
         let groupThread = SSKEnvironment.shared.databaseStorageRef.read { tx in
             return TSGroupThread.fetch(forGroupId: groupId, tx: tx)