code refactoring

rudderlabs · Dec 24, 2021 · feab8f5 · feab8f5
1 parent 7ac1bac
commit feab8f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/utils/EventRepository.js b/utils/EventRepository.js
@@ -1,7 +1,7 @@
 /* eslint-disable no-lonely-if */
 /* eslint-disable class-methods-use-this */
 import logger from "./logUtil";
-import xhrQueue from "./xhrModule";
+import XHRQueue from "./xhrModule";
 import BeaconQueue from "./storage/beaconQueue";
 import { getCurrentTimeFormatted } from "./utils";
 
@@ -50,7 +50,7 @@ class EventRepository {
         queueOptions = options.queueOptions;
       }
       targetUrl = this.url;
-      this.queue = xhrQueue;
+      this.queue = new XHRQueue();
     }
     this.queue.init(targetUrl, queueOptions, this.writeKey);
   }

diff --git a/utils/xhrModule.js b/utils/xhrModule.js
@@ -28,28 +28,29 @@ class XHRQueue {
       // TODO: add checks for value - has to be +ve?
       Object.assign(queueOptions, options);
     }
-    this.payloadQueue = new Queue("rudder", queueOptions, function (
-      item,
-      done
-    ) {
-      // apply sentAt at flush time and reset on each retry
-      item.message.sentAt = getCurrentTimeFormatted();
-      // send this item for processing, with a callback to enable queue to get the done status
-      // eslint-disable-next-line no-use-before-define
-      xhrQueue.processQueueElement(
-        item.url,
-        item.headers,
-        item.message,
-        10 * 1000,
-        // eslint-disable-next-line consistent-return
-        function (err, res) {
-          if (err) {
-            return done(err);
+    this.payloadQueue = new Queue(
+      "rudder",
+      queueOptions,
+      function (item, done) {
+        // apply sentAt at flush time and reset on each retry
+        item.message.sentAt = getCurrentTimeFormatted();
+        // send this item for processing, with a callback to enable queue to get the done status
+        // eslint-disable-next-line no-use-before-define
+        this.processQueueElement(
+          item.url,
+          item.headers,
+          item.message,
+          10 * 1000,
+          // eslint-disable-next-line consistent-return
+          function (err, res) {
+            if (err) {
+              return done(err);
+            }
+            done(null, res);
           }
-          done(null, res);
-        }
-      );
-    });
+        );
+      }.bind(this)
+    );
 
     // start queue
     this.payloadQueue.start();
@@ -111,5 +112,5 @@ class XHRQueue {
   }
 }
 
-const xhrQueue = new XHRQueue();
-export default xhrQueue;
+// const xhrQueue = new XHRQueue();
+export default XHRQueue;