From cc9d442212fcb0dea8ccf0f682709e6b26a6b045 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Tue, 2 Apr 2024 20:40:58 -0700 Subject: [PATCH 1/2] remove expresss rate limits --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 90365b5..4babc00 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "cors": "^2.8.5", "dotenv": "^10.0.0", "express": "^4.18.2", - "express-rate-limit": "^6.7.0", "ioredis": "^5.3.2", "morgan": "^1.10.0", "prom-client": "^15.0.0", diff --git a/yarn.lock b/yarn.lock index 3855683..decea40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2521,11 +2521,6 @@ eventemitter3@^4.0.7: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -express-rate-limit@^6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-6.7.0.tgz#6aa8a1bd63dfe79702267b3af1161a93afc1d3c2" - integrity sha512-vhwIdRoqcYB/72TK3tRZI+0ttS8Ytrk24GfmsxDXK9o9IhHNO5bXRiXQSExPQ4GbaE5tvIS7j1SGrxsuWs+sGA== - express@^4.18.2: version "4.18.2" resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" From 845b7f9e0c98de17a0c332d563a2f7019c7b2b10 Mon Sep 17 00:00:00 2001 From: Nour Alharithi Date: Tue, 2 Apr 2024 20:49:52 -0700 Subject: [PATCH 2/2] update server lite --- src/serverLite.ts | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/serverLite.ts b/src/serverLite.ts index f607797..a2066fa 100644 --- a/src/serverLite.ts +++ b/src/serverLite.ts @@ -2,7 +2,6 @@ import { program } from 'commander'; import compression from 'compression'; import cors from 'cors'; import express from 'express'; -import rateLimit from 'express-rate-limit'; import morgan from 'morgan'; import { Commitment, Connection } from '@solana/web3.js'; @@ -65,13 +64,9 @@ const sdkConfig = initialize({ env: process.env.ENV }); const stateCommitment: Commitment = 'processed'; const serverPort = process.env.PORT || 6969; -const rateLimitCallsPerSecond = process.env.RATE_LIMIT_CALLS_PER_SECOND - ? parseInt(process.env.RATE_LIMIT_CALLS_PER_SECOND) - : 1; const SLOT_STALENESS_TOLERANCE = parseInt(process.env.SLOT_STALENESS_TOLERANCE) || 20; -const loadTestAllowed = process.env.ALLOW_LOAD_TEST?.toLowerCase() === 'true'; const logFormat = ':remote-addr - :remote-user [:date[clf]] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent" :req[x-forwarded-for]'; @@ -85,21 +80,6 @@ app.use(compression()); app.set('trust proxy', 1); app.use(logHttp); app.use(handleResponseTime); -app.use( - rateLimit({ - windowMs: 1000, // 1 second - max: rateLimitCallsPerSecond, - standardHeaders: true, // Return rate limit info in the `RateLimit-*` headers - legacyHeaders: false, // Disable the `X-RateLimit-*` headers - skip: (req, _res) => { - if (!loadTestAllowed) { - return false; - } - - return req.headers['user-agent'].includes('k6'); - }, - }) -); // Metrics defined here const bootTimeMs = Date.now();