@wireapp/core 41.2.3 → 41.2.5

package/lib/Account.js

@@ -270,8 +270,8 @@ class Account extends TypedEventEmitter_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 notificationService = new notification_1.NotificationService(this.apiClient, proteusService, this.storeEngine, mlsService);
         const conversationService = new conversation_1.ConversationService(this.apiClient, proteusService, 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);
         const broadcastService = new broadcast_1.BroadcastService(this.apiClient, proteusService);

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

@@ -1,5 +1,5 @@
 import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, RemoteConversations, PostMlsMessageResponse } from '@wireapp/api-client/lib/conversation';
-import { ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
+import { BackendEvent, ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { XOR } from '@wireapp/commons/lib/util/TypeUtil';
 import { APIClient } from '@wireapp/api-client';
@@ -8,6 +8,7 @@ import { MessageTimer, RemoveUsersParams } from '../../conversation/';
 import { MLSService } from '../../messagingProtocols/mls';
 import { ProteusService } from '../../messagingProtocols/proteus';
 import { AddUsersToProteusConversationParams, SendProteusMessageParams } from '../../messagingProtocols/proteus/ProteusService/ProteusService.types';
+import { HandledEventPayload } from '../../notification';
 import { RemoteData } from '../content';
 export declare class ConversationService {
     private readonly apiClient;
@@ -100,5 +101,9 @@ export declare class ConversationService {
         user: QualifiedId;
         client: string;
     }, otherUserId: QualifiedId) => Promise<void>;
+    private handleMLSMessageAddEvent;
+    private handleMLSWelcomeMessageEvent;
+    private handleOtrMessageAddEvent;
+    handleEvent(event: BackendEvent): Promise<HandledEventPayload | undefined>;
 }
 //# sourceMappingURL=ConversationService.d.ts.map

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

@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConversationService = void 0;
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const data_1 = require("@wireapp/api-client/lib/conversation/data");
+const event_1 = require("@wireapp/api-client/lib/event");
 const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const core_crypto_1 = require("@wireapp/core-crypto");
@@ -32,6 +33,7 @@ const ConversationService_types_1 = require("./ConversationService.types");
 const conversation_2 = require("../../conversation/");
 const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 const mls_1 = require("../../messagingProtocols/mls");
+const events_1 = require("../../messagingProtocols/mls/EventHandler/events");
 const proteus_1 = require("../../messagingProtocols/proteus");
 const util_1 = require("../../util");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
@@ -338,5 +340,25 @@ class ConversationService {
             }
         }
     }
+    async handleMLSMessageAddEvent(event) {
+        return (0, events_1.handleMLSMessageAdd)({ event, mlsService: this.mlsService });
+    }
+    async handleMLSWelcomeMessageEvent(event) {
+        return (0, events_1.handleMLSWelcomeMessage)({ event, mlsService: this.mlsService });
+    }
+    async handleOtrMessageAddEvent(event) {
+        return this.proteusService.handleOtrMessageAddEvent(event);
+    }
+    async handleEvent(event) {
+        switch (event.type) {
+            case event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD:
+                return this.handleMLSMessageAddEvent(event);
+            case event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE:
+                return this.handleMLSWelcomeMessageEvent(event);
+            case event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD:
+                return this.handleOtrMessageAddEvent(event);
+        }
+        return undefined;
+    }
 }
 exports.ConversationService = ConversationService;

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

@@ -1,10 +1,10 @@
-import { BackendEvent, ConversationMLSMessageAddEvent } from '@wireapp/api-client/lib/event';
-import { EventHandlerResult } from '../../../../common.types';
-import { EventHandlerParams } from '../../EventHandler.types';
-declare const isMLSMessageAddEvent: (event: BackendEvent) => event is ConversationMLSMessageAddEvent;
-interface HandleMLSMessageAddParams extends EventHandlerParams {
+import { ConversationMLSMessageAddEvent } from '@wireapp/api-client/lib/event';
+import { HandledEventPayload } from '../../../../../notification';
+import { MLSService } from '../../../MLSService/MLSService';
+interface HandleMLSMessageAddParams {
     event: ConversationMLSMessageAddEvent;
+    mlsService: MLSService;
 }
-declare const handleMLSMessageAdd: ({ mlsService, event }: HandleMLSMessageAddParams, onEpochChanged: (groupId: string) => Promise<void>) => EventHandlerResult;
-export { isMLSMessageAddEvent, handleMLSMessageAdd };
+export declare const handleMLSMessageAdd: ({ event, mlsService, }: HandleMLSMessageAddParams) => Promise<HandledEventPayload | undefined>;
+export {};
 //# sourceMappingURL=messageAdd.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAK/G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;CACvC;AACD,QAAA,MAAM,mBAAmB,0BACF,yBAAyB,4BACpB,MAAM,KAAK,QAAQ,IAAI,CAAC,uBA+CnD,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAK7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAuB,MAAM,gCAAgC,CAAC;AAEhF,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,2BAG7B,yBAAyB,KAAG,QAAQ,mBAAmB,GAAG,SAAS,CA+CrE,CAAC"}

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

@@ -18,14 +18,11 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMLSMessageAdd = exports.isMLSMessageAddEvent = void 0;
-const event_1 = require("@wireapp/api-client/lib/event");
+exports.handleMLSMessageAdd = void 0;
 const bazinga64_1 = require("bazinga64");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const MLSService_1 = require("../../../MLSService/MLSService");
-const isMLSMessageAddEvent = (event) => event.type === event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD;
-exports.isMLSMessageAddEvent = isMLSMessageAddEvent;
-const handleMLSMessageAdd = async ({ mlsService, event }, onEpochChanged) => {
+const handleMLSMessageAdd = async ({ event, mlsService, }) => {
     var _a;
     const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
     const qualifiedConversationId = (_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' };
@@ -52,7 +49,8 @@ const handleMLSMessageAdd = async ({ mlsService, event }, onEpochChanged) => {
         });
     }
     if (hasEpochChanged) {
-        await onEpochChanged(groupId);
+        const newEpoch = await mlsService.getEpoch(groupId);
+        mlsService.emit('newEpoch', { groupId, epoch: newEpoch });
     }
     return message ? { event, decryptedData: protocol_messaging_1.GenericMessage.decode(message) } : undefined;
 };

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

@@ -19,20 +19,87 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const event_1 = require("@wireapp/api-client/lib/event");
+const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const messageAdd_1 = require("./messageAdd");
-describe('MLS messageAdd eventHandler', () => {
-    describe('isMessageAdd', () => {
-        it('returns true for a messageAdd event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.MLS_MESSAGE_ADD,
-            };
-            expect((0, messageAdd_1.isMLSMessageAddEvent)(event)).toBe(true);
+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('throws when received a message for a group that is not known by a client', async () => {
+        const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
+        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(undefined);
+        await expect((0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService })).rejects.toThrow();
+    });
+    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=';
+        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const message = createMockedMessage();
+        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [],
+            commitDelay: undefined,
+            message,
+            hasEpochChanged: false,
+            isActive: true,
+        });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        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=';
+        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const message = createMockedMessage();
+        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [{ proposal: new Uint8Array(), proposalRef: new Uint8Array() }],
+            commitDelay: 2000,
+            message,
+            hasEpochChanged: false,
+            isActive: true,
+        });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        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=';
+        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const message = createMockedMessage();
+        jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
+            proposals: [],
+            message,
+            hasEpochChanged: true,
+            isActive: true,
         });
-        it('returns false for a non-messageAdd event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.MEMBER_JOIN,
-            };
-            expect((0, messageAdd_1.isMLSMessageAddEvent)(event)).toBe(false);
+        const mockedNewEpoch = 5;
+        jest.spyOn(mockedMLSService, 'getEpoch').mockResolvedValueOnce(mockedNewEpoch);
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        expect(mockedMLSService.emit).toHaveBeenCalledWith('newEpoch', {
+            groupId: mockGroupId,
+            epoch: mockedNewEpoch,
         });
     });
 });

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.d.ts

@@ -1,10 +1,10 @@
-import { BackendEvent, ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
-import { EventHandlerResult } from '../../../../common.types';
-import { EventHandlerParams } from '../../EventHandler.types';
-declare const isWelcomeMessageEvent: (event: BackendEvent) => event is ConversationMLSWelcomeEvent;
-interface HandleWelcomeMessageParams extends EventHandlerParams {
+import { ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
+import { HandledEventPayload } from '../../../../../notification';
+import { MLSService } from '../../../MLSService';
+interface HandleWelcomeMessageParams {
     event: ConversationMLSWelcomeEvent;
+    mlsService: MLSService;
 }
-declare const handleWelcomeMessage: ({ mlsService, event }: HandleWelcomeMessageParams) => EventHandlerResult;
-export { isWelcomeMessageEvent, handleWelcomeMessage };
+export declare const handleMLSWelcomeMessage: ({ mlsService, event, }: HandleWelcomeMessageParams) => Promise<HandledEventPayload>;
+export {};
 //# sourceMappingURL=welcomeMessage.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"welcomeMessage.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,2BAA2B,EAAqB,MAAM,+BAA+B,CAAC;AAG5G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,qBAAqB,UAAW,YAAY,yCACK,CAAC;AAExD,UAAU,0BAA2B,SAAQ,kBAAkB;IAC7D,KAAK,EAAE,2BAA2B,CAAC;CACpC;AACD,QAAA,MAAM,oBAAoB,0BAA+B,0BAA0B,uBAYlF,CAAC;AAEF,OAAO,EAAC,qBAAqB,EAAE,oBAAoB,EAAC,CAAC"}
+{"version":3,"file":"welcomeMessage.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAG1E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAE/C,UAAU,0BAA0B;IAClC,KAAK,EAAE,2BAA2B,CAAC;IACnC,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,eAAO,MAAM,uBAAuB,2BAGjC,0BAA0B,KAAG,QAAQ,mBAAmB,CAa1D,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.js

@@ -18,12 +18,9 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleWelcomeMessage = exports.isWelcomeMessageEvent = void 0;
-const event_1 = require("@wireapp/api-client/lib/event");
+exports.handleMLSWelcomeMessage = void 0;
 const bazinga64_1 = require("bazinga64");
-const isWelcomeMessageEvent = (event) => event.type === event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE;
-exports.isWelcomeMessageEvent = isWelcomeMessageEvent;
-const handleWelcomeMessage = async ({ mlsService, event }) => {
+const handleMLSWelcomeMessage = async ({ mlsService, event, }) => {
     const data = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
     // We extract the groupId from the welcome message and let coreCrypto store this group
     const newGroupId = await mlsService.processWelcomeMessage(data);
@@ -35,4 +32,4 @@ const handleWelcomeMessage = async ({ mlsService, event }) => {
         event: Object.assign(Object.assign({}, event), { data: groupIdStr }),
     };
 };
-exports.handleWelcomeMessage = handleWelcomeMessage;
+exports.handleMLSWelcomeMessage = handleMLSWelcomeMessage;

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

@@ -41,28 +41,14 @@ const mockParams = {
     dryRun: false,
 };
 describe('MLS welcomeMessage eventHandler', () => {
-    describe('isWelcomeMessageEvent', () => {
-        it('returns true for a welcome message event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
-            };
-            expect((0, welcomeMessage_1.isWelcomeMessageEvent)(event)).toBe(true);
-        });
-        it('returns false for a non-welcome message event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.MEMBER_JOIN,
-            };
-            expect((0, welcomeMessage_1.isWelcomeMessageEvent)(event)).toBe(false);
-        });
-    });
     describe('handleWelcomeMessage', () => {
         it('calls processWelcomeMessage and schedules periodic key material updates', async () => {
-            await (0, welcomeMessage_1.handleWelcomeMessage)(mockParams);
+            await (0, welcomeMessage_1.handleMLSWelcomeMessage)(mockParams);
             expect(mockParams.mlsService.processWelcomeMessage).toHaveBeenCalled();
             expect(mockParams.mlsService.scheduleKeyMaterialRenewal).toHaveBeenCalled();
         });
         it('returns a eventHandlerResult', async () => {
-            const eventHandlerResult = await (0, welcomeMessage_1.handleWelcomeMessage)(mockParams);
+            const eventHandlerResult = await (0, welcomeMessage_1.handleMLSWelcomeMessage)(mockParams);
             expect(eventHandlerResult).toBeDefined();
             expect(eventHandlerResult.event).toEqual({ data: 'conversationId', type: 'conversation.mls-welcome' });
         });

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

@@ -7,8 +7,6 @@ import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, External
 import { MLSServiceConfig } from './MLSService.types';
 import { KeyPackageClaimUser } from '../../../conversation';
 import { TypedEventEmitter } from '../../../util/TypedEventEmitter';
-import { EventHandlerResult } from '../../common.types';
-import { EventHandlerParams } from '../EventHandler';
 import { CommitPendingProposalsParams, HandlePendingProposalsParams, MLSCallbacks } from '../types';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 export interface SubconversationEpochInfoMember {
@@ -155,7 +153,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     private uploadMLSPublicKeys;
     private uploadMLSKeyPackages;
     wipeConversation(groupId: string): Promise<void>;
-    handleEvent(params: Omit<EventHandlerParams, 'mlsService'>): EventHandlerResult;
     /**
      * If there is a matching conversationId => groupId pair in the database,
      * we can find the groupId and return it as a string

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

@@ -47,7 +47,6 @@ const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClien
 const RecurringTaskScheduler_1 = require("../../../util/RecurringTaskScheduler");
 const TaskScheduler_1 = require("../../../util/TaskScheduler");
 const TypedEventEmitter_1 = require("../../../util/TypedEventEmitter");
-const EventHandler_1 = require("../EventHandler");
 //@todo: this function is temporary, we wait for the update from core-crypto side
 //they are returning regular array instead of Uint8Array for commit and welcome messages
 const optionalToUint8Array = (array) => {
@@ -485,16 +484,6 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         return this.coreCryptoClient.wipeConversation(groupIdBytes);
     }
-    async handleEvent(params) {
-        return (0, EventHandler_1.handleBackendEvent)(Object.assign(Object.assign({}, params), { mlsService: this }), async (groupId) => {
-            const conversationExists = await this.conversationExists(groupId);
-            if (!conversationExists) {
-                return;
-            }
-            const newEpoch = await this.getEpoch(groupId);
-            this.emit('newEpoch', { groupId, epoch: newEpoch });
-        });
-    }
     /**
      * If there is a matching conversationId => groupId pair in the database,
      * we can find the groupId and return it as a string

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.d.ts

@@ -1,10 +1,10 @@
-import { BackendEvent, ConversationOtrMessageAddEvent } from '@wireapp/api-client/lib/event';
-import { EventHandlerResult } from '../../../../common.types';
-import { EventHandlerParams } from '../../EventHandler.types';
-declare const isOtrMessageAddEvent: (event: BackendEvent) => event is ConversationOtrMessageAddEvent;
-type HandleOtrMessageAddParams = Omit<EventHandlerParams, 'event'> & {
+import { ConversationOtrMessageAddEvent } from '@wireapp/api-client/lib/event';
+import { HandledEventPayload } from '../../../../../notification';
+import { ProteusService } from '../../../ProteusService';
+interface HandleOtrMessageAddParams {
     event: ConversationOtrMessageAddEvent;
-};
-declare const handleOtrMessageAdd: ({ decryptMessage, event, dryRun, }: HandleOtrMessageAddParams) => EventHandlerResult;
-export { isOtrMessageAddEvent, handleOtrMessageAdd };
+    proteusService: ProteusService;
+}
+export declare const handleOtrMessageAdd: ({ event, proteusService, }: HandleOtrMessageAddParams) => Promise<HandledEventPayload>;
+export {};
 //# sourceMappingURL=otrMessageAdd.d.ts.map

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otrMessageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAM/G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,KAAK,yBAAyB,GAAG,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG;IACnE,KAAK,EAAE,8BAA8B,CAAC;CACvC,CAAC;AAEF,QAAA,MAAM,mBAAmB,uCAItB,yBAAyB,uBAyB3B,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"otrMessageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAO7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAEvD,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,cAAc,EAAE,cAAc,CAAC;CAChC;AAED,eAAO,MAAM,mBAAmB,+BAG7B,yBAAyB,KAAG,QAAQ,mBAAmB,CA6BzD,CAAC"}

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.js

@@ -18,27 +18,26 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleOtrMessageAdd = exports.isOtrMessageAddEvent = void 0;
-const event_1 = require("@wireapp/api-client/lib/event");
+exports.handleOtrMessageAdd = void 0;
 const bazinga64_1 = require("bazinga64");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const conversation_1 = require("../../../../../conversation");
 const DecryptionError_1 = require("../../../../../errors/DecryptionError");
-const isOtrMessageAddEvent = (event) => event.type === event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD;
-exports.isOtrMessageAddEvent = isOtrMessageAddEvent;
-const handleOtrMessageAdd = async ({ decryptMessage, event, dryRun = false, }) => {
-    if (dryRun) {
-        // In case of a dry run, we do not want to decrypt messages
-        // We just return the raw event to the caller
-        return { event };
-    }
+const handleOtrMessageAdd = async ({ event, proteusService, }) => {
     try {
         const { from, qualified_from, data: { sender: clientId, text: encodedCiphertext }, } = event;
         const userId = qualified_from || { id: from, domain: '' };
         const messageBytes = bazinga64_1.Decoder.fromBase64(encodedCiphertext).asBytes;
-        const decryptedData = await decryptMessage(messageBytes, userId, clientId);
+        const decryptedData = await proteusService.decrypt(messageBytes, userId, clientId);
+        const decodedData = protocol_messaging_1.GenericMessage.decode(decryptedData);
+        const isSessionReset = decodedData[conversation_1.GenericMessageType.CLIENT_ACTION] === protocol_messaging_1.ClientAction.RESET_SESSION;
+        if (isSessionReset) {
+            // If a session reset message was received, we need to count a consumed prekey (because the sender has created a new session from a new prekey)
+            await proteusService.consumePrekey();
+        }
         return {
             event,
-            decryptedData: protocol_messaging_1.GenericMessage.decode(decryptedData),
+            decryptedData: decodedData,
         };
     }
     catch (error) {

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

@@ -34,11 +34,12 @@ const isCryptoboxError = (error) => {
     return 'code' in error;
 };
 const generateDecryptionError = (senderInfo, error) => {
+    var _a;
     const { clientId, userId } = senderInfo;
     const sender = `${userId.id} (${clientId})`;
-    const coreCryptoCode = isCoreCryptoError(error) && error.proteusErrorCode;
-    const cryptoboxCode = isCryptoboxError(error) && error.code;
-    const code = coreCryptoCode || cryptoboxCode || exports.ProteusErrors.Unknown;
+    const coreCryptoCode = isCoreCryptoError(error) ? error.proteusErrorCode : null;
+    const cryptoboxCode = isCryptoboxError(error) ? error.code : null;
+    const code = (_a = coreCryptoCode !== null && coreCryptoCode !== void 0 ? coreCryptoCode : cryptoboxCode) !== null && _a !== void 0 ? _a : exports.ProteusErrors.Unknown;
     const message = `Decryption error from ${sender} (${error.message})`;
     return new DecryptionError_1.DecryptionError(message, code);
 };

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

@@ -22,15 +22,15 @@ const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const DecryptionError_1 = require("../../../../errors/DecryptionError");
 const basePayload = { userId: { id: 'user1', domain: 'domain' }, clientId: 'client1' };
 describe('generateDecryptionError', () => {
-    it('handles coreCrypto error', () => {
-        const coreCryptoError = { proteusErrorCode: Math.floor(Math.random() * 100), message: 'decryption error' };
+    it.each([Math.floor(Math.random() * 100), 0])('handles coreCrypto error', proteusErrorCode => {
+        const coreCryptoError = { proteusErrorCode, message: 'decryption error' };
         const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, coreCryptoError);
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
         expect(error.message).toBe(`Decryption error from user1 (client1) (${coreCryptoError.message})`);
         expect(error.code).toBe(coreCryptoError.proteusErrorCode);
     });
-    it('handles cryptobox error', () => {
-        const coreCryptoError = { code: Math.floor(Math.random() * 100), message: 'decryption error' };
+    it.each([Math.floor(Math.random() * 100), 0])('handles cryptobox error', code => {
+        const coreCryptoError = { code, message: 'decryption error' };
         const error = (0, DecryptionErrorGenerator_1.generateDecryptionError)(basePayload, coreCryptoError);
         expect(error).toBeInstanceOf(DecryptionError_1.DecryptionError);
         expect(error.message).toBe(`Decryption error from user1 (client1) (${coreCryptoError.message})`);

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

@@ -1,13 +1,13 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
 import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
 import { NewConversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import type { ConversationOtrMessageAddEvent } from '@wireapp/api-client/lib/event';
 import type { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { CryptoClient } from './CryptoClient';
 import type { AddUsersToProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
 import { ProteusCreateConversationResponse, SendResult, ProteusAddUsersResponse } from '../../../conversation';
-import type { EventHandlerResult } from '../../common.types';
-import { EventHandlerParams } from '../EventHandler';
+import { HandledEventPayload } from '../../../notification';
 export type EncryptionResult = {
     /** the encrypted payloads for the clients that have a valid sessions */
     payloads: QualifiedOTRRecipients;
@@ -23,7 +23,7 @@ export declare class ProteusService {
     private readonly messageService;
     private readonly logger;
     constructor(apiClient: APIClient, cryptoClient: CryptoClient, config: ProteusServiceConfig);
-    handleEvent(params: Pick<EventHandlerParams, 'event' | 'source' | 'dryRun'>): EventHandlerResult;
+    handleOtrMessageAddEvent(event: ConversationOtrMessageAddEvent): Promise<HandledEventPayload>;
     initClient(storeEngine: CRUDEngine, context: Context): Promise<void>;
     createClient(entropy?: Uint8Array): Promise<import("./CryptoClient").InitialPrekeys>;
     /**
@@ -46,7 +46,8 @@ export declare class ProteusService {
      */
     addUsersToConversation({ conversationId, qualifiedUsers, }: AddUsersToProteusConversationParams): Promise<ProteusAddUsersResponse>;
     sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
-    private decrypt;
+    decrypt(encryptedText: Uint8Array, userId: QualifiedId, clientId: string): Promise<Uint8Array>;
+    consumePrekey(): Promise<void>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
     encrypt(plainText: Uint8Array, recipients: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<EncryptionResult>;
     wipe(storeEngine?: CRUDEngine): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAGL,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAEL,iCAAiC,EAGjC,UAAU,EACV,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA2B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAwC9G;;;OAGG;IACU,sBAAsB,CAAC,EAClC,cAAc,EACd,cAAc,GACf,EAAE,mCAAmC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAqC5D,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,OAAO;IAuBd,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}
+{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAGL,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAClF,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAG5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAEL,iCAAiC,EAEjC,UAAU,EACV,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAY1D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,wBAAwB,CAAC,KAAK,EAAE,8BAA8B,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO7F,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IA2B1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,iCAAiC,CAAC;IAwC9G;;;OAGG;IACU,sBAAsB,CAAC,EAClC,cAAc,EACd,cAAc,GACf,EAAE,mCAAmC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAqC5D,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;IA6CpC,OAAO,CAAC,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAuB9E,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}

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

@@ -24,7 +24,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProteusService = void 0;
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const logdown_1 = __importDefault(require("logdown"));
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const cryptoMigrationStateStore_1 = require("./cryptoMigrationStateStore");
 const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const identityClearer_1 = require("./identityClearer");
@@ -33,7 +32,7 @@ const userDomainFilters_1 = require("./userDomainFilters");
 const conversation_2 = require("../../../conversation");
 const MessageService_1 = require("../../../conversation/message/MessageService");
 const errors_1 = require("../../../errors");
-const EventHandler_1 = require("../EventHandler");
+const events_1 = require("../EventHandler/events");
 const getGenericMessageParams_1 = require("../Utility/getGenericMessageParams");
 const isClearFromMismatch_1 = require("../Utility/isClearFromMismatch");
 const SessionHandler_1 = require("../Utility/SessionHandler");
@@ -45,17 +44,11 @@ class ProteusService {
         this.logger = (0, logdown_1.default)('@wireapp/core/ProteusService');
         this.messageService = new MessageService_1.MessageService(this.apiClient, this);
     }
-    async handleEvent(params) {
-        const handledEvent = await (0, EventHandler_1.handleBackendEvent)(Object.assign(Object.assign({}, params), { decryptMessage: (payload, userId, clientId) => this.decrypt(payload, userId, clientId) }));
-        if (handledEvent === null || handledEvent === void 0 ? void 0 : handledEvent.decryptedData) {
-            const isSessionReset = handledEvent.decryptedData[conversation_2.GenericMessageType.CLIENT_ACTION] === protocol_messaging_1.ClientAction.RESET_SESSION;
-            if (isSessionReset) {
-                this.logger.debug('A session was reset from a remote device');
-                // If a session reset message was received, we need to count a consumed prekey (because the sender has created a new session from a new prekey)
-                await this.cryptoClient.consumePrekey();
-            }
-        }
-        return handledEvent;
+    async handleOtrMessageAddEvent(event) {
+        return (0, events_1.handleOtrMessageAdd)({
+            event,
+            proteusService: this,
+        });
     }
     async initClient(storeEngine, context) {
         var _a;
@@ -236,6 +229,9 @@ class ProteusService {
             throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error);
         }
     }
+    consumePrekey() {
+        return this.cryptoClient.consumePrekey();
+    }
     deleteSession(userId, clientId) {
         return (0, SessionHandler_1.deleteSession)({
             userId,

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

@@ -48,7 +48,6 @@ const conversation_2 = require("../../../conversation");
 const MessageBuilder_1 = require("../../../conversation/message/MessageBuilder");
 const ProteusService_mocks_1 = require("./ProteusService.mocks");
 const SessionHandler_1 = require("../Utility/SessionHandler");
-const notification_1 = require("../../../notification");
 const event_1 = require("@wireapp/api-client/lib/event");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const errors_1 = require("../../../errors");
@@ -188,14 +187,14 @@ describe('ProteusService', () => {
             expect(result).toBe(expectedFingerprint);
         });
     });
-    describe('handleEvent', () => {
+    describe('handleOtrMessageAddEvent', () => {
         const eventPayload = {
-            event: {
-                type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD,
-                qualified_from: (0, testUtils_1.generateQualifiedId)('domain'),
-                data: { sender: 'client1', text: '' },
-            },
-            source: notification_1.NotificationSource.WEBSOCKET,
+            type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD,
+            qualified_from: (0, testUtils_1.generateQualifiedId)('domain'),
+            data: { sender: 'client1', text: '', recipient: '' },
+            conversation: '',
+            from: '',
+            time: '',
         };
         const decryptedMessage = {};
         it('decrypts incoming proteus encrypted events when session already exists', async () => {
@@ -204,7 +203,7 @@ describe('ProteusService', () => {
             const createSessionSpy = jest.spyOn(cryptoClient, 'sessionFromMessage');
             jest.spyOn(cryptoClient, 'decrypt').mockResolvedValue(new Uint8Array());
             jest.spyOn(protocol_messaging_1.GenericMessage, 'decode').mockReturnValue(decryptedMessage);
-            const result = await proteusService.handleEvent(eventPayload);
+            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);
@@ -216,7 +215,7 @@ describe('ProteusService', () => {
             const createSessionSpy = jest.spyOn(cryptoClient, 'sessionFromMessage').mockResolvedValue(new Uint8Array());
             const decryptSpy = jest.spyOn(cryptoClient, 'decrypt');
             jest.spyOn(protocol_messaging_1.GenericMessage, 'decode').mockReturnValue(decryptedMessage);
-            const result = await proteusService.handleEvent(eventPayload);
+            const result = await proteusService.handleOtrMessageAddEvent(eventPayload);
             expect(result).toBeDefined();
             expect(createSessionSpy).toHaveBeenCalled();
             expect(decryptSpy).not.toHaveBeenCalled();

package/lib/notification/NotificationService.d.ts

@@ -5,10 +5,9 @@ import { APIClient } from '@wireapp/api-client';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { NotificationSource } from './Notifications.types';
+import { ConversationService } from '../conversation';
 import { NotificationError } from '../CoreError';
 import { DecryptionError } from '../errors/DecryptionError';
-import { MLSService } from '../messagingProtocols/mls';
-import { ProteusService } from '../messagingProtocols/proteus';
 import { TypedEventEmitter } from '../util/TypedEventEmitter';
 export type HandledEventPayload = {
     /** the raw event received from backend */
@@ -29,14 +28,13 @@ type Events = {
     [TOPIC.NOTIFICATION_ERROR]: NotificationError;
 };
 export declare class NotificationService extends TypedEventEmitter<Events> {
-    private readonly proteusService;
-    private readonly mlsService?;
+    private readonly conversationService;
     private readonly apiClient;
     private readonly backend;
     private readonly database;
     private readonly logger;
     static readonly TOPIC: typeof TOPIC;
-    constructor(apiClient: APIClient, proteusService: ProteusService, storeEngine: CRUDEngine, mlsService?: MLSService | undefined);
+    constructor(apiClient: APIClient, storeEngine: CRUDEngine, conversationService: ConversationService);
     private getAllNotifications;
     /** Should only be called with a completely new client. */
     initializeNotificationStream(): Promise<string>;
@@ -62,7 +60,6 @@ export declare class NotificationService extends TypedEventEmitter<Events> {
     /**
      * Will process one event
      * @param event The backend event to process
-     * @param source The source of the event (websocket or notication stream)
      * @param dryRun Will not try to decrypt if true
      * @return the decrypted payload and the raw event. Returns `undefined` when the payload is a coreCrypto-only system message
      */

package/lib/notification/NotificationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAqB,MAAM,+BAA+B,CAAC;AAC/E,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAY,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,kEAAkE;IAClE,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,8FAA8F;IAC9F,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,aAAK,KAAK;IACR,kBAAkB,iDAAiD;CACpE;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,KACpC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,KAAK,MAAM,GAAG;IACZ,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;CAC/C,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAY9D,OAAO,CAAC,QAAQ,CAAC,cAAc;IAE/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAb9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IACH,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACH,cAAc,EAAE,cAAc,EAC/C,WAAW,EAAE,UAAU,EACN,UAAU,CAAC,wBAAY;YAQ5B,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,wBAAwB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7C,gBAAgB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAsB/C,qBAAqB;IAItB,yBAAyB,CACpC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,EACvD,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAoC3D;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAYT,kBAAkB,CAC9B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,OAAe,GACtB,cAAc,CAAC,mBAAmB,CAAC;IAmCtC;;;;;;OAMG;YACW,WAAW;CAmC1B"}
+{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAY,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,2BAA2B,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,kEAAkE;IAClE,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,8FAA8F;IAC9F,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,aAAK,KAAK;IACR,kBAAkB,iDAAiD;CACpE;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,KACpC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,KAAK,MAAM,GAAG;IACZ,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;CAC/C,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAa9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAZtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IACH,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,UAAU,EACN,mBAAmB,EAAE,mBAAmB;YAQ7C,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,IAAI,OAAO,CAAC,MAAM,CAAC;IAO/C,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,wBAAwB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7C,gBAAgB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAsB/C,qBAAqB;IAItB,yBAAyB,CACpC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,EACvD,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAoC3D;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAYT,kBAAkB,CAC9B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,OAAe,GACtB,cAAc,CAAC,mBAAmB,CAAC;IAmCtC;;;;;OAKG;YACW,WAAW;CAc1B"}

package/lib/notification/NotificationService.js

@@ -34,7 +34,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationService = void 0;
-const event_1 = require("@wireapp/api-client/lib/event");
 const logdown_1 = __importDefault(require("logdown"));
 const store_engine_1 = require("@wireapp/store-engine");
 const NotificationBackendRepository_1 = require("./NotificationBackendRepository");
@@ -47,10 +46,9 @@ var TOPIC;
     TOPIC["NOTIFICATION_ERROR"] = "NotificationService.TOPIC.NOTIFICATION_ERROR";
 })(TOPIC || (TOPIC = {}));
 class NotificationService extends TypedEventEmitter_1.TypedEventEmitter {
-    constructor(apiClient, proteusService, storeEngine, mlsService) {
+    constructor(apiClient, storeEngine, conversationService) {
         super();
-        this.proteusService = proteusService;
-        this.mlsService = mlsService;
+        this.conversationService = conversationService;
         this.logger = (0, logdown_1.default)('@wireapp/core/NotificationService', {
             logger: console,
             markdown: false,
@@ -163,7 +161,7 @@ class NotificationService extends TypedEventEmitter_1.TypedEventEmitter {
                     continue;
                 }
                 try {
-                    const data = yield __await(this.handleEvent(event, source, dryRun));
+                    const data = yield __await(this.handleEvent(event, dryRun));
                     if (typeof data !== 'undefined') {
                         yield yield __await(data);
                     }
@@ -187,35 +185,18 @@ class NotificationService extends TypedEventEmitter_1.TypedEventEmitter {
     /**
      * Will process one event
      * @param event The backend event to process
-     * @param source The source of the event (websocket or notication stream)
      * @param dryRun Will not try to decrypt if true
      * @return the decrypted payload and the raw event. Returns `undefined` when the payload is a coreCrypto-only system message
      */
-    async handleEvent(event, source, dryRun = false) {
-        var _a, _b;
-        // Handle MLS Events
-        const mlsResult = await ((_a = this.mlsService) === null || _a === void 0 ? void 0 : _a.handleEvent({ event, source, dryRun }));
-        if (mlsResult) {
-            return mlsResult;
+    async handleEvent(event, dryRun = false) {
+        if (dryRun) {
+            // In case of a dry run, we do not want to decrypt messages
+            // We just return the raw event to the caller
+            return { event };
         }
-        const proteusResult = await this.proteusService.handleEvent({
-            event,
-            source,
-            dryRun,
-        });
-        if (proteusResult) {
-            return proteusResult;
-        }
-        // Fallback to other events
-        switch (event.type) {
-            // Meta events
-            case event_1.CONVERSATION_EVENT.MEMBER_JOIN:
-                // As of today (07/07/2022) the backend sends `WELCOME` message to the user's own conversation (not the actual conversation that the welcome should be part of)
-                // So in order to map conversation Ids and groupId together, we need to first fetch the conversation and get the groupId linked to it.
-                const conversation = await this.apiClient.api.conversation.getConversation((_b = event.qualified_conversation) !== null && _b !== void 0 ? _b : { id: event.conversation, domain: '' });
-                if (!conversation) {
-                    throw new Error('no conv');
-                }
+        const conversationEventResult = await this.conversationService.handleEvent(event);
+        if (conversationEventResult) {
+            return conversationEventResult;
         }
         return { event };
     }

package/lib/notification/NotificationService.test.js

@@ -27,15 +27,14 @@ const MOCK_BACKEND = {
     rest: `https://${BASE_URL}`,
     ws: `wss://${BASE_URL}`,
 };
-const mockedMLSService = {};
-const mockedProteusService = {};
+const mockedConversationService = {};
 describe('NotificationService', () => {
     describe('handleEvent', () => {
         it('propagates errors to the outer calling function', async () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
+            const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockImplementation(() => {
                 throw new Error('Test error');
             });
@@ -58,7 +57,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
+            const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
                 .spyOn(notificationService, 'setLastNotificationId')
@@ -76,7 +75,7 @@ describe('NotificationService', () => {
             const storeEngine = new store_engine_1.MemoryEngine();
             await storeEngine.init('NotificationService.test');
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
+            const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
             jest.spyOn(notificationService, 'handleEvent').mockReturnValue({});
             const spySetLastNotificationId = jest
                 .spyOn(notificationService, 'setLastNotificationId')
@@ -94,7 +93,7 @@ describe('NotificationService', () => {
                 const storeEngine = new store_engine_1.MemoryEngine();
                 await storeEngine.init('NotificationService.test');
                 const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-                const notificationService = new _1.NotificationService(apiClient, mockedProteusService, storeEngine, mockedMLSService);
+                const notificationService = new _1.NotificationService(apiClient, storeEngine, mockedConversationService);
                 notificationService.on(_1.NotificationService.TOPIC.NOTIFICATION_ERROR, notificationError => {
                     expect(notificationError.error.message).toBe('Test error');
                     expect(spySetLastNotificationId).toHaveBeenCalledTimes(0);

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "41.2.3",
-  "gitHead": "cf1f74b286a476f66f7bfd7c81020de425a8166b"
+  "version": "41.2.5",
+  "gitHead": "1f1b61d8d7ef5c41c6363c2f8c3978e13b10e147"
 }

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

@@ -1,5 +0,0 @@
-import { EventHandlerParams } from './EventHandler.types';
-import { EventHandlerResult } from '../../common.types';
-declare const handleBackendEvent: (params: EventHandlerParams, onEpochChanged: (groupId: string) => Promise<void>) => EventHandlerResult;
-export { handleBackendEvent };
-//# sourceMappingURL=EventHandler.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"EventHandler.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/EventHandler/EventHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,kBAAkB,WACd,kBAAkB,4BACA,MAAM,KAAK,QAAQ,IAAI,CAAC,uBASnD,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/EventHandler.js

@@ -1,32 +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.handleBackendEvent = void 0;
-const events_1 = require("./events");
-const handleBackendEvent = async (params, onEpochChanged) => {
-    const { event } = params;
-    if ((0, events_1.isWelcomeMessageEvent)(event)) {
-        return (0, events_1.handleWelcomeMessage)(Object.assign(Object.assign({}, params), { event }));
-    }
-    if ((0, events_1.isMLSMessageAddEvent)(event)) {
-        return (0, events_1.handleMLSMessageAdd)(Object.assign(Object.assign({}, params), { event }), onEpochChanged);
-    }
-};
-exports.handleBackendEvent = handleBackendEvent;

package/lib/messagingProtocols/mls/EventHandler/EventHandler.types.d.ts

@@ -1,11 +0,0 @@
-import { BackendEvent } from '@wireapp/api-client/lib/event';
-import { NotificationSource } from '../../../notification';
-import { MLSService } from '../MLSService/MLSService';
-export { BackendEvent };
-export type EventHandlerParams = {
-    mlsService: MLSService;
-    event: BackendEvent;
-    source: NotificationSource;
-    dryRun?: boolean;
-};
-//# sourceMappingURL=EventHandler.types.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/EventHandler.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EventHandler.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/EventHandler/EventHandler.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAC,YAAY,EAAC,CAAC;AAEtB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/EventHandler.types.js

@@ -1,20 +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 });

package/lib/messagingProtocols/mls/EventHandler/index.d.ts

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

package/lib/messagingProtocols/mls/EventHandler/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/EventHandler/index.ts"],"names":[],"mappings":"AAmBA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/index.js

@@ -1,36 +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("./EventHandler.types"), exports);
-__exportStar(require("./EventHandler"), exports);

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.d.ts

@@ -1,5 +0,0 @@
-import { EventHandlerParams } from './EventHandler.types';
-import { EventHandlerResult } from '../../common.types';
-declare const handleBackendEvent: (params: EventHandlerParams) => EventHandlerResult;
-export { handleBackendEvent };
-//# sourceMappingURL=EventHandler.d.ts.map

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EventHandler.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/EventHandler/EventHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,kBAAkB,WAAkB,kBAAkB,uBAK3D,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.js

@@ -1,29 +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.handleBackendEvent = void 0;
-const events_1 = require("./events");
-const handleBackendEvent = async (params) => {
-    const { event } = params;
-    if ((0, events_1.isOtrMessageAddEvent)(event)) {
-        return (0, events_1.handleOtrMessageAdd)(Object.assign(Object.assign({}, params), { event }));
-    }
-};
-exports.handleBackendEvent = handleBackendEvent;

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.types.d.ts

@@ -1,11 +0,0 @@
-import { BackendEvent } from '@wireapp/api-client/lib/event';
-import { QualifiedId } from '@wireapp/api-client/lib/user';
-import { NotificationSource } from '../../../notification';
-export { BackendEvent };
-export type EventHandlerParams = {
-    dryRun?: boolean;
-    event: BackendEvent;
-    source: NotificationSource;
-    decryptMessage: (encryptedPayload: Uint8Array, userId: QualifiedId, clientId: string) => Promise<Uint8Array>;
-};
-//# sourceMappingURL=EventHandler.types.d.ts.map

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EventHandler.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/EventHandler/EventHandler.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAC,YAAY,EAAC,CAAC;AAEtB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,cAAc,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAC9G,CAAC"}

package/lib/messagingProtocols/proteus/EventHandler/EventHandler.types.js

@@ -1,20 +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 });

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.test.d.ts

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

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.test.d.ts.map

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

package/lib/messagingProtocols/proteus/EventHandler/events/otrMessageAdd/otrMessageAdd.test.js

@@ -1,38 +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 event_1 = require("@wireapp/api-client/lib/event");
-const _1 = require(".");
-describe('MLS messageAdd eventHandler', () => {
-    describe('isMessageAdd', () => {
-        it('returns true for a messageAdd event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD,
-            };
-            expect((0, _1.isOtrMessageAddEvent)(event)).toBe(true);
-        });
-        it('returns false for a non-messageAdd event', () => {
-            const event = {
-                type: event_1.CONVERSATION_EVENT.MEMBER_JOIN,
-            };
-            expect((0, _1.isOtrMessageAddEvent)(event)).toBe(false);
-        });
-    });
-});

package/lib/messagingProtocols/proteus/EventHandler/index.d.ts

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

package/lib/messagingProtocols/proteus/EventHandler/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/EventHandler/index.ts"],"names":[],"mappings":"AAmBA,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC"}

package/lib/messagingProtocols/proteus/EventHandler/index.js

@@ -1,36 +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("./EventHandler.types"), exports);
-__exportStar(require("./EventHandler"), exports);