@wireapp/core 30.9.0 → 30.10.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [30.10.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.9.0...@wireapp/core@30.10.0) (2022-09-15)
+
+
+### Features
+
+* Queue message sending [FS-882] ([#4392](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4392)) ([3b29dd0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/3b29dd012ebd41debcea3460c6e0fffa2da3646e))
+
+
+
+
+
 # [30.9.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.8.0...@wireapp/core@30.9.0) (2022-09-15)
 
 

package/package.json

@@ -10,6 +10,7 @@
     "@wireapp/commons": "4.3.0",
     "@wireapp/core-crypto": "0.4.0",
     "@wireapp/cryptobox": "12.8.0",
+    "@wireapp/promise-queue": "1.1.1",
     "@wireapp/store-engine-dexie": "1.6.10",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -77,6 +78,6 @@
     "test:node": "nyc jasmine --config=jasmine.json",
     "watch": "tsc ---watch"
   },
-  "version": "30.9.0",
-  "gitHead": "72d73664ce7afadd6bb3aba146a5102ce2938f48"
+  "version": "30.10.0",
+  "gitHead": "4baf6f355f55532d2a59967ac81f72a81f36e25b"
 }

package/src/main/Account.js

@@ -73,6 +73,7 @@ const linkPreview_1 = require("./linkPreview");
 const encryptedStore_1 = require("./util/encryptedStore");
 const bazinga64_1 = require("bazinga64");
 const mls_1 = require("./mls");
+const messageSender_1 = require("./conversation/message/messageSender");
 var TOPIC;
 (function (TOPIC) {
     TOPIC["ERROR"] = "Account.TOPIC.ERROR";
@@ -402,6 +403,9 @@ class Account extends events_1.EventEmitter {
             }, onMissedNotifications, abortHandler);
             // We can now unlock the websocket and let the new messages being handled and decrypted
             this.apiClient.transport.ws.unlock();
+            // We need to wait for the notification stream to be fully handled before releasing the message sending queue.
+            // This is due to the nature of how message are encrypted, any change in mls epoch needs to happen before we start encrypting any kind of messages
+            (0, messageSender_1.resumeMessageSending)();
             onConnected();
         };
         await this.apiClient.connect(onBeforeConnect);

package/src/main/conversation/ConversationService/ConversationService.js

@@ -32,6 +32,7 @@ const ConversationService_types_1 = require("./ConversationService.types");
 const bazinga64_1 = require("bazinga64");
 const mapQualifiedUserClientIdsToFullyQualifiedClientIds_1 = require("../../util/mapQualifiedUserClientIdsToFullyQualifiedClientIds");
 const mls_1 = require("../../mls");
+const messageSender_1 = require("../message/messageSender");
 class ConversationService {
     constructor(apiClient, cryptographyService, config, notificationService, mlsService) {
         this.apiClient = apiClient;
@@ -716,9 +717,9 @@ class ConversationService {
             // If the onStart call returns false, it means the consumer wants to cancel the message sending
             return Object.assign(Object.assign({}, payload), { state: conversation_2.PayloadBundleState.CANCELLED });
         }
-        return isMLS(params)
+        return (0, messageSender_1.sendMessage)(() => isMLS(params)
             ? this.sendMLSMessage(params, genericMessage, content)
-            : this.sendProteusMessage(params, genericMessage, content);
+            : this.sendProteusMessage(params, genericMessage, content));
     }
     sendTypingStart(conversationId) {
         return this.apiClient.api.conversation.postTyping(conversationId, { status: data_1.CONVERSATION_TYPING.STARTED });
@@ -916,16 +917,18 @@ class ConversationService {
      * @param epoch The current epoch of the local conversation
      */
     async sendExternalJoinProposal(conversationGroupId, epoch) {
-        const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
-        const externalProposal = await this.mlsService.newExternalProposal(0 /* Add */, {
-            epoch,
-            conversationId: groupIdDecodedFromBase64,
-        });
-        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
-        (0, mls_1.optionalToUint8Array)(externalProposal));
-        //We store the info when user was added (and key material was created), so we will know when to renew it
-        await this.storeLastKeyMaterialUpdateDateWithCurrentTime(conversationGroupId);
+        return (0, messageSender_1.sendMessage)(async () => {
+            const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;
+            const externalProposal = await this.mlsService.newExternalProposal(0 /* Add */, {
+                epoch,
+                conversationId: groupIdDecodedFromBase64,
+            });
+            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
+            (0, mls_1.optionalToUint8Array)(externalProposal));
+            //We store the info when user was added (and key material was created), so we will know when to renew it
+            await this.storeLastKeyMaterialUpdateDateWithCurrentTime(conversationGroupId);
+        });
     }
     async isMLSConversationEstablished(conversationGroupId) {
         const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(conversationGroupId).asBytes;

package/src/main/conversation/message/messageSender.d.ts

@@ -0,0 +1,4 @@
+import { Task } from '@wireapp/promise-queue';
+export declare function sendMessage<T>(sendingFunction: Task<T>): Promise<T>;
+export declare function resumeMessageSending(): void;
+export declare function pauseMessageSending(): void;

package/src/main/conversation/message/messageSender.js

@@ -0,0 +1,36 @@
+"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.pauseMessageSending = exports.resumeMessageSending = exports.sendMessage = void 0;
+const promise_queue_1 = require("@wireapp/promise-queue");
+const sendingQueue = new promise_queue_1.PromiseQueue({ name: 'message-sender', paused: true });
+function sendMessage(sendingFunction) {
+    return sendingQueue.push(sendingFunction);
+}
+exports.sendMessage = sendMessage;
+function resumeMessageSending() {
+    sendingQueue.pause(false);
+}
+exports.resumeMessageSending = resumeMessageSending;
+function pauseMessageSending() {
+    sendingQueue.pause(true);
+}
+exports.pauseMessageSending = pauseMessageSending;
+//# sourceMappingURL=messageSender.js.map

package/src/main/mls/MLSService/MLSService.js

@@ -20,6 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLSService = exports.optionalToUint8Array = void 0;
 const bazinga64_1 = require("bazinga64");
+const messageSender_1 = require("../../conversation/message/messageSender");
 //@todo: this function is temporary, we wait for the update from core-crypto side
 //they are returning regular array instead of Uint8Array for commit and welcome messages
 const optionalToUint8Array = (array) => {
@@ -60,10 +61,12 @@ class MLSService {
         }
         return null;
     }
-    async addUsersToExistingConversation(groupId, invitee) {
-        const coreCryptoClient = this.getCoreCryptoClient();
-        const memberAddedMessages = await coreCryptoClient.addClientsToConversation(groupId, invitee);
-        return this.uploadCommitBundle(groupId, memberAddedMessages);
+    addUsersToExistingConversation(groupId, invitee) {
+        return (0, messageSender_1.sendMessage)(async () => {
+            const coreCryptoClient = this.getCoreCryptoClient();
+            const memberAddedMessages = await coreCryptoClient.addClientsToConversation(groupId, invitee);
+            return this.uploadCommitBundle(groupId, memberAddedMessages);
+        });
     }
     async getKeyPackagesPayload(qualifiedUsers) {
         /**
@@ -104,16 +107,20 @@ class MLSService {
     async encryptMessage(conversationId, message) {
         return this.getCoreCryptoClient().encryptMessage(conversationId, message);
     }
-    async updateKeyingMaterial(conversationId) {
-        const commitBundle = await this.getCoreCryptoClient().updateKeyingMaterial(conversationId);
-        return this.uploadCommitBundle(conversationId, commitBundle);
+    updateKeyingMaterial(conversationId) {
+        return (0, messageSender_1.sendMessage)(async () => {
+            const commitBundle = await this.getCoreCryptoClient().updateKeyingMaterial(conversationId);
+            return this.uploadCommitBundle(conversationId, commitBundle);
+        });
     }
     async createConversation(conversationId, configuration) {
         return this.getCoreCryptoClient().createConversation(conversationId, configuration);
     }
-    async removeClientsFromConversation(conversationId, clientIds) {
-        const commitBundle = await this.getCoreCryptoClient().removeClientsFromConversation(conversationId, clientIds);
-        return this.uploadCommitBundle(conversationId, commitBundle);
+    removeClientsFromConversation(conversationId, clientIds) {
+        return (0, messageSender_1.sendMessage)(async () => {
+            const commitBundle = await this.getCoreCryptoClient().removeClientsFromConversation(conversationId, clientIds);
+            return this.uploadCommitBundle(conversationId, commitBundle);
+        });
     }
     async commitPendingProposals(conversationId) {
         return this.getCoreCryptoClient().commitPendingProposals(conversationId);