web-gatekeeper-js 1.0.9 → 1.0.11

package/package.json

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

package/src/scripts/slidingWindow.lua.js

@@ -21,7 +21,7 @@ export const slidingWindowScript = `
       'currentCount',  1,
       'previousCount', 0
     )
-    redis.call('PEXPIRE', key, math.floor(ttl))
+    redis.call('EXPIRE', key, math.floor(ttl))
     return { 1, 1, limit - 1, resetAfter }   -- ← 4 values
   end
 
@@ -55,7 +55,7 @@ export const slidingWindowScript = `
     'currentCount',  newCurrentCount,
     'previousCount', newPreviousCount
   )
-  redis.call('PEXPIRE', key, math.floor(ttl))
+  redis.call('EXPIRE', key, math.floor(ttl))
 
   local remaining = math.floor(limit - effectiveCount - 1)
   return { 1, newCurrentCount, remaining, resetAfter }   -- ← 4 values

package/src/scripts/throttler.lua.js

@@ -14,21 +14,21 @@ export const throttlerScript = `
 
   -- reject if queue too full
   if waitTime > maxWait then
-    return { 0, waitTime }
+    return { 0, math.floor(waitTime) }
   end
 
   -- calculate new nextAllowedTime
   local newNextAllowedTime
   if waitTime <= 0 then
-    newNextAllowedTime = now + (1000 / refillRate)
+    newNextAllowedTime = math.floor(now + (1000 / refillRate))
   else
-    newNextAllowedTime = nextAllowedTime + (1000 / refillRate)
+    newNextAllowedTime = math.floor(nextAllowedTime + (1000 / refillRate))
   end
 
   -- save and set TTL
   redis.call('HSET', key, 'nextAllowedTime', newNextAllowedTime)
-  redis.call('PEXPIRE', key, math.floor(ttl))
+  redis.call('EXPIRE', key, math.floor(ttl))
 
   -- return allowed + waitTime so Node.js knows how long to delay
-  return { 1, math.max(waitTime, 0) }
+  return { 1, math.floor(math.max(waitTime, 0)) }
 `

package/src/scripts/tokenBucket.lua.js

@@ -15,8 +15,8 @@ export const tokenBucketScript = `
       'time',      now,
       'tokenLeft', maxToken - 1
     )
-    redis.call('PEXPIRE', key, math.floor(ttl))
-    return { 1, maxToken - 1 }
+    redis.call('EXPIRE', key, math.floor(ttl))
+    return { 1, math.floor(maxToken - 1) }
   end
 
   -- calculate refill (same as your timeElapsed and updatedToken)
@@ -29,10 +29,10 @@ export const tokenBucketScript = `
       'time',      now,
       'tokenLeft', updatedToken
     )
-    redis.call('PEXPIRE', key, math.floor(ttl))
+    redis.call('EXPIRE', key, math.floor(ttl))
 
     local retryAfter = math.ceil((1 - updatedToken) / refillRate)
-    return { 0, 0, retryAfter }
+    return { 0, 0, math.floor(retryAfter) }
   end
 
   -- allow — consume 1 token and save (same as your hSet)
@@ -40,7 +40,7 @@ export const tokenBucketScript = `
     'time',      now,
     'tokenLeft', updatedToken - 1
   )
-  redis.call('PEXPIRE', key, math.floor(ttl))
+  redis.call('EXPIRE', key, math.floor(ttl))
 
-  return { 1, updatedToken - 1, 0 }
+  return { 1, math.floor(updatedToken - 1), 0 }
 `