@wireapp/core 46.39.12 → 46.40.1

package/lib/conversation/ConversationService/ConversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EACX,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EAInB,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EACL,YAAY,EAIZ,4BAA4B,EAE7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAGvD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAa,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAY/D,OAAO,EACL,cAAc,EACd,8BAA8B,EAE9B,oBAAoB,EACpB,UAAU,EACX,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAC,YAAY,EAAuB,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACzF,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAG1E,OAAO,EAAkC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AACjG,OAAO,EACL,mCAAmC,EACnC,wBAAwB,EACzB,MAAM,sEAAsE,CAAC;AAC9E,OAAO,EAAsB,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAIlD,OAAO,EAAC,sBAAsB,EAAC,MAAM,kDAAkD,CAAC;AAExF,KAAK,MAAM,GAAG;IACZ,wBAAwB,EAAE;QAAC,cAAc,EAAE,WAAW,CAAA;KAAC,CAAC;IACxD,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,EAAE;QAAC,MAAM,EAAE,GAAG,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,CAAC;CACvE,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,yBAAyB;IAI1C,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAb/B,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6D;gBAGjE,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,YAAY,EAAE,YAAY,EAC1B,yBAAyB,EAAE,CAC1C,cAAc,EAAE,WAAW,EAC3B,iBAAiB,CAAC,EAAE,kBAAkB,KACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,EACf,sBAAsB,EAAE,sBAAsB,EAC9C,gCAAgC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,EACxD,WAAW,CAAC,EAAE,UAAU,YAAA;IAY3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;OAKG;IACU,2BAA2B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkBpG;;;;;;;;;;OAUG;IACU,yBAAyB,CAAC,gBAAgB,EAAE,eAAe;IAI3D,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAInE,sBAAsB,IAAI,OAAO,CAAC,eAAe,CAAC;IAIlD,gBAAgB,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAQ/E,6BAA6B,CAAC,MAAM,EAAE,mCAAmC;IAIzE,0BAA0B,CACrC,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,4BAA4B,CAAC;IAIxC;;;OAGG;IACU,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,wBAAwB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5F,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,cAAc,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE;;;;OAIG;IACH,SAAgB,qBAAqB,mBAA0B,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAExF;IAEF;;;OAGG;IACH,SAAgB,+BAA+B,mBAA0B,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAElG;IAEF;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAIpB,0BAA0B,CAC/B,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,WAAW,EAC3B,QAAQ,EAAE,OAAO,EACjB,gBAAgB,GAAE,MAAM,GAAG,IAAiB,GAC3C,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,EACnB,gBAAgB,EAAE,2BAA2B,GAAG,MAAM,GACrD,OAAO,CAAC,IAAI,CAAC;IAMhB;;;;OAIG;IAEH;;;OAGG;IACU,qBAAqB,CAChC,gBAAgB,EAAE,eAAe,EACjC,UAAU,EAAE,WAAW,EACvB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,8BAA8B,CAAC;IAuB1C;;;;;;;;;OASG;YACW,2BAA2B;IA2BzC;;;OAGG;IACU,6BAA6B,CACxC,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,WAAW,EAAE,EAC3B,UAAU,EAAE,WAAW,EACvB,YAAY,EAAE,MAAM,EACpB,uBAAuB,EAAE,WAAW,GACnC,OAAO,CAAC,8BAA8B,CAAC;YAiB5B,cAAc;IAgF5B;;;;;;OAMG;IACU,yBAAyB,CAAC,EACrC,cAAc,EACd,OAAO,EACP,cAAc,EACd,WAAkB,GACnB,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,8BAA8B,CAAC;IAqClF,8BAA8B,CAAC,EAC1C,OAAO,EACP,cAAc,EACd,gBAAgB,EAChB,WAAkB,GACnB,EAAE,iBAAiB,GAAG;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAsCzD,oBAAoB,CAAC,cAAc,EAAE,WAAW,EAAE,WAAW,UAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAiBnF,oBAAoB;IAiElC;;;OAGG;IACU,qBAAqB,CAAC,OAAO,EAAE,MAAM;IAIlD;;;;OAIG;IACU,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAI5C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIlD,YAAY;IAYb,gCAAgC;IAe7C;;;OAGG;YACW,kCAAkC;IA2BhD;;;OAGG;YACW,+BAA+B;IAqB7C;;;;;;;OAOG;YACW,gBAAgB;IAQ9B;;;OAGG;IACG,sBAAsB,CAAC,MAAM,EAAE,WAAW;IAShD;;;;;;;OAOG;IACH,SAAgB,4BAA4B,YACjC,MAAM,YACL;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,eAChC,WAAW,4BAEvB,OAAO,CAAC,eAAe,CAAC,CAwDzB;IAEF;;;;;;;;OAQG;IACU,uBAAuB,CAAC,EACnC,OAAO,EACP,cAAc,EACd,UAAU,EACV,cAAc,GACf,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,WAAW,CAAC;QAC5B,UAAU,EAAE,WAAW,CAAC;QACxB,cAAc,EAAE,WAAW,EAAE,CAAC;KAC/B,GAAG,OAAO,CAAC,IAAI,CAAC;YAkCH,wBAAwB;YAsBxB,gCAAgC;YAyBhC,4BAA4B;IA2B1C,OAAO,CAAC,2BAA2B;IAmBnC;;;OAGG;YACW,uCAAuC;YA4BvC,wBAAwB;YAIxB,yBAAyB;IAKvC;;;;OAIG;IACU,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAoB3E"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js

@@ -263,9 +263,9 @@ class ConversationService extends commons_1.TypedEventEmitter {
             };
         }
         catch (error) {
-            this.logger.error('Failed to send MLS message', { error, groupId });
+            this.logger.warn('Failed to send MLS message', { error, groupId });
             if (!shouldRetry) {
-                this.logger.warn("Tried to send MLS message but it's still failing after recovery", {
+                this.logger.error("Tried to send MLS message but it's still failing after recovery", {
                     error,
                     groupId,
                 });
@@ -280,7 +280,6 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     groupId,
                 });
                 await this.handleBrokenMLSConversation(conversationId);
-                return this.sendMLSMessage(params, false);
             }
             /**
              * We may have the same error from core-crypto or from the backend error mapper
@@ -293,13 +292,19 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     groupId,
                 });
                 await this.recoverMLSGroupFromEpochMismatch(conversationId);
-                return this.sendMLSMessage(params, false);
             }
-            this.logger.error('Failed to send MLS message, error did not match any known patterns, rethrowing the error', {
-                error,
-                groupId,
-            });
-            throw error;
+            if (error instanceof conversation_1.MLSGroupOutOfSyncError) {
+                this.logger.info('Failed to send MLS message because of group out of sync, recovering by adding missing users', {
+                    error,
+                    groupId,
+                });
+                await this.addUsersToMLSConversation({
+                    groupId,
+                    conversationId,
+                    qualifiedUsers: error.missing_users,
+                });
+            }
+            return this.sendMLSMessage(params, false);
         }
     }
     /**
@@ -311,6 +316,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
      */
     async addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, shouldRetry = true, }) {
         try {
+            this.logger.info(`Adding users to MLS conversation`, { groupId, conversationId, qualifiedUsers });
             const exisitingClientIdsInGroup = await this.mlsService.getClientIdsInGroup(groupId);
             const conversation = await this.getConversation(conversationId);
             const { keyPackages, failures: keysClaimingFailures } = await this.mlsService.getKeyPackagesPayload(qualifiedUsers, exisitingClientIdsInGroup);
@@ -326,6 +332,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
             };
         }
         catch (error) {
+            this.logger.warn('Failed to add users to MLS conversation', { error, groupId, conversationId });
             if (mls_1.MLSService.isBrokenMLSConversationError(error)) {
                 if (!shouldRetry) {
                     this.logger.warn("Tried to add users to MLS conversation but it's still broken after reset", error);
@@ -510,8 +517,14 @@ class ConversationService extends commons_1.TypedEventEmitter {
     async hasEpochMismatch(groupId, epoch) {
         const isEstablished = await this.mlsGroupExistsLocally(groupId);
         const doesEpochMatch = isEstablished && (await this.matchesEpoch(groupId, epoch));
-        //if conversation is not established or epoch does not match -> try to rejoin
-        return !isEstablished || !doesEpochMatch;
+        // if conversation is not established or epoch does not match -> try to rejoin
+        const hasEpochMismatch = !isEstablished || !doesEpochMatch;
+        this.logger.info(`Conversation (group_id: ${groupId}) epoch mismatch check result: ${hasEpochMismatch}`, {
+            isEstablished,
+            doesEpochMatch,
+            epoch,
+        });
+        return hasEpochMismatch;
     }
     /**
      * Get a MLS 1:1-conversation with a given user.
@@ -628,6 +641,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
         }
     }
     async recoverMLSGroupFromEpochMismatch(conversationId, subconversationId) {
+        this.logger.info(`Recovering MLS group from epoch mismatch`, { conversationId, subconversationId });
         if (subconversationId) {
             const parentGroupId = await this.groupIdFromConversationId(conversationId);
             const subconversation = await this.apiClient.api.conversation.getSubconversation(conversationId, subconversationId);

package/lib/conversation/ConversationService/ConversationService.test.js

@@ -222,6 +222,34 @@ describe('ConversationService', () => {
             });
             expect(apiClient.api.conversation.postMlsMessage).toHaveBeenCalledTimes(2);
         });
+        it('adds missing users to MLS group and retries when group is out of sync during send', async () => {
+            const [conversationService, { apiClient }] = await buildConversationService();
+            const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
+            const mockConversationId = { id: 'mockConversationId', domain: 'staging.zinfra.io' };
+            const mockedMessage = MessageBuilder.buildTextMessage({ text: 'test' });
+            const missingUsers = [
+                { id: 'user-1', domain: 'staging.zinfra.io' },
+                { id: 'user-2', domain: 'staging.zinfra.io' },
+            ];
+            const outOfSyncError = new conversation_1.MLSGroupOutOfSyncError(http_status_codes_1.StatusCodes.CONFLICT, missingUsers, http_1.BackendErrorLabel.MLS_GROUP_OUT_OF_SYNC);
+            // First send fails with out-of-sync, second succeeds via default mock
+            jest.spyOn(apiClient.api.conversation, 'postMlsMessage').mockRejectedValueOnce(outOfSyncError);
+            const addUsersSpy = jest
+                .spyOn(conversationService, 'addUsersToMLSConversation')
+                .mockResolvedValueOnce({ conversation: { members: { others: [] } } });
+            await conversationService.send({
+                protocol: conversation_1.ConversationProtocol.MLS,
+                groupId: mockGroupId,
+                payload: mockedMessage,
+                conversationId: mockConversationId,
+            });
+            expect(addUsersSpy).toHaveBeenCalledWith({
+                groupId: mockGroupId,
+                conversationId: mockConversationId,
+                qualifiedUsers: missingUsers,
+            });
+            expect(apiClient.api.conversation.postMlsMessage).toHaveBeenCalledTimes(2);
+        });
     });
     describe('handleConversationsEpochMismatch', () => {
         beforeEach(() => {

package/lib/conversation/SubconversationService/SubconversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/SubconversationService/SubconversationService.js

@@ -52,6 +52,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
      */
     async joinConferenceSubconversation(conversationId, groupId, shouldRetry = true) {
         try {
+            this.logger.info('Joining conference subconversation', { conversationId, groupId });
             const { group_id: subconversationGroupId, epoch: subconversationEpoch, epoch_timestamp: subconversationEpochTimestamp, subconv_id: subconversationId, } = await this.getConferenceSubconversation(conversationId);
             // We store the mapping between the subconversation and the parent conversation
             await this.saveSubconversationGroupId(conversationId, subconversationId, subconversationGroupId);
@@ -81,6 +82,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
             return { groupId: subconversationGroupId, epoch };
         }
         catch (error) {
+            this.logger.error('Failed to join conference subconversation', { conversationId, groupId, error, shouldRetry });
             if (shouldRetry) {
                 return this.joinConferenceSubconversation(conversationId, groupId, false);
             }
@@ -93,71 +95,132 @@ class SubconversationService extends commons_1.TypedEventEmitter {
      * @param conversationId Id of the parent conversation which subconversation we want to leave
      */
     async leaveConferenceSubconversation(conversationId) {
+        this.logger.info('Leaving conference subconversation', { conversationId });
         const subconversationGroupId = await this.getSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         if (!subconversationGroupId) {
+            this.logger.warn('No subconversation groupId found when leaving conference subconversation', { conversationId });
             return;
         }
         const doesGroupExistLocally = await this.mlsService.conversationExists(subconversationGroupId);
         if (!doesGroupExistLocally) {
             // If the subconversation was known by a client but is does not exist locally, we can remove it from the store.
+            this.logger.info('Subconversation not found locally; clearing stored mapping', {
+                conversationId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+                subconversationGroupId,
+            });
             return this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         }
         try {
             await this.apiClient.api.conversation.deleteSubconversationSelf(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         }
         catch (error) {
-            this.logger.error(`Failed to leave conference subconversation:`, error);
+            this.logger.error('Failed to leave conference subconversation', {
+                conversationId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+                subconversationGroupId,
+                error,
+            });
         }
         await this.mlsService.wipeConversation(subconversationGroupId);
         // once we've left the subconversation, we can remove it from the store
+        this.logger.info('Clearing stored mapping after leaving conference subconversation', {
+            conversationId,
+            subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            subconversationGroupId,
+        });
         await this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
     }
     async leaveStaleConferenceSubconversations() {
+        this.logger.info('Leaving all stale conference subconversations');
         const conversationIds = await this.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         for (const { parentConversationId } of conversationIds) {
+            this.logger.debug('Leaving stale conference subconversation for parent conversation', {
+                parentConversationId,
+            });
             await this.leaveConferenceSubconversation(parentConversationId);
         }
     }
     async getSubconversationEpochInfo(parentConversationId, parentConversationGroupId, shouldAdvanceEpoch = false) {
+        this.logger.info('Getting subconversation epoch info', {
+            parentConversationId,
+            parentConversationGroupId,
+            shouldAdvanceEpoch,
+        });
         const subconversationGroupId = await this.getSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         // this method should not be called if the subconversation (and its parent conversation) is not established
         if (!subconversationGroupId) {
-            this.logger.error(`Could not obtain epoch info for conference subconversation of conversation ${JSON.stringify(parentConversationId)}: parent or subconversation group ID is missing`);
+            this.logger.error('Could not obtain epoch info for conference subconversation: missing groupId', {
+                parentConversationId,
+            });
             return null;
         }
         //we don't want to react to avs callbacks when conversation was not yet established
         const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
         if (!doesMLSGroupExist) {
+            this.logger.debug('Subconversation MLS group does not exist locally; skipping epoch info', {
+                parentConversationId,
+                parentConversationGroupId,
+                subconversationGroupId,
+            });
             return null;
         }
         const members = await this.generateSubconversationMembers(subconversationGroupId, parentConversationGroupId);
         if (shouldAdvanceEpoch) {
+            this.logger.info('Advancing epoch and renewing key material for subconversation', { subconversationGroupId });
             await this.mlsService.renewKeyMaterial(subconversationGroupId);
         }
         const epoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
         const secretKey = await this.mlsService.exportSecretKey(subconversationGroupId, MLS_CONVERSATION_KEY_LENGTH);
+        this.logger.debug('Obtained subconversation epoch info', {
+            parentConversationId,
+            parentConversationGroupId,
+            subconversationGroupId,
+            epoch,
+            membersCount: members.length,
+            keyLength: MLS_CONVERSATION_KEY_LENGTH,
+        });
         return { members, epoch, keyLength: MLS_CONVERSATION_KEY_LENGTH, secretKey };
     }
     async subscribeToEpochUpdates(parentConversationId, parentConversationGroupId, findConversationByGroupId, onEpochUpdate) {
+        this.logger.info('Subscribing to subconversation epoch updates', {
+            parentConversationId,
+            parentConversationGroupId,
+        });
         const { epoch: initialEpoch, groupId: subconversationGroupId } = await this.joinConferenceSubconversation(parentConversationId, parentConversationGroupId);
         const forwardNewEpoch = async ({ groupId }) => {
+            this.logger.debug('Received MLS NEW_EPOCH event', { eventGroupId: groupId, subconversationGroupId });
             if (groupId !== subconversationGroupId) {
                 // if the epoch update did not happen in the subconversation directly, check if it happened in the parent conversation
                 const parentConversationId = findConversationByGroupId(groupId);
                 if (!parentConversationId) {
+                    this.logger.debug('Ignoring NEW_EPOCH event: could not map to parent conversation');
                     return;
                 }
                 const foundSubconversationGroupId = await this.getSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
                 // if the conference subconversation of parent conversation is not known, ignore the epoch update
                 if (foundSubconversationGroupId !== subconversationGroupId) {
+                    this.logger.debug('Ignoring NEW_EPOCH event: not related to subscribed subconversation', {
+                        eventGroupId: groupId,
+                        foundSubconversationGroupId,
+                        expectedSubconversationGroupId: subconversationGroupId,
+                    });
                     return;
                 }
             }
             const subconversationEpochInfo = await this.getSubconversationEpochInfo(parentConversationId, parentConversationGroupId);
             if (!subconversationEpochInfo) {
+                this.logger.debug('No subconversation epoch info available; skipping callback', {
+                    parentConversationId,
+                    parentConversationGroupId,
+                });
                 return;
             }
             const newSubconversationEpoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
+            this.logger.info('Forwarding epoch update to subscriber', {
+                subconversationGroupId,
+                epoch: newSubconversationEpoch,
+            });
             return onEpochUpdate({
                 ...subconversationEpochInfo,
                 epoch: newSubconversationEpoch,
@@ -165,15 +228,26 @@ class SubconversationService extends commons_1.TypedEventEmitter {
         };
         this.mlsService.on(mls_1.MLSServiceEvents.NEW_EPOCH, forwardNewEpoch);
         await forwardNewEpoch({ groupId: subconversationGroupId, epoch: initialEpoch });
+        this.logger.info('Subscribed to MLS NEW_EPOCH events for subconversation', { subconversationGroupId });
         return () => this.mlsService.off(mls_1.MLSServiceEvents.NEW_EPOCH, forwardNewEpoch);
     }
     async removeClientFromConferenceSubconversation(conversationId, clientToRemove) {
+        this.logger.info('Removing client from conference subconversation', {
+            conversationId,
+            user: clientToRemove.user,
+            clientId: clientToRemove.clientId,
+        });
         const subconversationGroupId = await this.getSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         if (!subconversationGroupId) {
+            this.logger.warn('Cannot remove client: subconversation groupId missing', { conversationId });
             return;
         }
         const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
         if (!doesMLSGroupExist) {
+            this.logger.debug('Cannot remove client: subconversation MLS group does not exist locally', {
+                conversationId,
+                subconversationGroupId,
+            });
             return;
         }
         const { user: { id: userId, domain }, clientId, } = clientToRemove;
@@ -181,23 +255,70 @@ class SubconversationService extends commons_1.TypedEventEmitter {
         const subconversationMembers = await this.mlsService.getClientIds(subconversationGroupId);
         const isSubconversationMember = subconversationMembers.some(({ userId, clientId, domain }) => (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain) === clientToRemoveQualifiedId);
         if (!isSubconversationMember) {
+            this.logger.info('Client is not a member of the subconversation; nothing to remove', {
+                conversationId,
+                subconversationGroupId,
+                clientToRemoveQualifiedId,
+            });
             return;
         }
-        return void this.mlsService.removeClientsFromConversation(subconversationGroupId, [clientToRemoveQualifiedId]);
+        this.logger.info('Removing client from subconversation', {
+            subconversationGroupId,
+            clientToRemoveQualifiedId,
+        });
+        try {
+            await this.mlsService.removeClientsFromConversation(subconversationGroupId, [clientToRemoveQualifiedId]);
+        }
+        catch (error) {
+            this.logger.error('Failed to remove client from subconversation', {
+                subconversationGroupId,
+                clientToRemoveQualifiedId,
+                error,
+            });
+        }
     }
     async joinSubconversationByExternalCommit(conversationId, subconversation) {
-        await this.mlsService.joinByExternalCommit(() => this.apiClient.api.conversation.getSubconversationGroupInfo(conversationId, subconversation));
+        try {
+            this.logger.info('Joining subconversation by external commit', { conversationId, subconversation });
+            await this.mlsService.joinByExternalCommit(() => this.apiClient.api.conversation.getSubconversationGroupInfo(conversationId, subconversation));
+        }
+        catch (error) {
+            this.logger.error('Failed to join subconversation by external commit', {
+                conversationId,
+                subconversation,
+                error,
+            });
+            throw error;
+        }
     }
     async getConferenceSubconversation(conversationId) {
-        return this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        this.logger.debug('Fetching conference subconversation metadata', { conversationId });
+        try {
+            return await this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        catch (error) {
+            this.logger.error('Failed to fetch conference subconversation metadata', { conversationId, error });
+            throw error;
+        }
     }
     async deleteConferenceSubconversation(conversationId, data) {
-        return this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, data);
+        this.logger.info('Deleting conference subconversation', { conversationId, data });
+        try {
+            return await this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, data);
+        }
+        catch (error) {
+            this.logger.error('Failed to delete conference subconversation', { conversationId, data, error });
+            throw error;
+        }
     }
     async generateSubconversationMembers(subconversationGroupId, parentGroupId) {
+        this.logger.debug('Generating subconversation members info', {
+            subconversationGroupId,
+            parentGroupId,
+        });
         const subconversationMemberIds = await this.mlsService.getClientIds(subconversationGroupId);
         const parentMemberIds = await this.mlsService.getClientIds(parentGroupId);
-        return parentMemberIds.map(parentMember => {
+        const members = parentMemberIds.map(parentMember => {
             const isSubconversationMember = subconversationMemberIds.some(({ userId, clientId, domain }) => (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain) ===
                 (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(parentMember.userId, parentMember.clientId, parentMember.domain));
             return {
@@ -208,20 +329,45 @@ class SubconversationService extends commons_1.TypedEventEmitter {
                 in_subconv: isSubconversationMember,
             };
         });
+        this.logger.debug('Generated subconversation members info', {
+            subconversationGroupId,
+            parentGroupId,
+            membersCount: members.length,
+        });
+        return members;
     }
     getSubconversationGroupId = async (parentConversationId, subconversationId) => {
         const foundSubconversation = await this.coreDatabase.get('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
+        this.logger.debug('Loaded subconversation groupId from store', {
+            parentConversationId,
+            subconversationId,
+            found: Boolean(foundSubconversation?.groupId),
+        });
         return foundSubconversation?.groupId;
     };
     getAllGroupIdsBySubconversationId = async (subconversationId) => {
+        this.logger.debug('Retrieving all subconversations by subconversationId', { subconversationId });
         const allSubconversations = await this.coreDatabase.getAll('subconversations');
         const foundSubconversations = allSubconversations.filter(subconversation => subconversation.subconversationId === subconversationId);
+        this.logger.debug('Found subconversations by id', {
+            subconversationId,
+            count: foundSubconversations.length,
+        });
         return foundSubconversations;
     };
     saveSubconversationGroupId = async (parentConversationId, subconversationId, groupId) => {
+        this.logger.debug('Saving subconversation groupId mapping', {
+            parentConversationId,
+            subconversationId,
+            groupId,
+        });
         return this.coreDatabase.put('subconversations', { parentConversationId, subconversationId, groupId }, (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
     };
     clearSubconversationGroupId = async (parentConversationId, subconversationId) => {
+        this.logger.debug('Clearing subconversation groupId mapping', {
+            parentConversationId,
+            subconversationId,
+        });
         return this.coreDatabase.delete('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
     };
 }

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.81.0",
+    "@wireapp/api-client": "^27.82.0",
     "@wireapp/commons": "^5.4.5",
     "@wireapp/core-crypto": "9.1.0",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.39.12",
-  "gitHead": "5c163bf9fccc9529595855f48bf68f9bbf405604"
+  "version": "46.40.1",
+  "gitHead": "b1f2c021022374610797c31b73dfeb8a934b8f2d"
 }