@wireapp/core 46.0.19 → 46.1.0-hotfix-1.0

package/lib/conversation/ConversationService/ConversationService.js

@@ -38,14 +38,6 @@ const util_1 = require("../../util");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const messageSender_1 = require("../message/messageSender");
 class ConversationService extends commons_1.TypedEventEmitter {
-    apiClient;
-    proteusService;
-    coreDatabase;
-    groupIdFromConversationId;
-    subconversationService;
-    _mlsService;
-    messageTimer;
-    logger = (0, logdown_1.default)('@wireapp/core/ConversationService');
     constructor(apiClient, proteusService, coreDatabase, groupIdFromConversationId, subconversationService, _mlsService) {
         super();
         this.apiClient = apiClient;
@@ -54,6 +46,67 @@ class ConversationService extends commons_1.TypedEventEmitter {
         this.groupIdFromConversationId = groupIdFromConversationId;
         this.subconversationService = subconversationService;
         this._mlsService = _mlsService;
+        this.logger = (0, logdown_1.default)('@wireapp/core/ConversationService');
+        /**
+         * Blacklists a conversation.
+         * When conversations is blacklisted, it means that it will be completely ignored by a client, even though it does exist on backend and we're the conversation member.
+         * @param conversationId id of the conversation to blacklist
+         */
+        this.blacklistConversation = async (conversationId) => {
+            await this.coreDatabase.put('conversationBlacklist', conversationId, conversationId.id);
+        };
+        /**
+         * Removes a conversation from the blacklists.
+         * @param conversationId id of the conversation to remove from the blacklist
+         */
+        this.removeConversationFromBlacklist = async (conversationId) => {
+            await this.coreDatabase.delete('conversationBlacklist', conversationId.id);
+        };
+        /**
+         * Will try registering mls 1:1 conversation adding the other user.
+         * If it fails and the conversation is already established, it will try joining via external commit instead.
+         *
+         * @param mlsConversation - mls 1:1 conversation
+         * @param selfUser - user and client ids of the self user
+         * @param otherUserId - id of the other user
+         */
+        this.establishMLS1to1Conversation = async (groupId, selfUser, otherUserId, shouldRetry = true) => {
+            this.logger.info(`Trying to establish a MLS 1:1 conversation with user ${otherUserId.id}...`);
+            // Before trying to register a group, check if the group is already established o backend.
+            // If remote epoch is higher than 0, it means that the group was already established.
+            // It's possible that we've already received a welcome message.
+            const mlsConversation = await this.getMLS1to1Conversation(otherUserId);
+            if (mlsConversation.epoch > 0) {
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is already established on backend, checking the local epoch...`);
+                const isMLSGroupEstablishedLocally = await this.isMLSGroupEstablishedLocally(groupId);
+                // If group is already established locally, there's nothing more to do
+                if (isMLSGroupEstablishedLocally) {
+                    this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is already established locally.`);
+                    return mlsConversation;
+                }
+                // If local epoch is 0 it means that we've not received a welcome message
+                // We try joining via external commit.
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is not yet established locally, joining via external commit...`);
+                await this.joinByExternalCommit(mlsConversation.qualified_id);
+                return this.getMLS1to1Conversation(otherUserId);
+            }
+            // If group is not established on backend,
+            // we wipe the it locally (in case it exsits in the local store) and try to register it.
+            await this.mlsService.wipeConversation(groupId);
+            try {
+                await this.mlsService.register1to1Conversation(groupId, otherUserId, selfUser);
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
+                return this.getMLS1to1Conversation(otherUserId);
+            }
+            catch (error) {
+                this.logger.info(`Could not register MLS group with id ${groupId}: `, error);
+                if (!shouldRetry) {
+                    throw error;
+                }
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is not established, retrying to establish it`);
+                return this.establishMLS1to1Conversation(groupId, selfUser, otherUserId, false);
+            }
+        };
         this.messageTimer = new conversation_2.MessageTimer();
     }
     get mlsService() {
@@ -76,7 +129,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
         const allClients = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedMembers });
         const qualifiedUserClients = {};
         Object.entries(allClients.qualified_user_map).map(([domain, userClientMap]) => Object.entries(userClientMap).map(async ([userId, clients]) => {
-            qualifiedUserClients[domain] ||= {};
+            qualifiedUserClients[domain] || (qualifiedUserClients[domain] = {});
             qualifiedUserClients[domain][userId] = clients.map(client => client.id);
         }));
         return qualifiedUserClients;
@@ -130,21 +183,6 @@ class ConversationService extends commons_1.TypedEventEmitter {
     sendTypingStop(conversationId) {
         return this.apiClient.api.conversation.postTyping(conversationId, { status: data_1.CONVERSATION_TYPING.STOPPED });
     }
-    /**
-     * Blacklists a conversation.
-     * When conversations is blacklisted, it means that it will be completely ignored by a client, even though it does exist on backend and we're the conversation member.
-     * @param conversationId id of the conversation to blacklist
-     */
-    blacklistConversation = async (conversationId) => {
-        await this.coreDatabase.put('conversationBlacklist', conversationId, conversationId.id);
-    };
-    /**
-     * Removes a conversation from the blacklists.
-     * @param conversationId id of the conversation to remove from the blacklist
-     */
-    removeConversationFromBlacklist = async (conversationId) => {
-        await this.coreDatabase.delete('conversationBlacklist', conversationId.id);
-    };
     /**
      * returns the number of messages that are in the queue expecting to be sent
      */
@@ -192,11 +230,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
          * field must be empty as backend is not aware which users
          * are in a MLS conversation because of the MLS architecture.
          */
-        const newConversation = await this.apiClient.api.conversation.postConversation({
-            ...conversationData,
-            users: undefined,
-            qualified_users: undefined,
-        });
+        const newConversation = await this.apiClient.api.conversation.postConversation(Object.assign(Object.assign({}, conversationData), { users: undefined, qualified_users: undefined }));
         const { group_id: groupId, qualified_id: qualifiedId } = newConversation;
         if (!groupId) {
             throw new Error('No group_id found in response which is required for creating MLS conversations.');
@@ -216,6 +250,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
         };
     }
     async sendMLSMessage(params, shouldRetry = true) {
+        var _a, _b;
         const { payload, groupId, conversationId } = params;
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         // immediately execute pending commits before sending the message
@@ -225,7 +260,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
         let sentAt = '';
         try {
             response = await this.apiClient.api.conversation.postMlsMessage(encrypted);
-            sentAt = response.time?.length > 0 ? response.time : new Date().toISOString();
+            sentAt = ((_a = response.time) === null || _a === void 0 ? void 0 : _a.length) > 0 ? response.time : new Date().toISOString();
         }
         catch (error) {
             const isMLSStaleMessageError = error instanceof http_1.BackendError && error.label === http_1.BackendErrorLabel.MLS_STALE_MESSAGE;
@@ -237,10 +272,10 @@ class ConversationService extends commons_1.TypedEventEmitter {
             }
             throw error;
         }
-        const failedToSend = response?.failed || (response?.failed_to_send ?? []).length > 0
+        const failedToSend = (response === null || response === void 0 ? void 0 : response.failed) || ((_b = response === null || response === void 0 ? void 0 : response.failed_to_send) !== null && _b !== void 0 ? _b : []).length > 0
             ? {
-                queued: response?.failed_to_send,
-                failed: response?.failed,
+                queued: response === null || response === void 0 ? void 0 : response.failed_to_send,
+                failed: response === null || response === void 0 ? void 0 : response.failed,
             }
             : undefined;
         return {
@@ -306,12 +341,12 @@ class ConversationService extends commons_1.TypedEventEmitter {
     }
     async matchesEpoch(groupId, backendEpoch) {
         const localEpoch = await this.mlsService.getEpoch(groupId);
-        this.logger.debug(`Comparing conversation's (group_id: ${groupId}) local and backend epoch number: {local: ${String(localEpoch)}, backend: ${backendEpoch}}`);
+        this.logger.log(`Comparing conversation's (group_id: ${groupId}) local and backend epoch number: {local: ${String(localEpoch)}, backend: ${backendEpoch}}`);
         //corecrypto stores epoch number as BigInt, we're mapping both values to be sure comparison is valid
         return BigInt(localEpoch) === BigInt(backendEpoch);
     }
     async handleConversationsEpochMismatch() {
-        this.logger.warn(`There were some missed messages, handling possible epoch mismatch in MLS conversations.`);
+        this.logger.info(`There were some missed messages, handling possible epoch mismatch in MLS conversations.`);
         //fetch all the mls conversations from backend
         const conversations = await this.apiClient.api.conversation.getConversationList();
         const foundConversations = conversations.found || [];
@@ -328,7 +363,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
     async handleSubconversationEpochMismatch(subconversation, parentGroupId) {
         const { parent_qualified_id: parentConversationId, group_id: groupId, epoch, subconv_id: subconversationId, } = subconversation;
         if (await this.hasEpochMismatch(groupId, epoch)) {
-            this.logger.warn(`Subconversation "${subconversationId}" (parent id: ${parentConversationId.id}) was not established or its epoch number was out of date, joining via external commit`);
+            this.logger.log(`Subconversation "${subconversationId}" (parent id: ${parentConversationId.id}) was not established or its epoch number was out of date, joining via external commit`);
             // We only support conference subconversations for now
             if (subconversationId !== conversation_1.SUBCONVERSATION_ID.CONFERENCE) {
                 throw new Error('Unexpected subconversation id');
@@ -349,10 +384,10 @@ class ConversationService extends commons_1.TypedEventEmitter {
     async handleConversationEpochMismatch(remoteMlsConversation, onSuccessfulRejoin) {
         const { qualified_id: qualifiedId, group_id: groupId, epoch } = remoteMlsConversation;
         if (await this.hasEpochMismatch(groupId, epoch)) {
-            this.logger.warn(`Conversation (id ${qualifiedId.id}) was not established or it's epoch number was out of date, joining via external commit`);
+            this.logger.log(`Conversation (id ${qualifiedId.id}) was not established or it's epoch number was out of date, joining via external commit`);
             try {
                 await this.joinByExternalCommit(qualifiedId);
-                onSuccessfulRejoin?.();
+                onSuccessfulRejoin === null || onSuccessfulRejoin === void 0 ? void 0 : onSuccessfulRejoin();
             }
             catch (error) {
                 const message = `There was an error while handling epoch mismatch in MLS conversation (id: ${qualifiedId.id}):`;
@@ -381,51 +416,6 @@ class ConversationService extends commons_1.TypedEventEmitter {
     async getMLS1to1Conversation(userId) {
         return this.apiClient.api.conversation.getMLS1to1Conversation(userId);
     }
-    /**
-     * Will try registering mls 1:1 conversation adding the other user.
-     * If it fails and the conversation is already established, it will try joining via external commit instead.
-     *
-     * @param mlsConversation - mls 1:1 conversation
-     * @param selfUser - user and client ids of the self user
-     * @param otherUserId - id of the other user
-     */
-    establishMLS1to1Conversation = async (groupId, selfUser, otherUserId, shouldRetry = true) => {
-        this.logger.debug(`Trying to establish a MLS 1:1 conversation with user ${otherUserId.id}...`);
-        // Before trying to register a group, check if the group is already established o backend.
-        // If remote epoch is higher than 0, it means that the group was already established.
-        // It's possible that we've already received a welcome message.
-        const mlsConversation = await this.getMLS1to1Conversation(otherUserId);
-        if (mlsConversation.epoch > 0) {
-            this.logger.debug(`Conversation (id ${mlsConversation.qualified_id.id}) is already established on backend, checking the local epoch...`);
-            const isMLSGroupEstablishedLocally = await this.isMLSGroupEstablishedLocally(groupId);
-            // If group is already established locally, there's nothing more to do
-            if (isMLSGroupEstablishedLocally) {
-                this.logger.debug(`Conversation (id ${mlsConversation.qualified_id.id}) is already established locally.`);
-                return mlsConversation;
-            }
-            // If local epoch is 0 it means that we've not received a welcome message
-            // We try joining via external commit.
-            this.logger.debug(`Conversation (id ${mlsConversation.qualified_id.id}) is not yet established locally, joining via external commit...`);
-            await this.joinByExternalCommit(mlsConversation.qualified_id);
-            return this.getMLS1to1Conversation(otherUserId);
-        }
-        // If group is not established on backend,
-        // we wipe the it locally (in case it exsits in the local store) and try to register it.
-        await this.mlsService.wipeConversation(groupId);
-        try {
-            await this.mlsService.register1to1Conversation(groupId, otherUserId, selfUser);
-            this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
-            return this.getMLS1to1Conversation(otherUserId);
-        }
-        catch (error) {
-            if (!shouldRetry) {
-                this.logger.error(`Could not register MLS group with id ${groupId}: `, error);
-                throw error;
-            }
-            this.logger.error(`Conversation (id ${mlsConversation.qualified_id.id}) is not established, retrying to establish it`);
-            return this.establishMLS1to1Conversation(groupId, selfUser, otherUserId, false);
-        }
-    };
     /**
      * Will try to register mls group by sending an empty commit to establish it.
      * After group was successfully established, it will try to add other users to the group.
@@ -438,13 +428,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
     async tryEstablishingMLSGroup({ groupId, conversationId, selfUserId, qualifiedUsers, }) {
         const wasGroupEstablishedBySelfClient = await this.mlsService.tryEstablishingMLSGroup(groupId);
         if (!wasGroupEstablishedBySelfClient) {
-            this.logger.debug('Group was not established by self client, skipping adding users to the group.');
+            this.logger.info('Group was not established by self client, skipping adding users to the group.');
             return;
         }
-        this.logger.debug('Group was established by self client, adding other users to the group...');
+        this.logger.info('Group was established by self client, adding other users to the group...');
         const usersToAdd = [
             ...qualifiedUsers,
-            { ...selfUserId, skipOwnClientId: this.apiClient.validatedClientId },
+            Object.assign(Object.assign({}, selfUserId), { skipOwnClientId: this.apiClient.validatedClientId }),
         ];
         const { conversation } = await this.addUsersToMLSConversation({
             conversationId,
@@ -453,10 +443,10 @@ class ConversationService extends commons_1.TypedEventEmitter {
         });
         const addedUsers = conversation.members.others;
         if (addedUsers.length > 0) {
-            this.logger.debug(`Successfully added ${addedUsers} users to the group.`);
+            this.logger.info(`Successfully added ${addedUsers} users to the group.`);
         }
         else {
-            this.logger.debug('No other users were added to the group.');
+            this.logger.info('No other users were added to the group.');
         }
     }
     async handleMLSMessageAddEvent(event) {
@@ -465,7 +455,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
         }
         catch (error) {
             if ((0, CoreCryptoMLSError_1.isCoreCryptoMLSWrongEpochError)(error)) {
-                this.logger.warn(`Received message for the wrong epoch in conversation ${event.conversation}, handling epoch mismatch...`);
+                this.logger.info(`Received message for the wrong epoch in conversation ${event.conversation}, handling epoch mismatch...`);
                 const { qualified_conversation: conversationId, subconv } = event;
                 if (!conversationId) {
                     throw new Error('Qualified conversation id is missing in the event');
@@ -503,7 +493,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 if (!conversationId) {
                     throw new Error('Qualified conversation id is missing in the event');
                 }
-                this.logger.warn(`Received an orphan welcome message, joining the conversation (${conversationId.id}) via external commit...`);
+                this.logger.info(`Received an orphan welcome message, joining the conversation (${conversationId.id}) via external commit...`);
                 void (0, conversationRejoinQueue_1.queueConversationRejoin)(conversationId.id, () => this.joinByExternalCommit(conversationId));
                 return null;
             }

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

@@ -71,17 +71,9 @@ const createMLSWelcomeMessageEventMock = (conversationId) => ({
     type: event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
     time: '2023-08-21T06:47:43.387Z',
 });
-jest.mock('../../messagingProtocols/proteus', () => ({
-    ...jest.requireActual('../../messagingProtocols/proteus'),
-    getGenericMessageParams: jest.fn(),
-    getRecipientsForConversation: jest.fn(),
-    getConversationQualifiedMembers: jest.fn(),
-}));
+jest.mock('../../messagingProtocols/proteus', () => (Object.assign(Object.assign({}, jest.requireActual('../../messagingProtocols/proteus')), { getGenericMessageParams: jest.fn(), getRecipientsForConversation: jest.fn(), getConversationQualifiedMembers: jest.fn() })));
 const MockedMessagingProtocols = MessagingProtocols;
-jest.mock('../message/messageSender', () => ({
-    ...jest.requireActual('../message/messageSender'),
-    sendMessage: jest.fn().mockImplementation(fn => fn()),
-}));
+jest.mock('../message/messageSender', () => (Object.assign(Object.assign({}, jest.requireActual('../message/messageSender')), { sendMessage: jest.fn().mockImplementation(fn => fn()) })));
 const mockedProteusService = {
     encryptGenericMessage: () => Promise.resolve(),
     sendProteusMessage: () => Promise.resolve({ sentAt: new Date() }),
@@ -446,13 +438,14 @@ describe('ConversationService', () => {
     });
     describe('getConversations', () => {
         it('returns a list of conversations by conversation ids', async () => {
+            var _a;
             const [conversationService, { apiClient }] = await buildConversationService();
             const conversationIds = Array.from({ length: 10 }, () => ({ id: PayloadHelper.getUUID(), domain: 'test.zinfra.io' }));
             jest.spyOn(apiClient.api.conversation, 'getConversationsByQualifiedIds').mockResolvedValueOnce({
                 found: conversationIds,
             });
             const conversations = await conversationService.getConversations(conversationIds);
-            expect(conversations.found?.length).toBe(conversationIds.length);
+            expect((_a = conversations.found) === null || _a === void 0 ? void 0 : _a.length).toBe(conversationIds.length);
         });
         it('returns a full list of conversations if a list of conversations is not provided', async () => {
             const [conversationService, { apiClient }] = await buildConversationService();
@@ -585,7 +578,7 @@ describe('ConversationService', () => {
             expect(conversationService.addUsersToMLSConversation).toHaveBeenCalledWith({
                 conversationId: mockConversationId,
                 groupId: mockGroupId,
-                qualifiedUsers: [...otherUsersToAdd, { ...selfUserId, skipOwnClientId: apiClient.clientId }],
+                qualifiedUsers: [...otherUsersToAdd, Object.assign(Object.assign({}, selfUserId), { skipOwnClientId: apiClient.clientId })],
             });
         });
         it('should not add any users if MLS group was not established by the self client', async () => {

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

@@ -1 +1 @@
-{"version":3,"file":"getConversationQualifiedMembers.d.ts","sourceRoot":"","sources":["../../../../src/conversation/ConversationService/Utility/getConversationQualifiedMembers.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,UAAU,MAAM;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;CAC7B;AACD,QAAA,MAAM,+BAA+B,kCAAuC,MAAM,KAAG,OAAO,CAAC,WAAW,EAAE,CAWzG,CAAC;AAEF,OAAO,EAAC,+BAA+B,EAAC,CAAC"}
+{"version":3,"file":"getConversationQualifiedMembers.d.ts","sourceRoot":"","sources":["../../../../src/conversation/ConversationService/Utility/getConversationQualifiedMembers.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,UAAU,MAAM;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;CAC7B;AACD,QAAA,MAAM,+BAA+B,kCAAuC,MAAM,KAAG,QAAQ,WAAW,EAAE,CAWzG,CAAC;AAEF,OAAO,EAAC,+BAA+B,EAAC,CAAC"}

package/lib/conversation/MessageTimer/MessageTimer.js

@@ -20,8 +20,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageTimer = void 0;
 class MessageTimer {
-    conversationLevelTimers;
-    messageLevelTimers;
     constructor() {
         this.conversationLevelTimers = new Map();
         this.messageLevelTimers = new Map();

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

@@ -38,6 +38,14 @@ export declare class SubconversationService extends TypedEventEmitter<Events> {
      * @param conversationId Id of the parent conversation which subconversation we want to leave
      */
     leaveConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
+    /**
+     * Short term solution to an issues with 1:1 MLS call, see
+     * https://wearezeta.atlassian.net/wiki/spaces/PAD/pages/1314750477/2024-07-29+1+1+calls+over+SFT#Do-not-leave-the-subconversation
+     * Will delete a conference subconversation when hanging up on a 1:1 call instead of leaving.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
+    leave1on1ConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
     leaveStaleConferenceSubconversations(): Promise<void>;
     getSubconversationEpochInfo(parentConversationId: QualifiedId, parentConversationGroupId: string, shouldAdvanceEpoch?: boolean): Promise<{
         members: SubconversationEpochInfoMember[];

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

@@ -30,15 +30,27 @@ const subconversationUtil_1 = require("./subconversationUtil");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const MLS_CONVERSATION_KEY_LENGTH = 32;
 class SubconversationService extends commons_1.TypedEventEmitter {
-    apiClient;
-    coreDatabase;
-    _mlsService;
-    logger = (0, logdown_1.default)('@wireapp/core/SubconversationService');
     constructor(apiClient, coreDatabase, _mlsService) {
         super();
         this.apiClient = apiClient;
         this.coreDatabase = coreDatabase;
         this._mlsService = _mlsService;
+        this.logger = (0, logdown_1.default)('@wireapp/core/SubconversationService');
+        this.getSubconversationGroupId = async (parentConversationId, subconversationId) => {
+            const foundSubconversation = await this.coreDatabase.get('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
+            return foundSubconversation === null || foundSubconversation === void 0 ? void 0 : foundSubconversation.groupId;
+        };
+        this.getAllGroupIdsBySubconversationId = async (subconversationId) => {
+            const allSubconversations = await this.coreDatabase.getAll('subconversations');
+            const foundSubconversations = allSubconversations.filter(subconversation => subconversation.subconversationId === subconversationId);
+            return foundSubconversations;
+        };
+        this.saveSubconversationGroupId = async (parentConversationId, subconversationId, groupId) => {
+            return this.coreDatabase.put('subconversations', { parentConversationId, subconversationId, groupId }, (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
+        };
+        this.clearSubconversationGroupId = async (parentConversationId, subconversationId) => {
+            return this.coreDatabase.delete('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
+        };
     }
     get mlsService() {
         if (!this._mlsService) {
@@ -115,6 +127,40 @@ class SubconversationService extends commons_1.TypedEventEmitter {
         // once we've left the subconversation, we can remove it from the store
         await this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
     }
+    /**
+     * Short term solution to an issues with 1:1 MLS call, see
+     * https://wearezeta.atlassian.net/wiki/spaces/PAD/pages/1314750477/2024-07-29+1+1+calls+over+SFT#Do-not-leave-the-subconversation
+     * Will delete a conference subconversation when hanging up on a 1:1 call instead of leaving.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
+    async leave1on1ConferenceSubconversation(conversationId) {
+        const subconversationGroupId = await this.getSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        if (!subconversationGroupId) {
+            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.
+            return this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        try {
+            const epochInfo = await this.getSubconversationEpochInfo(conversationId, subconversationGroupId);
+            if (!epochInfo) {
+                throw new Error('Failed to get epoch info for conference subconversation');
+            }
+            await this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, {
+                groupId: subconversationGroupId,
+                epoch: epochInfo.epoch,
+            });
+        }
+        catch (error) {
+            this.logger.error(`Failed to delete conference subconversation:`, error);
+        }
+        await this.mlsService.wipeConversation(subconversationGroupId);
+        // once we've deleted the subconversation, we can remove it from the store
+        await this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+    }
     async leaveStaleConferenceSubconversations() {
         const conversationIds = await this.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
         for (const { parentConversationId } of conversationIds) {
@@ -161,10 +207,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
                 return;
             }
             const newSubconversationEpoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
-            return onEpochUpdate({
-                ...subconversationEpochInfo,
-                epoch: newSubconversationEpoch,
-            });
+            return onEpochUpdate(Object.assign(Object.assign({}, subconversationEpochInfo), { epoch: newSubconversationEpoch }));
         };
         this.mlsService.on('newEpoch', forwardNewEpoch);
         await forwardNewEpoch({ groupId: subconversationGroupId, epoch: initialEpoch });
@@ -212,20 +255,5 @@ class SubconversationService extends commons_1.TypedEventEmitter {
             };
         });
     }
-    getSubconversationGroupId = async (parentConversationId, subconversationId) => {
-        const foundSubconversation = await this.coreDatabase.get('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
-        return foundSubconversation?.groupId;
-    };
-    getAllGroupIdsBySubconversationId = async (subconversationId) => {
-        const allSubconversations = await this.coreDatabase.getAll('subconversations');
-        const foundSubconversations = allSubconversations.filter(subconversation => subconversation.subconversationId === subconversationId);
-        return foundSubconversations;
-    };
-    saveSubconversationGroupId = async (parentConversationId, subconversationId, groupId) => {
-        return this.coreDatabase.put('subconversations', { parentConversationId, subconversationId, groupId }, (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
-    };
-    clearSubconversationGroupId = async (parentConversationId, subconversationId) => {
-        return this.coreDatabase.delete('subconversations', (0, subconversationUtil_1.generateSubconversationStoreKey)(parentConversationId, subconversationId));
-    };
 }
 exports.SubconversationService = SubconversationService;

package/lib/conversation/content/AssetContent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { Asset } from '@wireapp/protocol-messaging';
 import { AbortReason, AssetTransferState } from '..';
 import { EncryptedAssetUploaded } from '../../cryptography';

package/lib/conversation/content/AssetContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AssetContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/AssetContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAElD,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,IAAI,CAAC;AACnD,OAAO,EAAC,sBAAsB,EAAC,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAC,MAAM,GAAG,CAAC;AAElF,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;AACjD,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;AACjD,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;AAEvC,MAAM,WAAW,SAAS;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAGD,MAAM,WAAW,YAAa,SAAQ,SAAS;IAC7C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,QAAQ,CAAC,EAAE,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,WAAW;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,oBAAoB,CAAC;IACrF,kBAAkB,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,KAAK,EAAE,sBAAsB,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,KAAK,EAAE,sBAAsB,CAAC;IAC9B,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,WAAW,wBAAyB,SAAQ,SAAS;IACzD,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACtD,MAAM,EAAE,WAAW,CAAC;CACrB"}
+{"version":3,"file":"AssetContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/AssetContent.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAElD,OAAO,EAAC,WAAW,EAAE,kBAAkB,EAAC,MAAM,IAAI,CAAC;AACnD,OAAO,EAAC,sBAAsB,EAAC,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAE,eAAe,EAAC,MAAM,GAAG,CAAC;AAElF,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;AACjD,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,cAAc,CAAC;AACjD,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC;AACrC,MAAM,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC;AAEvC,MAAM,WAAW,SAAS;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAGD,MAAM,WAAW,YAAa,SAAQ,SAAS;IAC7C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,QAAQ,CAAC,EAAE,UAAU,CAAC;CACvB;AAED,MAAM,WAAW,UAAW,SAAQ,KAAK,CAAC,WAAW;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;IAC5B,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,oBAAoB,CAAC;IACrF,kBAAkB,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAAC;CACjD;AAED,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,KAAK,EAAE,sBAAsB,CAAC;IAC9B,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD,KAAK,EAAE,sBAAsB,CAAC;IAC9B,IAAI,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,WAAW,wBAAyB,SAAQ,SAAS;IACzD,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAsB,SAAQ,SAAS;IACtD,MAAM,EAAE,WAAW,CAAC;CACrB"}

package/lib/conversation/content/ContentType.js

@@ -18,75 +18,76 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAbortedAssetContent = isAbortedAssetContent;
-exports.isAssetContent = isAssetContent;
-exports.isClearedContent = isClearedContent;
-exports.isClientActionContent = isClientActionContent;
-exports.isClientActionType = isClientActionType;
-exports.isConfirmationContent = isConfirmationContent;
-exports.isConnection = isConnection;
-exports.isDeletedContent = isDeletedContent;
-exports.isEditedTextContent = isEditedTextContent;
-exports.isFileAssetAbortContent = isFileAssetAbortContent;
-exports.isFileAssetContent = isFileAssetContent;
-exports.isFileAssetMetaDataContent = isFileAssetMetaDataContent;
-exports.isHiddenContent = isHiddenContent;
-exports.isImageAssetContent = isImageAssetContent;
-exports.isImageContent = isImageContent;
-exports.isLocationContent = isLocationContent;
-exports.isReactionContent = isReactionContent;
-exports.isTextContent = isTextContent;
+exports.isTextContent = exports.isReactionContent = exports.isLocationContent = exports.isImageContent = exports.isImageAssetContent = exports.isHiddenContent = exports.isFileAssetMetaDataContent = exports.isFileAssetContent = exports.isFileAssetAbortContent = exports.isEditedTextContent = exports.isDeletedContent = exports.isConnection = exports.isConfirmationContent = exports.isClientActionType = exports.isClientActionContent = exports.isClearedContent = exports.isAssetContent = exports.isAbortedAssetContent = void 0;
 function isAbortedAssetContent(content) {
     return !!content.abortReason;
 }
+exports.isAbortedAssetContent = isAbortedAssetContent;
 function isAssetContent(content) {
     return !!(content.uploaded || content.preview);
 }
+exports.isAssetContent = isAssetContent;
 function isClearedContent(content) {
     return !!content.clearedTimestamp;
 }
+exports.isClearedContent = isClearedContent;
 function isClientActionContent(content) {
     return !!content.clientAction;
 }
+exports.isClientActionContent = isClientActionContent;
 function isClientActionType(content) {
     return typeof content === 'number';
 }
+exports.isClientActionType = isClientActionType;
 function isConfirmationContent(content) {
     return !!content.firstMessageId;
 }
+exports.isConfirmationContent = isConfirmationContent;
 function isConnection(content) {
     return !!content.from && !!content.to;
 }
+exports.isConnection = isConnection;
 function isDeletedContent(content) {
     return !!content.messageId && !content.text;
 }
+exports.isDeletedContent = isDeletedContent;
 function isEditedTextContent(content) {
     return !!content.text && !!content.originalMessageId;
 }
+exports.isEditedTextContent = isEditedTextContent;
 function isFileAssetAbortContent(content) {
     return !!content.reason;
 }
+exports.isFileAssetAbortContent = isFileAssetAbortContent;
 function isFileAssetContent(content) {
     return !!content.asset && !!content.file;
 }
+exports.isFileAssetContent = isFileAssetContent;
 function isFileAssetMetaDataContent(content) {
     return !!content.metaData;
 }
+exports.isFileAssetMetaDataContent = isFileAssetMetaDataContent;
 function isHiddenContent(content) {
     return !!content.conversationId;
 }
+exports.isHiddenContent = isHiddenContent;
 function isImageAssetContent(content) {
     return !!content.asset && !!content.image;
 }
+exports.isImageAssetContent = isImageAssetContent;
 function isImageContent(content) {
     return !!content.data && !!content.type;
 }
+exports.isImageContent = isImageContent;
 function isLocationContent(content) {
     return !!content.latitude && !!content.longitude;
 }
+exports.isLocationContent = isLocationContent;
 function isReactionContent(content) {
     return !!content.type && !!content.originalMessageId;
 }
+exports.isReactionContent = isReactionContent;
 function isTextContent(content) {
     return !!content.text;
 }
+exports.isTextContent = isTextContent;

package/lib/conversation/content/FileContent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AudioMetaData, VideoMetaData, ImageMetaData } from './AssetContent';
 export interface FileContent {
     data: Buffer;

package/lib/conversation/content/FileContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/FileContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE3E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB"}
+{"version":3,"file":"FileContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/FileContent.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE3E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB"}

package/lib/conversation/content/ImageContent.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 export interface ImageContent {
     data: Buffer | Uint8Array;
     height: number;

package/lib/conversation/content/ImageContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImageContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ImageContent.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf"}
+{"version":3,"file":"ImageContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ImageContent.ts"],"names":[],"mappings":";AAmBA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,GAAG,UAAU,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf"}