#172 Merge pull request #173 from MiniKraken-Team/fix-negative-remain…

…ing-response-value fix for negative remaining values
animir · Jul 29, 2022 · b271676 · b271676
2 parents 76b94c0 + 1ef2438
commit b271676
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/RateLimiterMemory.js b/lib/RateLimiterMemory.js
@@ -48,7 +48,7 @@ class RateLimiterMemory extends RateLimiterAbstract {
     return new Promise((resolve) => {
       const secDuration = this._getKeySecDuration(options);
       const res = this._memoryStorage.incrby(rlKey, points, secDuration);
-      res.remainingPoints = this.points - res.consumedPoints;
+      res.remainingPoints = Math.max(this.points - res.consumedPoints, 0);
       resolve(res);
     });
   }
@@ -58,7 +58,7 @@ class RateLimiterMemory extends RateLimiterAbstract {
     return new Promise((resolve) => {
       const secDuration = this._getKeySecDuration(options);
       const res = this._memoryStorage.incrby(rlKey, -points, secDuration);
-      res.remainingPoints = this.points - res.consumedPoints;
+      res.remainingPoints = Math.max(this.points - res.consumedPoints, 0);
       resolve(res);
     });
   }
@@ -91,7 +91,7 @@ class RateLimiterMemory extends RateLimiterAbstract {
   get(key) {
     const res = this._memoryStorage.get(this.getKey(key));
     if (res !== null) {
-      res.remainingPoints = this.points - res.consumedPoints;
+      res.remainingPoints = Math.max(this.points - res.consumedPoints, 0);
     }
 
     return Promise.resolve(res);

diff --git a/test/RateLimiterMemory.test.js b/test/RateLimiterMemory.test.js
@@ -361,6 +361,7 @@ describe('RateLimiterMemory with fixed window', function RateLimiterMemoryTest()
         rateLimiter.get(testKey)
           .then((res) => {
             expect(res.consumedPoints).to.equal(12);
+            expect(res.remainingPoints).to.equal(0);
             done();
           });
       })