rate-limiter-flexible 8.3.0 → 9.0.1

package/lib/RateLimiterDynamo.js

@@ -154,15 +154,23 @@ class RateLimiterDynamo extends RateLimiterStoreAbstract {
       };
       
       const data = await this.client.getItem(params);
-      if(data.Item) {
-        return new DynamoItem(
+      
+      if (!data.Item) {
+          return null;
+        }
+
+        const item = new DynamoItem(
           data.Item.key.S,
           Number(data.Item.points.N),
           Number(data.Item.expire.N)
         );
-      } else {
-        return null;
-      }
+
+        const dateNowSec = Date.now() / 1000;
+
+        if (item.expire !== -1 && item.expire <= dateNowSec) {
+          return null;
+        }
+        return item;
     }
 
     /**

package/lib/RateLimiterMongo.js

@@ -1,34 +1,6 @@
 const RateLimiterStoreAbstract = require('./RateLimiterStoreAbstract');
 const RateLimiterRes = require('./RateLimiterRes');
 
-/**
- * Get MongoDB driver version as upsert options differ
- * @params {Object} Client instance
- * @returns {Object} Version Object containing major, feature & minor versions.
- */
-function getDriverVersion(client) {
-  try {
-    const _client = client.client ? client.client : client;
-
-    let _v = [0, 0, 0];
-    if (typeof _client.topology === 'undefined') {
-      const { version } = _client.options.metadata.driver;
-      _v = version.split('|', 1)[0].split('.').map(v => parseInt(v));
-    } else {
-      const { version } = _client.topology.s.options.metadata.driver;
-      _v = version.split('.').map(v => parseInt(v));
-    }
-
-    return {
-      major: _v[0],
-      feature: _v[1],
-      patch: _v[2],
-    };
-  } catch (err) {
-    return { major: 0, feature: 0, patch: 0 };
-  }
-}
-
 class RateLimiterMongo extends RateLimiterStoreAbstract {
   /**
    *
@@ -59,11 +31,9 @@ class RateLimiterMongo extends RateLimiterStoreAbstract {
         .then((conn) => {
           this.client = conn;
           this._initCollection();
-          this._driverVersion = getDriverVersion(this.client);
         });
     } else {
       this._initCollection();
-      this._driverVersion = getDriverVersion(this.client);
     }
   }
 
@@ -198,20 +168,11 @@ class RateLimiterMongo extends RateLimiterStoreAbstract {
       upsertData.$setOnInsert = Object.assign(upsertData.$setOnInsert, docAttrs);
     }
 
-    // Options for collection updates differ between driver versions
+    // All supported MongoDB drivers (3.6.7+) use returnDocument: 'after'
     const upsertOptions = {
       upsert: true,
+      returnDocument: 'after',
     };
-    if ((this._driverVersion.major >= 4) ||
-        (this._driverVersion.major === 3 &&
-          (this._driverVersion.feature >=7) ||
-          (this._driverVersion.feature >= 6 &&
-              this._driverVersion.patch >= 7 )))
-    {
-      upsertOptions.returnDocument = 'after';
-    } else {
-      upsertOptions.returnOriginal = false;
-    }
 
     /*
      * 1. Find actual limit and increment points

package/lib/RateLimiterQueue.js

@@ -3,14 +3,18 @@ const MAX_QUEUE_SIZE = 4294967295;
 const KEY_DEFAULT = 'limiter';
 
 module.exports = class RateLimiterQueue {
-  constructor(limiterFlexible, opts = {
-    maxQueueSize: MAX_QUEUE_SIZE,
-  }) {
+  constructor(limiterFlexible, opts = {}) {
+    const maxQueueSize =
+      opts.maxQueueSize !== undefined ? opts.maxQueueSize : MAX_QUEUE_SIZE;
     this._queueLimiters = {
-      KEY_DEFAULT: new RateLimiterQueueInternal(limiterFlexible, opts)
+      KEY_DEFAULT: new RateLimiterQueueInternal(limiterFlexible, {
+        ...opts,
+        maxQueueSize,
+        key: KEY_DEFAULT
+      }),
     };
     this._limiterFlexible = limiterFlexible;
-    this._maxQueueSize = opts.maxQueueSize
+    this._maxQueueSize = maxQueueSize;
   }
 
   getTokensRemaining(key = KEY_DEFAULT) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-limiter-flexible",
-  "version": "8.3.0",
+  "version": "9.0.1",
   "description": "Node.js atomic and non-atomic counters, rate limiting tools, protection from DoS and brute-force attacks at scale",
   "main": "index.js",
   "scripts": {