@wireapp/core 42.14.1 → 42.15.0

package/lib/Account.js

@@ -305,7 +305,7 @@ class Account extends commons_1.TypedEventEmitter {
         const connectionService = new connection_1.ConnectionService(this.apiClient);
         const giphyService = new giphy_1.GiphyService(this.apiClient);
         const linkPreviewService = new linkPreview_1.LinkPreviewService(assetService);
-        const conversationService = new conversation_1.ConversationService(this.apiClient, proteusService, mlsService);
+        const conversationService = new conversation_1.ConversationService(this.apiClient, proteusService, this.db, mlsService);
         const notificationService = new notification_1.NotificationService(this.apiClient, this.storeEngine, conversationService);
         const selfService = new self_1.SelfService(this.apiClient);
         const teamService = new team_1.TeamService(this.apiClient);

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

@@ -10,6 +10,7 @@ import { MLSService } from '../../messagingProtocols/mls';
 import { ProteusService } from '../../messagingProtocols/proteus';
 import { AddUsersToProteusConversationParams, SendProteusMessageParams } from '../../messagingProtocols/proteus/ProteusService/ProteusService.types';
 import { HandledEventPayload } from '../../notification';
+import { CoreDatabase } from '../../storage/CoreDB';
 import { RemoteData } from '../content';
 type Events = {
     MLSConversationRecovered: {
@@ -19,10 +20,11 @@ type Events = {
 export declare class ConversationService extends TypedEventEmitter<Events> {
     private readonly apiClient;
     private readonly proteusService;
+    private readonly coreDatabase;
     private readonly _mlsService?;
     readonly messageTimer: MessageTimer;
     private readonly logger;
-    constructor(apiClient: APIClient, proteusService: ProteusService, _mlsService?: MLSService | undefined);
+    constructor(apiClient: APIClient, proteusService: ProteusService, coreDatabase: CoreDatabase, _mlsService?: MLSService | undefined);
     get mlsService(): MLSService;
     /**
      * Get a fresh list from backend of clients for all the participants of the conversation.
@@ -56,6 +58,12 @@ export declare class ConversationService extends TypedEventEmitter<Events> {
     send(params: XOR<SendMlsMessageParams, SendProteusMessageParams>): Promise<SendResult>;
     sendTypingStart(conversationId: QualifiedId): Promise<void>;
     sendTypingStop(conversationId: QualifiedId): Promise<void>;
+    /**
+     * Blacklists a conversation.
+     * When conversations is blacklisted, it means that it will be completely ignored by a client, even though it does exist on backend and we're the conversation member.
+     * @param conversationId id of the conversation to blacklist
+     */
+    readonly blacklistConversation: (conversationId: QualifiedId) => Promise<void>;
     /**
      * returns the number of messages that are in the queue expecting to be sent
      */

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

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

package/lib/conversation/ConversationService/ConversationService.js

@@ -41,12 +41,21 @@ const util_1 = require("../../util");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const messageSender_1 = require("../message/messageSender");
 class ConversationService extends commons_1.TypedEventEmitter {
-    constructor(apiClient, proteusService, _mlsService) {
+    constructor(apiClient, proteusService, coreDatabase, _mlsService) {
         super();
         this.apiClient = apiClient;
         this.proteusService = proteusService;
+        this.coreDatabase = coreDatabase;
         this._mlsService = _mlsService;
         this.logger = (0, logdown_1.default)('@wireapp/core/ConversationService');
+        /**
+         * Blacklists a conversation.
+         * When conversations is blacklisted, it means that it will be completely ignored by a client, even though it does exist on backend and we're the conversation member.
+         * @param conversationId id of the conversation to blacklist
+         */
+        this.blacklistConversation = async (conversationId) => {
+            await this.coreDatabase.put('conversationBlacklist', conversationId, conversationId.id);
+        };
         /**
          * Will try registering mls 1:1 conversation adding the other user.
          * If it fails and the conversation is already established, it will try joining via external commit instead.
@@ -138,7 +147,8 @@ class ConversationService extends commons_1.TypedEventEmitter {
     }
     async getConversations(conversationIds) {
         if (!conversationIds) {
-            return this.apiClient.api.conversation.getConversationList();
+            const conversationIdsToSkip = await this.coreDatabase.getAll('conversationBlacklist');
+            return this.apiClient.api.conversation.getConversationList(conversationIdsToSkip);
         }
         return this.apiClient.api.conversation.getConversationsByQualifiedIds(conversationIds);
     }

package/lib/conversation/ConversationService/ConversationService.test.js

@@ -50,6 +50,7 @@ const api_client_1 = require("@wireapp/api-client");
 const __1 = require("..");
 const CoreCryptoMLSError_1 = require("../../messagingProtocols/mls/MLSService/CoreCryptoMLSError");
 const MessagingProtocols = __importStar(require("../../messagingProtocols/proteus"));
+const CoreDB_1 = require("../../storage/CoreDB");
 const PayloadHelper = __importStar(require("../../test/PayloadHelper"));
 const MessageBuilder = __importStar(require("../message/MessageBuilder"));
 const createMLSMessageAddEventMock = (conversationId) => ({
@@ -73,7 +74,7 @@ describe('ConversationService', () => {
         jest.useFakeTimers();
         jest.setSystemTime(new Date(0));
     });
-    function buildConversationService() {
+    async function buildConversationService() {
         const client = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
         jest.spyOn(client.api.conversation, 'postMlsMessage').mockReturnValue(Promise.resolve({
             events: [],
@@ -110,7 +111,8 @@ describe('ConversationService', () => {
             addUsersToExistingConversation: jest.fn(),
             resetKeyMaterialRenewal: jest.fn(),
         };
-        const conversationService = new __1.ConversationService(client, mockedProteusService, mockedMLSService);
+        const mockedDb = await (0, CoreDB_1.openDB)('core-test-db');
+        const conversationService = new __1.ConversationService(client, mockedProteusService, mockedDb, mockedMLSService);
         jest.spyOn(conversationService, 'joinByExternalCommit');
         jest.spyOn(conversationService, 'emit');
         return [conversationService, { apiClient: client, mlsService: mockedMLSService }];
@@ -126,7 +128,7 @@ describe('ConversationService', () => {
         ];
         messages.forEach(({ type, message }) => {
             it(`calls callbacks when sending '${type}' message is successful`, async () => {
-                const [conversationService] = buildConversationService();
+                const [conversationService] = await buildConversationService();
                 const sentTime = new Date().toISOString();
                 mockedProteusService.sendMessage = jest.fn().mockResolvedValue({ sentAt: sentTime });
                 const promise = conversationService.send({
@@ -152,7 +154,7 @@ describe('ConversationService', () => {
         ];
         messages.forEach(({ type, message }) => {
             it(`calls callbacks when sending '${type}' message is starting and successful`, async () => {
-                const [conversationService] = buildConversationService();
+                const [conversationService] = await buildConversationService();
                 const promise = conversationService.send({
                     protocol: conversation_1.ConversationProtocol.MLS,
                     groupId,
@@ -164,7 +166,7 @@ describe('ConversationService', () => {
             });
         });
         it('rejoins a MLS group when failed encrypting MLS message', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
             const mockConversationId = { id: 'mockConversationId', domain: 'staging.zinfra.io' };
             const mockedMessage = MessageBuilder.buildTextMessage({ text: 'test' });
@@ -207,7 +209,7 @@ describe('ConversationService', () => {
             };
         };
         it('re-joins multiple not-established conversations', async () => {
-            const [conversationService, { apiClient }] = buildConversationService();
+            const [conversationService, { apiClient }] = await buildConversationService();
             const remoteEpoch = 1;
             const mlsConversation1 = createConversation(remoteEpoch, 'conversation1');
             const mlsConversation2 = createConversation(remoteEpoch, 'conversation2');
@@ -219,7 +221,7 @@ describe('ConversationService', () => {
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation2.qualified_id);
         });
         it('re-joins multiple conversations when mismatches detected', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mlsConversation1 = createConversation(1, 'conversation1');
             const mlsConversation2 = createConversation(1, 'conversation2');
             const mockedDBResponse = [mlsConversation1, mlsConversation2];
@@ -231,7 +233,7 @@ describe('ConversationService', () => {
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation2.qualified_id);
         });
         it("does not re-join when there's no mismatch", async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mlsConversation = createConversation(1);
             const mockedDBResponse = [mlsConversation];
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({ found: mockedDBResponse });
@@ -244,7 +246,7 @@ describe('ConversationService', () => {
     });
     describe('establishMLS1to1Conversation', () => {
         it('only returns a conversation if a group is already established on backend and locally', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
             const mockGroupId = 'mock-group-id';
             const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
@@ -262,7 +264,7 @@ describe('ConversationService', () => {
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
         });
         it('joins with an external commit if a group is already established on backend but not established locally', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
             const mockGroupId = 'mock-group-id';
             const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
@@ -290,7 +292,7 @@ describe('ConversationService', () => {
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
         it('wipes the conversation and registers it if a group is not yet established on backend', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
             const mockGroupId = 'mock-group-id';
             const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
@@ -319,7 +321,7 @@ describe('ConversationService', () => {
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
         it('retries to register the conversation after it has failed for the first time', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
             const mockGroupId = 'mock-group-id';
             const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
@@ -358,7 +360,7 @@ describe('ConversationService', () => {
     });
     describe('handleEvent', () => {
         it('rejoins a MLS conversation if epoch mismatch detected when decrypting mls message', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const conversationId = { id: 'conversationId', domain: 'staging.zinfra.io' };
             const mockGroupId = 'mock-group-id';
             const mockMLSMessageAddEvent = createMLSMessageAddEventMock(conversationId);
@@ -380,9 +382,38 @@ describe('ConversationService', () => {
             expect(conversationService.emit).toHaveBeenCalledWith('MLSConversationRecovered', { conversationId });
         });
     });
+    describe('getConversations', () => {
+        it('returns a list of conversations by conversation ids', async () => {
+            var _a;
+            const [conversationService, { apiClient }] = await buildConversationService();
+            const conversationIds = Array.from({ length: 10 }, () => ({ id: PayloadHelper.getUUID(), domain: 'test.zinfra.io' }));
+            jest.spyOn(apiClient.api.conversation, 'getConversationsByQualifiedIds').mockResolvedValueOnce({
+                found: conversationIds,
+            });
+            const conversations = await conversationService.getConversations(conversationIds);
+            expect((_a = conversations.found) === null || _a === void 0 ? void 0 : _a.length).toBe(conversationIds.length);
+        });
+        it('returns a full list of conversations if a list of conversations is not provided', async () => {
+            const [conversationService, { apiClient }] = await buildConversationService();
+            jest.spyOn(apiClient.api.conversation, 'getConversationList').mockImplementation(jest.fn());
+            await conversationService.getConversations();
+            expect(apiClient.api.conversation.getConversationList).toHaveBeenCalled();
+        });
+        it('includes a list of ids to skip if they exist in db store', async () => {
+            const [conversationService, { apiClient }] = await buildConversationService();
+            const conversationIdsToSkip = Array.from({ length: 2 }, () => ({
+                id: PayloadHelper.getUUID(),
+                domain: 'test.zinfra.io',
+            }));
+            conversationIdsToSkip.forEach(conversationService.blacklistConversation);
+            jest.spyOn(apiClient.api.conversation, 'getConversationList').mockImplementation(jest.fn());
+            await conversationService.getConversations();
+            expect(apiClient.api.conversation.getConversationList).toHaveBeenCalledWith(expect.arrayContaining(conversationIdsToSkip));
+        });
+    });
     describe('fetchAllParticipantsClients', () => {
         it('gives the members and clients of a federated conversation', async () => {
-            const [conversationService, { apiClient }] = buildConversationService();
+            const [conversationService, { apiClient }] = await buildConversationService();
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValue({
                 members: {
                     others: [
@@ -408,7 +439,7 @@ describe('ConversationService', () => {
     });
     describe('addUsersToMLSConversation', () => {
         it('should claim key packages for all the users and add them to the group', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockGroupId = 'groupId';
             const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'local.wire.com' };
             const otherUsersToAdd = Array(3)
@@ -438,7 +469,7 @@ describe('ConversationService', () => {
     });
     describe('tryEstablishingMLSGroup', () => {
         it('should add all the users to a MLS group after group was established by the self client', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const selfUserId = { id: 'self-user-id', domain: 'local.wire.com' };
             const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'local.wire.com' };
             const mockGroupId = 'groupId';
@@ -462,7 +493,7 @@ describe('ConversationService', () => {
             });
         });
         it('should not add any users if MLS group was not established by the self client', async () => {
-            const [conversationService, { mlsService }] = buildConversationService();
+            const [conversationService, { mlsService }] = await buildConversationService();
             const selfUserId = { id: 'self-user-id', domain: 'local.wire.com' };
             const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'local.wire.com' };
             const mockGroupId = 'groupId';

package/lib/storage/CoreDB.d.ts

@@ -21,6 +21,13 @@ interface CoreDBSchema extends DBSchema {
             firingDate: number;
         };
     };
+    conversationBlacklist: {
+        key: string;
+        value: {
+            id: string;
+            domain: string;
+        };
+    };
 }
 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;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;IACF,cAAc,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC1C,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAelE;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;IACF,cAAc,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC1C,CAAC;IACF,qBAAqB,EAAE;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAC,CAAC;KACrC,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAiBlE;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D"}

package/lib/storage/CoreDB.js

@@ -20,7 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDB = exports.openDB = void 0;
 const idb_1 = require("idb");
-const VERSION = 3;
+const VERSION = 4;
 async function openDB(dbName) {
     const db = await (0, idb_1.openDB)(dbName, VERSION, {
         upgrade: (db, oldVersion) => {
@@ -32,6 +32,8 @@ async function openDB(dbName) {
                     db.createObjectStore('pendingProposals');
                 case 2:
                     db.createObjectStore('recurringTasks');
+                case 3:
+                    db.createObjectStore('conversationBlacklist');
             }
         },
     });

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.3.3",
+    "@wireapp/api-client": "^26.4.0",
     "@wireapp/commons": "^5.2.1",
     "@wireapp/core-crypto": "1.0.0-rc.13",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.14.1",
-  "gitHead": "ed484e176d93f152aa4f476c99b162443eeae227"
+  "version": "42.15.0",
+  "gitHead": "ed5b55b51ef156d0e50051c5ba4409e2d9360683"
 }