@wireapp/core 36.4.4 → 36.6.0

package/lib/Account.d.ts

@@ -16,8 +16,8 @@ import { CoreError } from './CoreError';
 import { CryptographyService, SessionId } from './cryptography/';
 import { GiphyService } from './giphy/';
 import { LinkPreviewService } from './linkPreview';
-import { MLSService } from './mls';
-import { MLSCallbacks, CryptoProtocolConfig } from './mls/types';
+import { MLSService } from './messagingProtocols/mls';
+import { MLSCallbacks, CryptoProtocolConfig } from './messagingProtocols/mls/types';
 import { HandledEventPayload, NotificationService } from './notification/';
 import { SelfService } from './self/';
 import { TeamService } from './team/';
@@ -148,7 +148,7 @@ export declare class Account<T = any> extends EventEmitter {
      */
     register(registration: RegisterData, clientType: ClientType): Promise<Context>;
     /**
-     * Will init the core with an aleady existing client (both on backend and local)
+     * Will init the core with an already existing client (both on backend and local)
      * Will fail if local client cannot be found
      *
      * @param clientType The type of client the user is using (temporary or permanent)
@@ -166,7 +166,7 @@ export declare class Account<T = any> extends EventEmitter {
     /**
      * Will try to get the load the local client from local DB.
      * If clientInfo are provided, will also create the client on backend and DB
-     * If clientInfo are not provideo, the method will fail if local client cannot be found
+     * If clientInfo are not provided, the method will fail if local client cannot be found
      *
      * @param loginData User's credentials
      * @param clientInfo Will allow creating the client if the local client cannot be found (else will fail if local client is not found)
@@ -217,7 +217,7 @@ export declare class Account<T = any> extends EventEmitter {
             total: number;
         }) => void;
         /**
-         * called when the connection stateh with the backend has changed
+         * called when the connection state with the backend has changed
          */
         onConnectionStateChanged?: (state: ConnectionState) => void;
         /**

package/lib/Account.d.ts.map

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

package/lib/Account.js

@@ -75,7 +75,8 @@ const messageSender_1 = require("./conversation/message/messageSender");
 const cryptography_1 = require("./cryptography/");
 const giphy_1 = require("./giphy/");
 const linkPreview_1 = require("./linkPreview");
-const mls_1 = require("./mls");
+const mls_1 = require("./messagingProtocols/mls");
+const proteus_1 = require("./messagingProtocols/proteus");
 const notification_1 = require("./notification/");
 const self_1 = require("./self/");
 const team_1 = require("./team/");
@@ -166,7 +167,7 @@ class Account extends events_1.EventEmitter {
         return context;
     }
     /**
-     * Will init the core with an aleady existing client (both on backend and local)
+     * Will init the core with an already existing client (both on backend and local)
      * Will fail if local client cannot be found
      *
      * @param clientType The type of client the user is using (temporary or permanent)
@@ -191,7 +192,9 @@ class Account extends events_1.EventEmitter {
         });
         // Assumption: client gets only initialized once
         if (initClient) {
-            await this.initClient({ clientType });
+            const { localClient } = await this.initClient({ clientType });
+            //call /access endpoint with client_id after client initialisation
+            await this.apiClient.transport.http.associateClientWithSession(localClient.id);
             if (((_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls) && this.backendFeatures.supportsMLS) {
                 // initialize schedulers for pending mls proposals once client is initialized
                 await ((_b = this.service) === null || _b === void 0 ? void 0 : _b.mls.checkExistingPendingProposals());
@@ -224,7 +227,7 @@ class Account extends events_1.EventEmitter {
     /**
      * Will try to get the load the local client from local DB.
      * If clientInfo are provided, will also create the client on backend and DB
-     * If clientInfo are not provideo, the method will fail if local client cannot be found
+     * If clientInfo are not provided, the method will fail if local client cannot be found
      *
      * @param loginData User's credentials
      * @param clientInfo Will allow creating the client if the local client cannot be found (else will fail if local client is not found)
@@ -298,6 +301,10 @@ class Account extends events_1.EventEmitter {
         });
         const clientService = new client_2.ClientService(this.apiClient, this.storeEngine, cryptographyService);
         const mlsService = new mls_1.MLSService(this.apiClient, () => this.coreCryptoClient, Object.assign(Object.assign({}, (_a = this.cryptoProtocolConfig) === null || _a === void 0 ? void 0 : _a.mls), { nbKeyPackages: this.nbPrekeys }));
+        const proteusService = new proteus_1.ProteusService(this.apiClient, cryptographyService, {
+            // We can use qualified ids to send messages as long as the backend supports federated endpoints
+            useQualifiedIds: this.backendFeatures.federationEndpoints,
+        });
         const connectionService = new connection_1.ConnectionService(this.apiClient);
         const giphyService = new giphy_1.GiphyService(this.apiClient);
         const linkPreviewService = new linkPreview_1.LinkPreviewService(assetService);
@@ -305,11 +312,11 @@ class Account extends events_1.EventEmitter {
         const conversationService = new conversation_1.ConversationService(this.apiClient, cryptographyService, {
             // We can use qualified ids to send messages as long as the backend supports federated endpoints
             useQualifiedIds: this.backendFeatures.federationEndpoints,
-        }, mlsService);
+        }, mlsService, proteusService);
         const selfService = new self_1.SelfService(this.apiClient);
         const teamService = new team_1.TeamService(this.apiClient);
         const broadcastService = new broadcast_1.BroadcastService(this.apiClient, cryptographyService);
-        const userService = new user_1.UserService(this.apiClient, broadcastService, conversationService, connectionService);
+        const userService = new user_1.UserService(this.apiClient, broadcastService, connectionService);
         this.service = {
             mls: mlsService,
             account: accountService,

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

@@ -1,54 +1,25 @@
 import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
 import { ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
-import { QualifiedId, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { XOR } from '@wireapp/commons/lib/util/TypeUtil';
 import { APIClient } from '@wireapp/api-client';
-import { AddUsersParams, MLSReturnType, SendMlsMessageParams, SendProteusMessageParams } from './ConversationService.types';
-import { MessageTimer, PayloadBundleState, RemoveUsersParams } from '../../conversation/';
+import { AddUsersParams, MLSReturnType, SendMlsMessageParams, SendResult } from './ConversationService.types';
+import { MessageTimer, RemoveUsersParams } from '../../conversation/';
 import { CryptographyService } from '../../cryptography/';
-import { MLSService } from '../../mls';
+import { MLSService } from '../../messagingProtocols/mls';
+import { ProteusService } from '../../messagingProtocols/proteus';
+import { SendProteusMessageParams } from '../../messagingProtocols/proteus/ProteusService/ProteusService.types';
 import { RemoteData } from '../content';
-declare type SendResult = {
-    /** The id of the message sent */
-    id: string;
-    /** the ISO formatted date at which the message was received by the backend */
-    sentAt: string;
-    /** The sending state of the payload (has the payload been succesfully sent or canceled) */
-    state: PayloadBundleState;
-};
 export declare class ConversationService {
     private readonly apiClient;
     private readonly config;
     private readonly mlsService;
+    private readonly proteusService;
     readonly messageTimer: MessageTimer;
     private readonly messageService;
     constructor(apiClient: APIClient, cryptographyService: CryptographyService, config: {
         useQualifiedIds?: boolean;
-    }, mlsService: MLSService);
-    private getConversationQualifiedMembers;
-    /**
-     * Will generate a prekey bundle for specific users.
-     * If a QualifiedId array is given the bundle will contain all the clients from those users fetched from the server.
-     * If a QualifiedUserClients is provided then only the clients in the payload will be targeted (which could generate a ClientMismatch when sending messages)
-     *
-     * @param {QualifiedId[]|QualifiedUserClients} userIds - Targeted users.
-     * @returns {Promise<QualifiedUserPreKeyBundleMap}
-     */
-    private getQualifiedPreKeyBundle;
-    getPreKeyBundleMap(conversationId: QualifiedId, userIds?: string[] | UserClients): Promise<UserPreKeyBundleMap>;
-    private getQualifiedRecipientsForConversation;
-    private getRecipientsForConversation;
-    /**
-     * Sends a message to a conversation
-     *
-     * @param sendingClientId The clientId from which the message is sent
-     * @param conversationId The conversation in which to send the message
-     * @param genericMessage The payload of the message to send
-     * @return Resolves with the message sending status from backend
-     */
-    private sendGenericMessage;
-    private extractUserIds;
-    private extractQualifiedUserIds;
+    }, mlsService: MLSService, proteusService: ProteusService);
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
      * This is a hacky way of getting all the clients for a conversation.
@@ -91,7 +62,6 @@ export declare class ConversationService {
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
     addUsersToProteusConversation({ conversationId, qualifiedUserIds }: Omit<AddUsersParams, 'groupId'>): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
     removeUserFromConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
-    private sendProteusMessage;
     /**
      * Sends a message to a conversation
      * @return resolves with the sending status
@@ -102,7 +72,6 @@ export declare class ConversationService {
     setConversationMutedStatus(conversationId: string, status: MutedStatus, muteTimestamp: number | Date): Promise<void>;
     toggleArchiveConversation(conversationId: string, archived: boolean, archiveTimestamp?: number | Date): Promise<void>;
     setMemberConversationRole(conversationId: string, userId: string, conversationRole: DefaultConversationRoleName | string): Promise<void>;
-    private isClearFromMismatch;
     /**
      *   ###############################################
      *   ################ MLS Functions ################
@@ -123,5 +92,4 @@ export declare class ConversationService {
     isMLSConversationEstablished(groupId: string): Promise<boolean>;
     wipeMLSConversation(groupId: Uint8Array): Promise<void>;
 }
-export {};
 //# sourceMappingURL=ConversationService.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAEL,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,WAAW,EAGZ,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAC,4BAA4B,EAAC,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAC,WAAW,EAAgC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAC5G,OAAO,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAGvD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EACL,cAAc,EAGd,aAAa,EACb,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAE,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACxF,OAAO,EAAC,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAC,UAAU,EAAuB,MAAM,WAAW,CAAC;AAG3D,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAItC,aAAK,UAAU,GAAG;IAChB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,kBAAkB,CAAC;CAC3B,CAAC;AACF,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAP7B,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAG7B,SAAS,EAAE,SAAS,EACrC,mBAAmB,EAAE,mBAAmB,EACvB,MAAM,EAAE;QAAC,eAAe,CAAC,EAAE,OAAO,CAAA;KAAC,EACnC,UAAU,EAAE,UAAU;YAM3B,+BAA+B;IAa7C;;;;;;;OAOG;YACW,wBAAwB;IAwChC,kBAAkB,CACtB,cAAc,EAAE,WAAW,EAC3B,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,GAC/B,OAAO,CAAC,mBAAmB,CAAC;YAiCjB,qCAAqC;YAWrC,4BAA4B;IAU1C;;;;;;;OAOG;YACW,kBAAkB;IA6DhC,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,uBAAuB;IAS/B;;;;;;;;;OASG;IACI,yBAAyB,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG,oBAAoB,CAAC;IA0B1G;;;;;OAKG;IACU,2BAA2B,CACtC,cAAc,EAAE,MAAM,EACtB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,WAAW,GAAG,oBAAoB,CAAC;IAiB9C;;;;;;OAMG;IACI,yBAAyB,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC;IACtG;;;;;;;;OAQG;IACI,yBAAyB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAqB7E,gBAAgB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAC/D,gBAAgB,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAWrE,QAAQ,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAWhF,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAK/E,6BAA6B,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAC,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC;IAIjG,0BAA0B,CACrC,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,4BAA4B,CAAC;YAI1B,kBAAkB;IA+BhC;;;OAGG;IACU,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,wBAAwB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5F,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrD,0BAA0B,CAC/B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,OAAO,EACjB,gBAAgB,GAAE,MAAM,GAAG,IAAiB,GAC3C,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,2BAA2B,GAAG,MAAM,GACrD,OAAO,CAAC,IAAI,CAAC;IAMhB,OAAO,CAAC,mBAAmB;IAQ3B;;;;OAIG;IAEU,qBAAqB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;YA6D/E,cAAc;IAqBf,yBAAyB,CAAC,EACrC,gBAAgB,EAChB,OAAO,EACP,cAAc,GACf,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAcvC,8BAA8B,CAAC,EAC1C,OAAO,EACP,cAAc,EACd,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAsBhC,oBAAoB,CAAC,cAAc,EAAE,WAAW;IAI7D;;;;;OAKG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAiBvD,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAK5C,mBAAmB,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAGrE"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js

@@ -24,190 +24,22 @@ const data_1 = require("@wireapp/api-client/lib/conversation/data");
 const bazinga64_1 = require("bazinga64");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
-const ConversationService_types_1 = require("./ConversationService.types");
 const conversation_2 = require("../../conversation/");
 const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
-const mls_1 = require("../../mls");
+const mls_1 = require("../../messagingProtocols/mls");
+const proteus_1 = require("../../messagingProtocols/proteus");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
-const TypePredicateUtil_1 = require("../../util/TypePredicateUtil");
 const messageSender_1 = require("../message/messageSender");
 const MessageService_1 = require("../message/MessageService");
 class ConversationService {
-    constructor(apiClient, cryptographyService, config, mlsService) {
+    constructor(apiClient, cryptographyService, config, mlsService, proteusService) {
         this.apiClient = apiClient;
         this.config = config;
         this.mlsService = mlsService;
+        this.proteusService = proteusService;
         this.messageTimer = new conversation_2.MessageTimer();
         this.messageService = new MessageService_1.MessageService(this.apiClient, cryptographyService);
     }
-    async getConversationQualifiedMembers(conversationId) {
-        const conversation = await this.apiClient.api.conversation.getConversation(conversationId);
-        /*
-         * If you are sending a message to a conversation, you have to include
-         * yourself in the list of users if you want to sync a message also to your
-         * other clients.
-         */
-        return conversation.members.others
-            .filter(member => !!member.qualified_id)
-            .map(member => member.qualified_id)
-            .concat(conversation.members.self.qualified_id);
-    }
-    /**
-     * Will generate a prekey bundle for specific users.
-     * If a QualifiedId array is given the bundle will contain all the clients from those users fetched from the server.
-     * If a QualifiedUserClients is provided then only the clients in the payload will be targeted (which could generate a ClientMismatch when sending messages)
-     *
-     * @param {QualifiedId[]|QualifiedUserClients} userIds - Targeted users.
-     * @returns {Promise<QualifiedUserPreKeyBundleMap}
-     */
-    async getQualifiedPreKeyBundle(userIds) {
-        let targets = [];
-        if (userIds) {
-            if ((0, TypePredicateUtil_1.isQualifiedIdArray)(userIds)) {
-                targets = userIds.map(id => ({ id }));
-            }
-            else {
-                targets = Object.entries(userIds).reduce((accumulator, [domain, userClients]) => {
-                    for (const userId in userClients) {
-                        accumulator.push({ id: { id: userId, domain }, clients: userClients[userId] });
-                    }
-                    return accumulator;
-                }, []);
-            }
-        }
-        const preKeys = await Promise.all(targets.map(async ({ id: userId, clients }) => {
-            const prekeyBundle = await this.apiClient.api.user.getUserPreKeys(userId);
-            // We filter the clients that should not receive the message (if a QualifiedUserClients was given as parameter)
-            const userClients = clients
-                ? prekeyBundle.clients.filter(client => clients.includes(client.client))
-                : prekeyBundle.clients;
-            return { user: userId, clients: userClients };
-        }));
-        return preKeys.reduce((bundleMap, qualifiedPrekey) => {
-            var _a, _b, _c;
-            bundleMap[_a = qualifiedPrekey.user.domain] || (bundleMap[_a] = {});
-            for (const client of qualifiedPrekey.clients) {
-                (_b = bundleMap[qualifiedPrekey.user.domain])[_c = qualifiedPrekey.user.id] || (_b[_c] = {});
-                bundleMap[qualifiedPrekey.user.domain][qualifiedPrekey.user.id][client.client] = client.prekey;
-            }
-            return bundleMap;
-        }, {});
-    }
-    async getPreKeyBundleMap(conversationId, userIds) {
-        let members = [];
-        if (userIds) {
-            if ((0, TypePredicateUtil_1.isStringArray)(userIds)) {
-                members = userIds;
-            }
-            else if ((0, TypePredicateUtil_1.isUserClients)(userIds)) {
-                members = Object.keys(userIds);
-            }
-        }
-        if (!members.length) {
-            const conversation = await this.apiClient.api.conversation.getConversation(conversationId);
-            /*
-             * If you are sending a message to a conversation, you have to include
-             * yourself in the list of users if you want to sync a message also to your
-             * other clients.
-             */
-            members = conversation.members.others.map(member => member.id).concat(conversation.members.self.id);
-        }
-        const preKeys = await Promise.all(members.map(member => this.apiClient.api.user.getUserPreKeys(member)));
-        return preKeys.reduce((bundleMap, bundle) => {
-            const userId = bundle.user;
-            bundleMap[userId] || (bundleMap[userId] = {});
-            for (const client of bundle.clients) {
-                bundleMap[userId][client.client] = client.prekey;
-            }
-            return bundleMap;
-        }, {});
-    }
-    async getQualifiedRecipientsForConversation(conversationId, userIds) {
-        if ((0, TypePredicateUtil_1.isQualifiedUserClients)(userIds)) {
-            return userIds;
-        }
-        const recipientIds = userIds || (await this.getConversationQualifiedMembers(conversationId));
-        return this.getQualifiedPreKeyBundle(recipientIds);
-    }
-    async getRecipientsForConversation(conversationId, userIds) {
-        if ((0, TypePredicateUtil_1.isUserClients)(userIds)) {
-            return userIds;
-        }
-        return this.getPreKeyBundleMap(conversationId, userIds);
-    }
-    /**
-     * Sends a message to a conversation
-     *
-     * @param sendingClientId The clientId from which the message is sent
-     * @param conversationId The conversation in which to send the message
-     * @param genericMessage The payload of the message to send
-     * @return Resolves with the message sending status from backend
-     */
-    async sendGenericMessage(conversationId, sendingClientId, genericMessage, { userIds, nativePush, sendAsProtobuf, onClientMismatch, targetMode = ConversationService_types_1.MessageTargetMode.NONE, } = {}) {
-        const plainText = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
-        if (targetMode !== ConversationService_types_1.MessageTargetMode.NONE && !userIds) {
-            throw new Error('Cannot send targetted message when no userIds are given');
-        }
-        if (conversationId.domain && this.config.useQualifiedIds) {
-            if ((0, TypePredicateUtil_1.isStringArray)(userIds) || (0, TypePredicateUtil_1.isUserClients)(userIds)) {
-                throw new Error('Invalid userIds option for sending to federated backend');
-            }
-            const recipients = await this.getQualifiedRecipientsForConversation(conversationId, userIds);
-            let reportMissing;
-            if (targetMode === ConversationService_types_1.MessageTargetMode.NONE) {
-                reportMissing = (0, TypePredicateUtil_1.isQualifiedUserClients)(userIds); // we want to check mismatch in case the consumer gave an exact list of users/devices
-            }
-            else if (targetMode === ConversationService_types_1.MessageTargetMode.USERS) {
-                reportMissing = this.extractQualifiedUserIds(userIds);
-            }
-            else {
-                // in case the message is fully targetted at user/client pairs, we do not want to report the missing clients or users at all
-                reportMissing = false;
-            }
-            return this.messageService.sendFederatedMessage(sendingClientId, recipients, plainText, {
-                conversationId,
-                nativePush,
-                reportMissing,
-                onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false),
-            });
-        }
-        if ((0, TypePredicateUtil_1.isQualifiedIdArray)(userIds) || (0, TypePredicateUtil_1.isQualifiedUserClients)(userIds)) {
-            throw new Error('Invalid userIds option for sending');
-        }
-        const recipients = await this.getRecipientsForConversation(conversationId, userIds);
-        let reportMissing;
-        if (targetMode === ConversationService_types_1.MessageTargetMode.NONE) {
-            reportMissing = (0, TypePredicateUtil_1.isUserClients)(userIds); // we want to check mismatch in case the consumer gave an exact list of users/devices
-        }
-        else if (targetMode === ConversationService_types_1.MessageTargetMode.USERS) {
-            reportMissing = this.extractUserIds(userIds);
-        }
-        else {
-            // in case the message is fully targetted at user/client pairs, we do not want to report the missing clients or users at all
-            reportMissing = false;
-        }
-        return this.messageService.sendMessage(sendingClientId, recipients, plainText, {
-            conversationId,
-            sendAsProtobuf,
-            nativePush,
-            reportMissing,
-            onClientMismatch: mistmatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mistmatch, false),
-        });
-    }
-    extractUserIds(userIds) {
-        if ((0, TypePredicateUtil_1.isUserClients)(userIds)) {
-            return Object.keys(userIds);
-        }
-        return userIds;
-    }
-    extractQualifiedUserIds(userIds) {
-        if ((0, TypePredicateUtil_1.isQualifiedUserClients)(userIds)) {
-            return Object.entries(userIds).reduce((ids, [domain, userClients]) => {
-                return ids.concat(Object.keys(userClients).map(userId => ({ domain, id: userId })));
-            }, []);
-        }
-        return userIds;
-    }
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
      * This is a hacky way of getting all the clients for a conversation.
@@ -250,7 +82,10 @@ class ConversationService {
      * @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
      */
     async fetchAllParticipantsClients(conversationId, conversationDomain) {
-        const qualifiedMembers = await this.getConversationQualifiedMembers(conversationDomain ? { id: conversationId, domain: conversationDomain } : conversationId);
+        const qualifiedMembers = await (0, proteus_1.getConversationQualifiedMembers)({
+            apiClient: this.apiClient,
+            conversationId: conversationDomain ? { id: conversationId, domain: conversationDomain } : conversationId,
+        });
         const allClients = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedMembers });
         const qualifiedUserClients = {};
         Object.entries(allClients.qualified_user_map).map(([domain, userClientMap]) => Object.entries(userClientMap).map(async ([userId, clients]) => {
@@ -302,26 +137,6 @@ class ConversationService {
     async removeUserFromConversation(conversationId, userId) {
         return this.apiClient.api.conversation.deleteMember(conversationId, userId);
     }
-    async sendProteusMessage({ userIds, sendAsProtobuf, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
-        const response = await this.sendGenericMessage(conversationId, this.apiClient.validatedClientId, payload, {
-            userIds,
-            sendAsProtobuf,
-            nativePush,
-            targetMode,
-            onClientMismatch,
-        });
-        if (!response.errored) {
-            if (!this.isClearFromMismatch(response)) {
-                // We warn the consumer that there is a mismatch that did not prevent message sending
-                await (onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(response, true));
-            }
-        }
-        return {
-            id: payload.messageId,
-            sentAt: response.time,
-            state: response.errored ? conversation_2.PayloadBundleState.CANCELLED : conversation_2.PayloadBundleState.OUTGOING_SENT,
-        };
-    }
     /**
      * Sends a message to a conversation
      * @return resolves with the sending status
@@ -330,7 +145,7 @@ class ConversationService {
         function isMLS(params) {
             return params.protocol === conversation_1.ConversationProtocol.MLS;
         }
-        return (0, messageSender_1.sendMessage)(() => (isMLS(params) ? this.sendMLSMessage(params) : this.sendProteusMessage(params)));
+        return (0, messageSender_1.sendMessage)(() => isMLS(params) ? this.sendMLSMessage(params) : this.proteusService.sendProteusMessage(params));
     }
     sendTypingStart(conversationId) {
         return this.apiClient.api.conversation.postTyping(conversationId, { status: data_1.CONVERSATION_TYPING.STARTED });
@@ -363,13 +178,6 @@ class ConversationService {
             conversation_role: conversationRole,
         });
     }
-    isClearFromMismatch(mismatch) {
-        const hasMissing = Object.keys(mismatch.missing || {}).length > 0;
-        const hasDeleted = Object.keys(mismatch.deleted || {}).length > 0;
-        const hasRedundant = Object.keys(mismatch.redundant || {}).length > 0;
-        const hasFailed = Object.keys(mismatch.failed_to_send || {}).length > 0;
-        return !hasMissing && !hasDeleted && !hasRedundant && !hasFailed;
-    }
     /**
      *   ###############################################
      *   ################ MLS Functions ################

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

@@ -2,6 +2,7 @@ import { QualifiedUserClients, ClientMismatch, ConversationProtocol, MessageSend
 import { MlsEvent } from '@wireapp/api-client/lib/conversation/data/MlsEventData';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { GenericMessage } from '@wireapp/protocol-messaging';
+import { PayloadBundleState } from '..';
 export declare enum MessageTargetMode {
     NONE = 0,
     USERS = 1,
@@ -59,19 +60,6 @@ export declare type ProtocolParam = {
 export declare type SendCommonParams = ProtocolParam & {
     payload: GenericMessage;
 };
-export declare type SendProteusMessageParams = SendCommonParams & MessageSendingOptions & {
-    conversationId: QualifiedId;
-    /**
-     * Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method. (Needed only for Proteus)
-     *    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
-     */
-    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
-    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
-    protocol: ConversationProtocol.PROTEUS;
-};
 export declare type SendMlsMessageParams = SendCommonParams & {
     /**
      * The groupId of the conversation to send the message to (Needed only for MLS)
@@ -96,4 +84,12 @@ export declare type MLSReturnType = {
     events: MlsEvent[];
     conversation: Conversation;
 };
+export declare type SendResult = {
+    /** The id of the message sent */
+    id: string;
+    /** the ISO formatted date at which the message was received by the backend */
+    sentAt: string;
+    /** The sending state of the payload (has the payload been succesfully sent or canceled) */
+    state: PayloadBundleState;
+};
 //# 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,QAAQ,EAAC,MAAM,wDAAwD,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,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,oBAAY,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AACF,oBAAY,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB,cAAc,EAAE,WAAW,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IACxE,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,oBAAY,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,oBAAY,cAAc,GAAG,WAAW,GAAG;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9D,oBAAY,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC"}
+{"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,QAAQ,EAAC,MAAM,wDAAwD,CAAC;AAChF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAE3D,OAAO,EAAC,kBAAkB,EAAC,MAAM,IAAI,CAAC;AAEtC,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,oBAAY,aAAa,GAAG;IAC1B,QAAQ,EAAE,oBAAoB,CAAC;CAChC,CAAC;AAEF;;GAEG;AACH,oBAAY,gBAAgB,GAAG,aAAa,GAAG;IAC7C,OAAO,EAAE,cAAc,CAAC;CACzB,CAAC;AAEF,oBAAY,oBAAoB,GAAG,gBAAgB,GAAG;IACpD;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,oBAAoB,CAAC,GAAG,CAAC;CACpC,CAAC;AAEF,oBAAY,cAAc,GAAG,WAAW,GAAG;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAE9D,oBAAY,cAAc,GAAG;IAC3B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,cAAc,EAAE,WAAW,CAAC;IAC5B,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC;AAE7E,oBAAY,UAAU,GAAG;IACvB,iCAAiC;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,MAAM,EAAE,MAAM,CAAC;IACf,2FAA2F;IAC3F,KAAK,EAAE,kBAAkB,CAAC;CAC3B,CAAC"}

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

@@ -0,0 +1,9 @@
+import { APIClient } from '@wireapp/api-client/lib/APIClient';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+interface Params {
+    apiClient: APIClient;
+    conversationId: string | QualifiedId;
+}
+declare const getConversationQualifiedMembers: ({ apiClient, conversationId }: Params) => Promise<QualifiedId[]>;
+export { getConversationQualifiedMembers };
+//# sourceMappingURL=getConversationQualifiedMembers.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,34 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConversationQualifiedMembers = void 0;
+const getConversationQualifiedMembers = async ({ apiClient, conversationId }) => {
+    const conversation = await apiClient.api.conversation.getConversation(conversationId);
+    /*
+     * If you are sending a message to a conversation, you have to include
+     * yourself in the list of users if you want to sync a message also to your
+     * other clients.
+     */
+    return conversation.members.others
+        .filter(member => !!member.qualified_id)
+        .map(member => member.qualified_id)
+        .concat(conversation.members.self.qualified_id);
+};
+exports.getConversationQualifiedMembers = getConversationQualifiedMembers;

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/ConversationEvent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConversationEvent.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/ConversationEvent.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,IAAI,CAAC;AAI1D,QAAA,MAAM,uBAAuB,WAAkB,kBAAkB,uBAQhE,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/events/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/events/index.ts"],"names":[],"mappings":"AAmBA,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/index.ts"],"names":[],"mappings":"AAmBA,cAAc,cAAc,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/mls/EventHandler/ConversationEvent/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAE/G,OAAO,OAAO,MAAM,SAAS,CAAC;AAK9B,OAAO,EAAC,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAEnF,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;IACtC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;CACxB;AACD,QAAA,MAAM,mBAAmB,kCAAuC,yBAAyB,uBAgDxF,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}