@wireapp/core 42.9.0 → 42.9.2

package/lib/Account.js

@@ -260,7 +260,7 @@ class Account extends commons_1.TypedEventEmitter {
         const cryptoClientDef = await this.buildCryptoClient(context, this.storeEngine, enableMLS);
         const [clientType, cryptoClient] = cryptoClientDef;
         const mlsService = clientType === CryptoClient_1.CryptoClientType.CORE_CRYPTO && enableMLS
-            ? new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), Object.assign({}, (_b = this.cryptoProtocolConfig) === null || _b === void 0 ? void 0 : _b.mls))
+            ? new mls_1.MLSService(this.apiClient, cryptoClient.getNativeClient(), this.db, Object.assign({}, (_b = this.cryptoProtocolConfig) === null || _b === void 0 ? void 0 : _b.mls))
             : undefined;
         const proteusService = new proteus_1.ProteusService(this.apiClient, cryptoClient, {
             onNewClient: payload => this.emit(EVENTS.NEW_SESSION, payload),

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts

@@ -9,6 +9,7 @@ import { TypedEventEmitter } from '@wireapp/commons';
 import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ExternalAddProposalArgs, ExternalProposalType, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { MLSServiceConfig } from './MLSService.types';
 import { KeyPackageClaimUser } from '../../../conversation';
+import { CoreDatabase } from '../../../storage/CoreDB';
 import { CommitPendingProposalsParams, HandlePendingProposalsParams, MLSCallbacks } from '../types';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 interface LocalMLSServiceConfig extends MLSServiceConfig {
@@ -31,12 +32,13 @@ type Events = {
 export declare class MLSService extends TypedEventEmitter<Events> {
     private readonly apiClient;
     private readonly coreCryptoClient;
+    private readonly coreDatabase;
     logger: logdown.Logger;
     config: LocalMLSServiceConfig;
     groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     private readonly textEncoder;
     private readonly textDecoder;
-    constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, { keyingMaterialUpdateThreshold, nbKeyPackages, defaultCiphersuite, defaultCredentialType, }: Partial<MLSServiceConfig>);
+    constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, { keyingMaterialUpdateThreshold, nbKeyPackages, defaultCiphersuite, defaultCredentialType, }: Partial<MLSServiceConfig>);
     initClient(userId: QualifiedId, client: RegisteredClient): Promise<void>;
     private readonly uploadCommitBundle;
     /**

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

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

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -41,7 +41,6 @@ const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const CoreCryptoMLSError_1 = require("./CoreCryptoMLSError");
-const pendingProposalsStore_1 = require("./stores/pendingProposalsStore");
 const subconversationGroupIdStore_1 = require("./stores/subconversationGroupIdStore/subconversationGroupIdStore");
 const messageSender_1 = require("../../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
@@ -62,10 +61,11 @@ const defaultConfig = {
     defaultCredentialType: core_crypto_1.CredentialType.Basic,
 };
 class MLSService extends commons_1.TypedEventEmitter {
-    constructor(apiClient, coreCryptoClient, { keyingMaterialUpdateThreshold = defaultConfig.keyingMaterialUpdateThreshold, nbKeyPackages = defaultConfig.nbKeyPackages, defaultCiphersuite = defaultConfig.defaultCiphersuite, defaultCredentialType = defaultConfig.defaultCredentialType, }) {
+    constructor(apiClient, coreCryptoClient, coreDatabase, { keyingMaterialUpdateThreshold = defaultConfig.keyingMaterialUpdateThreshold, nbKeyPackages = defaultConfig.nbKeyPackages, defaultCiphersuite = defaultConfig.defaultCiphersuite, defaultCredentialType = defaultConfig.defaultCredentialType, }) {
         super();
         this.apiClient = apiClient;
         this.coreCryptoClient = coreCryptoClient;
+        this.coreDatabase = coreDatabase;
         this.logger = (0, logdown_1.default)('@wireapp/core/MLSService');
         this.textEncoder = new TextEncoder();
         this.textDecoder = new TextDecoder();
@@ -556,10 +556,7 @@ class MLSService extends commons_1.TypedEventEmitter {
         if (delayInMs > 0) {
             const eventDate = new Date(eventTime);
             const firingDate = eventDate.setTime(eventDate.getTime() + delayInMs);
-            pendingProposalsStore_1.pendingProposalsStore.storeItem({
-                groupId,
-                firingDate,
-            });
+            await this.coreDatabase.put('pendingProposals', { groupId, firingDate }, groupId);
             TaskScheduler_1.TaskScheduler.addTask({
                 task: () => this.commitPendingProposals({ groupId }),
                 firingDate,
@@ -581,7 +578,7 @@ class MLSService extends commons_1.TypedEventEmitter {
             await this.commitProposals(bazinga64_1.Decoder.fromBase64(groupId).asBytes);
             if (!skipDelete) {
                 TaskScheduler_1.TaskScheduler.cancelTask(groupId);
-                pendingProposalsStore_1.pendingProposalsStore.deleteItem({ groupId });
+                await this.coreDatabase.delete('pendingProposals', groupId);
             }
         }
         catch (error) {
@@ -595,7 +592,7 @@ class MLSService extends commons_1.TypedEventEmitter {
      */
     async checkExistingPendingProposals() {
         try {
-            const pendingProposals = pendingProposalsStore_1.pendingProposalsStore.getAllItems();
+            const pendingProposals = await this.coreDatabase.getAll('pendingProposals');
             if (pendingProposals.length > 0) {
                 pendingProposals.forEach(({ groupId, firingDate }) => TaskScheduler_1.TaskScheduler.addTask({
                     task: () => this.commitPendingProposals({ groupId }),

package/lib/messagingProtocols/mls/MLSService/MLSService.test.js

@@ -23,11 +23,12 @@ const event_1 = require("@wireapp/api-client/lib/event");
 const crypto_1 = require("crypto");
 const api_client_1 = require("@wireapp/api-client");
 const MLSService_1 = require("./MLSService");
+const CoreDB_1 = require("../../../storage/CoreDB");
 jest.createMockFromModule('@wireapp/api-client');
 function createUserId() {
     return { id: (0, crypto_1.randomUUID)(), domain: '' };
 }
-describe('MLSService', () => {
+const createMLSService = async () => {
     const apiClient = new api_client_1.APIClient();
     const mockCoreCrypto = {
         createConversation: jest.fn(),
@@ -38,11 +39,24 @@ describe('MLSService', () => {
         mlsInit: jest.fn(),
         clientPublicKey: jest.fn(),
         processWelcomeMessage: jest.fn(),
+        decryptMessage: jest.fn(),
+        conversationEpoch: jest.fn(),
+        commitPendingProposals: jest.fn(),
     };
+    const mockedDb = await (0, CoreDB_1.openDB)('core-test-db');
+    const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, mockedDb, {});
+    return [mlsService, { apiClient, coreCrypto: mockCoreCrypto }];
+};
+describe('MLSService', () => {
     describe('registerConversation', () => {
         let mlsService;
-        beforeEach(() => {
-            mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+        let apiClient;
+        let coreCrypto;
+        beforeEach(async () => {
+            const [mockedMLSService, { apiClient: mockApiClient, coreCrypto: mockCoreCrypto }] = await createMLSService();
+            mlsService = mockedMLSService;
+            apiClient = mockApiClient;
+            coreCrypto = mockCoreCrypto;
             jest
                 .spyOn(apiClient.api.client, 'getPublicKeys')
                 .mockResolvedValue({ removal: { algo: 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=' } });
@@ -73,21 +87,21 @@ describe('MLSService', () => {
         });
         it('cancels key material timers after group is wiped', async () => {
             const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm4OQFc=';
-            jest.spyOn(mockCoreCrypto, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(coreCrypto, 'conversationExists').mockResolvedValueOnce(true);
             await mlsService.wipeConversation(groupId);
             expect(mlsService.cancelKeyMaterialRenewal).toHaveBeenCalledWith(groupId);
         });
     });
     describe('isConversationEstablished', () => {
         it('returns false if conversation does not exist locally', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService] = await createMLSService();
             const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
             const isEstablshed = await mlsService.isConversationEstablished(groupId);
             expect(isEstablshed).toBe(false);
         });
         it('returns false if epoch number is 0', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService] = await createMLSService();
             const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(0);
@@ -95,7 +109,7 @@ describe('MLSService', () => {
             expect(isEstablshed).toBe(false);
         });
         it.each([1, 2, 100])('returns false if epoch number is 1 or more', async (epoch) => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService] = await createMLSService();
             const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(epoch);
@@ -105,62 +119,121 @@ describe('MLSService', () => {
     });
     describe('initClient', () => {
         it('uploads public key only if it was not yet defined on client entity', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockUserId = { id: 'user-1', domain: 'local.zinfra.io' };
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: {}, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             const mockedClientPublicKey = new Uint8Array();
-            jest.spyOn(mockCoreCrypto, 'clientPublicKey').mockResolvedValueOnce(mockedClientPublicKey);
+            jest.spyOn(coreCrypto, 'clientPublicKey').mockResolvedValueOnce(mockedClientPublicKey);
             jest.spyOn(apiClient.api.client, 'putClient').mockResolvedValueOnce(undefined);
             jest.spyOn(apiClient.api.client, 'getMLSKeyPackageCount').mockResolvedValueOnce(mlsService.config.nbKeyPackages);
             await mlsService.initClient(mockUserId, mockClient);
-            expect(mockCoreCrypto.mlsInit).toHaveBeenCalled();
+            expect(coreCrypto.mlsInit).toHaveBeenCalled();
             expect(apiClient.api.client.putClient).toHaveBeenCalledWith(mockClientId, expect.anything());
         });
         it('uploads key packages if there are not enough keys on backend', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockUserId = { id: 'user-1', domain: 'local.zinfra.io' };
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: { ed25519: 'key' }, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             const mockedClientKeyPackages = [new Uint8Array()];
-            jest.spyOn(mockCoreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
+            jest.spyOn(coreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
             jest
                 .spyOn(apiClient.api.client, 'getMLSKeyPackageCount')
                 .mockResolvedValueOnce(mlsService.config.minRequiredNumberOfAvailableKeyPackages - 1);
             jest.spyOn(apiClient.api.client, 'uploadMLSKeyPackages').mockResolvedValueOnce(undefined);
             await mlsService.initClient(mockUserId, mockClient);
-            expect(mockCoreCrypto.mlsInit).toHaveBeenCalled();
+            expect(coreCrypto.mlsInit).toHaveBeenCalled();
             expect(apiClient.api.client.uploadMLSKeyPackages).toHaveBeenCalledWith(mockClientId, expect.anything());
         });
         it('does not upload public key or key packages if both are already uploaded', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockUserId = { id: 'user-1', domain: 'local.zinfra.io' };
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: { ed25519: 'key' }, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             jest.spyOn(apiClient.api.client, 'getClient').mockResolvedValueOnce(mockClient);
             jest.spyOn(apiClient.api.client, 'getMLSKeyPackageCount').mockResolvedValueOnce(mlsService.config.nbKeyPackages);
+            jest.spyOn(apiClient.api.client, 'uploadMLSKeyPackages');
+            jest.spyOn(apiClient.api.client, 'putClient');
             await mlsService.initClient(mockUserId, mockClient);
-            expect(mockCoreCrypto.mlsInit).toHaveBeenCalled();
+            expect(coreCrypto.mlsInit).toHaveBeenCalled();
             expect(apiClient.api.client.uploadMLSKeyPackages).not.toHaveBeenCalled();
             expect(apiClient.api.client.putClient).not.toHaveBeenCalled();
         });
     });
+    describe('handleMLSMessageAddEvent', () => {
+        it('decrypts a message and emits new epoch event if epoch has changed', async () => {
+            const [mlsService, { coreCrypto: mockCoreCrypto }] = await createMLSService();
+            const mockGroupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
+            const mockedNewEpoch = 3;
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+            const mockedDecryptoedMessage = {
+                hasEpochChanged: true,
+                isActive: false,
+                proposals: [],
+            };
+            jest.spyOn(mockCoreCrypto, 'decryptMessage').mockResolvedValueOnce(mockedDecryptoedMessage);
+            jest.spyOn(mockCoreCrypto, 'conversationEpoch').mockResolvedValueOnce(mockedNewEpoch);
+            jest.spyOn(mlsService, 'emit').mockImplementation(jest.fn());
+            const mockedMLSWelcomeEvent = {
+                type: event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD,
+                senderClientId: '',
+                conversation: '',
+                data: '',
+                from: '',
+                time: '',
+            };
+            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent);
+            expect(mockCoreCrypto.decryptMessage).toHaveBeenCalled();
+            expect(mlsService.emit).toHaveBeenCalledWith('newEpoch', { epoch: mockedNewEpoch, groupId: mockGroupId });
+        });
+        it('handles pending propoals with a delay after decrypting a message', async () => {
+            const [mlsService, { coreCrypto: mockCoreCrypto }] = await createMLSService();
+            jest.useFakeTimers();
+            const mockGroupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
+            const mockedNewEpoch = 3;
+            const commitDelay = 1000;
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+            const mockedDecryptoedMessage = {
+                hasEpochChanged: true,
+                isActive: false,
+                proposals: [],
+                commitDelay,
+            };
+            jest.spyOn(mockCoreCrypto, 'decryptMessage').mockResolvedValueOnce(mockedDecryptoedMessage);
+            jest.spyOn(mockCoreCrypto, 'conversationEpoch').mockResolvedValueOnce(mockedNewEpoch);
+            jest.spyOn(mlsService, 'commitPendingProposals');
+            const mockedMLSWelcomeEvent = {
+                type: event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD,
+                senderClientId: '',
+                conversation: '',
+                data: '',
+                from: '',
+                time: new Date().toISOString(),
+            };
+            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent);
+            expect(mockCoreCrypto.commitPendingProposals).not.toHaveBeenCalled();
+            jest.advanceTimersByTime(commitDelay);
+            expect(mockCoreCrypto.decryptMessage).toHaveBeenCalled();
+            expect(mockCoreCrypto.commitPendingProposals).toHaveBeenCalled();
+        });
+    });
     describe('handleMLSWelcomeMessageEvent', () => {
         it("before processing welcome it verifies that there's enough key packages locally", async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: { ed25519: 'key' }, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             const mockedClientKeyPackages = [new Uint8Array()];
-            jest.spyOn(mockCoreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
+            jest.spyOn(coreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
             const numberOfKeysBelowThreshold = mlsService.config.minRequiredNumberOfAvailableKeyPackages - 1;
             jest.spyOn(apiClient.api.client, 'getMLSKeyPackageCount').mockResolvedValueOnce(numberOfKeysBelowThreshold);
-            jest.spyOn(mockCoreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysBelowThreshold);
+            jest.spyOn(coreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysBelowThreshold);
             jest.spyOn(apiClient.api.client, 'uploadMLSKeyPackages').mockResolvedValueOnce(undefined);
-            jest.spyOn(mockCoreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
+            jest.spyOn(coreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
             jest.spyOn(mlsService, 'scheduleKeyMaterialRenewal').mockImplementation(jest.fn());
             const mockedMLSWelcomeEvent = {
                 type: event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
@@ -170,21 +243,21 @@ describe('MLSService', () => {
                 time: '',
             };
             await mlsService.handleMLSWelcomeMessageEvent(mockedMLSWelcomeEvent, mockClient.id);
-            expect(mockCoreCrypto.processWelcomeMessage).toHaveBeenCalled();
+            expect(coreCrypto.processWelcomeMessage).toHaveBeenCalled();
             expect(apiClient.api.client.uploadMLSKeyPackages).toHaveBeenCalledWith(mockClientId, expect.anything());
         });
         it('before processing welcome it does not generate new keys if there is enough key packages locally', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: { ed25519: 'key' }, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             const mockedClientKeyPackages = [new Uint8Array()];
-            jest.spyOn(mockCoreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
+            jest.spyOn(coreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
             const numberOfKeysAboveThreshold = mlsService.config.minRequiredNumberOfAvailableKeyPackages + 1;
-            jest.spyOn(mockCoreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysAboveThreshold);
+            jest.spyOn(coreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysAboveThreshold);
             jest.spyOn(apiClient.api.client, 'getMLSKeyPackageCount').mockResolvedValueOnce(numberOfKeysAboveThreshold);
             jest.spyOn(apiClient.api.client, 'uploadMLSKeyPackages').mockResolvedValueOnce(undefined);
-            jest.spyOn(mockCoreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
+            jest.spyOn(coreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
             jest.spyOn(mlsService, 'scheduleKeyMaterialRenewal').mockImplementation(jest.fn());
             const mockedMLSWelcomeEvent = {
                 type: event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
@@ -194,22 +267,22 @@ describe('MLSService', () => {
                 time: '',
             };
             await mlsService.handleMLSWelcomeMessageEvent(mockedMLSWelcomeEvent, mockClient.id);
-            expect(mockCoreCrypto.processWelcomeMessage).toHaveBeenCalled();
+            expect(coreCrypto.processWelcomeMessage).toHaveBeenCalled();
             expect(apiClient.api.client.uploadMLSKeyPackages).not.toHaveBeenCalled();
         });
         it('before processing welcome it does not generate new keys if there is enough key packages uploaded to backend', async () => {
-            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const [mlsService, { apiClient, coreCrypto }] = await createMLSService();
             const mockClientId = 'client-1';
             const mockClient = { mls_public_keys: { ed25519: 'key' }, id: mockClientId };
             apiClient.context = { clientType: client_1.ClientType.PERMANENT, clientId: mockClientId, userId: '' };
             const mockedClientKeyPackages = [new Uint8Array()];
-            jest.spyOn(mockCoreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
+            jest.spyOn(coreCrypto, 'clientKeypackages').mockResolvedValueOnce(mockedClientKeyPackages);
             const numberOfKeysBelowThreshold = mlsService.config.minRequiredNumberOfAvailableKeyPackages - 1;
             const numberOfKeysAboveThreshold = mlsService.config.minRequiredNumberOfAvailableKeyPackages + 1;
-            jest.spyOn(mockCoreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysBelowThreshold);
+            jest.spyOn(coreCrypto, 'clientValidKeypackagesCount').mockResolvedValueOnce(numberOfKeysBelowThreshold);
             jest.spyOn(apiClient.api.client, 'getMLSKeyPackageCount').mockResolvedValueOnce(numberOfKeysAboveThreshold);
             jest.spyOn(apiClient.api.client, 'uploadMLSKeyPackages').mockResolvedValueOnce(undefined);
-            jest.spyOn(mockCoreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
+            jest.spyOn(coreCrypto, 'processWelcomeMessage').mockResolvedValueOnce(new Uint8Array());
             jest.spyOn(mlsService, 'scheduleKeyMaterialRenewal').mockImplementation(jest.fn());
             const mockedMLSWelcomeEvent = {
                 type: event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
@@ -219,7 +292,7 @@ describe('MLSService', () => {
                 time: '',
             };
             await mlsService.handleMLSWelcomeMessageEvent(mockedMLSWelcomeEvent, mockClient.id);
-            expect(mockCoreCrypto.processWelcomeMessage).toHaveBeenCalled();
+            expect(coreCrypto.processWelcomeMessage).toHaveBeenCalled();
             expect(apiClient.api.client.uploadMLSKeyPackages).not.toHaveBeenCalled();
         });
     });

package/lib/storage/CoreDB.d.ts

@@ -7,6 +7,13 @@ interface CoreDBSchema extends DBSchema {
             highestId: number;
         };
     };
+    pendingProposals: {
+        key: string;
+        value: {
+            groupId: string;
+            firingDate: number;
+        };
+    };
 }
 export type CoreDatabase = IDBPDatabase<CoreDBSchema>;
 export declare function openDB(dbName: string): Promise<CoreDatabase>;

package/lib/storage/CoreDB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreDB.d.ts","sourceRoot":"","sources":["../../src/storage/CoreDB.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAA2B,YAAY,EAAsB,MAAM,KAAK,CAAC;AAGzF,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAC;KAC/C,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAUlE;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D"}
+{"version":3,"file":"CoreDB.d.ts","sourceRoot":"","sources":["../../src/storage/CoreDB.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,QAAQ,EAA2B,YAAY,EAAsB,MAAM,KAAK,CAAC;AAGzF,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAC;KAC/C,CAAC;IACF,gBAAgB,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC9C,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAalE;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D"}

package/lib/storage/CoreDB.js

@@ -20,13 +20,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDB = exports.openDB = void 0;
 const idb_1 = require("idb");
-const VERSION = 1;
+const VERSION = 2;
 async function openDB(dbName) {
     const db = await (0, idb_1.openDB)(dbName, VERSION, {
         upgrade: (db, oldVersion) => {
             switch (oldVersion) {
                 case 0:
                     db.createObjectStore('prekeys');
+                case 1:
+                    db.deleteObjectStore('prekeys');
+                    db.createObjectStore('pendingProposals');
             }
         },
     });

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.js

@@ -39,11 +39,11 @@ const addTask = ({ key, firingDate, task, intervalDelay }) => {
         const tasks = (_a = intervals[intervalDelay]) === null || _a === void 0 ? void 0 : _a.tasks;
         if ((tasks === null || tasks === void 0 ? void 0 : tasks.length) !== 0) {
             for (const taskData of tasks) {
-                if (nowTime >= firingDate) {
+                if (nowTime >= taskData.firingDate) {
                     const { task, key } = taskData;
                     logger.info(`Executing task with key "${key}"`);
-                    task();
                     cancelTask({ intervalDelay, key });
+                    task();
                 }
             }
         }

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RecurringTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/RecurringTaskScheduler/RecurringTaskScheduler.ts"],"names":[],"mappings":"AA0BA,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,qBAAqB,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,EAAE,UAAU,QAoBnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,QAGlD"}
+{"version":3,"file":"RecurringTaskScheduler.d.ts","sourceRoot":"","sources":["../../../src/util/RecurringTaskScheduler/RecurringTaskScheduler.ts"],"names":[],"mappings":"AA0BA,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,qBAAqB,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAC,EAAE,UAAU,QAqBnE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,QAIlD"}

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.js

@@ -24,13 +24,13 @@ const RecurringTaskScheduler_store_1 = require("./RecurringTaskScheduler.store")
 const LowPrecisionTaskScheduler_1 = require("../LowPrecisionTaskScheduler");
 const TaskScheduler_1 = require("../TaskScheduler");
 function registerRecurringTask({ every, task, key }) {
-    var _a;
-    const lastFireDate = (_a = (0, RecurringTaskScheduler_store_1.loadState)(key)) !== null && _a !== void 0 ? _a : Date.now();
+    const firingDate = (0, RecurringTaskScheduler_store_1.loadState)(key) || Date.now() + every;
+    (0, RecurringTaskScheduler_store_1.saveState)(key, firingDate);
     const taskConfig = {
-        firingDate: lastFireDate + every,
+        firingDate,
         key,
-        task() {
-            (0, RecurringTaskScheduler_store_1.saveState)(key, Date.now());
+        task: () => {
+            (0, RecurringTaskScheduler_store_1.deleteState)(key);
             task();
             registerRecurringTask({ every, task, key });
         },
@@ -46,6 +46,7 @@ function registerRecurringTask({ every, task, key }) {
 }
 exports.registerRecurringTask = registerRecurringTask;
 function cancelRecurringTask(taskKey) {
+    (0, RecurringTaskScheduler_store_1.deleteState)(taskKey);
     TaskScheduler_1.TaskScheduler.cancelTask(taskKey);
     LowPrecisionTaskScheduler_1.LowPrecisionTaskScheduler.cancelTask({ intervalDelay: commons_1.TimeUtil.TimeInMillis.MINUTE, key: taskKey });
 }

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.test.js

@@ -36,6 +36,20 @@ describe('RecurringTaskScheduler', () => {
         jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE + 1);
         expect(task).toHaveBeenCalledTimes(2);
     });
+    it('resumes a task after re-registering a recurring task', () => {
+        const task = jest.fn();
+        // it should fire in a minute
+        (0, RecurringTaskScheduler_1.registerRecurringTask)({ every: commons_1.TimeUtil.TimeInMillis.MINUTE, task, key: 'test-task2' });
+        jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE / 2);
+        // re-register the task
+        (0, RecurringTaskScheduler_1.registerRecurringTask)({ every: commons_1.TimeUtil.TimeInMillis.MINUTE, task, key: 'test-task2' });
+        // only 30s have passed, so the task should not have fired yet
+        expect(task).toHaveBeenCalledTimes(0);
+        // advance the timer by another 30s (so we have 1 minute in total)
+        jest.advanceTimersByTime(commons_1.TimeUtil.TimeInMillis.MINUTE / 2);
+        // the task should have fired once after a minute from the beginning even if we re-registered it
+        expect(task).toHaveBeenCalledTimes(1);
+    });
     it('cancel a task before it is run', () => {
         const task = jest.fn();
         const testKey = 'test-task-1';

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.9.0",
-  "gitHead": "e3e0f0451f1e34b4ad97ac972429b6176b05a07a"
+  "version": "42.9.2",
+  "gitHead": "8c7762276ee1d4563f2cfd02d0017fb8ad3f95a3"
 }

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/index.d.ts

@@ -1,2 +0,0 @@
-export * from './pendingProposalsStore';
-//# sourceMappingURL=index.d.ts.map

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/index.ts"],"names":[],"mappings":"AAmBA,cAAc,yBAAyB,CAAC"}

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/index.js

@@ -1,35 +0,0 @@
-"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/.
- *
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./pendingProposalsStore"), exports);

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.d.ts

@@ -1,10 +0,0 @@
-import { CommonMLS } from '../../../types';
-export type PendingProposalsParams = {
-    firingDate: number;
-} & CommonMLS;
-export declare const pendingProposalsStore: {
-    getAllItems: () => PendingProposalsParams[];
-    storeItem: ({ groupId, firingDate }: PendingProposalsParams) => void;
-    deleteItem: ({ groupId }: CommonMLS) => void;
-};
-//# sourceMappingURL=pendingProposalsStore.d.ts.map

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pendingProposalsStore.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,SAAS,CAAC;AAmCd,eAAO,MAAM,qBAAqB;uBAnBV,sBAAsB,EAAE;yCAKN,sBAAsB;8BAMjC,SAAS;CAYvC,CAAC"}

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.js

@@ -1,50 +0,0 @@
-"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.pendingProposalsStore = void 0;
-const storageKey = 'pendingProposals';
-const getAllItemsMap = () => {
-    const storedState = localStorage.getItem(storageKey);
-    if (!storedState) {
-        return {};
-    }
-    return JSON.parse(storedState);
-};
-const getAllItems = () => {
-    const storedStateMap = getAllItemsMap();
-    return Object.values(storedStateMap);
-};
-const storeItem = ({ groupId, firingDate }) => {
-    const storedState = getAllItemsMap();
-    const newStoredState = Object.assign(Object.assign({}, storedState), { [groupId]: { groupId, firingDate } });
-    localStorage.setItem(storageKey, JSON.stringify(newStoredState));
-};
-const deleteItem = ({ groupId }) => {
-    const storedState = getAllItemsMap();
-    if (storedState[groupId]) {
-        delete storedState[groupId];
-    }
-    localStorage.setItem(storageKey, JSON.stringify(storedState));
-};
-exports.pendingProposalsStore = {
-    getAllItems,
-    storeItem,
-    deleteItem,
-};

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=pendingProposalsStore.test.d.ts.map

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"pendingProposalsStore.test.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.test.ts"],"names":[],"mappings":""}

package/lib/messagingProtocols/mls/MLSService/stores/pendingProposalsStore/pendingProposalsStore.test.js

@@ -1,42 +0,0 @@
-"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 });
-const pendingProposalsStore_1 = require("./pendingProposalsStore");
-const mockEntries = [
-    { groupId: 'group0', firingDate: 1 },
-    { groupId: 'group1', firingDate: 2 },
-];
-describe('pendingProposalsStore', () => {
-    it('adds and retrieves items to/from dates store', () => {
-        pendingProposalsStore_1.pendingProposalsStore.storeItem(mockEntries[0]);
-        expect(pendingProposalsStore_1.pendingProposalsStore.getAllItems()).toContainEqual(mockEntries[0]);
-        pendingProposalsStore_1.pendingProposalsStore.storeItem(mockEntries[1]);
-        const stored = pendingProposalsStore_1.pendingProposalsStore.getAllItems();
-        expect(stored).toContainEqual(mockEntries[1]);
-        expect(stored).toContainEqual(mockEntries[0]);
-        expect(stored).toHaveLength(2);
-    });
-    it('removes items from dates store', () => {
-        pendingProposalsStore_1.pendingProposalsStore.storeItem(mockEntries[0]);
-        expect(pendingProposalsStore_1.pendingProposalsStore.getAllItems()).toContainEqual(mockEntries[0]);
-        pendingProposalsStore_1.pendingProposalsStore.deleteItem({ groupId: mockEntries[0].groupId });
-        expect(pendingProposalsStore_1.pendingProposalsStore.getAllItems()).not.toContainEqual(mockEntries[0]);
-    });
-});