@wireapp/core 46.46.6-beta.14.f6fd03fe6 → 46.46.6

package/lib/test/StoreHelper.js

@@ -0,0 +1,27 @@
+"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.createMemoryEngine = createMemoryEngine;
+const { MemoryEngine } = require('@wireapp/store-engine');
+async function createMemoryEngine(storeName = `temp-${Date.now()}`) {
+    const engine = new MemoryEngine();
+    await engine.init(storeName);
+    return engine;
+}

package/lib/user/UserService.d.ts

@@ -1,4 +1,4 @@
-import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId, User } from '@wireapp/api-client/lib/user/';
 import { APIClient } from '@wireapp/api-client';
 export declare class UserService {
@@ -13,6 +13,6 @@ export declare class UserService {
     /**
      * Get the list of other user's supported protocols.
      */
-    getUserSupportedProtocols(userId: QualifiedId): Promise<ConversationProtocol[]>;
+    getUserSupportedProtocols(userId: QualifiedId): Promise<CONVERSATION_PROTOCOL[]>;
 }
 //# sourceMappingURL=UserService.d.ts.map

package/lib/user/UserService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;IAO5C;;OAEG;IACU,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAS7F"}
+{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;IAO5C;;OAEG;IACU,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAS9F"}

package/lib/user/UserService.js

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserService = void 0;
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const team_1 = require("@wireapp/api-client/lib/team");
 class UserService {
     apiClient;
     constructor(apiClient) {
@@ -40,10 +40,10 @@ class UserService {
     async getUserSupportedProtocols(userId) {
         // Clients that uses version below the one supporting MLS, are not aware of user's supported protocols, we default to Proteus in this case.
         if (!this.apiClient.backendFeatures.supportsMLS) {
-            return [conversation_1.ConversationProtocol.PROTEUS];
+            return [team_1.CONVERSATION_PROTOCOL.PROTEUS];
         }
         const supportedProtocols = await this.apiClient.api.user.getUserSupportedProtocols(userId);
-        return supportedProtocols.length > 0 ? supportedProtocols : [conversation_1.ConversationProtocol.PROTEUS];
+        return supportedProtocols.length > 0 ? supportedProtocols : [team_1.CONVERSATION_PROTOCOL.PROTEUS];
     }
 }
 exports.UserService = UserService;

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

@@ -1 +1 @@
-{"version":3,"file":"TypePredicateUtil.d.ts","sourceRoot":"","sources":["../../src/util/TypePredicateUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAEZ,eAAe,EACf,oBAAoB,EACpB,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAEvD;AAMD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,EAAE,CAEjE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,oBAAoB,CAS5E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,CAM1D;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY,IAAI,eAAe,CAG7F"}
+{"version":3,"file":"TypePredicateUtil.d.ts","sourceRoot":"","sources":["../../src/util/TypePredicateUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAC,MAAM,uCAAuC,CAAC;AAEvH,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAEvD;AAMD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,EAAE,CAEjE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,oBAAoB,CAS5E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,CAM1D;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY,IAAI,eAAe,CAG7F"}

package/lib/util/TypePredicateUtil.js

@@ -23,7 +23,7 @@ exports.isQualifiedIdArray = isQualifiedIdArray;
 exports.isQualifiedUserClients = isQualifiedUserClients;
 exports.isUserClients = isUserClients;
 exports.isMLSConversation = isMLSConversation;
-const conversation_1 = require("@wireapp/api-client/lib/conversation/");
+const team_1 = require("@wireapp/api-client/lib/team");
 function isStringArray(obj) {
     return Array.isArray(obj) && (obj.length === 0 || typeof obj[0] === 'string');
 }
@@ -52,5 +52,5 @@ function isUserClients(obj) {
 }
 function isMLSConversation(conversation) {
     const { protocol, epoch, group_id } = conversation;
-    return protocol === conversation_1.ConversationProtocol.MLS && epoch !== undefined && group_id !== undefined;
+    return protocol === team_1.CONVERSATION_PROTOCOL.MLS && epoch !== undefined && group_id !== undefined;
 }

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.90.1-beta.22.f6fd03fe6",
+    "@wireapp/api-client": "^27.91.0",
     "@wireapp/commons": "^5.4.9",
     "@wireapp/core-crypto": "9.1.2",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.46.6-beta.14.f6fd03fe6",
-  "gitHead": "f6fd03fe61d83ba1f03786f6d202e1e19478c743"
+  "version": "46.46.6",
+  "gitHead": "e92cea52e807cc87abcb2f3329d11b41cc2e3bda"
 }

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/IncomingMessagesQueue/IncomingMesssagesQueue.d.ts

@@ -1,4 +0,0 @@
-export declare const queueIncomingMLSMessage: <EventHandler extends (...args: any[]) => any>(groupId: string, handler: EventHandler) => Promise<ReturnType<EventHandler>>;
-export declare const deleteMLSMessagesQueue: (groupId: string) => void;
-export declare const withLockedMLSMessagesQueue: <T>(groupId: string, fn: () => Promise<T>) => Promise<T>;
-//# sourceMappingURL=IncomingMesssagesQueue.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/IncomingMessagesQueue/IncomingMesssagesQueue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"IncomingMesssagesQueue.d.ts","sourceRoot":"","sources":["../../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/IncomingMessagesQueue/IncomingMesssagesQueue.ts"],"names":[],"mappings":"AA0CA,eAAO,MAAM,uBAAuB,GAAU,YAAY,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,WAC/E,MAAM,WACN,YAAY,KACpB,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAGlC,CAAC;AAEF,eAAO,MAAM,sBAAsB,YAAa,MAAM,SAErD,CAAC;AAcF,eAAO,MAAM,0BAA0B,GAAU,CAAC,WAAW,MAAM,MAAM,MAAM,OAAO,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAUpG,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/IncomingMessagesQueue/IncomingMesssagesQueue.js

@@ -1,69 +0,0 @@
-"use strict";
-/*
- * Wire
- * Copyright (C) 2023 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.withLockedMLSMessagesQueue = exports.deleteMLSMessagesQueue = exports.queueIncomingMLSMessage = void 0;
-const commons_1 = require("@wireapp/commons");
-const promise_queue_1 = require("@wireapp/promise-queue");
-const logger = commons_1.LogFactory.getLogger('@wireapp/core/MLSService/IncomingMessagesQueue');
-// (groupId string -> queue) map
-const queues = new Map();
-const getQueue = (groupId) => {
-    const queue = queues.get(groupId);
-    if (queue) {
-        return queue;
-    }
-    const newConversationQueue = new promise_queue_1.PromiseQueue({
-        name: `mls-messages-queue-${groupId}`,
-    });
-    queues.set(groupId, newConversationQueue);
-    return newConversationQueue;
-};
-const queueIncomingMLSMessage = async (groupId, handler) => {
-    const conversationQueue = getQueue(groupId);
-    return conversationQueue.push(handler);
-};
-exports.queueIncomingMLSMessage = queueIncomingMLSMessage;
-const deleteMLSMessagesQueue = (groupId) => {
-    queues.delete(groupId);
-};
-exports.deleteMLSMessagesQueue = deleteMLSMessagesQueue;
-const lockMLSMessagesQueue = (groupId) => {
-    logger.info(`Locking incoming MLS messages queue for group ${groupId}`);
-    const conversationQueue = getQueue(groupId);
-    conversationQueue.pause(true);
-};
-const unlockMLSMessagesQueue = (groupId) => {
-    logger.info(`Unlocking incoming MLS messages queue for group ${groupId}`);
-    const conversationQueue = getQueue(groupId);
-    conversationQueue.pause(false);
-};
-const withLockedMLSMessagesQueue = async (groupId, fn) => {
-    lockMLSMessagesQueue(groupId);
-    try {
-        const result = await fn();
-        unlockMLSMessagesQueue(groupId);
-        return result;
-    }
-    catch (error) {
-        unlockMLSMessagesQueue(groupId);
-        throw error;
-    }
-};
-exports.withLockedMLSMessagesQueue = withLockedMLSMessagesQueue;

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/IncomingMessagesQueue/index.d.ts

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

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.test.d.ts

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

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.test.d.ts.map

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

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.test.js

@@ -1,98 +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 protocol_messaging_1 = require("@pydio/protocol-messaging");
-const event_1 = require("@wireapp/api-client/lib/event");
-const messageAdd_1 = require("./messageAdd");
-const mockedMLSService = {
-    getGroupIdFromConversationId: jest.fn(),
-    decryptMessage: jest.fn(),
-    handlePendingProposals: jest.fn(),
-    getEpoch: jest.fn(),
-    emit: jest.fn(),
-};
-const createMLSMessageAddEventMock = (conversationId) => ({
-    data: '',
-    conversation: conversationId.id,
-    qualified_conversation: conversationId,
-    from: '',
-    senderClientId: '',
-    type: event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD,
-    time: '2023-08-21T06:47:43.387Z',
-});
-const createMockedMessage = () => {
-    return protocol_messaging_1.GenericMessage.encode(protocol_messaging_1.GenericMessage.create({
-        messageId: '2d7cb6d8-118f-11e8-b642-0ed5f89f718b',
-        text: protocol_messaging_1.Text.create({ content: 'Hello, World!' }),
-    })).finish();
-};
-describe('handleMLSMessageAdd', () => {
-    it('does not handle pending proposals if message does not contain proposals', async () => {
-        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
-        const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        const message = createMockedMessage();
-        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
-            proposals: [],
-            commitDelay: undefined,
-            message,
-            hasEpochChanged: false,
-            isActive: true,
-        });
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupId: mockGroupId });
-        expect(mockedMLSService.handlePendingProposals).not.toHaveBeenCalled();
-    });
-    it('handles pending proposals if message includes proposals', async () => {
-        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
-        const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        const message = createMockedMessage();
-        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
-            proposals: [{ proposal: new Uint8Array(), proposalRef: new Uint8Array(), crlNewDistributionPoints: [] }],
-            commitDelay: 2000,
-            crlNewDistributionPoints: [],
-            message,
-            hasEpochChanged: false,
-            isActive: true,
-        });
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupId: mockGroupId });
-        expect(mockedMLSService.handlePendingProposals).toHaveBeenCalledWith({
-            groupId: mockGroupId,
-            delayInMs: 2000,
-            eventTime: event.time,
-        });
-    });
-    it('emits "newEpoch" event if incoming message has advanced epoch number', async () => {
-        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
-        const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        const message = createMockedMessage();
-        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
-            proposals: [],
-            message,
-            hasEpochChanged: true,
-            isActive: true,
-        });
-        const mockedNewEpoch = 5;
-        jest.spyOn(mockedMLSService, 'getEpoch').mockResolvedValueOnce(mockedNewEpoch);
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupId: mockGroupId });
-        expect(mockedMLSService.emit).toHaveBeenCalledWith('newEpoch', {
-            groupId: mockGroupId,
-            epoch: mockedNewEpoch,
-        });
-    });
-});