@wireapp/core 32.0.7 → 32.0.8

package/package.json

@@ -43,13 +43,14 @@
     "jest": "29.0.3",
     "jest-babel": "1.0.1",
     "jest-jasmine2": "29.0.3",
+    "jest-websocket-mock": "2.4.0",
     "karma": "6.4.1",
     "karma-chrome-launcher": "3.1.1",
     "karma-jasmine": "4.0.2",
     "karma-jasmine-diff-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
     "karma-spec-reporter": "0.0.34",
-    "mock-socket": "9.0.3",
+    "mock-socket": "9.1.5",
     "nock": "13.1.1",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
@@ -81,6 +82,6 @@
     "test": "jest",
     "watch": "tsc ---watch"
   },
-  "version": "32.0.7",
-  "gitHead": "b8b83908d9516f9dc79e8e7591c0401618956caf"
+  "version": "32.0.8",
+  "gitHead": "9b39965aa991efec2376de9b40118be153d803f6"
 }

package/src/main/Account.d.ts

@@ -211,7 +211,7 @@ export declare class Account<T = any> extends EventEmitter {
          * 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;
-    }): Promise<() => void>;
+    }): () => void;
     private generateDbName;
     private generateSecretsDbName;
     private initEngine;

package/src/main/Account.js

@@ -377,7 +377,7 @@ class Account extends events_1.EventEmitter {
      * @param callbacks callbacks that will be called to handle different events
      * @returns close a function that will disconnect from the websocket
      */
-    async listen({ onEvent = () => { }, onConnectionStateChanged = () => { }, onNotificationStreamProgress = () => { }, onMissedNotifications = () => { }, dryRun = false, } = {}) {
+    listen({ onEvent = () => { }, onConnectionStateChanged = () => { }, onNotificationStreamProgress = () => { }, onMissedNotifications = () => { }, dryRun = false, } = {}) {
         if (!this.apiClient.context) {
             throw new Error('Context is not set - please login first');
         }
@@ -432,8 +432,8 @@ class Account extends events_1.EventEmitter {
         });
         const processNotificationStream = async (abortHandler) => {
             // Lock websocket in order to buffer any message that arrives while we handle the notification stream
-            onConnectionStateChanged(ConnectionState.PROCESSING_NOTIFICATIONS);
             this.apiClient.transport.ws.lock();
+            onConnectionStateChanged(ConnectionState.PROCESSING_NOTIFICATIONS);
             const results = await this.service.notification.processNotificationStream(async (notification, source, progress) => {
                 await handleNotification(notification, source);
                 onNotificationStreamProgress(progress);
@@ -443,13 +443,13 @@ class Account extends events_1.EventEmitter {
                 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();
             // 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)();
-            onConnectionStateChanged(ConnectionState.LIVE);
         };
         this.apiClient.connect(processNotificationStream);
         return () => {