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

package/lib/Account.test.js

@@ -41,14 +41,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const protocol_messaging_1 = require("@pydio/protocol-messaging");
 const auth_1 = require("@wireapp/api-client/lib/auth");
 const client_1 = require("@wireapp/api-client/lib/client");
-const Config_1 = require("@wireapp/api-client/lib/Config");
 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");
@@ -56,20 +57,6 @@ const nock_1 = __importStar(require("nock"));
 const uuid_1 = require("uuid");
 const api_client_1 = require("@wireapp/api-client");
 const commons_1 = require("@wireapp/commons");
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
-// Mock ConversationService to avoid requiring MLSService in constructor during tests
-jest.mock('./conversation', () => {
-    const actual = jest.requireActual('./conversation');
-    class FakeConversationService {
-        constructor(..._args) { }
-        // Return unhandled so NotificationService falls back to generic handling in tests
-        handleEvent = jest.fn(async () => ({ status: 'unhandled' }));
-    }
-    return {
-        ...actual,
-        ConversationService: FakeConversationService,
-    };
-});
 const Account_1 = require("./Account");
 const notification_2 = require("./notification");
 const BASE_URL = 'mock-backend.wire.com';
@@ -78,10 +65,8 @@ const MOCK_BACKEND = {
     rest: `https://${BASE_URL}`,
     ws: `wss://${BASE_URL}`,
 };
-const apiClients = [];
 async function createAccount() {
     const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-    apiClients.push(apiClient);
     const account = new Account_1.Account(apiClient);
     await account['initServices']({
         clientType: client_1.ClientType.TEMPORARY,
@@ -112,9 +97,6 @@ const waitFor = (assertion) => {
 /* eslint-disable jest/no-conditional-expect */
 describe('Account', () => {
     const CLIENT_ID = '4e37b32f57f6da55';
-    afterAll(() => {
-        apiClients.forEach(client => client.disconnect());
-    });
     // Fix for node 16, crypto.subtle.decrypt has a type problem
     jest.spyOn(global.crypto.subtle, 'decrypt').mockResolvedValue(new Uint8Array(32));
     const accessTokenData = {
@@ -123,8 +105,6 @@ describe('Account', () => {
         token_type: 'Bearer',
         user: 'aaf9a833-ef30-4c22-86a0-9adc8a15b3b4',
     };
-    const markerId = '90da5591-0a26-45f8-bbb2-6c0fc4a2df19';
-    const websocketServerAddress = `${MOCK_BACKEND.ws}/v${Config_1.MINIMUM_API_VERSION}/events?access_token=${accessTokenData.access_token}&marker=${markerId}`;
     beforeEach(() => {
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .post(auth_1.AuthAPI.URL.LOGIN, body => body.email && body.password)
@@ -154,14 +134,6 @@ 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: [Config_1.MINIMUM_API_VERSION],
-            federation: false,
-            development: [Config_1.MINIMUM_API_VERSION + 1],
-            domain: 'zinfra.io',
-        });
         (0, nock_1.default)(MOCK_BACKEND.rest)
             .get(notification_1.NotificationAPI.URL.NOTIFICATION)
             .query({ client: CLIENT_ID, size: 10000 })
@@ -170,16 +142,6 @@ 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)
-            .put(/\/clients\/[\w-]+$/, {
-            capabilities: ['legalhold-implicit-consent'],
-        })
-            .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, {
@@ -201,7 +163,6 @@ describe('Account', () => {
         (0, nock_1.cleanAll)();
     });
     const currentClient = {
-        capabilities: [],
         id: CLIENT_ID,
         cookie: '',
         time: '',
@@ -212,9 +173,6 @@ describe('Account', () => {
     describe('"init"', () => {
         it('initializes the Protocol buffers', async () => {
             const account = new Account_1.Account();
-            if (account['apiClient']) {
-                apiClients.push(account['apiClient']);
-            }
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             expect(account.service.conversation).toBeDefined();
             const message = protocol_messaging_1.GenericMessage.create({
@@ -227,7 +185,6 @@ describe('Account', () => {
     describe('"login"', () => {
         it('logs in with correct credentials', async () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            apiClients.push(apiClient);
             const account = new Account_1.Account(apiClient);
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             const { clientType, userId } = await account.login({
@@ -240,7 +197,6 @@ describe('Account', () => {
         });
         it('does not log in with incorrect credentials', async () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
-            apiClients.push(apiClient);
             const account = new Account_1.Account(apiClient);
             let backendError;
             await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
@@ -262,9 +218,35 @@ 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 dependencies;
         let server;
+        let dependencies;
         const mockNotifications = (size) => {
             const notifications = Array.from(new Array(size)).map(() => ({
                 id: (0, uuid_1.v4)(),
@@ -285,12 +267,12 @@ describe('Account', () => {
                 return callback();
             };
         };
-        beforeAll(() => {
+        beforeEach(() => {
+            server = new jest_websocket_mock_1.WS(`${MOCK_BACKEND.ws}/await?access_token=${accessTokenData.access_token}`);
             // 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({
@@ -305,48 +287,46 @@ describe('Account', () => {
             jest
                 .spyOn(dependencies.account.service.notification['database'], 'getLastNotificationId')
                 .mockResolvedValue('0');
-            await account.useAPIVersion(Config_1.MINIMUM_API_VERSION, Config_1.MINIMUM_API_VERSION);
-            jest
-                .spyOn(dependencies.apiClient.transport.ws, 'buildWebSocketUrl')
-                .mockResolvedValue(websocketServerAddress);
-            jest.spyOn(dependencies.account, 'getNotificationEventTime').mockReturnValue('2025-10-01T00:00:00Z');
         });
         afterEach(() => {
-            server.close(); // ensure server shutdown
-            jest_websocket_mock_1.WS.clean();
+            server.close();
         });
         describe('listen', () => {
-            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]);
+            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 () => {
                 return new Promise(async (resolve) => {
                     const nbNotifications = 10;
                     const onNotificationStreamProgress = jest.fn();
-                    const onEvent = jest.fn().mockImplementation(() => { });
+                    const onEvent = jest.fn();
                     mockNotifications(nbNotifications);
-                    await dependencies.account.listen({
-                        useLegacy: false,
-                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, async () => {
+                    const disconnect = 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();
-                            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);
+                            disconnect();
                             resolve();
                         }),
                         onEvent: onEvent,
@@ -354,66 +334,24 @@ describe('Account', () => {
                     });
                 });
             });
-            it('sends information to consumer of the connection state change in order', 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.CONNECTING);
-                                expect(onConnectionStateChanged).toHaveBeenNthCalledWith(3, Account_1.ConnectionState.LIVE);
-                                resolve();
-                                break;
-                        }
-                    });
-                    const disconnect = await dependencies.account.listen({
-                        useLegacy: false,
-                        onConnectionStateChanged,
-                    });
-                    await waitFor(() => expect(onConnectionStateChanged).toHaveBeenCalledWith(Account_1.ConnectionState.LIVE));
-                    disconnect();
-                });
-            });
-            it('warns consumer of the connection close', 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.CONNECTING);
-                                expect(onConnectionStateChanged).toHaveBeenNthCalledWith(3, Account_1.ConnectionState.CLOSED);
-                                resolve();
-                                break;
-                        }
-                    });
-                    const disconnect = await dependencies.account.listen({
-                        useLegacy: false,
-                        onConnectionStateChanged,
-                    });
-                    await waitFor(() => expect(onConnectionStateChanged).toHaveBeenCalledWith(Account_1.ConnectionState.PROCESSING_NOTIFICATIONS));
-                    disconnect();
-                });
-            });
-            it('processes notification stream upon connection', async () => {
+            it('fowards events from websocket to consumer after the notification stream has been processed', async () => {
                 return new Promise(async (resolve) => {
                     const nbNotifications = 10;
                     const onNotificationStreamProgress = jest.fn();
                     const onEvent = jest.fn();
                     mockNotifications(nbNotifications);
-                    await dependencies.account.listen({
-                        useLegacy: false,
-                        onConnectionStateChanged: callWhen(Account_1.ConnectionState.LIVE, () => {
+                    const disconnect = 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);
+                            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,
@@ -421,41 +359,63 @@ describe('Account', () => {
                     });
                 });
             });
-            it('does stop processing messages if websocket connection is aborted', async () => {
-                jest
-                    .spyOn(dependencies.account, 'getClientCapabilities')
-                    .mockReturnValue([client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT, client_1.ClientCapability.CONSUMABLE_NOTIFICATIONS]);
+            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
+                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 () => {
+                const nbNotifications = 10;
+                const onNotificationStreamProgress = jest
                     .fn()
                     .mockImplementationOnce(() => { })
-                    .mockImplementationOnce(() => {
-                    // abort websocket connection after the second notification is processeed
-                    server.close({ reason: 'Aborted by test', code: 2000, wasClean: true });
-                });
-                return new Promise(async (resolve) => {
-                    return dependencies.account.listen({
-                        useLegacy: false,
+                    .mockImplementationOnce(() => server.close());
+                const onEvent = jest.fn();
+                mockNotifications(nbNotifications);
+                return new Promise(async (resolve, reject) => {
+                    dependencies.account.listen({
                         onConnectionStateChanged: async (state) => {
                             switch (state) {
-                                case Account_1.ConnectionState.CONNECTING:
-                                    await server.connected;
-                                    for (let i = 0; i < nbNotifications; i++) {
-                                        server.send(JSON.stringify({
-                                            type: ConsumableNotification_1.ConsumableEvent.EVENT,
-                                            data: {
-                                                delivery_tag: 1000,
-                                                event: { id: (0, uuid_1.v4)(), payload: [{ domain: 'zinfra.io', type: 'federation.delete' }] },
-                                            },
-                                        }));
-                                    }
+                                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(onEvent).toHaveBeenCalledWith({ domain: 'zinfra.io', type: 'federation.delete' }, notification_2.NotificationSource.WEBSOCKET);
-                                    expect(dependencies.account.service.notification.handleNotification).toHaveBeenCalledTimes(2);
+                                    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();
                             }
                         },
@@ -464,6 +424,35 @@ 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/broadcast/AvailabilityType.d.ts

@@ -1,3 +1,3 @@
-import { Availability } from '@wireapp/protocol-messaging';
+import { Availability } from '@pydio/protocol-messaging';
 export type AvailabilityType = Availability.Type;
 //# sourceMappingURL=AvailabilityType.d.ts.map

package/lib/broadcast/AvailabilityType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AvailabilityType.d.ts","sourceRoot":"","sources":["../../src/broadcast/AvailabilityType.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAEzD,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC"}
+{"version":3,"file":"AvailabilityType.d.ts","sourceRoot":"","sources":["../../src/broadcast/AvailabilityType.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAEvD,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC"}

package/lib/broadcast/BroadcastService.d.ts

@@ -1,6 +1,6 @@
+import { GenericMessage } from '@pydio/protocol-messaging';
 import { MessageSendingStatus, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
 import { APIClient } from '@wireapp/api-client';
-import { GenericMessage } from '@wireapp/protocol-messaging';
 import { ProteusService } from '../messagingProtocols/proteus';
 export declare class BroadcastService {
     private readonly apiClient;

package/lib/broadcast/BroadcastService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAEhG,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,gBAAgB;IAIzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAG7B,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc;IAKpC,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,oBAAoB,EAChC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAY3F"}
+{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAEhG,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,gBAAgB;IAIzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAJjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAG7B,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc;IAKpC,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,oBAAoB,EAChC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAY3F"}

package/lib/broadcast/BroadcastService.js

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BroadcastService = void 0;
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const protocol_messaging_1 = require("@pydio/protocol-messaging");
 const messageSender_1 = require("../conversation/message/messageSender");
 const MessageService_1 = require("../conversation/message/MessageService");
 const UserClientsUtil_1 = require("../conversation/message/UserClientsUtil");

package/lib/client/ClientService.d.ts

@@ -1,5 +1,5 @@
 import { LoginData } from '@wireapp/api-client/lib/auth/';
-import { ClientCapabilityData, RegisteredClient } from '@wireapp/api-client/lib/client/';
+import { 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,14 +45,13 @@ export declare class ClientService {
      *
      * @return the loaded client or undefined
      */
-    loadClient(): Promise<MetaClient | undefined>;
+    loadClient(): Promise<RegisteredClient | 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)
      */
     synchronizeClients(currentClient: string): Promise<MetaClient[]>;
-    register(loginData: LoginData, clientInfo: ClientInfo, { prekeys, lastPrekey }: InitialPrekeys, useLegacyNotificationStream?: boolean): Promise<RegisteredClient>;
+    register(loginData: LoginData, clientInfo: ClientInfo, { prekeys, lastPrekey }: InitialPrekeys): Promise<RegisteredClient>;
 }
 //# sourceMappingURL=ClientService.d.ts.map

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,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;YAepD,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,EACrC,2BAA2B,GAAE,OAAc,GAC1C,OAAO,CAAC,gBAAgB,CAAC;CAkC7B"}
+{"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;YASpD,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"}

package/lib/client/ClientService.js

@@ -64,16 +64,9 @@ class ClientService {
     async deleteLocalClient(password) {
         const localClientId = this.apiClient.context?.clientId;
         if (!localClientId) {
-            // No client in context -> there's nothing to delete on backend, just drop local state
-            this.logger.warn('No local client id in context; deleting local client data from DB only.');
-            return this.database.deleteLocalClient();
-        }
-        try {
-            await this.backend.deleteClient(localClientId, password);
-        }
-        catch (error) {
-            this.logger.warn('Failed to delete client on backend', error);
+            throw new Error('Trying to delete local client, but local client has not been set');
         }
+        await this.backend.deleteClient(localClientId, password);
         return this.database.deleteLocalClient();
     }
     async getLocalClient() {
@@ -105,7 +98,7 @@ class ClientService {
             const notFoundOnBackend = axios_1.default.isAxiosError(error) ? error.response?.status === http_status_codes_1.StatusCodes.NOT_FOUND : false;
             if (notFoundOnBackend && this.storeEngine) {
                 const shouldDeleteWholeDatabase = loadedClient.type === client_1.ClientType.TEMPORARY;
-                await this.proteusService.wipe();
+                await this.proteusService.wipe(this.storeEngine);
                 if (shouldDeleteWholeDatabase) {
                     await this.storeEngine.clearTables();
                 }
@@ -118,9 +111,6 @@ 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)
@@ -131,20 +121,16 @@ class ClientService {
         return this.database.createClientList({ id: this.apiClient.context.userId, domain: this.apiClient.context.domain ?? '' }, filteredClients);
     }
     // TODO: Split functionality into "create" and "register" client
-    async register(loginData, clientInfo, { prekeys, lastPrekey }, useLegacyNotificationStream = true) {
+    async register(loginData, clientInfo, { prekeys, lastPrekey }) {
         if (!this.apiClient.context) {
             throw new Error('Context is not set.');
         }
         if (loginData.clientType === client_1.ClientType.NONE) {
             throw new Error(`Can't register client of type "${client_1.ClientType.NONE}"`);
         }
-        const capabilities = [client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT];
-        if (!useLegacyNotificationStream) {
-            capabilities.push(client_1.ClientCapability.CONSUMABLE_NOTIFICATIONS);
-        }
         const newClient = {
             class: clientInfo.classification,
-            capabilities,
+            capabilities: [client_1.ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT],
             cookie: clientInfo.cookieLabel,
             label: clientInfo.label,
             lastkey: lastPrekey,

package/lib/conversation/AbortReason.d.ts

@@ -1,3 +1,3 @@
-import { Asset } from '@wireapp/protocol-messaging';
+import { Asset } from '@pydio/protocol-messaging';
 export type AbortReason = Asset.NotUploaded;
 //# sourceMappingURL=AbortReason.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"AbortReason.d.ts","sourceRoot":"","sources":["../../src/conversation/AbortReason.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,KAAK,EAAC,MAAM,6BAA6B,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC"}
+{"version":3,"file":"AbortReason.d.ts","sourceRoot":"","sources":["../../src/conversation/AbortReason.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,KAAK,EAAC,MAAM,2BAA2B,CAAC;AAEhD,MAAM,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC"}