@wireapp/core 17.20.0 → 17.21.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [17.21.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.20.3...@wireapp/core@17.21.0) (2021-10-28)
+
+
+### Features
+
+* **core:** Allow the consumer to give a list of clients when sending a message ([#4163](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4163)) ([b437acc](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/b437accfc7151518a780734efeecd0dcbbde8c7e))
+
+
+
+
+
+## [17.20.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.20.2...@wireapp/core@17.20.3) (2021-10-21)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [17.20.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.20.1...@wireapp/core@17.20.2) (2021-10-19)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [17.20.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.20.0...@wireapp/core@17.20.1) (2021-10-19)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
 # [17.20.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@17.19.2...@wireapp/core@17.20.0) (2021-10-19)
 
 

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "15.2.0",
+    "@wireapp/api-client": "15.3.0",
     "@wireapp/cryptobox": "12.7.1",
     "bazinga64": "5.9.7",
     "hash.js": "1.1.7",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "17.20.0",
-  "gitHead": "af77fd3daa9b5279b16065eccce626d7936c1a49"
+  "version": "17.21.0",
+  "gitHead": "f4c18025a50cd71587620069cf7a8be47470175f"
 }

package/src/main/conversation/ConversationService.d.ts

@@ -8,7 +8,7 @@ import { AssetService, MessageTimer } from '../conversation/';
 import type { RemoteData } from '../conversation/content/';
 import type { CryptographyService } from '../cryptography/';
 import { MessageBuilder } from './message/MessageBuilder';
-import type { ButtonActionConfirmationMessage, ButtonActionMessage, CallMessage, ClearConversationMessage, CompositeMessage, ConfirmationMessage, DeleteMessage, EditedTextMessage, FileAssetAbortMessage, FileAssetMessage, FileAssetMetaDataMessage, HideMessage, ImageAssetMessage, LocationMessage, OtrMessage, PingMessage, ReactionMessage, ResetSessionMessage, TextMessage } from './message/OtrMessage';
+import type { ClearConversationMessage, DeleteMessage, HideMessage, OtrMessage } from './message/OtrMessage';
 export interface MessageSendingCallbacks {
     onStart?: (message: GenericMessage) => void;
     onSuccess?: (message: GenericMessage, sentTime?: string) => void;
@@ -26,23 +26,35 @@ export declare class ConversationService {
     getPreKeyBundleMap(conversationId: string, userIds?: string[] | UserClients): Promise<UserPreKeyBundleMap>;
     private getSelfConversation;
     private sendExternalGenericMessage;
+    /**
+     * Sends a message to a federated environment.
+     *
+     * @param sendingClientId - The clientId from which the message is sent
+     * @param conversationId - The conversation in which to send the message
+     * @param conversationDomain - The domain where the conversation lives
+     * @param genericMessage - The payload of the message to send
+     * @param userIds? - can be either a QualifiedId[] or QualfiedUserClients. The type has some effect on the behavior of the method.
+     *    When given a QualifiedId[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     * @return Resolves with the message sending status from backend
+     */
     private sendFederatedGenericMessage;
     private sendGenericMessage;
-    private sendButtonAction;
-    private sendButtonActionConfirmation;
-    private sendComposite;
-    private sendConfirmation;
-    private sendEditedText;
-    private sendFileData;
-    private sendFileMetaData;
-    private sendFileAbort;
-    private sendImage;
-    private sendLocation;
-    private sendKnock;
-    private sendReaction;
-    private sendSessionReset;
-    private sendCall;
-    private sendText;
+    private generateButtonActionGenericMessage;
+    private generateButtonActionConfirmationGenericMessage;
+    private generateCompositeGenericMessage;
+    private generateConfirmationGenericMessage;
+    private generateEditedTextGenericMessage;
+    private generateFileDataGenericMessage;
+    private generateFileMetaDataGenericMessage;
+    private generateFileAbortGenericMessage;
+    private generateImageGenericMessage;
+    private generateLocationGenericMessage;
+    private generatePingGenericMessage;
+    private generateReactionGenericMessage;
+    private generateSessionResetGenericMessage;
+    private generateCallGenericMessage;
+    private generateTextGenericMessage;
     clearConversation(conversationId: string, timestamp?: number | Date, messageId?: string, sendAsProtobuf?: boolean, conversationDomain?: string): Promise<ClearConversationMessage>;
     deleteMessageLocal(conversationId: string, messageIdToHide: string, sendAsProtobuf?: boolean, conversationDomain?: string): Promise<HideMessage>;
     deleteMessageEveryone(conversationId: string, messageIdToDelete: string, userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients, sendAsProtobuf?: boolean, conversationDomain?: string, callbacks?: MessageSendingCallbacks): Promise<DeleteMessage>;
@@ -57,18 +69,26 @@ export declare class ConversationService {
     addUser<T extends string | string[] | QualifiedId | QualifiedId[]>(conversationId: string, userIds: T): Promise<T>;
     removeUser(conversationId: string, userId: string): Promise<string>;
     /**
-     * @param payloadBundle Outgoing message
-     * @param userIds Only send message to specified user IDs or to certain clients of specified user IDs
-     * @param [callbacks] Optional callbacks that will be called when the message starts being sent and when it has been succesfully sent. Currently only used for `sendText`.
-     * @returns Sent message
+     * Sends a message to a conversation
+     *
+     * @param params.payloadBundle The message to send to the conversation
+     * @param params.userIds? Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method.
+     *    When given a QualifiedId[] or string[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients or UserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     *    When given a QualifiedId[] or QualifiedUserClients the method will send the message through the federated API endpoint
+     *    When given a string[] or UserClients the method will send the message through the old API endpoint
+     * @param params.sendAsProtobuf?
+     * @param params.conversationDomain? The domain the conversation lives on (if given with QualifiedId[] or QualfiedUserClients in the userIds params, will send the message to the federated endpoint)
+     * @param params.callbacks? Optional callbacks that will be called when the message starts being sent and when it has been succesfully sent.
+     * @return resolves with the sent message
      */
-    send({ payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks, }: {
-        payloadBundle: OtrMessage;
+    send<T extends OtrMessage = OtrMessage>({ payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks, }: {
+        payloadBundle: T;
         userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
         sendAsProtobuf?: boolean;
         conversationDomain?: string;
         callbacks?: MessageSendingCallbacks;
-    }): Promise<ButtonActionMessage | ButtonActionConfirmationMessage | CallMessage | CompositeMessage | ConfirmationMessage | EditedTextMessage | FileAssetAbortMessage | FileAssetMessage | FileAssetMetaDataMessage | ImageAssetMessage | LocationMessage | PingMessage | ReactionMessage | ResetSessionMessage | TextMessage>;
+    }): Promise<T>;
     sendTypingStart(conversationId: string): Promise<void>;
     sendTypingStop(conversationId: string): Promise<void>;
     setConversationMutedStatus(conversationId: string, status: MutedStatus, muteTimestamp: number | Date): Promise<void>;

package/src/main/conversation/ConversationService.js

@@ -164,11 +164,25 @@ class ConversationService {
         }
         return undefined;
     }
+    /**
+     * Sends a message to a federated environment.
+     *
+     * @param sendingClientId - The clientId from which the message is sent
+     * @param conversationId - The conversation in which to send the message
+     * @param conversationDomain - The domain where the conversation lives
+     * @param genericMessage - The payload of the message to send
+     * @param userIds? - can be either a QualifiedId[] or QualfiedUserClients. The type has some effect on the behavior of the method.
+     *    When given a QualifiedId[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     * @return Resolves with the message sending status from backend
+     */
     async sendFederatedGenericMessage(sendingClientId, conversationId, conversationDomain, genericMessage, userIds) {
         const plainTextArray = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
-        const preKeyBundles = await this.getQualifiedPreKeyBundle(conversationId, conversationDomain, userIds);
+        const preKeyBundles = (0, TypePredicateUtil_1.isQualifiedUserClients)(userIds)
+            ? userIds
+            : await this.getQualifiedPreKeyBundle(conversationId, conversationDomain, userIds);
         const recipients = await this.cryptographyService.encryptQualified(plainTextArray, preKeyBundles);
-        return this.messageService.sendFederatedOTRMessage(sendingClientId, conversationId, conversationDomain, recipients, plainTextArray);
+        return this.messageService.sendFederatedOTRMessage(sendingClientId, conversationId, conversationDomain, recipients, plainTextArray, undefined, (0, TypePredicateUtil_1.isQualifiedUserClients)(userIds));
     }
     async sendGenericMessage(sendingClientId, conversationId, genericMessage, userIds, sendAsProtobuf, conversationDomain) {
         if (conversationDomain) {
@@ -191,58 +205,42 @@ class ConversationService {
             ? this.messageService.sendOTRProtobufMessage(sendingClientId, recipients, conversationId, plainTextArray)
             : this.messageService.sendOTRMessage(sendingClientId, recipients, conversationId, plainTextArray);
     }
-    async sendButtonAction(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+    generateButtonActionGenericMessage(payloadBundle) {
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.BUTTON_ACTION]: protocol_messaging_1.ButtonAction.create(payloadBundle.content),
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendButtonActionConfirmation(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+    generateButtonActionConfirmationGenericMessage(payloadBundle) {
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.BUTTON_ACTION_CONFIRMATION]: protocol_messaging_1.ButtonActionConfirmation.create(payloadBundle.content),
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendComposite(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+    generateCompositeGenericMessage(payloadBundle) {
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.COMPOSITE]: protocol_messaging_1.Composite.create(payloadBundle.content),
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendConfirmation(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks) {
-        var _a, _b;
+    generateConfirmationGenericMessage(payloadBundle) {
         const content = protocol_messaging_1.Confirmation.create(payloadBundle.content);
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.CONFIRMATION]: content,
             messageId: payloadBundle.id,
         });
-        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
-        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendEditedText(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks) {
-        var _a, _b;
+    generateEditedTextGenericMessage(payloadBundle) {
         const editedMessage = protocol_messaging_1.MessageEdit.create({
             replacingMessageId: payloadBundle.content.originalMessageId,
             text: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
         });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.EDITED]: editedMessage,
             messageId: payloadBundle.id,
         });
-        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
-        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendFileData(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateFileDataGenericMessage(payloadBundle) {
         if (!payloadBundle.content) {
             throw new Error('No content for sendFileData provided.');
         }
@@ -259,18 +257,14 @@ class ConversationService {
             uploaded: remoteData,
         });
         assetMessage.status = conversation_2.AssetTransferState.UPLOADED;
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.ASSET]: assetMessage,
             messageId: payloadBundle.id,
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
-    async sendFileMetaData(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateFileMetaDataGenericMessage(payloadBundle) {
         if (!payloadBundle.content) {
             throw new Error('No content for sendFileMetaData provided.');
         }
@@ -287,18 +281,14 @@ class ConversationService {
             legalHoldStatus,
             original,
         });
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.ASSET]: assetMessage,
             messageId: payloadBundle.id,
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
-    async sendFileAbort(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateFileAbortGenericMessage(payloadBundle) {
         if (!payloadBundle.content) {
             throw new Error('No content for sendFileAbort provided.');
         }
@@ -309,18 +299,14 @@ class ConversationService {
             notUploaded: reason,
         });
         assetMessage.status = conversation_2.AssetTransferState.NOT_UPLOADED;
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.ASSET]: assetMessage,
             messageId: payloadBundle.id,
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
-    async sendImage(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateImageGenericMessage(payloadBundle) {
         if (!payloadBundle.content) {
             throw new Error('No content for sendImage provided.');
         }
@@ -353,13 +339,12 @@ class ConversationService {
             messageId: payloadBundle.id,
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
+        if (expireAfterMillis) {
             genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
         }
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { content: assetMessage, messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return { content: assetMessage, genericMessage };
     }
-    async sendLocation(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateLocationGenericMessage(payloadBundle) {
         const { expectsReadConfirmation, latitude, legalHoldStatus, longitude, name, zoom } = payloadBundle.content;
         const locationMessage = protocol_messaging_1.Location.create({
             expectsReadConfirmation,
@@ -369,34 +354,23 @@ class ConversationService {
             name,
             zoom,
         });
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.LOCATION]: locationMessage,
             messageId: payloadBundle.id,
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
-    async sendKnock(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks) {
-        var _a, _b;
+    generatePingGenericMessage(payloadBundle) {
         const content = protocol_messaging_1.Knock.create(payloadBundle.content);
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.KNOCK]: content,
             messageId: payloadBundle.id,
         });
-        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
-        return Object.assign(Object.assign({}, payloadBundle), { conversation: payloadBundle.conversation, messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
-    async sendReaction(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateReactionGenericMessage(payloadBundle) {
         const { legalHoldStatus, originalMessageId, type } = payloadBundle.content;
         const reaction = protocol_messaging_1.Reaction.create({
             emoji: type,
@@ -407,42 +381,30 @@ class ConversationService {
             [conversation_2.GenericMessageType.REACTION]: reaction,
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return genericMessage;
     }
-    async sendSessionReset(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+    generateSessionResetGenericMessage(payloadBundle) {
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.CLIENT_ACTION]: protocol_messaging_1.ClientAction.RESET_SESSION,
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendCall(payloadBundle, userIds, sendAsProtobuf, conversationDomain) {
+    generateCallGenericMessage(payloadBundle) {
         const callMessage = protocol_messaging_1.Calling.create({
             content: payloadBundle.content,
         });
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
+        return protocol_messaging_1.GenericMessage.create({
             [conversation_2.GenericMessageType.CALLING]: callMessage,
             messageId: payloadBundle.id,
         });
-        await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
-    async sendText(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks) {
-        var _a, _b;
-        let genericMessage = protocol_messaging_1.GenericMessage.create({
+    generateTextGenericMessage(payloadBundle) {
+        const genericMessage = protocol_messaging_1.GenericMessage.create({
             messageId: payloadBundle.id,
             [conversation_2.GenericMessageType.TEXT]: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
         });
         const expireAfterMillis = this.messageTimer.getMessageTimer(payloadBundle.conversation);
-        if (expireAfterMillis > 0) {
-            genericMessage = this.createEphemeral(genericMessage, expireAfterMillis);
-        }
-        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
-        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
-        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
-        return Object.assign(Object.assign({}, payloadBundle), { messageTimer: this.messageTimer.getMessageTimer(payloadBundle.conversation), state: conversation_2.PayloadBundleState.OUTGOING_SENT });
+        return expireAfterMillis > 0 ? this.createEphemeral(genericMessage, expireAfterMillis) : genericMessage;
     }
     async clearConversation(conversationId, timestamp = new Date(), messageId = MessageBuilder_1.MessageBuilder.createId(), sendAsProtobuf, conversationDomain) {
         if (timestamp instanceof Date) {
@@ -588,50 +550,82 @@ class ConversationService {
         return userId;
     }
     /**
-     * @param payloadBundle Outgoing message
-     * @param userIds Only send message to specified user IDs or to certain clients of specified user IDs
-     * @param [callbacks] Optional callbacks that will be called when the message starts being sent and when it has been succesfully sent. Currently only used for `sendText`.
-     * @returns Sent message
+     * Sends a message to a conversation
+     *
+     * @param params.payloadBundle The message to send to the conversation
+     * @param params.userIds? Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method.
+     *    When given a QualifiedId[] or string[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients or UserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     *    When given a QualifiedId[] or QualifiedUserClients the method will send the message through the federated API endpoint
+     *    When given a string[] or UserClients the method will send the message through the old API endpoint
+     * @param params.sendAsProtobuf?
+     * @param params.conversationDomain? The domain the conversation lives on (if given with QualifiedId[] or QualfiedUserClients in the userIds params, will send the message to the federated endpoint)
+     * @param params.callbacks? Optional callbacks that will be called when the message starts being sent and when it has been succesfully sent.
+     * @return resolves with the sent message
      */
     async send({ payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks, }) {
+        var _a, _b, _c;
+        let genericMessage;
+        let processedContent = undefined;
         switch (payloadBundle.type) {
             case conversation_2.PayloadBundleType.ASSET:
-                return this.sendFileData(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateFileDataGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.ASSET_ABORT:
-                return this.sendFileAbort(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateFileAbortGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.ASSET_META:
-                return this.sendFileMetaData(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateFileMetaDataGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.ASSET_IMAGE:
-                return this.sendImage(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                const res = this.generateImageGenericMessage(payloadBundle);
+                genericMessage = res.genericMessage;
+                processedContent = res.content;
+                break;
             case conversation_2.PayloadBundleType.BUTTON_ACTION:
-                return this.sendButtonAction(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateButtonActionGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.BUTTON_ACTION_CONFIRMATION:
-                return this.sendButtonActionConfirmation(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateButtonActionConfirmationGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.CALL:
-                return this.sendCall(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateCallGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.CLIENT_ACTION: {
-                if (payloadBundle.content.clientAction === protocol_messaging_1.ClientAction.RESET_SESSION) {
-                    return this.sendSessionReset(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                if (payloadBundle.content.clientAction !== protocol_messaging_1.ClientAction.RESET_SESSION) {
+                    throw new Error(`No send method implemented for "${payloadBundle.type}" and ClientAction "${payloadBundle.content}".`);
                 }
-                throw new Error(`No send method implemented for "${payloadBundle.type}" and ClientAction "${payloadBundle.content}".`);
+                genericMessage = this.generateSessionResetGenericMessage(payloadBundle);
+                break;
             }
             case conversation_2.PayloadBundleType.COMPOSITE:
-                return this.sendComposite(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateCompositeGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.CONFIRMATION:
-                return this.sendConfirmation(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks);
+                genericMessage = this.generateConfirmationGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.LOCATION:
-                return this.sendLocation(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateLocationGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.MESSAGE_EDIT:
-                return this.sendEditedText(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks);
+                genericMessage = this.generateEditedTextGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.PING:
-                return this.sendKnock(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks);
+                genericMessage = this.generatePingGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.REACTION:
-                return this.sendReaction(payloadBundle, userIds, sendAsProtobuf, conversationDomain);
+                genericMessage = this.generateReactionGenericMessage(payloadBundle);
+                break;
             case conversation_2.PayloadBundleType.TEXT:
-                return this.sendText(payloadBundle, userIds, sendAsProtobuf, conversationDomain, callbacks);
+                genericMessage = this.generateTextGenericMessage(payloadBundle);
+                break;
             default:
                 throw new Error(`No send method implemented for "${payloadBundle['type']}".`);
         }
+        (_a = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onStart) === null || _a === void 0 ? void 0 : _a.call(callbacks, genericMessage);
+        const response = await this.sendGenericMessage(this.apiClient.validatedClientId, payloadBundle.conversation, genericMessage, userIds, sendAsProtobuf, conversationDomain);
+        (_b = callbacks === null || callbacks === void 0 ? void 0 : callbacks.onSuccess) === null || _b === void 0 ? void 0 : _b.call(callbacks, genericMessage, response === null || response === void 0 ? void 0 : response.time);
+        return Object.assign(Object.assign({}, payloadBundle), { content: processedContent || payloadBundle.content, messageTimer: ((_c = genericMessage.ephemeral) === null || _c === void 0 ? void 0 : _c.expireAfterMillis) || 0, state: conversation_2.PayloadBundleState.OUTGOING_SENT });
     }
     sendTypingStart(conversationId) {
         return this.apiClient.conversation.api.postTyping(conversationId, { status: data_1.CONVERSATION_TYPING.STARTED });