Merge pull request #205 from Kkamikadzee/master

Switch from Unix seconds to milliseconds

Author: cristipufu

src/RedisRateLimiting/Concurrency/RedisConcurrencyManager.cs

@@ -18,8 +18,8 @@ internal class RedisConcurrencyManager
             local queue_limit = tonumber(@queue_limit)
             local try_enqueue = tonumber(@try_enqueue)
             local timestamp = tonumber(@current_time)
-            -- max seconds it takes to complete a request
-            local ttl = 60
+            -- max milliseconds it takes to complete a request
+            local ttl = 60000
 
             redis.call(""zremrangebyscore"", @rate_limit_key, '-inf', timestamp - ttl)
 
@@ -116,7 +116,7 @@ public RedisConcurrencyManager(
 
     internal async Task<RedisConcurrencyResponse> TryAcquireLeaseAsync(string requestId, bool tryEnqueue = false)
     {
-        var nowUnixTimeSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+        var unixTimeMilliseconds = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -130,7 +130,7 @@ internal async Task<RedisConcurrencyResponse> TryAcquireLeaseAsync(string reques
                 permit_limit = (RedisValue)_options.PermitLimit,
                 try_enqueue = (RedisValue)(tryEnqueue ? 1 : 0),
                 queue_limit = (RedisValue)_options.QueueLimit,
-                current_time = (RedisValue)nowUnixTimeSeconds,
+                current_time = (RedisValue)unixTimeMilliseconds,
                 unique_id = (RedisValue)requestId,
             });
 
@@ -149,7 +149,7 @@ internal async Task<RedisConcurrencyResponse> TryAcquireLeaseAsync(string reques
 
     internal RedisConcurrencyResponse TryAcquireLease(string requestId, bool tryEnqueue = false)
     {
-        var nowUnixTimeSeconds = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+        var unixTimeMilliseconds = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -163,7 +163,7 @@ internal RedisConcurrencyResponse TryAcquireLease(string requestId, bool tryEnqu
                 permit_limit = (RedisValue)_options.PermitLimit,
                 try_enqueue = (RedisValue)(tryEnqueue ? 1 : 0),
                 queue_limit = (RedisValue)_options.QueueLimit,
-                current_time = (RedisValue)nowUnixTimeSeconds,
+                current_time = (RedisValue)unixTimeMilliseconds,
                 unique_id = (RedisValue)requestId,
             });
 

src/RedisRateLimiting/FixedWindow/RedisFixedWindowManager.cs

@@ -25,8 +25,8 @@ internal class RedisFixedWindowManager
                 redis.call(""set"", @expires_at_key, @next_expires_at)
                 -- tell Redis to clean this up _one second after_ the expires_at time (clock differences).
                 -- (Redis will only clean up these keys long after the window has passed)
-                redis.call(""expireat"", @rate_limit_key, @next_expires_at + 1)
-                redis.call(""expireat"", @expires_at_key, @next_expires_at + 1)
+                redis.call(""pexpireat"", @rate_limit_key, @next_expires_at + 1)
+                redis.call(""pexpireat"", @expires_at_key, @next_expires_at + 1)
                 -- since the database was updated, return the new value
                 expires_at = @next_expires_at
             end
@@ -65,7 +65,7 @@ public RedisFixedWindowManager(
     internal async Task<RedisFixedWindowResponse> TryAcquireLeaseAsync(int permitCount)
     {
         var now = DateTimeOffset.UtcNow;
-        var nowUnixTimeSeconds = now.ToUnixTimeSeconds();
+        var unixTimeMilliseconds = now.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -75,8 +75,8 @@ internal async Task<RedisFixedWindowResponse> TryAcquireLeaseAsync(int permitCou
             {
                 rate_limit_key = RateLimitKey,
                 expires_at_key = RateLimitExpireKey,
-                next_expires_at = (RedisValue)now.Add(_options.Window).ToUnixTimeSeconds(),
-                current_time = (RedisValue)nowUnixTimeSeconds,
+                next_expires_at = (RedisValue)now.Add(_options.Window).ToUnixTimeMilliseconds(),
+                current_time = (RedisValue)unixTimeMilliseconds,
                 permit_limit = (RedisValue)_options.PermitLimit,
                 increment_amount = (RedisValue)permitCount,
             });
@@ -88,7 +88,7 @@ internal async Task<RedisFixedWindowResponse> TryAcquireLeaseAsync(int permitCou
             result.Count = (long)response[0];
             result.ExpiresAt = (long)response[1];
             result.Allowed = (bool)response[2];
-            result.RetryAfter = TimeSpan.FromSeconds(result.ExpiresAt - nowUnixTimeSeconds);
+            result.RetryAfter = TimeSpan.FromMilliseconds(result.ExpiresAt - unixTimeMilliseconds);
         }
 
         return result;
@@ -97,7 +97,7 @@ internal async Task<RedisFixedWindowResponse> TryAcquireLeaseAsync(int permitCou
     internal RedisFixedWindowResponse TryAcquireLease()
     {
         var now = DateTimeOffset.UtcNow;
-        var nowUnixTimeSeconds = now.ToUnixTimeSeconds();
+        var unixTimeMilliseconds = now.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -107,8 +107,8 @@ internal RedisFixedWindowResponse TryAcquireLease()
             {
                 rate_limit_key = RateLimitKey,
                 expires_at_key = RateLimitExpireKey,
-                next_expires_at = (RedisValue)now.Add(_options.Window).ToUnixTimeSeconds(),
-                current_time = (RedisValue)nowUnixTimeSeconds,
+                next_expires_at = (RedisValue)now.Add(_options.Window).ToUnixTimeMilliseconds(),
+                current_time = (RedisValue)unixTimeMilliseconds,
                 increment_amount = (RedisValue)1D,
             });
 
@@ -118,7 +118,7 @@ internal RedisFixedWindowResponse TryAcquireLease()
         {
             result.Count = (long)response[0];
             result.ExpiresAt = (long)response[1];
-            result.RetryAfter = TimeSpan.FromSeconds(result.ExpiresAt - nowUnixTimeSeconds);
+            result.RetryAfter = TimeSpan.FromMilliseconds(result.ExpiresAt - unixTimeMilliseconds);
         }
 
         return result;

src/RedisRateLimiting/SlidingWindow/RedisSlidingWindowManager.cs

@@ -28,7 +28,7 @@ internal class RedisSlidingWindowManager
                 redis.call(""zadd"", @rate_limit_key, timestamp, @unique_id)
             end
 
-            local expireAtMilliseconds = math.floor((timestamp + window) * 1000 + 1);
+            local expireAtMilliseconds = timestamp + window + 1;
             redis.call(""pexpireat"", @rate_limit_key, expireAtMilliseconds)
 
             if allowed
@@ -63,7 +63,7 @@ public RedisSlidingWindowManager(
     internal async Task<RedisSlidingWindowResponse> TryAcquireLeaseAsync(string requestId)
     {
         var now = DateTimeOffset.UtcNow;
-        double nowUnixTimeSeconds = now.ToUnixTimeMilliseconds() / 1000.0;
+        var unixTimeMilliseconds = now.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -74,8 +74,8 @@ internal async Task<RedisSlidingWindowResponse> TryAcquireLeaseAsync(string requ
                 rate_limit_key = RateLimitKey,
                 stats_key = StatsRateLimitKey,
                 permit_limit = (RedisValue)_options.PermitLimit,
-                window = (RedisValue)_options.Window.TotalSeconds,
-                current_time = (RedisValue)nowUnixTimeSeconds,
+                window = (RedisValue)_options.Window.TotalMilliseconds,
+                current_time = (RedisValue)unixTimeMilliseconds,
                 unique_id = (RedisValue)requestId,
             });
 
@@ -93,7 +93,7 @@ internal async Task<RedisSlidingWindowResponse> TryAcquireLeaseAsync(string requ
     internal RedisSlidingWindowResponse TryAcquireLease(string requestId)
     {
         var now = DateTimeOffset.UtcNow;
-        double nowUnixTimeSeconds = now.ToUnixTimeMilliseconds() / 1000.0;
+        var unixTimeMilliseconds = now.ToUnixTimeMilliseconds();
 
         var database = _connectionMultiplexer.GetDatabase();
 
@@ -104,8 +104,8 @@ internal RedisSlidingWindowResponse TryAcquireLease(string requestId)
                rate_limit_key = RateLimitKey,
                stats_key = StatsRateLimitKey,
                permit_limit = (RedisValue)_options.PermitLimit,
-               window = (RedisValue)_options.Window.TotalSeconds,
-               current_time = (RedisValue)nowUnixTimeSeconds,
+               window = (RedisValue)_options.Window.TotalMilliseconds,
+               current_time = (RedisValue)unixTimeMilliseconds,
                unique_id = (RedisValue)requestId,
            });