Merge pull request #295 from tjmehta/subRefsMap-use-maps-and-sets

make pubsub subRefsMap use maps and sets

Author: davidyaha

src/redis-pubsub.ts

@@ -79,7 +79,7 @@ export class RedisPubSub implements PubSubEngine {
     this.redisSubscriber.on(messageEventName, this.onMessage.bind(this, undefined));
 
     this.subscriptionMap = {};
-    this.subsRefsMap = {};
+    this.subsRefsMap = new Map<string, Set<number>>();
     this.currentSubscriptionId = 0;
   }
 
@@ -97,9 +97,13 @@ export class RedisPubSub implements PubSubEngine {
     const id = this.currentSubscriptionId++;
     this.subscriptionMap[id] = [triggerName, onMessage];
 
-    const refs = this.subsRefsMap[triggerName];
-    if (refs && refs.length > 0) {
-      this.subsRefsMap[triggerName] = [...refs, id];
+    if (!this.subsRefsMap.has(triggerName)) {
+      this.subsRefsMap.set(triggerName, new Set());
+    }
+
+    const refs = this.subsRefsMap.get(triggerName);
+    if (refs.size > 0) {
+      refs.add(id);
       return Promise.resolve(id);
     } else {
       return new Promise<number>((resolve, reject) => {
@@ -109,10 +113,7 @@ export class RedisPubSub implements PubSubEngine {
           if (err) {
             reject(err);
           } else {
-            this.subsRefsMap[triggerName] = [
-              ...(this.subsRefsMap[triggerName] || []),
-              id,
-            ];
+            refs.add(id);
             resolve(id);
           }
         });
@@ -122,21 +123,18 @@ export class RedisPubSub implements PubSubEngine {
 
   public unsubscribe(subId: number): void {
     const [triggerName = null] = this.subscriptionMap[subId] || [];
-    const refs = this.subsRefsMap[triggerName];
+    const refs = this.subsRefsMap.get(triggerName);
 
     if (!refs) throw new Error(`There is no subscription of id "${subId}"`);
 
-    if (refs.length === 1) {
+    if (refs.size === 1) {
       // unsubscribe from specific channel and pattern match
       this.redisSubscriber.unsubscribe(triggerName);
       this.redisSubscriber.punsubscribe(triggerName);
 
-      delete this.subsRefsMap[triggerName];
+      this.subsRefsMap.delete(triggerName);
     } else {
-      const index = refs.indexOf(subId);
-      this.subsRefsMap[triggerName] = index === -1
-          ? refs
-          : [...refs.slice(0, index), ...refs.slice(index + 1)];
+      refs.delete(subId);
     }
     delete this.subscriptionMap[subId];
   }
@@ -168,14 +166,14 @@ export class RedisPubSub implements PubSubEngine {
   private readonly reviver: Reviver;
 
   private readonly subscriptionMap: { [subId: number]: [string, OnMessage<unknown>] };
-  private readonly subsRefsMap: { [trigger: string]: Array<number> };
+  private readonly subsRefsMap: Map<string, Set<number>>;
   private currentSubscriptionId: number;
 
   private onMessage(pattern: string, channel: string, message: string) {
-    const subscribers = this.subsRefsMap[pattern || channel];
+    const subscribers = this.subsRefsMap.get(pattern || channel);
 
     // Don't work for nothing..
-    if (!subscribers || !subscribers.length) return;
+    if (!subscribers?.size) return;
 
     let parsedMessage;
     try {
@@ -186,10 +184,10 @@ export class RedisPubSub implements PubSubEngine {
       parsedMessage = message;
     }
 
-    for (const subId of subscribers) {
+    subscribers.forEach(subId => {
       const [, listener] = this.subscriptionMap[subId];
       listener(parsedMessage);
-    }
+    });
   }
 }