fix linter errors

Author: rrd108

playground/nuxt.config.ts

@@ -1,18 +1,6 @@
 export default defineNuxtConfig({
   modules: ['../src/module'],
-  nuxtApiShield: {
-    limit: {
-      max: 12,
-      duration: 10,
-      ban: 30,
-    },
-    delayOnBan: true,
-    retryAfterHeader: true,
-    log: {
-      path: 'logs',
-      attempts: 5,
-    },
-  },
+  devtools: { enabled: true },
   nitro: {
     storage: {
       shield: {
@@ -28,5 +16,17 @@ export default defineNuxtConfig({
       '*/5 * * * *': ['shield:clean'],
     },
   },
-  devtools: { enabled: true },
+  nuxtApiShield: {
+    limit: {
+      max: 12,
+      duration: 10,
+      ban: 30,
+    },
+    delayOnBan: true,
+    retryAfterHeader: true,
+    log: {
+      path: 'logs',
+      attempts: 5,
+    },
+  },
 })

src/runtime/server/middleware/shield.ts

@@ -1,5 +1,4 @@
 import type { RateLimit } from '../types/RateLimit'
-import { isBanExpired } from '../utils/isBanExpired'
 import shieldLog from '../utils/shieldLog'
 import {
   createError,
@@ -29,7 +28,7 @@ export default defineEventHandler(async (event) => {
   const banKey = `ban:${requestIP}`
   const bannedUntilRaw = await shieldStorage.getItem(banKey)
   const bannedUntil = typeof bannedUntilRaw === 'number' ? bannedUntilRaw : Number(bannedUntilRaw)
-  if (bannedUntilRaw && !isNaN(bannedUntil) && Date.now() < bannedUntil) {
+  if (bannedUntilRaw && !Number.isNaN(bannedUntil) && Date.now() < bannedUntil) {
     if (config.retryAfterHeader) {
       const retryAfter = Math.ceil((bannedUntil - Date.now()) / 1000)
       event.node.res.setHeader('Retry-After', retryAfter)
@@ -38,7 +37,8 @@ export default defineEventHandler(async (event) => {
       statusCode: 429,
       message: config.errorMessage,
     })
-  } else if (bannedUntilRaw && !isNaN(bannedUntil) && Date.now() >= bannedUntil) {
+  }
+  else if (bannedUntilRaw && !Number.isNaN(bannedUntil) && Date.now() >= bannedUntil) {
     await shieldStorage.removeItem(banKey)
     await shieldStorage.setItem(`ip:${requestIP}`, {
       count: 1,
@@ -74,7 +74,6 @@ export default defineEventHandler(async (event) => {
     count: 1,
     time: Date.now(),
   })
-  
 
   if (config.retryAfterHeader) {
     event.node.res.setHeader('Retry-After', config.limit.ban)
@@ -97,17 +96,3 @@ const isRateLimited = (req: RateLimit) => {
   // console.log("  ", (Date.now() - req.time) / 1000, "<", options.limit.duration);
   return (Date.now() - req.time) / 1000 < options.limit.duration
 }
-
-const banDelay = async (req: RateLimit) => {
-  const options = useRuntimeConfig().public.nuxtApiShield
-  // console.log("  delayOnBan is: " + options.delayOnBan);
-  if (options.delayOnBan && req.count > options.limit.max) {
-    // INFO Nuxt Devtools will send a new request if the response is slow,
-    // so we get the count incremented twice or more times, based on the ban delay time
-    // console.log(`  Applying ban delay for ${(req.count - options.limit.max) * options.limit.ban} sec (${Date.now()})`);
-    await new Promise(resolve =>
-      setTimeout(resolve, (req.count - options.limit.max) * options.limit.ban * 1000),
-    )
-    // console.log(`  Ban delay completed (${Date.now()})`);
-  }
-}

test/basic.test.ts

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'node:url'
-import { readFile, rm } from 'node:fs/promises'
+import { rm } from 'node:fs/promises'
 import { beforeEach, describe, it, expect } from 'vitest'
 import { setup, $fetch } from '@nuxt/test-utils/e2e'
 import type { ApiResponse } from './ApiResponse'
@@ -102,7 +102,8 @@ describe('shield', async () => {
     try {
       await $fetch('/api/basicexample?c=77/3', { method: 'GET', retryStatusCodes: [] })
       throw new Error('Nem dobott hibát a 3. kérésnél!')
-    } catch (err) {
+    }
+    catch (err) {
       const typedErr = err as { statusCode: number, statusMessage: string }
       expect(typedErr.statusCode).toBe(429)
     }
@@ -112,7 +113,8 @@ describe('shield', async () => {
     try {
       await $fetch('/api/basicexample?c=77/4', { method: 'GET', retryStatusCodes: [] })
       throw new Error('Nem dobott hibát a ban idő alatt!')
-    } catch (err) {
+    }
+    catch (err) {
       const typedErr = err as { statusCode: number, statusMessage: string }
       expect(typedErr.statusCode).toBe(429)
     }

test/fixtures/basic/nuxt.config.ts

@@ -2,6 +2,15 @@ import nuxtApiShield from '../../../src/module'
 
 export default defineNuxtConfig({
   modules: [nuxtApiShield],
+  nitro: {
+    storage: {
+      shield: {
+        // driver: "memory",
+        driver: 'fs',
+        base: '_testBasicShield',
+      },
+    },
+  },
   nuxtApiShield: {
     limit: {
       max: 2,
@@ -15,13 +24,4 @@ export default defineNuxtConfig({
       attempts: 3,
     },
   },
-  nitro: {
-    storage: {
-      shield: {
-        // driver: "memory",
-        driver: 'fs',
-        base: '_testBasicShield',
-      },
-    },
-  },
 })

test/fixtures/withroutes/nuxt.config.ts

@@ -2,6 +2,15 @@ import nuxtApiShield from '../../../src/module'
 
 export default defineNuxtConfig({
   modules: [nuxtApiShield],
+  nitro: {
+    storage: {
+      shield: {
+        // driver: "memory",
+        driver: 'fs',
+        base: '_testWithRoutesShield',
+      },
+    },
+  },
   nuxtApiShield: {
     limit: {
       max: 2,
@@ -13,13 +22,4 @@ export default defineNuxtConfig({
     log: { path: '', attempts: 0 },
     routes: ['/api/v3'],
   },
-  nitro: {
-    storage: {
-      shield: {
-        // driver: "memory",
-        driver: 'fs',
-        base: '_testWithRoutesShield',
-      },
-    },
-  },
 })