refactor: Remove duplicate implementation of promise queue [WPB-19081] (#19518) (#19520)

* refactor: Remove duplicate implementation of promise queue [WPB-19081]

* Bump core

Co-authored-by: Amir Ghezelbash <[email protected]>

Author: otto-the-bot

package.json

@@ -16,8 +16,9 @@
     "@wireapp/avs": "10.0.46",
     "@wireapp/avs-debugger": "0.0.7",
     "@wireapp/commons": "5.4.4",
-    "@wireapp/core": "46.34.7",
+    "@wireapp/core": "46.34.8",
     "@wireapp/kalium-backup": "0.0.4",
+    "@wireapp/promise-queue": "2.4.4",
     "@wireapp/react-ui-kit": "9.63.0",
     "@wireapp/store-engine-dexie": "2.1.15",
     "@wireapp/telemetry": "0.3.1",

src/script/repositories/event/EventRepository.ts

@@ -29,14 +29,14 @@ import ko from 'knockout';
 import {container} from 'tsyringe';
 
 import {Account, ConnectionState, ProcessedEventPayload} from '@wireapp/core';
+import {PromiseQueue} from '@wireapp/promise-queue';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {ClientConversationEvent, EventBuilder} from 'Repositories/conversation/EventBuilder';
 import {CryptographyMapper} from 'Repositories/cryptography/CryptographyMapper';
 import {EventName} from 'Repositories/tracking/EventName';
 import {UserState} from 'Repositories/user/UserState';
 import {getLogger, Logger} from 'Util/Logger';
-import {queue} from 'Util/PromiseQueue';
 import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 
 import {ClientEvent} from './Client';
@@ -63,6 +63,8 @@ export class EventRepository {
   /** event processors are classes that are able to react and process an incoming event */
   private eventProcessors: EventProcessor[] = [];
 
+  private eventQueue: PromiseQueue = new PromiseQueue();
+
   static get CONFIG() {
     return {
       E_CALL_EVENT_LIFETIME: TIME_IN_MILLIS.SECOND * 30,
@@ -160,17 +162,19 @@ export class EventRepository {
    * this function will process any incoming event. It is being queued in case 2 events arrive at the same time.
    * Processing events should happen sequentially (thus the queue)
    */
-  private readonly handleIncomingEvent = queue(async (payload: HandledEventPayload, source: NotificationSource) => {
-    try {
-      await this.handleEvent(payload, source);
-    } catch (error) {
-      if (source === EventSource.NOTIFICATION_STREAM) {
-        this.logger.warn(`Failed to handle event of type "${event.type}": ${error.message}`, error);
-      } else {
-        throw error;
+  private readonly handleIncomingEvent = async (payload: HandledEventPayload, source: NotificationSource) => {
+    return this.eventQueue.push(async () => {
+      try {
+        await this.handleEvent(payload, source);
+      } catch (error) {
+        if (source === EventSource.NOTIFICATION_STREAM) {
+          this.logger.warn(`Failed to handle event of type "${event.type}": ${error.message}`, error);
+        } else {
+          throw error;
+        }
       }
-    }
-  });
+    });
+  };
 
   /**
    * Import events coming from an external source. This is only useful useful for profiling or debugging.
@@ -324,7 +328,7 @@ export class EventRepository {
     }
 
     const conversationId = 'conversation' in event && event.conversation;
-    const inSelfConversation = conversationId === this.userState.self().id;
+    const inSelfConversation = conversationId === this.userState.self()?.id;
     if (!inSelfConversation) {
       return this.processEvent(event, source);
     }