Compare commits

..

2 Commits

Author SHA1 Message Date
ead8fcffc0 Added matchesCidr utility
All checks were successful
Build / Publish Docs (push) Successful in 49s
Build / Build NPM Project (push) Successful in 1m8s
Build / Tag Version (push) Successful in 9s
2026-01-17 21:11:26 -05:00
367b026cea Added new error code (429 - too many requests)
All checks were successful
Build / Publish Docs (push) Successful in 49s
Build / Build NPM Project (push) Successful in 1m3s
Build / Tag Version (push) Successful in 9s
2026-01-17 13:20:55 -05:00
3 changed files with 30 additions and 1 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "@ztimson/utils",
"version": "0.28.5",
"version": "0.28.7",
"description": "Utility library",
"author": "Zak Timson",
"license": "MIT",

View File

@@ -113,6 +113,18 @@ export class NotAcceptableError extends CustomError {
}
}
export class TooManyRequestsError extends CustomError {
static code = 429;
constructor(message: string = 'Rate Limit Reached') {
super(message);
}
static instanceof(err: Error) {
return (<any>err).constructor.code == this.code;
}
}
export class InternalServerError extends CustomError {
static code = 500;

View File

@@ -76,6 +76,23 @@ export function gravatar(email: string, def='mp') {
return `https://www.gravatar.com/avatar/${md5(email)}?d=${def}`;
}
/**
* Check if IP address falls within CIDR range
* @param {string} ip IPV4 to check (192.168.0.12)
* @param {string} cidr IP range to check against (example: 192.168.0.0/24)
* @returns {boolean} Whether IP address is within range
*/
export function matchesCidr(ip: string, cidr: string): boolean {
if(!cidr) return true;
if(!ip) return false;
if(!cidr?.includes('/')) return ip === cidr; // Single IP
const [range, bits] = cidr.split('/');
const mask = ~(2 ** (32 - parseInt(bits)) - 1);
const ipToInt = (str: string) => str.split('.')
.reduce((int, octet) => (int << 8) + parseInt(octet), 0) >>> 0;
return (ipToInt(ip) & mask) === (ipToInt(range) & mask);
}
/**
* Convert IPv6 to v4 because who uses that, NAT4Life
* @param {string} ip IPv6 address, e.g. 2001:0db8:85a3:0000:0000:8a2e:0370:7334