web-gatekeeper-js 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-gatekeeper-js",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Redis based rate limiter and throttler using sliding window and token bucket algorithms",
   "main": "src/index.js",
   "type": "module",

package/src/RateLimiter.js

@@ -11,18 +11,23 @@ export class RateLimiter {
 
   constructor({ redisClient, windowSize, limit, maxToken, refillRate }) {
     if (!redisClient) throw new Error("redisClient is required");
-    if (!windowSize) throw new Error("windowSize is required");
-    if (!limit) throw new Error("limit is required");
+    if (windowSize == null) throw new Error("windowSize is required");
+    if (limit == null) throw new Error("limit is required");
     if (maxToken == null) throw new Error("maxToken is required");
     if (refillRate == null) throw new Error("refillRate is required");
 
-    if (refillRate <= 0) {
-  throw new Error("refillRate must be greater than 0");
-}
-
-if (maxToken <= 0) {
-  throw new Error("maxToken must be greater than 0");
-}
+    if (!Number.isFinite(windowSize) || windowSize <= 0) {
+      throw new Error("windowSize must be a positive number (ms)");
+    }
+    if (!Number.isFinite(limit) || limit <= 0) {
+      throw new Error("limit must be a positive number");
+    }
+    if (!Number.isFinite(maxToken) || maxToken <= 0) {
+      throw new Error("maxToken must be a positive number");
+    }
+    if (!Number.isFinite(refillRate) || refillRate <= 0) {
+      throw new Error("refillRate must be a positive number");
+    }
 
     this.#store = new RedisStore(redisClient);
     this.#windowSize = windowSize;

package/src/Throttler.js

@@ -10,8 +10,15 @@ export class Throttler {
 
   constructor({ redisClient, refillRate, maxWait }) {
     if (!redisClient) throw new Error('redisClient is required')
-    if (!refillRate)  throw new Error('refillRate is required')
-    if (!maxWait)     throw new Error('maxWait is required')
+    if (refillRate == null)  throw new Error('refillRate is required')
+    if (maxWait == null)     throw new Error('maxWait is required')
+
+    if (!Number.isFinite(refillRate) || refillRate <= 0) {
+      throw new Error('refillRate must be a positive number')
+    }
+    if (!Number.isFinite(maxWait) || maxWait < 0) {
+      throw new Error('maxWait must be a non-negative number')
+    }
 
     this.#store      = new RedisStore(redisClient)
     this.#refillRate = refillRate

package/src/scripts/slidingWindow.lua.js

@@ -3,7 +3,9 @@ export const slidingWindowScript = `
   local windowSize = math.floor(tonumber(ARGV[1]))
   local limit      = math.floor(tonumber(ARGV[2]))
   local now        = math.floor(tonumber(ARGV[3]))
-  local ttl        = math.floor(tonumber(ARGV[4]))
+  local ttlRaw     = tonumber(ARGV[4])
+  local ttl        = math.floor(ttlRaw or 0)
+  if ttl < 1 then ttl = 1 end
 
   local windowStart = math.floor(now / windowSize) * windowSize
   local resetAfter  = math.ceil((windowSize - (now - windowStart)) / 1000)

package/src/scripts/throttler.lua.js

@@ -3,7 +3,9 @@ export const throttlerScript = `
   local now        = math.floor(tonumber(ARGV[1]))
   local refillRate = tonumber(ARGV[2])
   local maxWait    = math.floor(tonumber(ARGV[3]))
-  local ttl        = math.floor(tonumber(ARGV[4]))
+  local ttlRaw     = tonumber(ARGV[4])
+  local ttl        = math.floor(ttlRaw or 0)
+  if ttl < 1 then ttl = 1 end
 
   -- safely read nextAllowedTime
   local raw             = redis.call('HGET', key, 'nextAllowedTime')

package/src/scripts/tokenBucket.lua.js

@@ -3,7 +3,9 @@ export const tokenBucketScript = `
   local now        = math.floor(tonumber(ARGV[1]))
   local maxToken   = tonumber(ARGV[2])
   local refillRate = tonumber(ARGV[3])
-  local ttl        = math.floor(tonumber(ARGV[4]))
+  local ttlRaw     = tonumber(ARGV[4])
+  local ttl        = math.floor(ttlRaw or 0)
+  if ttl < 1 then ttl = 1 end
 
   local rawTime   = redis.call('HGET', key, 'time')
   local rawTokens = redis.call('HGET', key, 'tokenLeft')