fix(conversation): add retry attempts for conversationNotFound Error [WPB-18227] (#19768)

Author: aweiss-dev

src/script/repositories/conversation/ConversationRepository.ts

@@ -57,7 +57,7 @@ import {ClientMLSError, ClientMLSErrorLabel} from '@wireapp/core/lib/messagingPr
 import {amplify} from 'amplify';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
 import {container} from 'tsyringe';
-import {flatten} from 'underscore';
+import {flatten, isError} from 'underscore';
 
 import {Account} from '@wireapp/core';
 import {Asset as ProtobufAsset, Confirmation, LegalHoldStatus} from '@wireapp/protocol-messaging';
@@ -611,23 +611,34 @@ export class ConversationRepository {
       await this.updateParticipatingUserEntities(conversationEntity);
       await this.saveConversation(conversationEntity);
 
-      fetching_conversations[conversationId].forEach(({resolveFn}) => resolveFn(conversationEntity));
+      for (const {resolveFn} of fetching_conversations[conversationId]) {
+        resolveFn(conversationEntity);
+      }
       delete fetching_conversations[conversationId];
 
       return conversationEntity;
-    } catch (originalError) {
-      if (originalError.code === HTTP_STATUS.NOT_FOUND) {
-        this.deleteConversationLocally(qualifiedId, false);
-      }
-      const error = new ConversationError(
-        ConversationError.TYPE.CONVERSATION_NOT_FOUND,
-        ConversationError.MESSAGE.CONVERSATION_NOT_FOUND,
-        originalError,
-      );
-      fetching_conversations[conversationId].forEach(({rejectFn}) => rejectFn(error));
-      delete fetching_conversations[conversationId];
+    } catch (originalError: unknown) {
+      if (isError(originalError)) {
+        const code =
+          originalError && typeof originalError === 'object' && 'code' in originalError ? originalError.code : null;
+        this.logger.error(originalError.message);
+        if (code === HTTP_STATUS.NOT_FOUND) {
+          await this.deleteConversationLocally(qualifiedId, false);
+        }
+        const error = new ConversationError(
+          ConversationError.TYPE.CONVERSATION_NOT_FOUND,
+          ConversationError.MESSAGE.CONVERSATION_NOT_FOUND,
+          originalError,
+        );
 
-      throw error;
+        for (const {rejectFn} of fetching_conversations[conversationId]) {
+          rejectFn(error);
+        }
+
+        delete fetching_conversations[conversationId];
+        throw error;
+      }
+      throw new Error('unkown error encountered', {cause: originalError});
     }
   }
 

src/script/view_model/ContentViewModel.ts

@@ -22,6 +22,7 @@ import {QualifiedId} from '@wireapp/api-client/lib/user/';
 import {amplify} from 'amplify';
 import ko from 'knockout';
 import {container} from 'tsyringe';
+import {isError} from 'underscore';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
@@ -218,8 +219,25 @@ export class ContentViewModel {
     );
   }
 
-  private isConversationNotFoundError(error: any): boolean {
-    return error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
+  private isConversationNotFoundError(error: unknown): boolean {
+    return isError(error) && 'type' in error && error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
+  }
+
+  private async retryFetchConversationWithBackoff(
+    conversationId: QualifiedId,
+    maxRetries: number = 3,
+    initialDelayMs: number = 100,
+  ): Promise<boolean> {
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+      try {
+        await new Promise(resolve => setTimeout(resolve, initialDelayMs * (attempt + 1)));
+        await this.conversationRepository.fetchBackendConversationEntityById(conversationId);
+        return true;
+      } catch (error) {
+        this.logger.warn(`Retry attempt ${attempt + 1}/${maxRetries} failed for conversation fetch`, error);
+      }
+    }
+    return false;
   }
 
   /**
@@ -264,7 +282,6 @@ export class ContentViewModel {
       }
 
       const isOpenedConversation = this.isConversationOpen(conversationEntity, isActiveConversation);
-
       this.handleConversationState(isOpenedConversation, openNotificationSettings, conversationEntity);
       if (!isActiveConversation) {
         this.conversationState.activeConversation(conversationEntity);
@@ -274,8 +291,20 @@ export class ContentViewModel {
       const messageEntity = openFirstSelfMention ? conversationEntity.getFirstUnreadSelfMention() : exposeMessageEntity;
       this.changeConversation(conversationEntity, messageEntity);
       this.showAndNavigate(conversationEntity, openNotificationSettings, filePath);
-    } catch (error: any) {
+    } catch (error: unknown) {
       if (this.isConversationNotFoundError(error)) {
+        // Retry fetching the conversation to handle race conditions
+        const fetchSucceeded = await this.retryFetchConversationWithBackoff({
+          id: conversation.domain,
+          domain: conversation.domain,
+        });
+
+        if (fetchSucceeded) {
+          // Conversation was found after retry, attempt to show it again
+          return this.showConversation(conversation, options);
+        }
+
+        // All retries failed, show the error modal
         return this.showConversationNotFoundErrorModal();
       }