@wireapp/core 46.29.4 → 46.30.0

package/lib/Account.d.ts

@@ -1,6 +1,8 @@
 import { RegisterData, Context, Cookie, LoginData } from '@wireapp/api-client/lib/auth';
-import { ClientType, RegisteredClient } from '@wireapp/api-client/lib/client/';
+import { ClientCapability, ClientType, RegisteredClient } from '@wireapp/api-client/lib/client/';
 import * as Events from '@wireapp/api-client/lib/event';
+import { Notification } from '@wireapp/api-client/lib/notification/';
+import { ConsumableNotification } from '@wireapp/api-client/lib/notification/ConsumableNotification';
 import { APIClient, BackendFeatures } from '@wireapp/api-client';
 import { TypedEventEmitter } from '@wireapp/commons';
 import { CRUDEngine } from '@wireapp/store-engine';
@@ -65,6 +67,12 @@ export declare enum EVENTS {
 type Events = {
     [EVENTS.NEW_SESSION]: NewClient;
 };
+export declare const AccountLocalStorageStore: {
+    get: (key: string) => string | undefined;
+    add: (key: string, value: string) => void;
+    remove: (key: string) => void;
+    has: (key: string) => boolean;
+};
 export declare class Account extends TypedEventEmitter<Events> {
     private options;
     private readonly apiClient;
@@ -75,6 +83,9 @@ export declare class Account extends TypedEventEmitter<Events> {
     private db?;
     private encryptedDb?;
     private coreCallbacks?;
+    private totalPendingNotifications;
+    private remainingNotifications;
+    private connectionState;
     service?: {
         mls?: MLSService;
         e2eIdentity?: E2EIServiceExternal;
@@ -157,7 +168,7 @@ export declare class Account extends TypedEventEmitter<Events> {
     registerClient(loginData: LoginData, clientInfo?: ClientInfo, 
     /** will add extra manual entropy to the client's identity being created */
     entropyData?: Uint8Array): Promise<RegisteredClient>;
-    getLocalClient(): Promise<RegisteredClient | undefined> | undefined;
+    getLocalClient(): Promise<import("./client/ClientService").MetaClient | undefined> | undefined;
     /**
      * Will initiate all the cryptographic material of the given registered device and setup all the background tasks.
      *
@@ -204,7 +215,7 @@ export declare class Account extends TypedEventEmitter<Events> {
      * @param callbacks callbacks that will be called to handle different events
      * @returns close a function that will disconnect from the websocket
      */
-    listen({ onEvent, onConnectionStateChanged, onNotificationStreamProgress, onMissedNotifications, dryRun, }?: {
+    listen({ onEvent, onConnectionStateChanged: onConnectionStateChangedCallBack, onNotificationStreamProgress, onMissedNotifications, dryRun, }?: {
         /**
          * Called when a new event arrives from backend
          * @param payload the payload of the event. Contains the raw event received and the decrypted data (if event was encrypted)
@@ -234,7 +245,62 @@ export declare class Account extends TypedEventEmitter<Events> {
          * When set will not decrypt and not store the last notification ID. This is useful if you only want to subscribe to unencrypted backend events
          */
         dryRun?: boolean;
-    }): () => void;
+    }): Promise<() => void>;
+    private createConnectionStateChangedHandler;
+    /**
+     * Creates the event handler that is invoked for each decrypted event from the backend.
+     * Responsible for handling specific event types like `MESSAGE_TIMER_UPDATE`, and then
+     * forwarding the event to the consumer via the `onEvent` callback.
+     */
+    private createEventHandler;
+    private createLegacyNotificationHandler;
+    private createNotificationHandler;
+    /**
+     * Returns a function to handle missed notifications — i.e., when the backend indicates
+     * that some notifications were lost due to age (typically >28 days).
+     * Also handles MLS-specific epoch mismatch recovery by triggering a conversation rejoin.
+     */
+    private createLegacyMissedNotificationsHandler;
+    /**
+     * Returns a processor function for the notification stream (legacy sync).
+     * It pauses message sending and MLS rejoining during stream handling to prevent race conditions,
+     * then resumes normal operations after sync is complete.
+     *
+     * @param handlers Various logic handlers wired to notification callbacks
+     */
+    private createLegacyNotificationStreamProcessor;
+    /**
+     * Sets up WebSocket event listeners for:
+     * - Incoming backend messages
+     * - WebSocket state changes
+     * On each new backend message, we pass it to the  notification handler.
+     * On state changes, we map raw socket states to public connection states and emit them.
+     */
+    private setupWebSocketListeners;
+    /**
+     * Handles logic for reacting to a missed notification event.
+     *
+     * The backend sends a special "missed notification" signal if it detects
+     * that the client has missed one or more notifications. Once this signal is sent,
+     * the backend will **stop sending all further notifications** until the client
+     * acknowledges the missed state.
+     *
+     * Because our app currently lacks functionality to perform a full real-time sync
+     * while running, we must reload the application to re-fetch the entire state.
+     *
+     * On first detection of the missed notification:
+     * - We set a local storage flag (`has_missing_notification`) to mark that we've
+     *   entered this state.
+     * - We reload the application so the state can be re-fetched from scratch.
+     *
+     * On the next load:
+     * - If the flag is already present, we acknowledge the missed notification via
+     * the WebSocket transport, unblocking the backend so it resumes sending updates
+     * then we remove the flag.
+     */
+    private reactToMissedNotification;
+    getClientCapabilities(): ClientCapability[];
+    checkIsConsumable(notification: Notification | ConsumableNotification): notification is ConsumableNotification;
     private generateDbName;
     private generateCoreDbName;
     private generateEncryptedDbName;

package/lib/Account.d.ts.map

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

package/lib/Account.js

@@ -41,10 +41,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Account = exports.EVENTS = exports.ConnectionState = void 0;
+exports.Account = exports.AccountLocalStorageStore = exports.EVENTS = exports.ConnectionState = void 0;
 const auth_1 = require("@wireapp/api-client/lib/auth");
 const client_1 = require("@wireapp/api-client/lib/client/");
 const event_1 = require("@wireapp/api-client/lib/event");
+const ConsumableNotification_1 = require("@wireapp/api-client/lib/notification/ConsumableNotification");
 const tcp_1 = require("@wireapp/api-client/lib/tcp/");
 const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/ReconnectingWebsocket");
 const team_1 = require("@wireapp/api-client/lib/team");
@@ -76,6 +77,7 @@ const self_1 = require("./self/");
 const CoreDB_1 = require("./storage/CoreDB");
 const team_2 = require("./team/");
 const user_1 = require("./user/");
+const LocalStorageStore_1 = require("./util/LocalStorageStore");
 const RecurringTaskScheduler_1 = require("./util/RecurringTaskScheduler");
 var ConnectionState;
 (function (ConnectionState) {
@@ -101,6 +103,7 @@ var EVENTS;
      */
     EVENTS["NEW_SESSION"] = "new_session";
 })(EVENTS || (exports.EVENTS = EVENTS = {}));
+exports.AccountLocalStorageStore = (0, LocalStorageStore_1.LocalStorageStore)('core_account');
 class Account extends commons_1.TypedEventEmitter {
     options;
     apiClient;
@@ -111,6 +114,9 @@ class Account extends commons_1.TypedEventEmitter {
     db;
     encryptedDb;
     coreCallbacks;
+    totalPendingNotifications = 0;
+    remainingNotifications = 0;
+    connectionState = ConnectionState.CLOSED;
     service;
     backendFeatures;
     recurringTaskScheduler;
@@ -419,11 +425,64 @@ class Account extends commons_1.TypedEventEmitter {
      * @param callbacks callbacks that will be called to handle different events
      * @returns close a function that will disconnect from the websocket
      */
-    listen({ onEvent = () => { }, onConnectionStateChanged = () => { }, onNotificationStreamProgress = () => { }, onMissedNotifications = () => { }, dryRun = false, } = {}) {
+    async listen({ onEvent = () => { }, onConnectionStateChanged: onConnectionStateChangedCallBack = () => { }, onNotificationStreamProgress = () => { }, onMissedNotifications = () => { }, dryRun = false, } = {}) {
         if (!this.currentClient) {
             throw new Error('Client has not been initialized - please login first');
         }
-        const handleEvent = async (payload, source) => {
+        const onConnectionStateChanged = this.createConnectionStateChangedHandler(onConnectionStateChangedCallBack);
+        const handleEvent = this.createEventHandler(onEvent);
+        const handleLegacyNotification = this.createLegacyNotificationHandler(handleEvent, dryRun);
+        const handleNotification = this.createNotificationHandler(handleEvent, onNotificationStreamProgress, onConnectionStateChanged, dryRun);
+        const handleMissedNotifications = this.createLegacyMissedNotificationsHandler(onMissedNotifications);
+        const processNotificationStream = this.createLegacyNotificationStreamProcessor({
+            handleLegacyNotification,
+            handleMissedNotifications,
+            onNotificationStreamProgress,
+            onConnectionStateChanged,
+        });
+        this.setupWebSocketListeners(handleNotification, onConnectionStateChanged);
+        const isClientCapableOfConsumableNotifications = this.getClientCapabilities().includes(client_1.ClientCapability.CONSUMABLE_NOTIFICATIONS);
+        /*
+         * When enabling async notifications, be aware that the backend maintains a separate queue
+         * for new async notifications (/events weboscket endpoint), which only starts populating *after* the client declares support
+         * for async notifications.
+         *
+         * Therefore, after declaring support, it's necessary to perform one final fetch from the legacy
+         * system to ensure no notifications are missed—since older notifications won't
+         * appear in the new queue.
+         *
+         * These two systems are separate, and the transition timing
+         * is important to avoid missing any messages during the switch.
+         */
+        if (!isClientCapableOfConsumableNotifications) {
+            // let the backend now client is capable of consumable notifications
+            await this.service?.client.putClientCapabilities(this.currentClient.id, {
+                capabilities: [client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT, client_1.ClientCapability.CONSUMABLE_NOTIFICATIONS],
+            });
+            // do a quick legacy sync without connecting to any websockets
+            await processNotificationStream();
+        }
+        this.apiClient.connect();
+        return () => {
+            this.apiClient.disconnect();
+            onConnectionStateChanged(ConnectionState.CLOSED);
+            this.apiClient.transport.ws.removeAllListeners();
+        };
+    }
+    createConnectionStateChangedHandler(onConnectionStateChanged) {
+        return (state) => {
+            this.connectionState = state;
+            onConnectionStateChanged(state);
+            this.logger.info(`Connection state changed to: ${state}`);
+        };
+    }
+    /**
+     * Creates the event handler that is invoked for each decrypted event from the backend.
+     * Responsible for handling specific event types like `MESSAGE_TIMER_UPDATE`, and then
+     * forwarding the event to the consumer via the `onEvent` callback.
+     */
+    createEventHandler(onEvent) {
+        return async (payload, source) => {
             const { event } = payload;
             switch (event?.type) {
                 case event_1.CONVERSATION_EVENT.MESSAGE_TIMER_UPDATE: {
@@ -433,9 +492,12 @@ class Account extends commons_1.TypedEventEmitter {
                     break;
                 }
             }
-            await onEvent(payload, source);
+            // Always forward the event to the consumer
+            onEvent(payload, source);
         };
-        const handleNotification = async (notification, source) => {
+    }
+    createLegacyNotificationHandler(handleEvent, dryRun) {
+        return async (notification, source) => {
             try {
                 const messages = this.service.notification.handleNotification(notification, source, dryRun);
                 for await (const message of messages) {
@@ -443,58 +505,153 @@ class Account extends commons_1.TypedEventEmitter {
                 }
             }
             catch (error) {
-                this.logger.error(`Failed to handle notification ID "${notification.id}": ${error.message}`, error);
+                this.logger.error(`Failed to handle legacy notification "${notification.id}": ${error.message}`, error);
             }
         };
-        this.apiClient.transport.ws.removeAllListeners(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE);
-        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE, notification => handleNotification(notification, notification_1.NotificationSource.WEBSOCKET));
-        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_STATE_CHANGE, wsState => {
-            const mapping = {
-                [ReconnectingWebsocket_1.WEBSOCKET_STATE.CLOSED]: ConnectionState.CLOSED,
-                [ReconnectingWebsocket_1.WEBSOCKET_STATE.CONNECTING]: ConnectionState.CONNECTING,
-            };
-            const connectionState = mapping[wsState];
-            if (connectionState) {
-                onConnectionStateChanged(connectionState);
+    }
+    createNotificationHandler(handleEvent, onNotificationStreamProgress, onConnectionStateChanged, dryRun) {
+        return async (notification, source) => {
+            try {
+                if (notification.type === ConsumableNotification_1.ConsumableEvent.MISSED) {
+                    this.reactToMissedNotification();
+                    return;
+                }
+                if (notification.type === ConsumableNotification_1.ConsumableEvent.MESSAGE_COUNT) {
+                    const { data: { count }, } = notification;
+                    onNotificationStreamProgress({ total: count, done: 0 });
+                    this.totalPendingNotifications = count;
+                    this.remainingNotifications = 0;
+                    this.apiClient.transport.ws.acknowledgeMessageCountNotification();
+                    (0, messageSender_1.pauseMessageSending)();
+                    onConnectionStateChanged(ConnectionState.PROCESSING_NOTIFICATIONS);
+                    if (count === 0) {
+                        (0, messageSender_1.resumeMessageSending)();
+                        onConnectionStateChanged(ConnectionState.LIVE);
+                    }
+                    return;
+                }
+                const event = notification.data.event;
+                const messages = this.service.notification.handleNotification(event, source, dryRun);
+                if (this.connectionState !== ConnectionState.LIVE) {
+                    this.remainingNotifications++;
+                    onNotificationStreamProgress({
+                        done: this.remainingNotifications,
+                        total: this.totalPendingNotifications,
+                    });
+                }
+                this.apiClient.transport.ws.acknowledgeNotification(notification);
+                for await (const message of messages) {
+                    await handleEvent(message, source);
+                }
+                if (this.totalPendingNotifications === this.remainingNotifications &&
+                    this.connectionState !== ConnectionState.LIVE) {
+                    (0, messageSender_1.resumeMessageSending)();
+                    onConnectionStateChanged(ConnectionState.LIVE);
+                }
             }
-        });
-        const handleMissedNotifications = async (notificationId) => {
+            catch (error) {
+                this.logger.error(`Failed to handle consumable notification "${notification.type}": ${error.message}`, error);
+            }
+        };
+    }
+    /**
+     * Returns a function to handle missed notifications — i.e., when the backend indicates
+     * that some notifications were lost due to age (typically >28 days).
+     * Also handles MLS-specific epoch mismatch recovery by triggering a conversation rejoin.
+     */
+    createLegacyMissedNotificationsHandler(onMissedNotifications) {
+        return async (notificationId) => {
             if (this.hasMLSDevice) {
                 (0, conversationRejoinQueue_1.queueConversationRejoin)('all-conversations', () => this.service.conversation.handleConversationsEpochMismatch());
             }
             return onMissedNotifications(notificationId);
         };
-        const processNotificationStream = async (abortHandler) => {
-            // Lock websocket in order to buffer any message that arrives while we handle the notification stream
-            this.apiClient.transport.ws.lock();
+    }
+    /**
+     * Returns a processor function for the notification stream (legacy sync).
+     * It pauses message sending and MLS rejoining during stream handling to prevent race conditions,
+     * then resumes normal operations after sync is complete.
+     *
+     * @param handlers Various logic handlers wired to notification callbacks
+     */
+    createLegacyNotificationStreamProcessor({ handleLegacyNotification, handleMissedNotifications, onNotificationStreamProgress, onConnectionStateChanged, }) {
+        return async () => {
             (0, messageSender_1.pauseMessageSending)();
             // We want to avoid triggering rejoins of out-of-sync MLS conversations while we are processing the notification stream
             (0, conversationRejoinQueue_1.pauseRejoiningMLSConversations)();
             onConnectionStateChanged(ConnectionState.PROCESSING_NOTIFICATIONS);
             const results = await this.service.notification.processNotificationStream(async (notification, source, progress) => {
-                await handleNotification(notification, source);
+                await handleLegacyNotification(notification, source);
                 onNotificationStreamProgress(progress);
-            }, handleMissedNotifications, abortHandler);
-            this.logger.info('Finished processing notifications', results);
-            if (abortHandler.signal.aborted) {
-                this.logger.warn('Ending connection process as websocket was closed');
-                return;
-            }
-            onConnectionStateChanged(ConnectionState.LIVE);
-            // We can now unlock the websocket and let the new messages being handled and decrypted
-            this.apiClient.transport.ws.unlock();
+            }, handleMissedNotifications);
+            this.logger.info('Finished processing notifications from the legacy endpoint', results);
             // We need to wait for the notification stream to be fully handled before releasing the message sending queue.
             // This is due to the nature of how message are encrypted, any change in mls epoch needs to happen before we start encrypting any kind of messages
             this.logger.info(`Resuming message sending. ${(0, messageSender_1.getQueueLength)()} messages to be sent`);
             (0, messageSender_1.resumeMessageSending)();
             (0, conversationRejoinQueue_1.resumeRejoiningMLSConversations)();
+            onConnectionStateChanged(ConnectionState.LIVE);
         };
-        this.apiClient.connect(processNotificationStream);
-        return () => {
-            this.apiClient.disconnect();
-            onConnectionStateChanged(ConnectionState.CLOSED);
-            this.apiClient.transport.ws.removeAllListeners();
-        };
+    }
+    /**
+     * Sets up WebSocket event listeners for:
+     * - Incoming backend messages
+     * - WebSocket state changes
+     * On each new backend message, we pass it to the  notification handler.
+     * On state changes, we map raw socket states to public connection states and emit them.
+     */
+    setupWebSocketListeners(handleNotification, onConnectionStateChanged) {
+        this.apiClient.transport.ws.removeAllListeners(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE);
+        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE, notification => handleNotification(notification, notification_1.NotificationSource.WEBSOCKET));
+        this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_STATE_CHANGE, wsState => {
+            const mapping = {
+                [ReconnectingWebsocket_1.WEBSOCKET_STATE.CLOSED]: ConnectionState.CLOSED,
+                [ReconnectingWebsocket_1.WEBSOCKET_STATE.CONNECTING]: ConnectionState.CONNECTING,
+            };
+            const connectionState = mapping[wsState];
+            if (connectionState) {
+                onConnectionStateChanged(connectionState);
+            }
+        });
+    }
+    /**
+     * Handles logic for reacting to a missed notification event.
+     *
+     * The backend sends a special "missed notification" signal if it detects
+     * that the client has missed one or more notifications. Once this signal is sent,
+     * the backend will **stop sending all further notifications** until the client
+     * acknowledges the missed state.
+     *
+     * Because our app currently lacks functionality to perform a full real-time sync
+     * while running, we must reload the application to re-fetch the entire state.
+     *
+     * On first detection of the missed notification:
+     * - We set a local storage flag (`has_missing_notification`) to mark that we've
+     *   entered this state.
+     * - We reload the application so the state can be re-fetched from scratch.
+     *
+     * On the next load:
+     * - If the flag is already present, we acknowledge the missed notification via
+     * the WebSocket transport, unblocking the backend so it resumes sending updates
+     * then we remove the flag.
+     */
+    reactToMissedNotification() {
+        const localStorageKey = 'has_missing_notification';
+        // First-time handling: set flag and reload to trigger full re-fetch of state.
+        if (!exports.AccountLocalStorageStore.has(localStorageKey)) {
+            exports.AccountLocalStorageStore.add(localStorageKey, 'true');
+            window.location.reload();
+            return;
+        }
+        // After reload: acknowledge the missed notification so backend resumes notifications.
+        this.apiClient.transport.ws.acknowledgeMissedNotification();
+        exports.AccountLocalStorageStore.remove(localStorageKey);
+    }
+    getClientCapabilities() {
+        return this.currentClient?.capabilities || [];
+    }
+    checkIsConsumable(notification) {
+        return 'type' in notification;
     }
     generateDbName(context) {
         const clientType = context.clientType === client_1.ClientType.NONE ? '' : `@${context.clientType}`;

package/lib/Account.test.js

@@ -44,11 +44,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const auth_1 = require("@wireapp/api-client/lib/auth");
 const client_1 = require("@wireapp/api-client/lib/client");
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
-const event_1 = require("@wireapp/api-client/lib/event");
 const http_1 = require("@wireapp/api-client/lib/http");
 const notification_1 = require("@wireapp/api-client/lib/notification");
+const ConsumableNotification_1 = require("@wireapp/api-client/lib/notification/ConsumableNotification");
 const self_1 = require("@wireapp/api-client/lib/self");
-const tcp_1 = require("@wireapp/api-client/lib/tcp");
 const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/ReconnectingWebsocket");
 const http_status_codes_1 = require("http-status-codes");
 const jest_websocket_mock_1 = require("jest-websocket-mock");
@@ -105,6 +104,8 @@ describe('Account', () => {
         token_type: 'Bearer',
         user: 'aaf9a833-ef30-4c22-86a0-9adc8a15b3b4',
     };
+    const BACKEND_VERSION = 8;
+    const websocketServerAddress = `${MOCK_BACKEND.ws}/v${BACKEND_VERSION}/events?access_token=${accessTokenData.access_token}`;
     beforeEach(() => {
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .post(auth_1.AuthAPI.URL.LOGIN, body => body.email && body.password)
@@ -134,6 +135,14 @@ describe('Account', () => {
             .get(`${notification_1.NotificationAPI.URL.NOTIFICATION}/${notification_1.NotificationAPI.URL.LAST}`)
             .query({ client: CLIENT_ID })
             .reply(http_status_codes_1.StatusCodes.OK, {});
+        (0, nock_1.default)(MOCK_BACKEND.rest)
+            .get(`/api-version`)
+            .reply(http_status_codes_1.StatusCodes.OK, {
+            supported: [BACKEND_VERSION],
+            federation: false,
+            development: [BACKEND_VERSION + 1],
+            domain: 'zinfra.io',
+        });
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .get(notification_1.NotificationAPI.URL.NOTIFICATION)
             .query({ client: CLIENT_ID, size: 10000 })
@@ -142,6 +151,11 @@ describe('Account', () => {
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .get(client_1.ClientAPI.URL.CLIENTS)
             .reply(http_status_codes_1.StatusCodes.OK, [{ id: CLIENT_ID }]);
+        (0, nock_1.default)(MOCK_BACKEND.rest)
+            .put(/\/clients\/[\w-]+$/, {
+            capabilities: ['legalhold-implicit-consent', 'consumable-notifications'],
+        })
+            .reply(http_status_codes_1.StatusCodes.OK);
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .get(self_1.SelfAPI.URL.SELF)
             .reply(http_status_codes_1.StatusCodes.OK, {
@@ -163,6 +177,7 @@ describe('Account', () => {
         (0, nock_1.cleanAll)();
     });
     const currentClient = {
+        capabilities: [],
         id: CLIENT_ID,
         cookie: '',
         time: '',
@@ -218,35 +233,9 @@ describe('Account', () => {
             }
         });
     });
-    it('emits text messages', () => {
-        return new Promise(async (resolve) => {
-            const { account, apiClient } = await createAccount();
-            await account.login({
-                clientType: client_1.ClientType.TEMPORARY,
-                email: 'hello@example.com',
-                password: 'my-secret',
-            });
-            account['currentClient'] = currentClient;
-            jest.spyOn(apiClient, 'connect').mockImplementation();
-            jest.spyOn(account.service.notification, 'handleEvent').mockReturnValue({
-                status: 'handled',
-                payload: {
-                    event: { type: event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD },
-                },
-            });
-            const kill = account.listen({
-                onEvent: ({ event }) => {
-                    expect(event.type).toBe(event_1.CONVERSATION_EVENT.OTR_MESSAGE_ADD);
-                    resolve();
-                },
-            });
-            apiClient.transport.ws.emit(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE, { payload: [{}] });
-            kill();
-        });
-    });
     describe('Websocket connection', () => {
-        let server;
         let dependencies;
+        let server;
         const mockNotifications = (size) => {
             const notifications = Array.from(new Array(size)).map(() => ({
                 id: (0, uuid_1.v4)(),
@@ -267,12 +256,12 @@ describe('Account', () => {
                 return callback();
             };
         };
-        beforeEach(() => {
-            server = new jest_websocket_mock_1.WS(`${MOCK_BACKEND.ws}/await?access_token=${accessTokenData.access_token}`);
+        beforeAll(() => {
             // Forces the reconnecting websocket not to automatically reconnect (to avoid infinitely hanging tests)
             ReconnectingWebsocket_1.ReconnectingWebsocket['RECONNECTING_OPTIONS'].maxRetries = 0;
         });
         beforeEach(async () => {
+            server = new jest_websocket_mock_1.WS(websocketServerAddress); // isolate per test
             dependencies = await createAccount();
             const { account } = dependencies;
             await account.login({
@@ -287,46 +276,40 @@ describe('Account', () => {
             jest
                 .spyOn(dependencies.account.service.notification['database'], 'getLastNotificationId')
                 .mockResolvedValue('0');
+            await account.useAPIVersion(BACKEND_VERSION, BACKEND_VERSION);
         });
         afterEach(() => {
-            server.close();
+            server.close(); // ensure server shutdown
+            jest_websocket_mock_1.WS.clean();
         });
         describe('listen', () => {
-            it('warns consumer of the connection state', async () => {
-                return new Promise(async (resolve) => {
-                    const expectedConnectionStates = [
-                        Account_1.ConnectionState.CONNECTING,
-                        Account_1.ConnectionState.PROCESSING_NOTIFICATIONS,
-                        Account_1.ConnectionState.LIVE,
-                        Account_1.ConnectionState.CLOSED,
-                    ];
-                    const disconnect = dependencies.account.listen({
-                        onConnectionStateChanged: state => {
-                            expect(state).toBe(expectedConnectionStates.splice(0, 1)[0]);
-                            switch (state) {
-                                case Account_1.ConnectionState.LIVE:
-                                    // We socket is live we disconnect before ending the test
-                                    disconnect();
-                                    break;
-                                case Account_1.ConnectionState.CLOSED:
-                                    resolve();
-                            }
-                        },
-                    });
-                });
-            });
-            it('processes notification stream upon connection', async () => {
+            it('connects to websocket after the notification stream has been processed', async () => {
+                jest
+                    .spyOn(dependencies.account, 'getClientCapabilities')
+                    .mockReturnValue([client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT]);
                 return new Promise(async (resolve) => {
                     const nbNotifications = 10;
                     const onNotificationStreamProgress = jest.fn();
-                    const onEvent = jest.fn();
+                    const onEvent = jest.fn().mockImplementation(() => { });
                     mockNotifications(nbNotifications);
-                    const disconnect = dependencies.account.listen({
-                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, () => {
+                    await dependencies.account.listen({
+                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, async () => {
                             expect(onNotificationStreamProgress).toHaveBeenCalledTimes(nbNotifications);
                             expect(onEvent).toHaveBeenCalledTimes(nbNotifications);
                             expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                            disconnect();
+                            expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
+                            onEvent.mockReset();
+                            await server.connected;
+                            jest
+                                .spyOn(dependencies.account.service.notification, 'handleNotification')
+                                .mockReturnValue([{ event: { testData: 1 } }]);
+                            server.send(JSON.stringify({
+                                type: ConsumableNotification_1.ConsumableEvent.EVENT,
+                                data: { delivery_tag: 1000, event: { id: (0, uuid_1.v4)(), payload: [] } },
+                            }));
+                            await waitFor(() => expect(onEvent).toHaveBeenCalledTimes(1));
+                            expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
+                            expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
                             resolve();
                         }),
                         onEvent: onEvent,
@@ -334,24 +317,39 @@ describe('Account', () => {
                     });
                 });
             });
-            it('fowards events from websocket to consumer after the notification stream has been processed', async () => {
+            it('warns consumer of the connection state', async () => {
+                await new Promise(async (resolve) => {
+                    mockNotifications(10);
+                    const onConnectionStateChanged = jest.fn().mockImplementation((state) => {
+                        switch (state) {
+                            case Account_1.ConnectionState.LIVE:
+                                break;
+                            case Account_1.ConnectionState.CLOSED:
+                                // Expect all states to have been called in order
+                                expect(onConnectionStateChanged).toHaveBeenNthCalledWith(1, Account_1.ConnectionState.PROCESSING_NOTIFICATIONS);
+                                expect(onConnectionStateChanged).toHaveBeenNthCalledWith(2, Account_1.ConnectionState.LIVE);
+                                resolve();
+                                break;
+                        }
+                    });
+                    const disconnect = await dependencies.account.listen({
+                        onConnectionStateChanged,
+                    });
+                    await waitFor(() => expect(onConnectionStateChanged).toHaveBeenCalledWith(Account_1.ConnectionState.PROCESSING_NOTIFICATIONS));
+                    disconnect();
+                });
+            });
+            it('processes notification stream upon connection', async () => {
                 return new Promise(async (resolve) => {
                     const nbNotifications = 10;
                     const onNotificationStreamProgress = jest.fn();
                     const onEvent = jest.fn();
                     mockNotifications(nbNotifications);
-                    const disconnect = dependencies.account.listen({
-                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, async () => {
+                    await dependencies.account.listen({
+                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, () => {
                             expect(onNotificationStreamProgress).toHaveBeenCalledTimes(nbNotifications);
                             expect(onEvent).toHaveBeenCalledTimes(nbNotifications);
                             expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                            expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
-                            onEvent.mockReset();
-                            server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
-                            await waitFor(() => expect(onEvent).toHaveBeenCalledTimes(1));
-                            expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                            expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
-                            disconnect();
                             resolve();
                         }),
                         onEvent: onEvent,
@@ -359,61 +357,27 @@ describe('Account', () => {
                     });
                 });
             });
-            it('locks the websocket and waits for notification stream to be processed before sending websocket events', async () => {
-                const nbNotifications = 10;
-                const onNotificationStreamProgress = jest.fn();
-                const onEvent = jest.fn();
-                mockNotifications(nbNotifications);
-                return new Promise(async (resolve) => {
-                    const disconnect = dependencies.account.listen({
-                        onConnectionStateChanged: async (state) => {
-                            switch (state) {
-                                case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
-                                    // sending a message as soon as the notificaiton stream starts to process
-                                    // This message should only be forwarded once the notification stream is fully processed
-                                    server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
-                                    break;
-                                case Account_1.ConnectionState.LIVE:
-                                    expect(onNotificationStreamProgress).toHaveBeenCalledTimes(nbNotifications);
-                                    expect(onEvent).toHaveBeenCalledTimes(nbNotifications);
-                                    expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                                    expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
-                                    onEvent.mockReset();
-                                    await waitFor(() => expect(onEvent).toHaveBeenCalledTimes(1));
-                                    expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                                    expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
-                                    disconnect();
-                                    resolve();
-                            }
-                        },
-                        onEvent: onEvent,
-                        onNotificationStreamProgress: onNotificationStreamProgress,
-                    });
-                });
-            });
-            it('does not unlock the websocket if the connection was aborted', async () => {
+            it('does not stop proccessing messages if websocket connection is aborted', async () => {
+                jest
+                    .spyOn(dependencies.account, 'getClientCapabilities')
+                    .mockReturnValue([client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT]);
                 const nbNotifications = 10;
                 const onNotificationStreamProgress = jest
                     .fn()
                     .mockImplementationOnce(() => { })
-                    .mockImplementationOnce(() => server.close());
+                    .mockImplementationOnce(() => {
+                    // abort websocket connection after the second notification is processeed
+                    server.close();
+                });
                 const onEvent = jest.fn();
                 mockNotifications(nbNotifications);
-                return new Promise(async (resolve, reject) => {
-                    dependencies.account.listen({
+                return new Promise(async (resolve) => {
+                    return dependencies.account.listen({
                         onConnectionStateChanged: async (state) => {
                             switch (state) {
-                                case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
-                                    // sending a message as soon as the notificaiton stream starts to process
-                                    // This message should only be forwarded once the notification stream is fully processed
-                                    server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
-                                    break;
                                 case Account_1.ConnectionState.LIVE:
-                                    reject(new Error());
-                                    throw new Error('should not go to `live` state');
-                                case Account_1.ConnectionState.CLOSED:
-                                    expect(onNotificationStreamProgress).toHaveBeenCalledTimes(2);
-                                    expect(onEvent).toHaveBeenCalledTimes(2);
+                                    expect(onNotificationStreamProgress).toHaveBeenCalledTimes(10);
+                                    expect(onEvent).toHaveBeenCalledTimes(10);
                                     expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
                                     expect(dependencies.account.service.notification.handleNotification).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
                                     resolve();
@@ -424,35 +388,6 @@ describe('Account', () => {
                     });
                 });
             });
-            it('cancels notification stream process if socket is disconnected', () => {
-                const nbNotifications = 10;
-                const onNotificationStreamProgress = jest.fn();
-                const onEvent = jest
-                    .fn()
-                    .mockImplementationOnce(() => { })
-                    .mockImplementationOnce(() => {
-                    // on second message, we kill the websocket
-                    server.close();
-                });
-                mockNotifications(nbNotifications);
-                return new Promise(resolve => {
-                    dependencies.account.listen({
-                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.CLOSED, () => {
-                            try {
-                                expect(onNotificationStreamProgress).toHaveBeenCalledTimes(1);
-                                expect(onEvent).toHaveBeenCalledTimes(2);
-                                expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
-                            }
-                            catch (error) {
-                                throw error;
-                            }
-                            resolve();
-                        }, 1),
-                        onEvent: onEvent,
-                        onNotificationStreamProgress: onNotificationStreamProgress,
-                    });
-                });
-            });
         });
     });
 });

package/lib/client/ClientService.d.ts

@@ -1,5 +1,5 @@
 import { LoginData } from '@wireapp/api-client/lib/auth/';
-import { RegisteredClient } from '@wireapp/api-client/lib/client/';
+import { ClientCapabilityData, RegisteredClient } from '@wireapp/api-client/lib/client/';
 import { APIClient } from '@wireapp/api-client';
 import { CRUDEngine } from '@wireapp/store-engine';
 import type { ProteusService } from '../messagingProtocols/proteus';
@@ -45,8 +45,9 @@ export declare class ClientService {
      *
      * @return the loaded client or undefined
      */
-    loadClient(): Promise<RegisteredClient | undefined>;
+    loadClient(): Promise<MetaClient | undefined>;
     private createLocalClient;
+    putClientCapabilities(clientId: string, capabilities: ClientCapabilityData): Promise<void>;
     /**
      * Will download all the clients of the self user (excluding the current client) and will store them in the database
      * @param currentClient - the id of the current client (to be excluded from the list)

package/lib/client/ClientService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientService.d.ts","sourceRoot":"","sources":["../../src/client/ClientService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAoD,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AAKpH,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,2DAA2D,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAoD,MAAM,IAAI,CAAC;AAEjF,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,qBAAa,aAAa;IAMtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAP9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;gBAGpD,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,UAAU;IAMnC,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIhD;;;;;;;OAOG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhF;;;OAGG;IACU,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAcpD,cAAc;IAQ5B;;;;;;;OAOG;IACU,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAyBhE,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACU,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAUhE,QAAQ,CACnB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,EAAC,OAAO,EAAE,UAAU,EAAC,EAAE,cAAc,GACpC,OAAO,CAAC,gBAAgB,CAAC;CA6B7B"}
+{"version":3,"file":"ClientService.d.ts","sourceRoot":"","sources":["../../src/client/ClientService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAEL,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iCAAiC,CAAC;AAKzC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,2DAA2D,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAoD,MAAM,IAAI,CAAC;AAEjF,MAAM,WAAW,UAAW,SAAQ,gBAAgB;IAClD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACJ,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,qBAAa,aAAa;IAMtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAP9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA2B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0B;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;gBAGpD,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,UAAU;IAMnC,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAIhD;;;;;;;OAOG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhF;;;OAGG;IACU,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAcpD,cAAc;IAQ5B;;;;;;;OAOG;IACU,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAyB1D,OAAO,CAAC,iBAAiB;IAIlB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjG;;;OAGG;IACU,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAUhE,QAAQ,CACnB,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,EAAC,OAAO,EAAE,UAAU,EAAC,EAAE,cAAc,GACpC,OAAO,CAAC,gBAAgB,CAAC;CA6B7B"}

package/lib/client/ClientService.js

@@ -118,6 +118,9 @@ class ClientService {
     createLocalClient(client, domain) {
         return this.database.createLocalClient(client, domain);
     }
+    putClientCapabilities(clientId, capabilities) {
+        return this.backend.putClient(clientId, capabilities);
+    }
     /**
      * Will download all the clients of the self user (excluding the current client) and will store them in the database
      * @param currentClient - the id of the current client (to be excluded from the list)
@@ -137,7 +140,7 @@ class ClientService {
         }
         const newClient = {
             class: clientInfo.classification,
-            capabilities: [client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT],
+            capabilities: [client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT, client_1.ClientCapability.CONSUMABLE_NOTIFICATIONS],
             cookie: clientInfo.cookieLabel,
             label: clientInfo.label,
             lastkey: lastPrekey,

package/lib/notification/NotificationBackendRepository.d.ts

@@ -3,7 +3,7 @@ import { APIClient } from '@wireapp/api-client';
 export declare class NotificationBackendRepository {
     private readonly apiClient;
     constructor(apiClient: APIClient);
-    getAllNotifications(clientId?: string, lastNotificationId?: string, abortController?: AbortController): Promise<{
+    getAllNotifications(clientId?: string, lastNotificationId?: string): Promise<{
         notifications: Notification[];
         missedNotification?: string;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"NotificationBackendRepository.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationBackendRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,6BAA6B;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEpC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe;;;;IAI3G,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAGrE"}
+{"version":3,"file":"NotificationBackendRepository.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationBackendRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,6BAA6B;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEpC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;;;;IAIxE,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAGrE"}

package/lib/notification/NotificationBackendRepository.js

@@ -24,8 +24,8 @@ class NotificationBackendRepository {
     constructor(apiClient) {
         this.apiClient = apiClient;
     }
-    async getAllNotifications(clientId, lastNotificationId, abortController) {
-        return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId, abortController);
+    async getAllNotifications(clientId, lastNotificationId) {
+        return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId);
     }
     getLastNotification(clientId) {
         return this.apiClient.api.notification.getLastNotification(clientId);

package/lib/notification/NotificationService.d.ts

@@ -55,7 +55,7 @@ export declare class NotificationService extends TypedEventEmitter<Events> {
     getNotificationEventList(): Promise<BackendEvent[]>;
     setLastEventDate(eventDate: Date): Promise<Date>;
     private setLastNotificationId;
-    processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortController): Promise<{
+    processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void): Promise<{
         total: number;
         error: number;
         success: number;

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

@@ -1 +1 @@
-{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"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"}
+{"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;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAa,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAC/D,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;AAE1D,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;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,GACrB;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GACnB;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAA;CAAC,CAAC;AAE7D,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;IAU9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IATtC,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,CAA6D;IACpF,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,UAAU,EACN,mBAAmB,EAAE,mBAAmB;YAQ7C,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAM/D,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,GACtD,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IA6B3D;;;;;;;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

@@ -43,9 +43,9 @@ class NotificationService extends commons_1.TypedEventEmitter {
         this.backend = new NotificationBackendRepository_1.NotificationBackendRepository(this.apiClient);
         this.database = new NotificationDatabaseRepository_1.NotificationDatabaseRepository(storeEngine);
     }
-    async getAllNotifications(since, abortController) {
+    async getAllNotifications(since) {
         const clientId = this.apiClient.clientId;
-        return this.backend.getAllNotifications(clientId, since, abortController);
+        return this.backend.getAllNotifications(clientId, since);
     }
     /** Should only be called with a completely new client. */
     async initializeNotificationStream(clientId) {
@@ -80,9 +80,9 @@ class NotificationService extends commons_1.TypedEventEmitter {
     async setLastNotificationId(lastNotification) {
         return this.database.updateLastNotificationId(lastNotification);
     }
-    async processNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
+    async processNotificationStream(notificationHandler, onMissedNotifications) {
         const lastNotificationId = await this.database.getLastNotificationId();
-        const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId, abortHandler);
+        const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId);
         if (missedNotification) {
             onMissedNotifications(missedNotification);
         }
@@ -92,13 +92,6 @@ class NotificationService extends commons_1.TypedEventEmitter {
             : `No notification to process from the stream`;
         this.logger.log(logMessage);
         for (const [index, notification] of notifications.entries()) {
-            if (abortHandler.signal.aborted) {
-                /* Stop handling notifications if the websocket has been disconnected.
-                 * Upon reconnecting we are going to restart handling the notification stream for where we left of
-                 */
-                this.logger.warn(`Stop processing notifications as connection to websocket was closed`);
-                return results;
-            }
             try {
                 await notificationHandler(notification, Notifications_types_1.NotificationSource.NOTIFICATION_STREAM, {
                     done: index + 1,

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.66.0",
+    "@wireapp/api-client": "^27.67.0",
     "@wireapp/commons": "^5.4.2",
     "@wireapp/core-crypto": "7.0.1",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.29.4",
-  "gitHead": "408aff5c28bffa4970bcf085e4f13864570c59be"
+  "version": "46.30.0",
+  "gitHead": "09304f9cc2241bdd6200926e263adbfe97ca5d68"
 }