@wireapp/core 46.46.6-beta.14.f6fd03fe6 → 46.46.6

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

@@ -1,7 +1,8 @@
-import { GenericMessage } from '@pydio/protocol-messaging';
-import { QualifiedUserClients, ConversationProtocol, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
 import { ConversationEvent, ConversationMemberJoinEvent } from '@wireapp/api-client/lib/event';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
+import { GenericMessage } from '@wireapp/protocol-messaging';
 import { MessageSendingState } from '..';
 export declare enum MessageTargetMode {
     NONE = 0,
@@ -48,7 +49,7 @@ export interface MessageSendingCallbacks {
  * The protocol to use to send the message (MLS or Proteus)
  */
 export type ProtocolParam = {
-    protocol: ConversationProtocol;
+    protocol: CONVERSATION_PROTOCOL;
 };
 /**
  * The message to send to the conversation
@@ -62,7 +63,7 @@ export type SendMlsMessageParams = SendCommonParams & {
      * The groupId of the conversation to send the message to (Needed only for MLS)
      */
     groupId: string;
-    protocol: ConversationProtocol.MLS;
+    protocol: CONVERSATION_PROTOCOL.MLS;
 };
 export type KeyPackageClaimUser = QualifiedId & {
     skipOwnClientId?: string;

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

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

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;AAED,QAAA,MAAM,+BAA+B,kCAAuC,MAAM,KAAG,OAAO,CAAC,WAAW,EAAE,CAgBzG,CAAC;AAEF,OAAO,EAAC,+BAA+B,EAAC,CAAC"}

package/lib/conversation/ConversationService/Utility/getConversationQualifiedMembers.js

@@ -26,9 +26,12 @@ const getConversationQualifiedMembers = async ({ apiClient, conversationId }) =>
      * yourself in the list of users if you want to sync a message also to your
      * other clients.
      */
-    return conversation.members.others
+    const filteredConversations = conversation.members.others
         .filter(member => !!member.qualified_id)
-        .map(member => member.qualified_id)
-        .concat(conversation.members.self.qualified_id);
+        .map(member => member.qualified_id);
+    if (conversation.members.self?.qualified_id) {
+        filteredConversations.push(conversation.members.self.qualified_id);
+    }
+    return filteredConversations;
 };
 exports.getConversationQualifiedMembers = getConversationQualifiedMembers;

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

@@ -23,6 +23,7 @@ const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const TimeUtil_1 = require("@wireapp/commons/lib/util/TimeUtil");
 const commons_1 = require("@wireapp/commons");
 const subconversationUtil_1 = require("./subconversationUtil");
+const mls_1 = require("../../messagingProtocols/mls");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const MLS_CONVERSATION_KEY_LENGTH = 32;
 class SubconversationService extends commons_1.TypedEventEmitter {
@@ -51,7 +52,10 @@ 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);
             if (subconversationEpoch === 0) {
                 const doesConversationExistsLocally = await this.mlsService.conversationExists(subconversationGroupId);
                 if (doesConversationExistsLocally) {
@@ -75,11 +79,10 @@ class SubconversationService extends commons_1.TypedEventEmitter {
                 await this.joinSubconversationByExternalCommit(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
             }
             const epoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
-            // We store the mapping between the subconversation and the parent conversation
-            await this.saveSubconversationGroupId(conversationId, subconversationId, subconversationGroupId);
             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);
             }
@@ -92,87 +95,159 @@ 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,
             });
         };
-        this.mlsService.on('newEpoch', forwardNewEpoch);
+        this.mlsService.on(mls_1.MLSServiceEvents.NEW_EPOCH, forwardNewEpoch);
         await forwardNewEpoch({ groupId: subconversationGroupId, epoch: initialEpoch });
-        return () => this.mlsService.off('newEpoch', forwardNewEpoch);
+        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;
@@ -180,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 {
@@ -207,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/lib/conversation/SubconversationService/SubconversationService.test.js

@@ -22,6 +22,7 @@ const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const http_1 = require("@wireapp/api-client/lib/http");
 const api_client_1 = require("@wireapp/api-client");
 const SubconversationService_1 = require("./SubconversationService");
+const mls_1 = require("../../messagingProtocols/mls");
 const CoreDB_1 = require("../../storage/CoreDB");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationId, groupId, members = [], subconversationId = conversation_1.SUBCONVERSATION_ID.CONFERENCE, }) => {
@@ -35,8 +36,10 @@ const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationI
         epoch_timestamp: epochTimestamp,
     };
 };
+const apiClients = [];
 const buildSubconversationService = async (isFederated = false) => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    apiClients.push(apiClient);
     apiClient.backendFeatures.isFederated = isFederated;
     const mlsService = {
         conversationExists: jest.fn(),
@@ -57,6 +60,9 @@ const buildSubconversationService = async (isFederated = false) => {
     return [subconversationService, { apiClient, mlsService, coreDatabase }];
 };
 describe('SubconversationService', () => {
+    afterAll(() => {
+        apiClients.forEach(client => client.disconnect());
+    });
     describe('joinConferenceSubconversation', () => {
         afterEach(() => {
             jest.useRealTimers();
@@ -313,11 +319,11 @@ describe('SubconversationService', () => {
             const onEpochUpdateCallback = jest.fn();
             const unsubscribe = await subconversationService.subscribeToEpochUpdates(parentConversationId, parentConversationGroupId, findConversationByGroupId, onEpochUpdateCallback);
             expect(mlsService.getEpoch).toHaveBeenCalledWith(subconversationGroupId);
-            expect(mlsService.on).toHaveBeenCalledWith('newEpoch', expect.any(Function));
+            expect(mlsService.on).toHaveBeenCalledWith(mls_1.MLSServiceEvents.NEW_EPOCH, expect.any(Function));
             expect(subconversationService.getSubconversationEpochInfo).toHaveBeenCalledWith(parentConversationId, parentConversationGroupId);
             expect(onEpochUpdateCallback).toHaveBeenCalledWith(mockedEpochInfo);
             unsubscribe();
-            expect(mlsService.off).toHaveBeenCalledWith('newEpoch', expect.any(Function));
+            expect(mlsService.off).toHaveBeenCalledWith(mls_1.MLSServiceEvents.NEW_EPOCH, expect.any(Function));
         });
     });
     describe('removeClientFromConferenceSubconversation', () => {

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

@@ -1,4 +1,4 @@
-import { Asset } from '@pydio/protocol-messaging';
+import { Asset } from '@wireapp/protocol-messaging';
 import { AbortReason, AssetTransferState } from '..';
 import { EncryptedAssetUploaded } from '../../cryptography';
 import { FileContent, FileMetaDataContent, ImageContent, LegalHoldStatus } from '.';

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,2BAA2B,CAAC;AAEhD,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;IAClB,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;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;IAClB,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;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/ButtonActionConfirmationContent.d.ts

@@ -1,3 +1,3 @@
-import { IButtonActionConfirmation } from '@pydio/protocol-messaging';
+import { IButtonActionConfirmation } from '@wireapp/protocol-messaging';
 export { IButtonActionConfirmation as ButtonActionConfirmationContent };
 //# sourceMappingURL=ButtonActionConfirmationContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ButtonActionConfirmationContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ButtonActionConfirmationContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,yBAAyB,EAAC,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAC,yBAAyB,IAAI,+BAA+B,EAAC,CAAC"}
+{"version":3,"file":"ButtonActionConfirmationContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ButtonActionConfirmationContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,yBAAyB,EAAC,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAC,yBAAyB,IAAI,+BAA+B,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IButtonAction } from '@pydio/protocol-messaging';
+import { IButtonAction } from '@wireapp/protocol-messaging';
 export { IButtonAction as ButtonActionContent };
 //# sourceMappingURL=ButtonActionContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ButtonActionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ButtonActionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"ButtonActionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ButtonActionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { ICleared } from '@pydio/protocol-messaging';
+import { ICleared } from '@wireapp/protocol-messaging';
 export { ICleared as ClearedContent };
 //# sourceMappingURL=ClearedContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ClearedContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ClearedContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAC,QAAQ,IAAI,cAAc,EAAC,CAAC"}
+{"version":3,"file":"ClearedContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ClearedContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAC,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAC,QAAQ,IAAI,cAAc,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IGenericMessage } from '@pydio/protocol-messaging';
+import { IGenericMessage } from '@wireapp/protocol-messaging';
 export type ClientActionContent = Required<Pick<IGenericMessage, 'clientAction'>>;
 //# sourceMappingURL=ClientActionContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ClientActionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ClientActionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ClientActionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ClientActionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IComposite } from '@pydio/protocol-messaging';
+import { IComposite } from '@wireapp/protocol-messaging';
 export { IComposite as CompositeContent };
 //# sourceMappingURL=CompositeContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"CompositeContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/CompositeContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,UAAU,IAAI,gBAAgB,EAAC,CAAC"}
+{"version":3,"file":"CompositeContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/CompositeContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAC,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAC,UAAU,IAAI,gBAAgB,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IConfirmation } from '@pydio/protocol-messaging';
+import { IConfirmation } from '@wireapp/protocol-messaging';
 export { IConfirmation as ConfirmationContent };
 //# sourceMappingURL=ConfirmationContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfirmationContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ConfirmationContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"ConfirmationContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/ConfirmationContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,aAAa,IAAI,mBAAmB,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IMessageDelete } from '@pydio/protocol-messaging';
+import { IMessageDelete } from '@wireapp/protocol-messaging';
 export { IMessageDelete as DeletedContent };
 //# sourceMappingURL=DeletedContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"DeletedContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/DeletedContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAC,cAAc,IAAI,cAAc,EAAC,CAAC"}
+{"version":3,"file":"DeletedContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/DeletedContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,cAAc,IAAI,cAAc,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IMessageHide } from '@pydio/protocol-messaging';
+import { IMessageHide } from '@wireapp/protocol-messaging';
 export { IMessageHide as HiddenContent };
 //# sourceMappingURL=HiddenContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"HiddenContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/HiddenContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,CAAC"}
+{"version":3,"file":"HiddenContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/HiddenContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAC,YAAY,IAAI,aAAa,EAAC,CAAC"}

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

@@ -1,3 +1,3 @@
-import { IKnock } from '@pydio/protocol-messaging';
+import { IKnock } from '@wireapp/protocol-messaging';
 export { IKnock as KnockContent };
 //# sourceMappingURL=KnockContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"KnockContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/KnockContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,CAAC"}
+{"version":3,"file":"KnockContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/KnockContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAC,MAAM,IAAI,YAAY,EAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { ILinkPreview } from '@pydio/protocol-messaging';
+import { ILinkPreview } from '@wireapp/protocol-messaging';
 import { ImageAssetContent, ImageContent, LegalHoldStatus } from '.';
 export interface LinkPreviewContent extends Omit<ILinkPreview, 'image'> {
     expectsReadConfirmation?: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"LinkPreviewContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/LinkPreviewContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAE,eAAe,EAAC,MAAM,GAAG,CAAC;AAEnE,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC;IACrE,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACnF,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC"}
+{"version":3,"file":"LinkPreviewContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/LinkPreviewContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAEzD,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAE,eAAe,EAAC,MAAM,GAAG,CAAC;AAEnE,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC;IACrE,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,0BAA2B,SAAQ,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC;IACnF,aAAa,CAAC,EAAE,iBAAiB,CAAC;CACnC"}

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

@@ -1,3 +1,3 @@
-import { IMention } from '@pydio/protocol-messaging';
+import { IMention } from '@wireapp/protocol-messaging';
 export { IMention as MentionContent };
 //# sourceMappingURL=MentionContent.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"MentionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/MentionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAC,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAC,QAAQ,IAAI,cAAc,EAAC,CAAC"}
+{"version":3,"file":"MentionContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/MentionContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAAC,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAC,QAAQ,IAAI,cAAc,EAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { IMultipart, IAttachment, ICellAsset, IAsset } from '@pydio/protocol-messaging';
+import { IMultipart, IAttachment, ICellAsset, IAsset } from '@wireapp/protocol-messaging';
 export { IMultipart as MultiPartContent };
 export { IAttachment as MultiPartAttachment };
 export { ICellAsset as MultiPartCellAsset };

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

@@ -1 +1 @@
-{"version":3,"file":"MultipartContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/MultipartContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAC,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAC,UAAU,IAAI,gBAAgB,EAAC,CAAC;AACxC,OAAO,EAAC,WAAW,IAAI,mBAAmB,EAAC,CAAC;AAC5C,OAAO,EAAC,UAAU,IAAI,kBAAkB,EAAC,CAAC;AAC1C,OAAO,EAAC,MAAM,IAAI,cAAc,EAAC,CAAC"}
+{"version":3,"file":"MultipartContent.d.ts","sourceRoot":"","sources":["../../../src/conversation/content/MultipartContent.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAC,UAAU,IAAI,gBAAgB,EAAC,CAAC;AACxC,OAAO,EAAC,WAAW,IAAI,mBAAmB,EAAC,CAAC;AAC5C,OAAO,EAAC,UAAU,IAAI,kBAAkB,EAAC,CAAC;AAC1C,OAAO,EAAC,MAAM,IAAI,cAAc,EAAC,CAAC"}

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

@@ -1,4 +1,4 @@
-import { IQuote } from '@pydio/protocol-messaging';
+import { IQuote } from '@wireapp/protocol-messaging';
 import { AssetContent, LocationContent, MultiPartContent, TextContent } from '.';
 export { IQuote as QuoteContent };
 export interface QuoteMessageContent {