fix(service): convert ms to secs in in increment-func (fixes #1167)

kkoomen · May 13, 2023 · 8269a2b · 8269a2b
1 parent 65cd3ca
commit 8269a2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/throttler-storage-redis.service.ts b/src/throttler-storage-redis.service.ts
@@ -70,7 +70,10 @@ export class ThrottlerStorageRedisService implements ThrottlerStorageRedis, OnMo
       throw new TypeError('Expected timeToExpire to be a number');
     }
 
-    return { totalHits, timeToExpire };
+    return {
+      totalHits,
+      timeToExpire: Math.ceil(timeToExpire / 1000),
+    };
   }
 
   onModuleDestroy() {

diff --git a/test/controller.e2e-spec.ts b/test/controller.e2e-spec.ts
@@ -83,7 +83,7 @@ describe.each`
           expect(response.headers).not.toMatchObject({
             'x-ratelimit-limit': '2',
             'x-ratelimit-remaining': '1',
-            'x-ratelimit-reset': /^\d+$/,
+            'x-ratelimit-reset': '10',
           });
         });
         it('GET /ignore-user-agents', async () => {
@@ -94,7 +94,7 @@ describe.each`
           expect(response.headers).not.toMatchObject({
             'x-ratelimit-limit': '2',
             'x-ratelimit-remaining': '1',
-            'x-ratelimit-reset': /^\d+$/,
+            'x-ratelimit-reset': '10',
           });
         });
         it('GET /', async () => {
@@ -103,7 +103,7 @@ describe.each`
           expect(response.headers).toMatchObject({
             'x-ratelimit-limit': '2',
             'x-ratelimit-remaining': '1',
-            'x-ratelimit-reset': /^\d+$/,
+            'x-ratelimit-reset': '10',
           });
         });
       });
@@ -124,13 +124,13 @@ describe.each`
               expect(response.headers).toMatchObject({
                 'x-ratelimit-limit': limit.toString(),
                 'x-ratelimit-remaining': (limit - (i + 1)).toString(),
-                'x-ratelimit-reset': /^\d+$/,
+                'x-ratelimit-reset': '10',
               });
             }
             const errRes = await httPromise(appUrl + '/limit' + url, method);
             expect(errRes.data).toMatchObject({ statusCode: 429, message: /ThrottlerException/ });
             expect(errRes.headers).toMatchObject({
-              'retry-after': /^\d+$/,
+              'retry-after': '10',
             });
             expect(errRes.status).toBe(429);
           },
@@ -147,15 +147,15 @@ describe.each`
               expect(response.headers).toMatchObject({
                 'x-ratelimit-limit': limit.toString(),
                 'x-ratelimit-remaining': (limit - (i + 1)).toString(),
-                'x-ratelimit-reset': /^\d+$/,
+                'x-ratelimit-reset': '10',
               });
             } else {
               expect(response.data).toMatchObject({
                 statusCode: 429,
                 message: /ThrottlerException/,
               });
               expect(response.headers).toMatchObject({
-                'retry-after': /^\d+$/,
+                'retry-after': '10',
               });
               expect(response.status).toBe(429);
             }
@@ -172,7 +172,7 @@ describe.each`
           expect(response.headers).toMatchObject({
             'x-ratelimit-limit': '5',
             'x-ratelimit-remaining': '4',
-            'x-ratelimit-reset': /^\d+$/,
+            'x-ratelimit-reset': '60',
           });
         });
       });