@wireapp/core 40.5.2-1 → 40.5.3-beta.0

package/lib/conversation/ConversationService/ConversationService.js

@@ -155,12 +155,9 @@ class ConversationService {
      * Will create a conversation on backend and register it to CoreCrypto once created
      * @param conversationData
      */
-    async createMLSConversation(conversationData) {
+    async createMLSConversation(conversationData, selfUserId, selfClientId) {
         var _a;
-        const { selfUserId, qualified_users: qualifiedUsers = [] } = conversationData;
-        if (!selfUserId) {
-            throw new Error('You need to pass self user qualified id in order to create an MLS conversation');
-        }
+        const { qualified_users: qualifiedUsers = [] } = conversationData;
         /**
          * @note For creating MLS conversations the users & qualified_users
          * field must be empty as backend is not aware which users
@@ -173,7 +170,7 @@ class ConversationService {
         }
         const response = await this.mlsService.registerConversation(groupId, qualifiedUsers.concat(selfUserId), {
             user: selfUserId,
-            client: conversationData.creator_client,
+            client: selfClientId,
         });
         // We fetch the fresh version of the conversation created on backend with the newly added users
         const conversation = await this.apiClient.api.conversation.getConversation(qualifiedId);
@@ -183,25 +180,41 @@ class ConversationService {
         };
     }
     async sendMLSMessage({ payload, groupId }) {
+        var _a, _b;
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         // immediately execute pending commits before sending the message
         await this.mlsService.commitPendingProposals({ groupId });
         const encrypted = await this.mlsService.encryptMessage(groupIdBytes, protocol_messaging_1.GenericMessage.encode(payload).finish());
+        let response = null;
         let sentAt = '';
         try {
-            const { time = '' } = await this.apiClient.api.conversation.postMlsMessage(encrypted);
-            sentAt = (time === null || time === void 0 ? void 0 : time.length) > 0 ? time : new Date().toISOString();
+            response = await this.apiClient.api.conversation.postMlsMessage(encrypted);
+            sentAt = ((_a = response.time) === null || _a === void 0 ? void 0 : _a.length) > 0 ? response.time : new Date().toISOString();
         }
-        catch (_a) { }
+        catch (_c) { }
+        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 === null || response === void 0 ? void 0 : response.failed_to_send,
+                failed: response === null || response === void 0 ? void 0 : response.failed,
+            }
+            : undefined;
         return {
             id: payload.messageId,
             sentAt,
+            failedToSend,
             state: sentAt ? conversation_2.MessageSendingState.OUTGOING_SENT : conversation_2.MessageSendingState.CANCELED,
         };
     }
-    async addUsersToMLSConversation({ qualifiedUserIds, groupId, conversationId, }) {
+    /**
+     * Will add users to existing MLS group by claiming their key packages and passing them to CoreCrypto.addClientsToConversation
+     *
+     * @param qualifiedUsers List of qualified user ids (with optional skipOwnClientId field - if provided we will not claim key package for this self client)
+     * @param groupId Id of the group to which we want to add users
+     * @param conversationId Id of the conversation to which we want to add users
+     */
+    async addUsersToMLSConversation({ qualifiedUsers, groupId, conversationId, }) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
-        const coreCryptoKeyPackagesPayload = await this.mlsService.getKeyPackagesPayload([...qualifiedUserIds]);
+        const coreCryptoKeyPackagesPayload = await this.mlsService.getKeyPackagesPayload(qualifiedUsers);
         const response = await this.mlsService.addUsersToExistingConversation(groupIdBytes, coreCryptoKeyPackagesPayload);
         const conversation = await this.getConversation(conversationId);
         //We store the info when user was added (and key material was created), so we will know when to renew it
@@ -238,6 +251,8 @@ class ConversationService {
             const externalProposal = await this.mlsService.newExternalProposal(core_crypto_1.ExternalProposalType.Add, {
                 epoch,
                 conversationId: groupIdBytes,
+                ciphersuite: core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
+                credentialType: core_crypto_1.CredentialType.Basic,
             });
             await this.apiClient.api.conversation.postMlsMessage(
             //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array

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

@@ -208,7 +208,7 @@ describe('ConversationService', () => {
                 { domain: 'test-domain', id: 'test-id-1' },
                 { domain: 'test-domain', id: 'test-id-2' },
             ]);
-            const fetchedMembers = await conversationService.fetchAllParticipantsClients('convid');
+            const fetchedMembers = await conversationService.fetchAllParticipantsClients({ id: 'convid', domain: '' });
             expect(fetchedMembers).toEqual(members);
         });
     });

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

@@ -1,4 +1,4 @@
-import { QualifiedUserClients, ClientMismatch, ConversationProtocol, MessageSendingStatus, UserClients, Conversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, ConversationProtocol, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
 import { ConversationEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { GenericMessage } from '@wireapp/protocol-messaging';
@@ -15,11 +15,7 @@ export interface MessageSendingOptions {
      *    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)
      */
-    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
-    /**
-     * Will send the message as a protobuf payload
-     */
-    sendAsProtobuf?: boolean;
+    userIds?: QualifiedId[] | QualifiedUserClients;
     nativePush?: boolean;
     /**
      * Will be called whenever there is a clientmismatch returned from the server. Needs to be combined with a userIds of type QualifiedUserClients
@@ -41,7 +37,7 @@ export interface MessageSendingCallbacks {
      * @param wasSent Indicate whether the message was already sent or if it can still be canceled
      * @return
      */
-    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
+    onClientMismatch?: (status: MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
 }
 /**
  *   ######################################################################
@@ -67,12 +63,12 @@ export type SendMlsMessageParams = SendCommonParams & {
     groupId: string;
     protocol: ConversationProtocol.MLS;
 };
-export type QualifiedUsers = QualifiedId & {
-    skipOwn?: string;
+export type KeyPackageClaimUser = QualifiedId & {
+    skipOwnClientId?: string;
 };
 export type AddUsersParams = {
     conversationId: QualifiedId;
-    qualifiedUserIds: QualifiedId[];
+    qualifiedUsers: KeyPackageClaimUser[];
     groupId?: string;
 };
 export type RemoveUsersParams = {
@@ -92,6 +88,11 @@ export type SendResult = {
     /** The sending state of the payload (has the payload been succesfully sent or canceled) */
     state: MessageSendingState;
     /** In case the message was sent to some federated backend, if the backend was down at the moment of sending the `failedToSend` property will contain all the users/devices that couldn't get the message */
-    failedToSend?: QualifiedUserClients;
+    failedToSend?: {
+        /** the message was encrypted for those recipients but will reach them later (a session existed but their backend is offline) */
+        queued?: QualifiedUserClients | QualifiedId[];
+        /** the message could not be encrypted for those recipients and thus will never reach them (a session did not exist and their backend if offline) */
+        failed?: QualifiedId[];
+    };
 };
 //# sourceMappingURL=ConversationService.types.d.ts.map

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":"AAmBA,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,WAAW,EACX,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,IAAI,CAAC;AAEvC,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,aAAa,IAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IAExE;;OAEG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE/D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAED;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9D,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAEtF,MAAM,MAAM,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,mBAAmB,CAAC;IAC3B,4MAA4M;IAC5M,YAAY,CAAC,EAAE,oBAAoB,CAAC;CACrC,CAAC"}
+{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,YAAY,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,mBAAmB,EAAC,MAAM,IAAI,CAAC;AAEvC,oBAAY,iBAAiB;IAC3B,IAAI,IAAA;IACJ,KAAK,IAAA;IACL,aAAa,IAAA;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;IAE/C,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,gBAAgB,CAAC,EAAE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAE/D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1G;AAED;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE3E,MAAM,MAAM,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,mBAAmB,EAAE,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAEtF,MAAM,MAAM,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,mBAAmB,CAAC;IAC3B,4MAA4M;IAC5M,YAAY,CAAC,EAAE;QACb,gIAAgI;QAChI,MAAM,CAAC,EAAE,oBAAoB,GAAG,WAAW,EAAE,CAAC;QAC9C,oJAAoJ;QACpJ,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;KACxB,CAAC;CACH,CAAC"}

package/lib/conversation/ConversationService/ConversationService.types.js

@@ -24,4 +24,4 @@ var MessageTargetMode;
     MessageTargetMode[MessageTargetMode["NONE"] = 0] = "NONE";
     MessageTargetMode[MessageTargetMode["USERS"] = 1] = "USERS";
     MessageTargetMode[MessageTargetMode["USERS_CLIENTS"] = 2] = "USERS_CLIENTS";
-})(MessageTargetMode = exports.MessageTargetMode || (exports.MessageTargetMode = {}));
+})(MessageTargetMode || (exports.MessageTargetMode = MessageTargetMode = {}));

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

@@ -2,7 +2,7 @@ import { APIClient } from '@wireapp/api-client/lib/APIClient';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 interface Params {
     apiClient: APIClient;
-    conversationId: string | QualifiedId;
+    conversationId: QualifiedId;
 }
 declare const getConversationQualifiedMembers: ({ apiClient, conversationId }: Params) => Promise<QualifiedId[]>;
 export { getConversationQualifiedMembers };

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,MAAM,GAAG,WAAW,CAAC;CACtC;AACD,QAAA,MAAM,+BAA+B,kCAAuC,MAAM,KAAG,QAAQ,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/GenericMessageType.js

@@ -45,4 +45,4 @@ var GenericMessageType;
     GenericMessageType["LOCATION"] = "location";
     GenericMessageType["REACTION"] = "reaction";
     GenericMessageType["TEXT"] = "text";
-})(GenericMessageType = exports.GenericMessageType || (exports.GenericMessageType = {}));
+})(GenericMessageType || (exports.GenericMessageType = GenericMessageType = {}));

package/lib/conversation/ReactionType.d.ts

@@ -1,5 +1,2 @@
-export declare enum ReactionType {
-    LIKE = "\u2764\uFE0F",
-    NONE = ""
-}
+export type ReactionType = string;
 //# sourceMappingURL=ReactionType.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ReactionType.d.ts","sourceRoot":"","sources":["../../src/conversation/ReactionType.ts"],"names":[],"mappings":"AAmBA,oBAAY,YAAY;IACtB,IAAI,iBAAO;IACX,IAAI,KAAK;CACV"}
+{"version":3,"file":"ReactionType.d.ts","sourceRoot":"","sources":["../../src/conversation/ReactionType.ts"],"names":[],"mappings":"AAmBA,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC"}

package/lib/conversation/ReactionType.js

@@ -18,9 +18,3 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReactionType = void 0;
-var ReactionType;
-(function (ReactionType) {
-    ReactionType["LIKE"] = "\u2764\uFE0F";
-    ReactionType["NONE"] = "";
-})(ReactionType = exports.ReactionType || (exports.ReactionType = {}));

package/lib/conversation/message/Message.types.js

@@ -24,4 +24,4 @@ var MessageSendingState;
     MessageSendingState["INCOMING"] = "INCOMING";
     MessageSendingState["OUTGOING_SENT"] = "OUTGOING_SENT";
     MessageSendingState["CANCELED"] = "CANCELED";
-})(MessageSendingState = exports.MessageSendingState || (exports.MessageSendingState = {}));
+})(MessageSendingState || (exports.MessageSendingState = MessageSendingState = {}));

package/lib/conversation/message/MessageBuilder.d.ts

@@ -8,7 +8,7 @@ export declare function buildCompositeMessage(payload: IComposite): GenericMessa
 export declare function buildConfirmationMessage(payloadBundle: ConfirmationMessage['content']): GenericMessage;
 export declare function buildEditedTextMessage(payloadBundle: EditedTextMessage['content'], messageId?: string): GenericMessage;
 export declare function buildFileDataMessage(payloadBundle: FileAssetMessage['content'], messageId?: string): GenericMessage;
-export declare function buildFileMetaDataMessage(payloadBundle: FileAssetMetaDataMessage['content']): GenericMessage;
+export declare function buildFileMetaDataMessage(payloadBundle: FileAssetMetaDataMessage['content'], messageId?: string): GenericMessage;
 export declare function buildFileAbortMessage(payloadBundle: FileAssetAbortMessage['content'], messageId?: string): GenericMessage;
 export declare function buildLastReadMessage(conversationId: QualifiedId, lastReadTimestamp: number): GenericMessage;
 export declare function buildDataTransferMessage(identifier: string): GenericMessage;

package/lib/conversation/message/MessageBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageBuilder.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageBuilder.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EACL,UAAU,EAUV,cAAc,EASd,QAAQ,EACT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,eAAe,EACf,WAAW,EACZ,MAAM,cAAc,CAAC;AAMtB,wBAAgB,QAAQ,WAEvB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,cAAc,CAKtG;AAED,wBAAgB,oCAAoC,CAClD,aAAa,EAAE,+BAA+B,CAAC,SAAS,CAAC,GACxD,cAAc,CAKhB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAKzE;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,cAAc,CAOtG;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAC3C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAUhB;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAC1C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAyBhB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,wBAAwB,CAAC,SAAS,CAAC,GAAG,cAAc,CAwB3G;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC/C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAiBhB;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAU1F;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,kBAW1D;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,WAAW,EAAE,SAAS,GAAE,MAAmB,kBAU9F;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,yBAAyB,CAAC,SAAS,CAAC,EACnD,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAShB;AACD,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,CAkB9F;AACD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,cAAc,CAStF;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,CAc9F;AAED,wBAAgB,wBAAwB,IAAI,cAAc,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,cAAc,CAOlE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,cAAc,CAOpF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,cAAc,CAOhF;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,EACrC,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAOhB;AAqCD,wBAAgB,eAAe,CAAC,sBAAsB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,GAAG,cAAc,CAYjH"}
+{"version":3,"file":"MessageBuilder.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageBuilder.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAGzD,OAAO,EACL,UAAU,EAUV,cAAc,EASd,QAAQ,EACT,MAAM,6BAA6B,CAAC;AAErC,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACxB,WAAW,EACX,yBAAyB,EACzB,eAAe,EACf,WAAW,EACX,eAAe,EACf,WAAW,EACZ,MAAM,cAAc,CAAC;AAMtB,wBAAgB,QAAQ,WAEvB;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,cAAc,CAKtG;AAED,wBAAgB,oCAAoC,CAClD,aAAa,EAAE,+BAA+B,CAAC,SAAS,CAAC,GACxD,cAAc,CAKhB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,UAAU,GAAG,cAAc,CAKzE;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,cAAc,CAOtG;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAC3C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAUhB;AAED,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,gBAAgB,CAAC,SAAS,CAAC,EAC1C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAyBhB;AAED,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,wBAAwB,CAAC,SAAS,CAAC,EAClD,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAwBhB;AAED,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,qBAAqB,CAAC,SAAS,CAAC,EAC/C,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAiBhB;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAU1F;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,kBAW1D;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,WAAW,EAAE,SAAS,GAAE,MAAmB,kBAU9F;AAED,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,yBAAyB,CAAC,SAAS,CAAC,EACnD,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAShB;AACD,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,CAkB9F;AACD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,cAAc,CAStF;AAED,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,eAAe,CAAC,SAAS,CAAC,GAAG,cAAc,CAc9F;AAED,wBAAgB,wBAAwB,IAAI,cAAc,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,GAAG,cAAc,CAOlE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,GAAG,cAAc,CAOpF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,cAAc,CAOhF;AAED,wBAAgB,gBAAgB,CAC9B,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,EACrC,SAAS,GAAE,MAAmB,GAC7B,cAAc,CAOhB;AAqCD,wBAAgB,eAAe,CAAC,sBAAsB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,GAAG,cAAc,CAYjH"}

package/lib/conversation/message/MessageBuilder.js

@@ -90,7 +90,7 @@ function buildFileDataMessage(payloadBundle, messageId = createId()) {
     return genericMessage;
 }
 exports.buildFileDataMessage = buildFileDataMessage;
-function buildFileMetaDataMessage(payloadBundle) {
+function buildFileMetaDataMessage(payloadBundle, messageId = createId()) {
     const { expectsReadConfirmation, legalHoldStatus, metaData } = payloadBundle;
     const original = protocol_messaging_1.Asset.Original.create({
         audio: metaData.audio,
@@ -107,7 +107,7 @@ function buildFileMetaDataMessage(payloadBundle) {
     });
     const genericMessage = protocol_messaging_1.GenericMessage.create({
         [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
-        messageId: createId(),
+        messageId,
     });
     return genericMessage;
 }

package/lib/conversation/message/MessageService.d.ts

@@ -1,32 +1,11 @@
-import { ClientMismatch, MessageSendingStatus, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
-import { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { MessageSendingStatus, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { APIClient } from '@wireapp/api-client';
 import type { ProteusService } from '../../messagingProtocols/proteus';
 export declare class MessageService {
     private readonly apiClient;
     private readonly proteusService;
     constructor(apiClient: APIClient, proteusService: ProteusService);
-    /**
-     * Sends a message to a non-federated backend.
-     *
-     * @param sendingClientId The clientId of the current user
-     * @param recipients The list of recipients to send the message to
-     * @param plainText The plainText data to send
-     * @param options.conversationId? the conversation to send the message to. Will broadcast if not set
-     * @param options.reportMissing? trigger a mismatch error when there are missing recipients in the payload
-     * @param options.sendAsProtobuf?
-     * @param options.onClientMismatch? Called when a mismatch happens on the server
-     * @return the ClientMismatch status returned by the backend
-     */
-    sendMessage(sendingClientId: string, recipients: UserClients | UserPreKeyBundleMap, plainText: Uint8Array, options?: {
-        conversationId?: QualifiedId;
-        reportMissing?: boolean | string[];
-        sendAsProtobuf?: boolean;
-        nativePush?: boolean;
-        onClientMismatch?: (mismatch: ClientMismatch) => void | boolean | Promise<boolean>;
-    }): Promise<ClientMismatch & {
-        canceled?: boolean;
-    }>;
     /**
      * Sends a message to a federated backend.
      *
@@ -39,7 +18,7 @@ export declare class MessageService {
      * @param options.onClientMismatch? Called when a mismatch happens on the server
      * @return the MessageSendingStatus returned by the backend
      */
-    sendFederatedMessage(sendingClientId: string, recipients: QualifiedUserClients | QualifiedUserPreKeyBundleMap, plainText: Uint8Array, options: {
+    sendMessage(sendingClientId: string, recipients: QualifiedUserClients | QualifiedUserPreKeyBundleMap, plainText: Uint8Array, options?: {
         assetData?: Uint8Array;
         conversationId?: QualifiedId;
         reportMissing?: boolean | QualifiedId[];
@@ -47,13 +26,10 @@ export declare class MessageService {
         onClientMismatch?: (mismatch: MessageSendingStatus) => void | boolean | Promise<boolean>;
     }): Promise<MessageSendingStatus & {
         canceled?: boolean;
+        failed?: QualifiedId[];
     }>;
-    private sendFederatedOtrMessage;
-    private sendOTRMessage;
-    private generateExternalPayload;
-    private shouldSendAsExternal;
+    private sendOtrMessage;
     private isClientMismatchError;
-    private reencryptAfterMismatch;
     /**
      * Will re-encrypt a message when there were some missing clients in the initial send (typically when the server replies with a client mismatch error)
      *
@@ -62,7 +38,6 @@ export declare class MessageService {
      * @param {Uint8Array} plainText The text that should be encrypted for the missing clients
      * @return resolves with a new message payload that can be sent
      */
-    private reencryptAfterFederatedMismatch;
-    private sendOTRProtobufMessage;
+    private reencryptAfterMismatch;
 }
 //# sourceMappingURL=MessageService.d.ts.map

package/lib/conversation/message/MessageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,cAAc,EACd,oBAAoB,EAIpB,oBAAoB,EACpB,WAAW,EACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAQ5G,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAS9C,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAKrE,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAArD,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAElG;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,WAAW,GAAG,mBAAmB,EAC7C,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,EAAE,CAAC;QACnC,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/E,GACL,OAAO,CAAC,cAAc,GAAG;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;IAgCjD;;;;;;;;;;;OAWG;IACU,oBAAoB,CAC/B,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAC1F,GACA,OAAO,CAAC,oBAAoB,GAAG;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;KAAC,CAAC;YAsBzC,uBAAuB;YAiEvB,cAAc;YAmCd,uBAAuB;IAiBrC,OAAO,CAAC,oBAAoB;IAc5B,OAAO,CAAC,qBAAqB;YAIf,sBAAsB;IAmBpC;;;;;;;OAOG;YACW,+BAA+B;YAuB/B,sBAAsB;CAoDrC"}
+{"version":3,"file":"MessageService.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/MessageService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAA0B,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AACxH,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAQvF,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,KAAK,EAAmB,cAAc,EAAC,MAAM,kCAAkC,CAAC;AAKvF,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;gBAArD,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAElG;;;;;;;;;;;OAWG;IACU,WAAW,CACtB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,EAC/D,SAAS,EAAE,UAAU,EACrB,OAAO,GAAE;QACP,SAAS,CAAC,EAAE,UAAU,CAAC;QACvB,cAAc,CAAC,EAAE,WAAW,CAAC;QAC7B,aAAa,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE,CAAC;QACxC,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACrF,GACL,OAAO,CAAC,oBAAoB,GAAG;QAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAA;KAAC,CAAC;YAyBjE,cAAc;IAiE5B,OAAO,CAAC,qBAAqB;IAI7B;;;;;;;OAOG;YACW,sBAAsB;CAiBrC"}

package/lib/conversation/message/MessageService.js

@@ -24,63 +24,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageService = void 0;
 const StringUtil_1 = require("@wireapp/commons/lib/util/StringUtil");
 const otr_1 = require("@wireapp/protocol-messaging/web/otr");
-const bazinga64_1 = require("bazinga64");
+const deepmerge_ts_1 = require("deepmerge-ts");
 const http_status_codes_1 = require("http-status-codes");
 const long_1 = __importDefault(require("long"));
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
-const MessageBuilder_1 = require("./MessageBuilder");
-const RecipientsHelper_1 = require("./RecipientsHelper");
 const UserClientsUtil_1 = require("./UserClientsUtil");
-const __1 = require("..");
-const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 const util_1 = require("../../util");
 class MessageService {
     constructor(apiClient, proteusService) {
         this.apiClient = apiClient;
         this.proteusService = proteusService;
     }
-    /**
-     * Sends a message to a non-federated backend.
-     *
-     * @param sendingClientId The clientId of the current user
-     * @param recipients The list of recipients to send the message to
-     * @param plainText The plainText data to send
-     * @param options.conversationId? the conversation to send the message to. Will broadcast if not set
-     * @param options.reportMissing? trigger a mismatch error when there are missing recipients in the payload
-     * @param options.sendAsProtobuf?
-     * @param options.onClientMismatch? Called when a mismatch happens on the server
-     * @return the ClientMismatch status returned by the backend
-     */
-    async sendMessage(sendingClientId, recipients, plainText, options = {}) {
-        let plainTextPayload = plainText;
-        let cipherText;
-        if (this.shouldSendAsExternal(plainText, recipients)) {
-            const externalPayload = await this.generateExternalPayload(plainText);
-            plainTextPayload = externalPayload.text;
-            cipherText = externalPayload.cipherText;
-        }
-        const encryptedPayload = await this.proteusService.encrypt(plainTextPayload, recipients);
-        const send = (payload) => {
-            return options.sendAsProtobuf
-                ? this.sendOTRProtobufMessage(sendingClientId, payload, Object.assign(Object.assign({}, options), { assetData: cipherText }))
-                : this.sendOTRMessage(sendingClientId, payload, Object.assign(Object.assign({}, options), { assetData: cipherText }));
-        };
-        try {
-            return await send(encryptedPayload);
-        }
-        catch (error) {
-            if (!this.isClientMismatchError(error)) {
-                throw error;
-            }
-            const mismatch = error.response.data;
-            const shouldStopSending = options.onClientMismatch && (await options.onClientMismatch(mismatch)) === false;
-            if (shouldStopSending) {
-                return Object.assign(Object.assign({}, mismatch), { canceled: true });
-            }
-            const reEncryptedMessage = await this.reencryptAfterMismatch(mismatch, encryptedPayload, plainText);
-            return send(reEncryptedMessage);
-        }
-    }
     /**
      * Sends a message to a federated backend.
      *
@@ -93,13 +46,15 @@ class MessageService {
      * @param options.onClientMismatch? Called when a mismatch happens on the server
      * @return the MessageSendingStatus returned by the backend
      */
-    async sendFederatedMessage(sendingClientId, recipients, plainText, options) {
-        const send = (payload) => {
-            return this.sendFederatedOtrMessage(sendingClientId, payload, options);
+    async sendMessage(sendingClientId, recipients, plainText, options = {}) {
+        const encryptionResults = await this.proteusService.encrypt(plainText, recipients);
+        const send = async ({ payloads, unknowns, failed }) => {
+            const result = await this.sendOtrMessage(sendingClientId, payloads, options);
+            const extras = { failed, deleted: unknowns !== null && unknowns !== void 0 ? unknowns : {} };
+            return (0, deepmerge_ts_1.deepmerge)(result, extras);
         };
-        const encryptedPayload = await this.proteusService.encryptQualified(plainText, recipients);
         try {
-            return await send(encryptedPayload);
+            return await send(encryptionResults);
         }
         catch (error) {
             if (!this.isClientMismatchError(error)) {
@@ -110,11 +65,11 @@ class MessageService {
             if (shouldStopSending) {
                 return Object.assign(Object.assign({}, mismatch), { canceled: true });
             }
-            const reEncryptedPayload = await this.reencryptAfterFederatedMismatch(mismatch, encryptedPayload, plainText);
+            const reEncryptedPayload = await this.reencryptAfterMismatch(mismatch, encryptionResults, plainText);
             return send(reEncryptedPayload);
         }
     }
-    async sendFederatedOtrMessage(sendingClientId, recipients, options) {
+    async sendOtrMessage(sendingClientId, recipients, options) {
         const qualifiedUserEntries = Object.entries(recipients).map(([domain, otrRecipients]) => {
             const userEntries = Object.entries(otrRecipients).map(([userId, otrClientMap]) => {
                 const clientEntries = Object.entries(otrClientMap).map(([clientId, payload]) => {
@@ -156,71 +111,15 @@ class MessageService {
             protoMessage.ignoreAll = true;
         }
         if (!options.conversationId) {
-            return this.apiClient.api.broadcast.postBroadcastFederatedMessage(sendingClientId, protoMessage);
+            return this.apiClient.api.broadcast.postBroadcastMessage(sendingClientId, protoMessage);
         }
         const { id, domain } = options.conversationId;
-        return this.apiClient.api.conversation.postOTRMessageV2(id, domain, protoMessage);
-    }
-    async sendOTRMessage(sendingClientId, recipients, options) {
-        const message = {
-            data: options.assetData ? bazinga64_1.Encoder.toBase64(options.assetData).asString : undefined,
-            recipients: (0, RecipientsHelper_1.recipientsToBase64)(recipients),
-            sender: sendingClientId,
-            native_push: options.nativePush,
-        };
-        let ignoreMissing;
-        if ((0, util_1.isStringArray)(options.reportMissing)) {
-            message.report_missing = options.reportMissing;
-        }
-        else {
-            // By default we want ignore missing to be false (and have mismatch errors in case some clients are missing)
-            ignoreMissing = typeof options.reportMissing === 'boolean' ? !options.reportMissing : false;
-        }
-        return !options.conversationId
-            ? this.apiClient.api.broadcast.postBroadcastMessage(sendingClientId, message, ignoreMissing)
-            : this.apiClient.api.conversation.postOTRMessage(sendingClientId, options.conversationId.id, message, ignoreMissing);
-    }
-    async generateExternalPayload(plainText) {
-        const asset = await (0, AssetCryptography_1.encryptAsset)({ plainText });
-        const { cipherText, keyBytes, sha256 } = asset;
-        const externalMessage = {
-            otrKey: new Uint8Array(keyBytes),
-            sha256: new Uint8Array(sha256),
-        };
-        const genericMessage = protocol_messaging_1.GenericMessage.create({
-            [__1.GenericMessageType.EXTERNAL]: externalMessage,
-            messageId: (0, MessageBuilder_1.createId)(),
-        });
-        return { text: protocol_messaging_1.GenericMessage.encode(genericMessage).finish(), cipherText };
-    }
-    shouldSendAsExternal(plainText, preKeyBundles) {
-        const EXTERNAL_MESSAGE_THRESHOLD_BYTES = 200 * 1024;
-        let clientCount = 0;
-        for (const user in preKeyBundles) {
-            clientCount += Object.keys(preKeyBundles[user]).length;
-        }
-        const messageInBytes = new Uint8Array(plainText).length;
-        const estimatedPayloadInBytes = clientCount * messageInBytes;
-        return estimatedPayloadInBytes > EXTERNAL_MESSAGE_THRESHOLD_BYTES;
+        return this.apiClient.api.conversation.postOTRMessage(id, domain, protoMessage);
     }
     isClientMismatchError(error) {
         var _a;
         return ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === http_status_codes_1.StatusCodes.PRECONDITION_FAILED;
     }
-    async reencryptAfterMismatch(mismatch, recipients, plainText) {
-        const deleted = (0, UserClientsUtil_1.flattenUserClients)(mismatch.deleted);
-        const missing = (0, UserClientsUtil_1.flattenUserClients)(mismatch.missing);
-        // remove deleted clients to the recipients
-        deleted.forEach(({ userId, data }) => data.forEach(clientId => delete recipients[userId.id][clientId]));
-        if (missing.length) {
-            const missingPreKeyBundles = await this.apiClient.api.user.postMultiPreKeyBundles(mismatch.missing);
-            const encrypted = await this.proteusService.encrypt(plainText, missingPreKeyBundles);
-            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenUserClients)(encrypted);
-            // add missing clients to the recipients
-            reEncryptedPayloads.forEach(({ data, userId }) => (recipients[userId.id] = Object.assign(Object.assign({}, recipients[userId.id]), data)));
-        }
-        return recipients;
-    }
     /**
      * Will re-encrypt a message when there were some missing clients in the initial send (typically when the server replies with a client mismatch error)
      *
@@ -229,57 +128,15 @@ class MessageService {
      * @param {Uint8Array} plainText The text that should be encrypted for the missing clients
      * @return resolves with a new message payload that can be sent
      */
-    async reencryptAfterFederatedMismatch(mismatch, recipients, plainText) {
-        const deleted = (0, UserClientsUtil_1.flattenQualifiedUserClients)(mismatch.deleted);
-        const missing = (0, UserClientsUtil_1.flattenQualifiedUserClients)(mismatch.missing);
+    async reencryptAfterMismatch(mismatch, initialPayloads, plainText) {
+        const deleted = (0, UserClientsUtil_1.flattenUserMap)(mismatch.deleted);
         // remove deleted clients to the recipients
-        deleted.forEach(({ userId, data }) => data.forEach(clientId => delete recipients[userId.domain][userId.id][clientId]));
-        if (Object.keys(missing).length) {
-            const missingPreKeyBundles = await this.apiClient.api.user.postQualifiedMultiPreKeyBundles(mismatch.missing);
-            const encrypted = await this.proteusService.encryptQualified(plainText, missingPreKeyBundles);
-            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenQualifiedUserClients)(encrypted);
-            reEncryptedPayloads.forEach(({ data, userId }) => (recipients[userId.domain][userId.id] = Object.assign(Object.assign({}, recipients[userId.domain][userId.id]), data)));
-        }
-        return recipients;
-    }
-    async sendOTRProtobufMessage(sendingClientId, recipients, options) {
-        const userEntries = Object.entries(recipients).map(([userId, otrClientMap]) => {
-            const clients = Object.entries(otrClientMap).map(([clientId, payload]) => {
-                return {
-                    client: {
-                        client: long_1.default.fromString(clientId, 16),
-                    },
-                    text: payload,
-                };
-            });
-            return {
-                clients,
-                user: {
-                    uuid: (0, StringUtil_1.uuidToBytes)(userId),
-                },
-            };
-        });
-        const protoMessage = otr_1.proteus.NewOtrMessage.create({
-            recipients: userEntries,
-            sender: {
-                client: long_1.default.fromString(sendingClientId, 16),
-            },
-        });
-        let ignoreMissing;
-        if ((0, util_1.isStringArray)(options.reportMissing)) {
-            const encoder = new TextEncoder();
-            protoMessage.reportMissing = options.reportMissing.map(userId => ({ uuid: encoder.encode(userId) }));
-        }
-        else {
-            // By default we want ignore missing to be false (and have mismatch errors in case some clients are missing)
-            ignoreMissing = typeof options.reportMissing === 'boolean' ? !options.reportMissing : false;
-        }
-        if (options.assetData) {
-            protoMessage.blob = options.assetData;
+        deleted.forEach(({ userId, data }) => data.forEach(clientId => delete initialPayloads.payloads[userId.domain][userId.id][clientId]));
+        if (Object.keys(mismatch.missing).length === 0) {
+            return initialPayloads;
         }
-        return !options.conversationId
-            ? this.apiClient.api.broadcast.postBroadcastProtobufMessage(sendingClientId, protoMessage, ignoreMissing)
-            : this.apiClient.api.conversation.postOTRProtobufMessage(sendingClientId, options.conversationId.id, protoMessage, ignoreMissing);
+        const reencryptedResults = await this.proteusService.encrypt(plainText, mismatch.missing);
+        return (0, deepmerge_ts_1.deepmerge)(initialPayloads, reencryptedResults);
     }
 }
 exports.MessageService = MessageService;