@wireapp/core 30.7.1 → 30.8.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [30.8.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.7.2...@wireapp/core@30.8.0) (2022-09-14)
+
+
+### Features
+
+* Call clearPendingCommits when commit sending failed on backend ([#4395](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4395)) ([b863bf0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/b863bf0b3292bb71db94eb6411e5232e5918646e))
+
+
+
+
+
+## [30.7.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.7.1...@wireapp/core@30.7.2) (2022-09-14)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
 ## [30.7.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@30.7.0...@wireapp/core@30.7.1) (2022-09-14)
 
 

package/package.json

@@ -77,6 +77,6 @@
     "test:node": "nyc jasmine --config=jasmine.json",
     "watch": "tsc ---watch"
   },
-  "version": "30.7.1",
-  "gitHead": "35d2172b1f840bcdf77cd3b40d93cae2e0d0556d"
+  "version": "30.8.0",
+  "gitHead": "908930586bdf08bdb150a1092084ab36f80fbb64"
 }

package/src/main/Account.js

@@ -144,12 +144,14 @@ class Account extends events_1.EventEmitter {
         // Assumption: client gets only initialized once
         if (initClient) {
             await this.initClient({ clientType });
-            // initialize schedulers for pending mls proposals once client is initialized
-            await ((_a = this.service) === null || _a === void 0 ? void 0 : _a.notification.checkExistingPendingProposals());
-            // initialize schedulers for renewing key materials
-            await ((_b = this.service) === null || _b === void 0 ? void 0 : _b.notification.checkForKeyMaterialsUpdate());
-            // initialize scheduler for syncing key packages with backend
-            await ((_c = this.service) === null || _c === void 0 ? void 0 : _c.notification.checkForKeyPackagesBackendSync());
+            if (this.mlsConfig) {
+                // initialize schedulers for pending mls proposals once client is initialized
+                await ((_a = this.service) === null || _a === void 0 ? void 0 : _a.notification.checkExistingPendingProposals());
+                // initialize schedulers for renewing key materials
+                await ((_b = this.service) === null || _b === void 0 ? void 0 : _b.notification.checkForKeyMaterialsUpdate());
+                // initialize scheduler for syncing key packages with backend
+                await ((_c = this.service) === null || _c === void 0 ? void 0 : _c.notification.checkForKeyPackagesBackendSync());
+            }
         }
         return context;
     }

package/src/main/mls/MLSService/MLSService.d.ts

@@ -1,4 +1,4 @@
-import { AddProposalArgs, CommitBundle, ConversationConfiguration, ConversationId, CoreCrypto, DecryptedMessage, ExternalProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto/platforms/web/corecrypto';
+import { AddProposalArgs, CommitBundle, ConversationConfiguration, ConversationId, CoreCrypto, DecryptedMessage, ExternalProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { APIClient } from '@wireapp/api-client';
 import { QualifiedUsers } from '../../conversation';
 import type { MLSConfig } from '../types';
@@ -11,9 +11,9 @@ export declare class MLSService {
     constructor(config: MLSConfig | undefined, apiClient: APIClient, coreCryptoClientProvider: () => CoreCrypto | undefined);
     private getCoreCryptoClient;
     private uploadCommitBundle;
-    addUsersToExistingConversation(groupIdDecodedFromBase64: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
+    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
     getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
-    newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto/platforms/web/corecrypto").ProposalBundle>;
+    newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
     newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
     decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;

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

@@ -39,36 +39,31 @@ class MLSService {
         }
         return client;
     }
-    async uploadCommitBundle(groupIdDecodedFromBase64, commitBundle) {
+    async uploadCommitBundle(groupId, commitBundle) {
         const coreCryptoClient = this.getCoreCryptoClient();
         if (commitBundle.welcome) {
             //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
             await this.apiClient.api.conversation.postMlsWelcomeMessage((0, exports.optionalToUint8Array)(commitBundle.welcome));
         }
         if (commitBundle.commit) {
-            const messageResponse = 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, exports.optionalToUint8Array)(commitBundle.commit));
-            await coreCryptoClient.commitAccepted(groupIdDecodedFromBase64);
-            return messageResponse;
+            try {
+                const messageResponse = 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, exports.optionalToUint8Array)(commitBundle.commit));
+                await coreCryptoClient.commitAccepted(groupId);
+                return messageResponse;
+            }
+            catch (error) {
+                await coreCryptoClient.clear_pending_commit(groupId);
+                return null;
+            }
         }
         return null;
     }
-    async addUsersToExistingConversation(groupIdDecodedFromBase64, invitee) {
+    async addUsersToExistingConversation(groupId, invitee) {
         const coreCryptoClient = this.getCoreCryptoClient();
-        const memberAddedMessages = await coreCryptoClient.addClientsToConversation(groupIdDecodedFromBase64, invitee);
-        if (memberAddedMessages === null || memberAddedMessages === void 0 ? void 0 : memberAddedMessages.welcome) {
-            //@todo: it's temporary - we wait for core-crypto fix to return the actual Uint8Array instead of regular array
-            await this.apiClient.api.conversation.postMlsWelcomeMessage((0, exports.optionalToUint8Array)(memberAddedMessages.welcome));
-        }
-        if (memberAddedMessages === null || memberAddedMessages === void 0 ? void 0 : memberAddedMessages.commit) {
-            const messageResponse = 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, exports.optionalToUint8Array)(memberAddedMessages.commit));
-            await coreCryptoClient.commitAccepted(groupIdDecodedFromBase64);
-            return messageResponse;
-        }
-        return null;
+        const memberAddedMessages = await coreCryptoClient.addClientsToConversation(groupId, invitee);
+        return this.uploadCommitBundle(groupId, memberAddedMessages);
     }
     async getKeyPackagesPayload(qualifiedUsers) {
         /**