Make listener removal async (it will wait for the API call to complete)

Author: maksis

src/PublicHelpers.ts

@@ -143,8 +143,8 @@ export const addContextMenuItems = async <IdT, EntityIdT extends EntityId | unde
     menu
   );
 
-  return () => {
-    removeHook();
-    removeListener();
+  return async () => {
+    await removeHook();
+    await removeListener();
   };
 };

src/SocketSubscriptionHandler.ts

@@ -43,7 +43,7 @@ const SocketSubscriptionHandler = (
   // Subscriptions pending to be added in the API
   const pendingSubscriptions: { [key: string]: PendingSubscription[] } = {};
 
-  const removeSocketListener = (
+  const removeSocketListener = async (
     subscriptionUrl: string, 
     subscriptionId: string, 
     callback: Subscriptions.HookCallback<any, any> | Subscriptions.SubscriptionCallback<any>, 
@@ -58,11 +58,12 @@ const SocketSubscriptionHandler = (
 
     if (subscriptions[subscriptionId] === 0) {
       if (sendApi && socket().isConnected()) {
-        socket().delete(subscriptionUrl)
-          .catch(
-            (error: Requests.ErrorResponse) => {
-              logger.error('Failed to remove socket listener', subscriptionUrl, error);
-            });
+        try {
+          await socket().delete(subscriptionUrl);
+        } catch (error) {
+          const e: Requests.ErrorResponse = error;
+          logger.error('Failed to remove socket listener', subscriptionUrl, e);
+        };
       }
 
       delete subscriptions[subscriptionId];

src/tests/public_helpers.test.ts

@@ -236,7 +236,7 @@ describe('public helpers', () => {
       }
 
       // Remove items
-      removeMenuItems();
+      await removeMenuItems();
       expect(socket.hasListeners()).toBe(false);
     });
   });

src/types/subscriptions.ts

@@ -2,7 +2,7 @@ import * as API from './api.js';
 
 
 // SUBSCRIPTIONS
-export type SubscriptionRemoveHandler = (sendApi?: boolean) => void;
+export type SubscriptionRemoveHandler = (sendApi?: boolean) => Promise<void>;
 
 export type SubscriptionCallback<
   DataT extends object | void = object,