rate-limiter-flexible 11.0.0 → 11.0.2

package/README.md

@@ -32,7 +32,7 @@ Memory limiter also works in the browser.
 
 **Deno compatible** See [this example](https://gist.github.com/animir/d06ca92931677f330d3f2d4c6c3108e4) 
 
-The enhanced fixed window algorithm starts counting from the moment a request is received, diversifying rate limit reset times across clients.
+The Flexible Fixed Window algorithm starts counting from the moment a request is received, diversifying rate limit reset times across clients. Read more [here](https://github.com/animir/node-rate-limiter-flexible/wiki/Fixed-Window-rate-limiting-algorithm-explained)
 
 ## Installation
 

package/lib/RateLimiterDrizzle.js

@@ -9,23 +9,76 @@ class RateLimiterDrizzleError extends Error {
   }
 }
 
-async function getDrizzleOperators() {
+async function loadDrizzleOperators() {
   if (drizzleOperators) return drizzleOperators;
 
-  try {
-    // Use dynamic import to prevent static analysis tools from detecting the import
-    function getPackageName() {
-      return ['drizzle', 'orm'].join('-');
+  const requiredOperators = ['and', 'or', 'gt', 'lt', 'eq', 'isNull', 'sql'];
+
+  // Use dynamic import to prevent static analysis tools from detecting the import
+  function getPackageName() {
+    return ['drizzle', 'orm'].join('-');
+  }
+
+  const collectModuleLayers = (mod) => {
+    const layers = [];
+    const seen = new Set();
+    let current = mod;
+
+    while (current && (typeof current === 'object' || typeof current === 'function') && !seen.has(current)) {
+      layers.push(current);
+      seen.add(current);
+      current = current.default;
+    }
+
+    return layers;
+  };
+
+  const importModule = async (specifier, { optional = false } = {}) => {
+    try {
+      return await import(/* @vite-ignore */ specifier);
+    } catch (error) {
+      if (optional) {
+        return null;
+      }
+      throw new RateLimiterDrizzleError(
+        error.message || 'Failed to import drizzle-orm package.'
+      );
+    }
+  };
+
+  const mainModule = await importModule(`${getPackageName()}`);
+  const sqlModule = await importModule(`${getPackageName()}/sql`, { optional: true });
+
+  const mainCandidates = collectModuleLayers(mainModule);
+  const sqlCandidates = sqlModule ? collectModuleLayers(sqlModule) : [];
+  const resolvedOperators = {};
+  const missingOperators = [];
+
+  for (const operatorName of requiredOperators) {
+    const candidates = operatorName === 'sql'
+      ? [...sqlCandidates, ...mainCandidates]
+      : mainCandidates;
+
+    const operator = candidates
+      .map((candidate) => candidate?.[operatorName])
+      .find((value) => typeof value === 'function');
+
+    if (!operator) {
+      missingOperators.push(operatorName);
+      continue;
     }
-    const drizzleOrm = await import(`${getPackageName()}`);
-    const { and, or, gt, lt, eq, isNull, sql } = drizzleOrm.default || drizzleOrm;
-    drizzleOperators = { and, or, gt, lt, eq, isNull, sql };
-    return drizzleOperators;
-  } catch (error) {
+
+    resolvedOperators[operatorName] = operator;
+  }
+
+  if (missingOperators.length > 0) {
     throw new RateLimiterDrizzleError(
-      'drizzle-orm is not installed. Please install drizzle-orm to use RateLimiterDrizzle.'
+      `Failed to load drizzle-orm operators: missing ${missingOperators.join(', ')}`
     );
   }
+
+  drizzleOperators = resolvedOperators;
+  return drizzleOperators;
 }
 
 const RateLimiterStoreAbstract = require('./RateLimiterStoreAbstract');
@@ -71,7 +124,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { eq, sql } = await getDrizzleOperators();
+    const { eq, sql } = await loadDrizzleOperators();
     const now = new Date();
     const newExpire = msDuration > 0 ? new Date(now.getTime() + msDuration) : null;
 
@@ -117,7 +170,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { and, or, gt, eq, isNull } = await getDrizzleOperators();
+    const { and, or, gt, eq, isNull } = await loadDrizzleOperators();
 
     const [response] = await this.drizzleClient
       .select()
@@ -139,7 +192,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { eq } = await getDrizzleOperators();
+    const { eq } = await loadDrizzleOperators();
 
     const [result] = await this.drizzleClient
       .delete(this.schema)
@@ -156,7 +209,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
 
     this._clearExpiredTimeoutId = setTimeout(async () => {
       try {
-        const { lt } = await getDrizzleOperators();
+        const { lt } = await loadDrizzleOperators();
         await this.drizzleClient
           .delete(this.schema)
           .where(lt(this.schema.expire, new Date(Date.now() - EXPIRED_THRESHOLD_MS)));

package/lib/RateLimiterMemory.js

@@ -35,6 +35,8 @@ class RateLimiterMemory extends RateLimiterAbstract {
         if (delay < this.execEvenlyMinDelayMs) {
           delay = res.consumedPoints * this.execEvenlyMinDelayMs;
         }
+        // Adjust msBeforeNext to reflect time already waited before resolving
+        res.msBeforeNext = Math.max(res.msBeforeNext - delay, 0);
 
         setTimeout(resolve, delay, res);
       } else {

package/lib/RateLimiterStoreAbstract.js

@@ -85,6 +85,9 @@ module.exports = class RateLimiterStoreAbstract extends RateLimiterInsuredAbstra
         delay = res.consumedPoints * this.execEvenlyMinDelayMs;
       }
 
+      // Adjust msBeforeNext to reflect time already waited before resolving
+      res.msBeforeNext = Math.max(res.msBeforeNext - delay, 0);
+
       setTimeout(resolve, delay, res);
     } else {
       resolve(res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-limiter-flexible",
-  "version": "11.0.0",
+  "version": "11.0.2",
   "description": "Node.js atomic and non-atomic counters, rate limiting tools, protection from DoS and brute-force attacks at scale",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,8 @@
     "test:valkey-cluster": "VALKEY_CLUSTER_PORT=7001 mocha test/RateLimiterValkeyGlide.test.js --  -g 'RateLimiterValkeyGlide with cluster client'",
     "prisma:postgres": "prisma generate --schema=./test/RateLimiterPrisma/Postgres/schema.prisma && prisma db push --schema=./test/RateLimiterPrisma/Postgres/schema.prisma",
     "drizzle:postgres": "cd ./test/RateLimiterDrizzle/Postgres && drizzle-kit push",
-    "test": "npm run prisma:postgres && npm run drizzle:postgres && nyc --reporter=html --reporter=text mocha \"test/**/*.test.js\"",
+    "test:drizzle:postgres:v1": "npm i --no-save --no-package-lock drizzle-orm@^1.0.0-beta.23 && mocha test/RateLimiterDrizzle/Postgres/RateLimiterDrizzlePostgres.test.js && ( [ \"$GITHUB_ACTIONS\" = \"true\" ] || npm i )",
+    "test": "npm run prisma:postgres && npm run drizzle:postgres && nyc --reporter=html --reporter=text mocha \"test/**/*.test.js\" && npm run test:drizzle:postgres:v1",
     "debug-test": "mocha --inspect-brk lib/**/**.test.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "eslint": "eslint --quiet lib/**/**.js test/**/**.js",
@@ -53,32 +54,32 @@
   "homepage": "https://github.com/animir/node-rate-limiter-flexible#readme",
   "types": "./types.d.ts",
   "devDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.431.0",
-    "@prisma/client": "^5.8.0",
-    "@valkey/valkey-glide": "^1.3.1",
-    "better-sqlite3": "^11.9.0",
-    "chai": "^4.1.2",
-    "coveralls": "^3.0.1",
-    "drizzle-kit": "^0.31.4",
-    "drizzle-orm": "^0.44.3",
+    "@aws-sdk/client-dynamodb": "^3.1029.0",
+    "@prisma/client": "^5.22.0",
+    "@valkey/valkey-glide": "^1.3.4",
+    "better-sqlite3": "^11.10.0",
+    "chai": "^4.5.0",
+    "coveralls": "^3.1.1",
+    "drizzle-kit": "^0.31.10",
+    "drizzle-orm": "^0.45.2",
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-node": "^6.0.1",
-    "eslint-plugin-security": "^1.4.0",
+    "eslint-plugin-security": "^1.7.1",
     "etcd3": "^1.1.2",
-    "ioredis": "^5.3.2",
-    "iovalkey": "^0.3.1",
+    "ioredis": "^5.10.1",
+    "iovalkey": "^0.3.3",
     "istanbul": "^1.1.0-alpha.1",
-    "knex": "^3.1.0",
+    "knex": "^3.2.9",
     "memcached-mock": "^0.1.0",
-    "mocha": "^10.2.0",
+    "mocha": "^10.8.2",
     "nyc": "^15.1.0",
-    "pg": "^8.16.3",
-    "prisma": "^5.8.0",
-    "redis": "^4.6.8",
-    "redis-mock": "^0.48.0",
-    "sinon": "^17.0.1",
+    "pg": "^8.20.0",
+    "prisma": "^5.22.0",
+    "redis": "^4.7.1",
+    "redis-mock": "^0.56.3",
+    "sinon": "^17.0.2",
     "sqlite3": "^5.1.7"
   },
   "browser": {