Skip to content

refactor #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 49 additions & 89 deletions rateLimiter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,64 @@
const sqlite3 = require('sqlite3').verbose();
const sqlite3 = require("sqlite3").verbose();
const runAsync = require("./utils/runAsync");
const getAsync = require("./utils/getAsync");
const setRateLimitHeaders = require("./utils/setRateLimitHeaders");
let db;

// Initialize database
db = new sqlite3.Database(':memory:');
db = new sqlite3.Database(":memory:");
db.run(
'CREATE TABLE IF NOT EXISTS rate_limit (ip TEXT, count INTEGER, expire_time INTEGER)'
"CREATE TABLE IF NOT EXISTS rate_limit (ip TEXT, count INTEGER, expire_time INTEGER)"
);

// Runs a query and returns a promise
const runAsync = (query, params = []) => {
return new Promise((resolve, reject) => {
db.run(query, params, function (err) {
if (err) reject(err);
else resolve(this);
});
});
};

// Gets a single wrapped result row as a promise
const getAsync = (query, params = []) => {
return new Promise((resolve, reject) => {
db.get(query, params, function (err, row) {
if (err) reject(err);
else resolve(row);
});
});
};

// Sets the rate limit headers
const setRateLimitHeaders = (
res,
maxRequests,
requestCount,
windowInSeconds
) => {
res.set({
'X-RateLimit-Limit': maxRequests,
'X-RateLimit-Remaining': maxRequests - requestCount,
'X-RateLimit-Reset': windowInSeconds,
});
};

// Returns an async middleware function that rate limits incoming requests
module.exports = function createRateLimiter({
maxRequests = 100,
windowInSeconds = 900,
maxRequests = 100,
windowInSeconds = 900,
}) {
return async (req, res, next) => {
const ip = req.ip;
const key = `rate_limit:${ip}`;
return async (req, res, next) => {
const ip = req.ip;
const key = `rate_limit:${ip}`;

try {
// Gets the row for the current IP, creates a new one if it doesn't exist
let row = await getAsync('SELECT * FROM rate_limit WHERE ip = ?', [
key,
]);
const currentTime = Math.floor(Date.now() / 1000);
try {
// Gets the row for the current IP, creates a new one if it doesn't exist
let row = await getAsync("SELECT * FROM rate_limit WHERE ip = ?", [key]);
const currentTime = Math.floor(Date.now() / 1000);

if (!row) {
await runAsync(
'INSERT INTO rate_limit(ip, count, expire_time) VALUES(?, ?, ?)',
[key, 1, currentTime + windowInSeconds]
);
} else {
// Resets the count if the window has expired, else incremenets
if (currentTime > row.expire_time) {
await runAsync(
'UPDATE rate_limit SET count = ?, expire_time = ? WHERE ip = ?',
[1, currentTime + windowInSeconds, key]
);
} else {
await runAsync(
'UPDATE rate_limit SET count = count + 1 WHERE ip = ?',
[key]
);
}
}
if (!row) {
await runAsync(
"INSERT INTO rate_limit(ip, count, expire_time) VALUES(?, ?, ?)",
[key, 1, currentTime + windowInSeconds]
);
} else {
// Resets the count if the window has expired, else incremenets
if (currentTime > row.expire_time) {
await runAsync(
"UPDATE rate_limit SET count = ?, expire_time = ? WHERE ip = ?",
[1, currentTime + windowInSeconds, key]
);
} else {
await runAsync(
"UPDATE rate_limit SET count = count + 1 WHERE ip = ?",
[key]
);
}
}

// Checks whether the request is over the limit
row = await getAsync('SELECT * FROM rate_limit WHERE ip = ?', [
key,
]);
const requestCount = row.count;
if (requestCount > maxRequests) {
return res.status(429).json({ message: 'Rate limit exceeded' });
}
// Checks whether the request is over the limit
row = await getAsync("SELECT * FROM rate_limit WHERE ip = ?", [key]);
const requestCount = row.count;
if (requestCount > maxRequests) {
return res.status(429).json({ message: "Rate limit exceeded" });
}

// Sets the rate limit headers
setRateLimitHeaders(
res,
maxRequests,
requestCount,
windowInSeconds
);
// Sets the rate limit headers
setRateLimitHeaders(res, maxRequests, requestCount, windowInSeconds);

// Passes the request to the next middleware
next();
} catch (err) {
console.error('SQLite query failed:', err);
return res.status(500).json({ message: 'Internal Server Error' });
}
};
// Passes the request to the next middleware
next();
} catch (err) {
console.error("SQLite query failed:", err);
return res.status(500).json({ message: "Internal Server Error" });
}
};
};
10 changes: 10 additions & 0 deletions utils/getAsync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Gets a single wrapped result row as a promise
const getAsync = (query, params = []) => {
return new Promise((resolve, reject) => {
db.get(query, params, function (err, row) {
if (err) reject(err);
else resolve(row);
});
});
};
module.exports = getAsync;
11 changes: 11 additions & 0 deletions utils/runAsync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Runs a query and returns a promise
const runAsync = (query, params = []) => {
return new Promise((resolve, reject) => {
db.run(query, params, function (err) {
if (err) reject(err);
else resolve(this);
});
});
};

module.exports = runAsync;
15 changes: 15 additions & 0 deletions utils/setRateLimitHeaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Sets the rate limit headers
const setRateLimitHeaders = (
res,
maxRequests,
requestCount,
windowInSeconds
) => {
res.set({
"X-RateLimit-Limit": maxRequests,
"X-RateLimit-Remaining": maxRequests - requestCount,
"X-RateLimit-Reset": windowInSeconds,
});
};
module.exports = setRateLimitHeaders;