@wireapp/core 27.3.1 → 27.3.4

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [27.3.4](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@27.3.3...@wireapp/core@27.3.4) (2022-06-08)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [27.3.3](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@27.3.2...@wireapp/core@27.3.3) (2022-06-08)
+
+
+### Bug Fixes
+
+* **core:** Abort notification stream handling when websocket is disconnected ([#4285](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4285)) ([e674a38](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/e674a3827f4e107f9d6ef39e26fa8d94c58986d7))
+
+
+
+
+
+## [27.3.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@27.3.1...@wireapp/core@27.3.2) (2022-06-07)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
 ## [27.3.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@27.3.0...@wireapp/core@27.3.1) (2022-06-03)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "19.4.0",
+    "@wireapp/api-client": "19.6.0",
     "@wireapp/cryptobox": "12.8.0",
     "bazinga64": "5.10.0",
     "hash.js": "1.1.7",
@@ -69,6 +69,6 @@
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json"
   },
-  "version": "27.3.1",
-  "gitHead": "c99307f4d8a8b5e2373b204dbca151415648042c"
+  "version": "27.3.4",
+  "gitHead": "d4ad56bf0f2ca6759b2e19742de7e26388905c56"
 }

package/src/main/Account.js

@@ -328,13 +328,13 @@ class Account extends events_1.EventEmitter {
         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, conversation_1.PayloadBundleSource.WEBSOCKET));
         this.apiClient.transport.ws.on(tcp_1.WebSocketClient.TOPIC.ON_STATE_CHANGE, onConnectionStateChanged);
-        const onBeforeConnect = async () => {
+        const onBeforeConnect = async (abortHandler) => {
             // Lock websocket in order to buffer any message that arrives while we handle the notification stream
             this.apiClient.transport.ws.lock();
             await this.service.notification.handleNotificationStream(async (notification, source, progress) => {
                 await handleNotification(notification, source);
                 onNotificationStreamProgress(progress);
-            }, onMissedNotifications);
+            }, onMissedNotifications, abortHandler);
             // We can now unlock the websocket and let the new messages being handled and decrypted
             this.apiClient.transport.ws.unlock();
             onConnected();
@@ -342,6 +342,8 @@ class Account extends events_1.EventEmitter {
         await this.apiClient.connect(onBeforeConnect);
         return () => {
             this.apiClient.disconnect();
+            this.apiClient.transport.ws.removeAllListeners(tcp_1.WebSocketClient.TOPIC.ON_MESSAGE);
+            this.apiClient.transport.ws.removeListener(tcp_1.WebSocketClient.TOPIC.ON_STATE_CHANGE, onConnectionStateChanged);
         };
     }
     async initEngine(context) {

package/src/main/notification/NotificationService.d.ts

@@ -8,6 +8,7 @@ import { PayloadBundle, PayloadBundleSource } from '../conversation';
 import { NotificationError } from '../CoreError';
 import type { CryptographyService } from '../cryptography';
 import { GenericMessage } from '@wireapp/protocol-messaging';
+import { AbortHandler } from '@wireapp/api-client/src/tcp';
 export declare type HandledEventPayload = {
     event: Events.BackendEvent;
     mappedEvent?: PayloadBundle;
@@ -42,7 +43,7 @@ export declare class NotificationService extends EventEmitter {
     getNotificationEventList(): Promise<Events.BackendEvent[]>;
     setLastEventDate(eventDate: Date): Promise<Date>;
     setLastNotificationId(lastNotification: Notification): Promise<string>;
-    handleNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void): Promise<void>;
+    handleNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortHandler): Promise<void>;
     handleNotification(notification: Notification, source: PayloadBundleSource, dryRun?: boolean): AsyncGenerator<HandledEventPayload>;
     private cleanupPayloadBundle;
     private handleEvent;

package/src/main/notification/NotificationService.js

@@ -118,12 +118,18 @@ class NotificationService extends events_1.EventEmitter {
     async setLastNotificationId(lastNotification) {
         return this.database.updateLastNotificationId(lastNotification);
     }
-    async handleNotificationStream(notificationHandler, onMissedNotifications) {
+    async handleNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
         const { notifications, missedNotification } = await this.getAllNotifications();
         if (missedNotification) {
             onMissedNotifications(missedNotification);
         }
         for (const [index, notification] of notifications.entries()) {
+            if (abortHandler.isAborted()) {
+                /* 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
+                 */
+                return;
+            }
             await notificationHandler(notification, conversation_1.PayloadBundleSource.NOTIFICATION_STREAM, {
                 done: index + 1,
                 total: notifications.length,