add hourly ratelimit info

Author: InventivetalentDev

src/generator/v2/V2GenerateHandler.ts

@@ -117,6 +117,8 @@ export class V2GenerateHandler {
                 req.nextRequest = Math.max(req.nextRequest || 0, (req.maxPerMinuteReset || 0) * 1000, now)
             }
 
+            const remainingHour = Math.max(0, (req.maxPerHour || 0) - (req.requestsThisHour || 0));
+
             const info = {
                 next: {
                     absolute: req.nextRequest || now,
@@ -127,9 +129,24 @@ export class V2GenerateHandler {
                     seconds: req.minDelay ? req.minDelay / 1000 : 0
                 },
                 limit: {
+                    //TODO: remove redundant fields
+                    used: req.requestsThisMinute || 0,
                     limit: req.maxPerMinute || 0,
                     remaining: remaining,
-                    reset: req.maxPerMinuteReset || Math.floor(now / 1000)
+                    reset: req.maxPerMinuteReset || Math.floor(now / 1000),
+
+                    minute: {
+                        used: req.requestsThisMinute || 0,
+                        limit: req.maxPerMinute || 0,
+                        remaining: remaining,
+                        reset: req.maxPerMinuteReset || Math.floor(now / 1000)
+                    },
+                    hour: {
+                        used: req.requestsThisHour || 0,
+                        limit: req.maxPerHour || 0,
+                        remaining: remainingHour,
+                        reset: req.maxPerHourReset || Math.floor(now / 1000)
+                    }
                 }
             };
             if (res) {

src/middleware/rateLimit.ts

@@ -69,6 +69,10 @@ export const globalPerMinuteInitMiddleware = async (req: GenerateV2Request, res:
             const now = Date.now();
             req.nextRequest = Math.max(req.nextRequest || 0, (req.maxPerMinuteReset || 0) * 1000, now)
         }
+
+        const [hourlyCounter, hourlyExp] = await trafficService.getHourlyRequestCounter(req.clientInfo);
+        req.requestsThisHour = hourlyCounter;
+        req.maxPerHourReset = hourlyExp;
     }
 
 

src/routes/v2/types.ts

@@ -37,6 +37,11 @@ export interface GenerateV2Request extends MineSkinV2Request {
     /** in seconds**/
     maxPerMinuteReset?: number;
 
+    requestsThisHour?: number;
+    maxPerHour?: number;
+    /** in seconds**/
+    maxPerHourReset?: number;
+
     maxConcurrent?: number;
     concurrentRequests?: number;