@wireapp/core 46.0.16 → 46.0.18

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.js

@@ -37,11 +37,15 @@ const getGenericMessageParams_1 = require("../Utility/getGenericMessageParams");
 const isClearFromMismatch_1 = require("../Utility/isClearFromMismatch");
 const SessionHandler_1 = require("../Utility/SessionHandler");
 class ProteusService {
+    apiClient;
+    cryptoClient;
+    config;
+    messageService;
+    logger = (0, logdown_1.default)('@wireapp/core/ProteusService');
     constructor(apiClient, cryptoClient, config) {
         this.apiClient = apiClient;
         this.cryptoClient = cryptoClient;
         this.config = config;
-        this.logger = (0, logdown_1.default)('@wireapp/core/ProteusService');
         this.messageService = new MessageService_1.MessageService(this.apiClient, this);
     }
     async handleOtrMessageAddEvent(event) {
@@ -51,7 +55,6 @@ class ProteusService {
         });
     }
     async initClient(storeEngine, context) {
-        var _a;
         const dbName = storeEngine.storeName;
         if (context.domain) {
             // We want sessions to be fully qualified from now on
@@ -63,17 +66,18 @@ class ProteusService {
             }
         }
         if (!cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.isReady(dbName) && this.cryptoClient.migrateFromCryptobox) {
-            this.logger.info(`Migrating data from cryptobox store (${dbName}) to corecrypto.`);
+            this.logger.info(`Migrating from cryptobox to corecrypto.`);
             try {
+                const startTime = Date.now();
                 await this.cryptoClient.migrateFromCryptobox(dbName);
                 cryptoMigrationStateStore_1.cryptoMigrationStore.coreCrypto.markAsReady(dbName);
-                this.logger.info(`Successfully migrated from cryptobox store (${dbName}) to corecrypto.`);
+                this.logger.info(`Successfully migrated from cryptobox to corecrypto (took ${Date.now() - startTime}ms).`);
             }
             catch (error) {
                 this.logger.error('Client was not able to perform DB migration: ', error);
             }
         }
-        const backendPrekeys = await this.apiClient.api.client.getClientPreKeys((_a = context.clientId) !== null && _a !== void 0 ? _a : '');
+        const backendPrekeys = await this.apiClient.api.client.getClientPreKeys(context.clientId ?? '');
         const totalUsableBackedPrekeys = backendPrekeys.length - 1; // we remove the last resort prekey from the total number of available prekeys
         return this.cryptoClient.init(totalUsableBackedPrekeys);
     }
@@ -101,7 +105,6 @@ class ProteusService {
         return this.cryptoClient.getRemoteFingerprint(sessionId);
     }
     async createConversation(conversationData) {
-        var _a;
         try {
             const conversation = await this.apiClient.api.conversation.postConversation(conversationData);
             return { conversation };
@@ -115,8 +118,8 @@ class ProteusService {
                     }
                     case conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS: {
                         const { backends } = error;
-                        const { excludedUsers: unreachableUsers, includedUsers: availableUsers } = (0, userDomainFilters_1.filterUsersFromDomains)((_a = conversationData.qualified_users) !== null && _a !== void 0 ? _a : [], backends);
-                        conversationData = Object.assign(Object.assign({}, conversationData), { qualified_users: availableUsers });
+                        const { excludedUsers: unreachableUsers, includedUsers: availableUsers } = (0, userDomainFilters_1.filterUsersFromDomains)(conversationData.qualified_users ?? [], backends);
+                        conversationData = { ...conversationData, qualified_users: availableUsers };
                         // If conversation creation returns an error because a backend is offline,
                         // we try creating the conversation again with users from available backends
                         const response = await this.apiClient.api.conversation.postConversation(conversationData);
@@ -188,7 +191,6 @@ class ProteusService {
         }
     }
     async sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
-        var _a;
         const messageParams = await (0, getGenericMessageParams_1.getGenericMessageParams)({
             apiClient: this.apiClient,
             sendingClientId: this.apiClient.validatedClientId,
@@ -201,16 +203,19 @@ class ProteusService {
             },
         });
         const { sendingClientId, recipients, plainText, options } = messageParams;
-        const response = await this.messageService.sendMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }));
+        const response = await this.messageService.sendMessage(sendingClientId, recipients, plainText, {
+            ...options,
+            onClientMismatch: mismatch => onClientMismatch?.(mismatch, false),
+        });
         if (!response.canceled) {
             if (!(0, isClearFromMismatch_1.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));
+                await onClientMismatch?.(response, true);
             }
             this.logger.log(`Successfully sent Proteus message to conversation '${conversationId.id}'`);
         }
         const sendingState = response.canceled ? conversation_2.MessageSendingState.CANCELED : conversation_2.MessageSendingState.OUTGOING_SENT;
-        const failedToSend = response.failed || Object.keys((_a = response.failed_to_confirm_clients) !== null && _a !== void 0 ? _a : {}).length > 0
+        const failedToSend = response.failed || Object.keys(response.failed_to_confirm_clients ?? {}).length > 0
             ? {
                 queued: response.failed_to_confirm_clients,
                 failed: response.failed,
@@ -224,7 +229,6 @@ class ProteusService {
         };
     }
     async decrypt(encryptedText, userId, clientId) {
-        var _a, _b;
         const sessionId = this.constructSessionId(userId, clientId);
         const sessionExists = await this.cryptoClient.sessionExists(sessionId);
         try {
@@ -233,11 +237,11 @@ class ProteusService {
                 : await this.cryptoClient.decrypt(sessionId, encryptedText);
             if (!sessionExists) {
                 await this.cryptoClient.saveSession(sessionId);
-                (_b = (_a = this.config).onNewClient) === null || _b === void 0 ? void 0 : _b.call(_a, { userId, clientId });
-                this.logger.info(`Created a new session from message for session ID "${sessionId}" and decrypted the message`);
+                this.config.onNewClient?.({ userId, clientId });
+                this.logger.debug(`Created a new session from message for session ID "${sessionId}" and decrypted the message`);
             }
             else {
-                this.logger.info(`Decrypted message for session ID "${sessionId}"`);
+                this.logger.debug(`Decrypted message for session ID "${sessionId}"`);
             }
             return decryptedMessage;
         }

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts

@@ -1,11 +1,8 @@
 import { APIClient } from '@wireapp/api-client';
 import { CryptoClient } from './CryptoClient';
 import { ProteusService } from './ProteusService';
-export declare const buildProteusService: () => Promise<[
-    ProteusService,
-    {
-        apiClient: APIClient;
-        cryptoClient: CryptoClient;
-    }
-]>;
+export declare const buildProteusService: () => Promise<[ProteusService, {
+    apiClient: APIClient;
+    cryptoClient: CryptoClient;
+}]>;
 //# sourceMappingURL=ProteusService.mocks.d.ts.map

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB,QAAa,QAC3C;IAAC,cAAc;IAAE;QAAC,SAAS,EAAE,SAAS,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAC;CAAC,CAgBrE,CAAC"}
+{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAClD,CAAC,cAAc,EAAE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CAgBrE,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.test.js

@@ -63,7 +63,11 @@ jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
         }),
     };
 });
-jest.mock('../Utility/Recipients', () => (Object.assign(Object.assign({}, jest.requireActual('../Utility/Recipients')), { getRecipientsForConversation: jest.fn(), getQualifiedRecipientsForConversation: jest.fn() })));
+jest.mock('../Utility/Recipients', () => ({
+    ...jest.requireActual('../Utility/Recipients'),
+    getRecipientsForConversation: jest.fn(),
+    getQualifiedRecipientsForConversation: jest.fn(),
+}));
 const MockedRecipients = Recipients;
 const prepareDataForEncryption = async () => {
     const [proteusService, { cryptoClient, apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
@@ -206,7 +210,7 @@ describe('ProteusService', () => {
             const result = await proteusService.handleOtrMessageAddEvent(eventPayload);
             expect(result).toBeDefined();
             expect(createSessionSpy).not.toHaveBeenCalled();
-            expect(result === null || result === void 0 ? void 0 : result.decryptedData).toBe(decryptedMessage);
+            expect(result?.decryptedData).toBe(decryptedMessage);
         });
         it('decrypts incoming proteus encrypted and creates session if not already existing', async () => {
             const [proteusService, { cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
@@ -219,7 +223,7 @@ describe('ProteusService', () => {
             expect(result).toBeDefined();
             expect(createSessionSpy).toHaveBeenCalled();
             expect(decryptSpy).not.toHaveBeenCalled();
-            expect(result === null || result === void 0 ? void 0 : result.decryptedData).toBe(decryptedMessage);
+            expect(result?.decryptedData).toBe(decryptedMessage);
         });
     });
     describe('"encrypt"', () => {
@@ -455,7 +459,6 @@ describe('ProteusService', () => {
                 });
             });
             it(`returns the recipients that will receive the message later`, async () => {
-                var _a;
                 const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
                 const recipients = {
                     domain1: { user1: ['client1'], user2: ['client11', 'client12'] },
@@ -477,7 +480,7 @@ describe('ProteusService', () => {
                     userIds: recipients,
                 });
                 expect(result.state).toBe(conversation_2.MessageSendingState.OUTGOING_SENT);
-                expect((_a = result.failedToSend) === null || _a === void 0 ? void 0 : _a.queued).toEqual({ domain2: recipients.domain2 });
+                expect(result.failedToSend?.queued).toEqual({ domain2: recipients.domain2 });
             });
         });
     });
@@ -502,7 +505,6 @@ describe('ProteusService', () => {
             expect(event).toEqual(baseResponse);
         });
         it('partially add users if some backends are unreachable', async () => {
-            var _a, _b, _c, _d;
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postMembersSpy = jest
                 .spyOn(apiClient.api.conversation, 'postMembers')
@@ -515,11 +517,10 @@ describe('ProteusService', () => {
             expect(postMembersSpy).toHaveBeenCalledTimes(2);
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([...usersDomain1, ...usersDomain2]));
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(usersDomain2));
-            expect((_b = (_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
-            expect((_d = (_c = result.failedToAdd) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.users).toEqual([...usersDomain1]);
+            expect(result.failedToAdd?.[0]?.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
+            expect(result.failedToAdd?.[0]?.users).toEqual([...usersDomain1]);
         });
         it('completely fails to add users if some backends are unreachable', async () => {
-            var _a, _b, _c, _d;
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const allUsers = [...usersDomain1, ...usersDomain2];
             const postMembersSpy = jest
@@ -532,11 +533,10 @@ describe('ProteusService', () => {
             expect(postMembersSpy).toHaveBeenCalledTimes(2);
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(allUsers));
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(usersDomain2));
-            expect((_b = (_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
-            expect((_d = (_c = result.failedToAdd) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.users).toEqual(allUsers);
+            expect(result.failedToAdd?.[0]?.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
+            expect(result.failedToAdd?.[0]?.users).toEqual(allUsers);
         });
         it('partially add users if some users are part of not-connected backends', async () => {
-            var _a, _b, _c, _d;
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postMembersSpy = jest
                 .spyOn(apiClient.api.conversation, 'postMembers')
@@ -549,8 +549,8 @@ describe('ProteusService', () => {
             expect(postMembersSpy).toHaveBeenCalledTimes(2);
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([...usersDomain1, ...usersDomain2]));
             expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining(usersDomain1));
-            expect((_b = (_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.reason).toBe(conversation_2.AddUsersFailureReasons.NON_FEDERATING_BACKENDS);
-            expect((_d = (_c = result.failedToAdd) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.users).toEqual([...usersDomain2, ...usersDomain3]);
+            expect(result.failedToAdd?.[0]?.reason).toBe(conversation_2.AddUsersFailureReasons.NON_FEDERATING_BACKENDS);
+            expect(result.failedToAdd?.[0]?.users).toEqual([...usersDomain2, ...usersDomain3]);
         });
     });
     describe('createConversation', () => {
@@ -579,7 +579,7 @@ describe('ProteusService', () => {
         };
         it('adds all requested users to a new conversation', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
-            jest.spyOn(apiClient.api.conversation, 'postConversation').mockResolvedValueOnce(Object.assign({}, newConversation));
+            jest.spyOn(apiClient.api.conversation, 'postConversation').mockResolvedValueOnce({ ...newConversation });
             const result = await proteusService.createConversation({
                 receipt_mode: null,
                 qualified_users: [...usersDomain1, ...usersDomain2, ...usersDomain3],

package/lib/messagingProtocols/proteus/ProteusService/cryptoMigrationStateStore.js

@@ -23,7 +23,7 @@ function getLocalStorage() {
     try {
         return window.localStorage;
     }
-    catch (_a) {
+    catch {
         return { setItem: () => { }, getItem: () => { }, removeItem: () => { } };
     }
 }

package/lib/messagingProtocols/proteus/ProteusService/identityClearer.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteIdentity = void 0;
+exports.deleteIdentity = deleteIdentity;
 /** all the tables in the database that stores information relative to the client identity */
 const IDENTITY_STORES = ['amplify', 'clients', 'keys', 'prekeys', 'sessions', 'group_ids'];
 /**
@@ -30,4 +30,3 @@ function deleteIdentity(storeEngine) {
     //make sure we use enum's lowercase values, not uppercase keys
     IDENTITY_STORES.map(store => storeEngine.deleteAll(store)));
 }
-exports.deleteIdentity = deleteIdentity;

package/lib/messagingProtocols/proteus/ProteusService/sessionIdMigrator.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateToQualifiedSessionIds = void 0;
+exports.migrateToQualifiedSessionIds = migrateToQualifiedSessionIds;
 const sessionTableName = 'sessions';
 /**
  * Will migrate all the session ids in the database to fully qualified ids (from 'user-id@device-id` to  `domain@user-id@device-id`)
@@ -34,7 +34,7 @@ async function migrateToQualifiedSessionIds(storeEngine, defaultDomain) {
         .reduce((acc, session) => {
         return acc.concat({
             oldId: session.id,
-            newSession: Object.assign(Object.assign({}, session), { id: `${defaultDomain}@${session.id}` }),
+            newSession: { ...session, id: `${defaultDomain}@${session.id}` },
         });
     }, []);
     for (const { oldId, newSession } of updatedSessions) {
@@ -43,4 +43,3 @@ async function migrateToQualifiedSessionIds(storeEngine, defaultDomain) {
         await storeEngine.create(sessionTableName, newSession.id, newSession);
     }
 }
-exports.migrateToQualifiedSessionIds = migrateToQualifiedSessionIds;

package/lib/messagingProtocols/proteus/ProteusService/userDomainFilters.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterUsersFromDomains = void 0;
+exports.filterUsersFromDomains = filterUsersFromDomains;
 function filterUsersFromDomains(userIds, domainsToExclude) {
     const excludedUsers = [];
     const includedUsers = [];
@@ -28,4 +28,3 @@ function filterUsersFromDomains(userIds, domainsToExclude) {
         includedUsers,
     };
 }
-exports.filterUsersFromDomains = filterUsersFromDomains;

package/lib/messagingProtocols/proteus/Utility/Recipients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Recipients.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/Recipients.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAczD,UAAU,2CAA2C;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;CAChD;AAED,QAAA,MAAM,4BAA4B,4CAI/B,2CAA2C,KAAG,QAAQ,oBAAoB,CAW5E,CAAC;AAEF,OAAO,EAAC,4BAA4B,EAAC,CAAC"}
+{"version":3,"file":"Recipients.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/Recipients.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAczD,UAAU,2CAA2C;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;CAChD;AAED,QAAA,MAAM,4BAA4B,4CAI/B,2CAA2C,KAAG,OAAO,CAAC,oBAAoB,CAW5E,CAAC;AAEF,OAAO,EAAC,4BAA4B,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,kBAAkB,GAAG;IACxB,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8GAA8G;IAC9G,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,kBAAkB,yBAAwB,wBAAwB,KAAG,MAI1E,CAAC;AA6BF;;;GAGG;AACH,QAAA,MAAM,WAAW,wCACoB;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAC,+BACvE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,KAC5E,QAAQ,MAAM,CAUhB,CAAC;AAqBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,qDAKf,wCAAwC,KAAG,QAAQ,kBAAkB,CAwDvE,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;CAC5B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA4CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9E;;GAEG;AACH,QAAA,MAAM,sBAAsB,gBAAiB,IAAI,MAAM,EAAE,CAAC,CAAC,KAAG,kBAAkB,CAAC,CAYhF,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}
+{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,kBAAkB,GAAG;IACxB,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8GAA8G;IAC9G,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,kBAAkB,yBAAwB,wBAAwB,KAAG,MAI1E,CAAC;AA6BF;;;GAGG;AACH,QAAA,MAAM,WAAW,wCACoB;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAC,+BACvE;IAAC,SAAS,EAAE,SAAS,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,KAC5E,OAAO,CAAC,MAAM,CAUhB,CAAC;AAqBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,qDAKf,wCAAwC,KAAG,OAAO,CAAC,kBAAkB,CAwDvE,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;CAC5B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA4CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9E;;GAEG;AACH,QAAA,MAAM,sBAAsB,GAAI,CAAC,YAAY,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,KAAG,iBAAiB,CAAC,CAAC,CAYhF,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.js

@@ -18,7 +18,8 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEncryptedPayloads = exports.deleteSession = exports.initSessions = exports.initSession = exports.constructSessionId = void 0;
+exports.buildEncryptedPayloads = exports.initSessions = exports.initSession = exports.constructSessionId = void 0;
+exports.deleteSession = deleteSession;
 const bazinga64_1 = require("bazinga64");
 const UserClientsUtil_1 = require("../../../../conversation/message/UserClientsUtil");
 const constructSessionId = ({ userId, clientId }) => {
@@ -68,13 +69,15 @@ const createSessions = async ({ recipients, apiClient, cryptoClient }) => {
         recipients: prekeysBundle,
         cryptoClient,
     });
-    return Object.assign(Object.assign({}, result), { failed: (failed === null || failed === void 0 ? void 0 : failed.length) ? failed : undefined });
+    return {
+        ...result,
+        failed: failed?.length ? failed : undefined,
+    };
 };
 /**
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
  */
 const initSessions = async ({ recipients, apiClient, cryptoClient, logger, }) => {
-    var _a, _b, _c;
     const missingClients = {};
     const missingClientsWithPrekeys = {};
     const existingSessions = [];
@@ -89,13 +92,13 @@ const initSessions = async ({ recipients, apiClient, cryptoClient, logger, }) =>
                 continue;
             }
             if (!Array.isArray(data)) {
-                const domainMissingWithPrekey = (_a = missingClientsWithPrekeys[userId.domain]) !== null && _a !== void 0 ? _a : {};
-                domainMissingWithPrekey[userId.id] = (_b = domainMissingWithPrekey[userId.id]) !== null && _b !== void 0 ? _b : {};
+                const domainMissingWithPrekey = missingClientsWithPrekeys[userId.domain] ?? {};
+                domainMissingWithPrekey[userId.id] = domainMissingWithPrekey[userId.id] ?? {};
                 domainMissingWithPrekey[userId.id][clientId] = data[clientId];
                 missingClientsWithPrekeys[userId.domain] = domainMissingWithPrekey;
                 continue;
             }
-            const domainMissing = (_c = missingClients[userId.domain]) !== null && _c !== void 0 ? _c : {};
+            const domainMissing = missingClients[userId.domain] ?? {};
             domainMissing[userId.id] = domainMissing[userId.id] || [];
             domainMissing[userId.id].push(clientId);
             missingClients[userId.domain] = domainMissing;
@@ -115,7 +118,7 @@ const initSessions = async ({ recipients, apiClient, cryptoClient, logger, }) =>
             logger,
         })
         : { sessions: [], failed: undefined, unknowns: undefined };
-    const allUnknowns = Object.assign(Object.assign({}, prekeyUnknows), unknowns);
+    const allUnknowns = { ...prekeyUnknows, ...unknowns };
     return {
         sessions: [...existingSessions, ...prekeyCreated, ...created],
         failed,
@@ -127,9 +130,7 @@ async function deleteSession(params) {
     const sessionId = constructSessionId(params);
     await params.cryptoClient.deleteSession(sessionId);
 }
-exports.deleteSession = deleteSession;
 const createSessionsFromPreKeys = async ({ recipients, cryptoClient, }) => {
-    var _a, _b;
     const sessions = [];
     const unknowns = {};
     for (const domain in recipients) {
@@ -139,8 +140,8 @@ const createSessionsFromPreKeys = async ({ recipients, cryptoClient, }) => {
                 const sessionId = constructSessionId({ userId: { id: userId, domain }, clientId });
                 const prekey = userClients[clientId];
                 if (!prekey) {
-                    const domainUnknowns = (_a = unknowns[domain]) !== null && _a !== void 0 ? _a : {};
-                    domainUnknowns[userId] = (_b = domainUnknowns[userId]) !== null && _b !== void 0 ? _b : [];
+                    const domainUnknowns = unknowns[domain] ?? {};
+                    domainUnknowns[userId] = domainUnknowns[userId] ?? [];
                     domainUnknowns[userId].push(clientId);
                     unknowns[domain] = domainUnknowns;
                     continue;
@@ -159,13 +160,12 @@ const createSessionsFromPreKeys = async ({ recipients, cryptoClient, }) => {
  */
 const buildEncryptedPayloads = (payloads) => {
     return [...payloads].reduce((acc, [sessionId, payload]) => {
-        var _a, _b;
         const { userId, domain, clientId } = parseSessionId(sessionId);
         if (!domain) {
             throw new Error('Invalid session ID');
         }
-        const domainPayloads = (_a = acc[domain]) !== null && _a !== void 0 ? _a : {};
-        domainPayloads[userId] = (_b = domainPayloads[userId]) !== null && _b !== void 0 ? _b : {};
+        const domainPayloads = acc[domain] ?? {};
+        domainPayloads[userId] = domainPayloads[userId] ?? {};
         domainPayloads[userId][clientId] = payload;
         acc[domain] = domainPayloads;
         return acc;

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.test.js

@@ -37,7 +37,10 @@ function generatePrekeys(recipients) {
                         id: index,
                         key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
                     };
-                return Object.assign(Object.assign({}, acc), { [clientId]: payload });
+                return {
+                    ...acc,
+                    [clientId]: payload,
+                };
             }, {});
             prekeys[domain] = domainUsers;
         });
@@ -111,7 +114,7 @@ describe('SessionHandler', () => {
                 .mockImplementation(sessionId => Promise.resolve(sessionId.includes('missing')));
             const sessionFromPrekeySpy = jest.spyOn(cryptoClient, 'sessionFromPrekey');
             const { sessions } = await (0, SessionHandler_1.initSessions)({
-                recipients: { domain: Object.assign(Object.assign({}, existingUserClients), missingUserClients) },
+                recipients: { domain: { ...existingUserClients, ...missingUserClients } },
                 apiClient,
                 cryptoClient,
             });

package/lib/messagingProtocols/proteus/Utility/getGenericMessageParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getGenericMessageParams.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/getGenericMessageParams.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAoB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE;QACP,cAAc,EAAE,WAAW,CAAC;QAC5B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;QAChC,aAAa,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC;KACpD,CAAC;CACH,CAAC;AACF,UAAU,6BAA6B;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;CACtB;AACD,KAAK,iCAAiC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,QAAA,MAAM,uBAAuB,kHAM1B,6BAA6B,sCA0B/B,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}
+{"version":3,"file":"getGenericMessageParams.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/getGenericMessageParams.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAoB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE;QACP,cAAc,EAAE,WAAW,CAAC;QAC5B,UAAU,EAAE,OAAO,GAAG,SAAS,CAAC;QAChC,aAAa,EAAE,OAAO,GAAG,WAAW,EAAE,GAAG,SAAS,CAAC;KACpD,CAAC;CACH,CAAC;AACF,UAAU,6BAA6B;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,WAAW,CAAC;IAC5B,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC;CACtB;AACD,KAAK,iCAAiC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,QAAA,MAAM,uBAAuB,kHAM1B,6BAA6B,KAAG,iCA0BlC,CAAC;AAEF,OAAO,EAAC,uBAAuB,EAAC,CAAC"}

package/lib/notification/NotificationBackendRepository.d.ts

@@ -5,7 +5,7 @@ export declare class NotificationBackendRepository {
     constructor(apiClient: APIClient);
     getAllNotifications(clientId?: string, lastNotificationId?: string): Promise<{
         notifications: Notification[];
-        missedNotification?: string | undefined;
+        missedNotification?: string;
     }>;
     getLastNotification(clientId?: string): Promise<Notification>;
 }

package/lib/notification/NotificationBackendRepository.js

@@ -20,6 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationBackendRepository = void 0;
 class NotificationBackendRepository {
+    apiClient;
     constructor(apiClient) {
         this.apiClient = apiClient;
     }

package/lib/notification/NotificationDatabaseRepository.js

@@ -32,6 +32,7 @@ const STORES = {
     AMPLIFY: 'amplify',
 };
 class NotificationDatabaseRepository {
+    storeEngine;
     constructor(storeEngine) {
         this.storeEngine = storeEngine;
     }

package/lib/notification/NotificationService.js

@@ -17,19 +17,6 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
-    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,13 +34,18 @@ var TOPIC;
     TOPIC["NOTIFICATION_ERROR"] = "NotificationService.TOPIC.NOTIFICATION_ERROR";
 })(TOPIC || (TOPIC = {}));
 class NotificationService extends commons_1.TypedEventEmitter {
+    conversationService;
+    apiClient;
+    backend;
+    database;
+    logger = (0, logdown_1.default)('@wireapp/core/NotificationService', {
+        logger: console,
+        markdown: false,
+    });
+    static TOPIC = TOPIC;
     constructor(apiClient, storeEngine, conversationService) {
         super();
         this.conversationService = conversationService;
-        this.logger = (0, logdown_1.default)('@wireapp/core/NotificationService', {
-            logger: console,
-            markdown: false,
-        });
         this.apiClient = apiClient;
         this.backend = new NotificationBackendRepository_1.NotificationBackendRepository(this.apiClient);
         this.database = new NotificationDatabaseRepository_1.NotificationDatabaseRepository(storeEngine);
@@ -147,40 +139,38 @@ class NotificationService extends commons_1.TypedEventEmitter {
         }
         return false;
     }
-    handleNotification(notification_1, source_1) {
-        return __asyncGenerator(this, arguments, function* handleNotification_1(notification, source, dryRun = false) {
-            for (const event of notification.payload) {
-                this.logger.log(`Handling event of type "${event.type}" for notification with ID "${notification.id}"`, event);
-                let lastEventDate = undefined;
-                try {
-                    lastEventDate = yield __await(this.database.getLastEventDate());
-                }
-                catch (_a) { }
-                if ('time' in event && this.isOutdatedEvent(event, source, lastEventDate)) {
-                    this.logger.info(`Ignored outdated event type: '${event.type}'`);
-                    continue;
-                }
-                try {
-                    const handledEventResult = yield __await(this.handleEvent(event, dryRun));
-                    if (handledEventResult.status === 'handled' && handledEventResult.payload) {
-                        yield yield __await(handledEventResult.payload);
-                    }
-                }
-                catch (error) {
-                    this.logger.error(`There was an error with notification ID "${notification.id}": ${error.message}`, error);
-                    const notificationError = {
-                        error: error,
-                        notification,
-                        type: CoreError_1.CoreError.NOTIFICATION_ERROR,
-                    };
-                    this.emit(NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError);
+    async *handleNotification(notification, source, dryRun = false) {
+        for (const event of notification.payload) {
+            this.logger.debug(`Handling event of type "${event.type}"`, event);
+            let lastEventDate = undefined;
+            try {
+                lastEventDate = await this.database.getLastEventDate();
+            }
+            catch { }
+            if ('time' in event && this.isOutdatedEvent(event, source, lastEventDate)) {
+                this.logger.info(`Ignored outdated event type: '${event.type}'`);
+                continue;
+            }
+            try {
+                const handledEventResult = await this.handleEvent(event, dryRun);
+                if (handledEventResult.status === 'handled' && handledEventResult.payload) {
+                    yield handledEventResult.payload;
                 }
             }
-            if (!dryRun && !notification.transient) {
-                // keep track of the last handled notification for next time we fetch the notification stream
-                yield __await(this.setLastNotificationId(notification));
+            catch (error) {
+                this.logger.error(`There was an error with notification ID "${notification.id}": ${error.message}`, error);
+                const notificationError = {
+                    error: error,
+                    notification,
+                    type: CoreError_1.CoreError.NOTIFICATION_ERROR,
+                };
+                this.emit(NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError);
             }
-        });
+        }
+        if (!dryRun && !notification.transient) {
+            // keep track of the last handled notification for next time we fetch the notification stream
+            await this.setLastNotificationId(notification);
+        }
     }
     /**
      * Will process one event
@@ -202,4 +192,3 @@ class NotificationService extends commons_1.TypedEventEmitter {
     }
 }
 exports.NotificationService = NotificationService;
-NotificationService.TOPIC = TOPIC;