Merge pull request #9 from dafortune/support-ttl

Support TTL
limitd · Jan 15, 2019 · 7af4235 · 7af4235
2 parents 5f6adcc + 3dbb1ad
commit 7af4235
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/db.js b/lib/db.js
@@ -39,7 +39,8 @@ function normalizeType(params) {
     'per_interval',
     'interval',
     'size',
-    'unlimited'
+    'unlimited',
+    'ttl'
   ]);
 
   INTERVAL_SHORTCUTS.forEach(ish => {
@@ -52,7 +53,7 @@ function normalizeType(params) {
     type.size = type.per_interval;
   }
 
-  if (type.per_interval) {
+  if (type.per_interval && !type.ttl) {
     type.ttl = (type.size * type.interval) / type.per_interval;
 
     if (process.env.NODE_ENV !== 'test') {

diff --git a/test/db.tests.js b/test/db.tests.js
@@ -34,6 +34,10 @@ const types = {
         size: 10
       }
     }
+  },
+  ttl_test: {
+    size: 10,
+    ttl: 100
   }
 };
 
@@ -138,6 +142,19 @@ describeForEachConfig((getConfig) => {
       });
     });
 
+    it('should support specifying a ttl in the bucket configuration', function (done) {
+      const params = { type: 'ttl_test', key: '211.45.66.1'};
+      db.take(params, function (err) {
+        if (err) return done(err);
+        setTimeout(function () {
+          db._types[params.type].db.get(params.key, function (err, result) {
+            assert.isUndefined(result);
+            done();
+          });
+        }, 300);
+      });
+    });
+
     it('should return TRUE with right remaining and reset after filling up the bucket', (done) => {
       var now = 1425920267;
       db.take({