rate-limiter-flexible 7.3.0 → 7.3.2

package/README.md

@@ -42,14 +42,9 @@ It uses a **fixed window**, as it is much faster than a rolling window.
 ## Import
   
   ```javascript
-  // CommonJS
-  const { RateLimiterMemory } = require("rate-limiter-flexible");
-
-  // or
-
-  // ECMAScript 
   import { RateLimiterMemory } from "rate-limiter-flexible";
-  // or
+  
+  // or import directly
   import RateLimiterMemory from "rate-limiter-flexible/lib/RateLimiterMemory.js";
   ```
 

package/lib/RateLimiterDrizzle.js

@@ -9,12 +9,17 @@ class RateLimiterDrizzleError extends Error {
   }
 }
 
-function getDrizzleOperators() {
+async function getDrizzleOperators() {
   if (drizzleOperators) return drizzleOperators;
 
   try {
-    const { and, or, gt, lt, eq, isNull , sql } = require('drizzle-orm');
-    drizzleOperators = { 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 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) {
     throw new RateLimiterDrizzleError(
@@ -66,7 +71,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { eq , sql } = getDrizzleOperators();
+    const { eq, sql } = await getDrizzleOperators();
     const now = new Date();
     const newExpire = msDuration > 0 ? new Date(now.getTime() + msDuration) : null;
 
@@ -112,7 +117,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { and, or, gt, eq, isNull } = getDrizzleOperators();
+    const { and, or, gt, eq, isNull } = await getDrizzleOperators();
 
     const [response] = await this.drizzleClient
       .select()
@@ -134,7 +139,7 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       return Promise.reject(new RateLimiterDrizzleError('Drizzle client is not established'))
     }
 
-    const { eq } = getDrizzleOperators();
+    const { eq } = await getDrizzleOperators();
 
     const [result] = await this.drizzleClient
       .delete(this.schema)
@@ -149,10 +154,9 @@ class RateLimiterDrizzle extends RateLimiterStoreAbstract {
       clearTimeout(this._clearExpiredTimeoutId);
     }
 
-    const { lt } = getDrizzleOperators();
-
     this._clearExpiredTimeoutId = setTimeout(async () => {
       try {
+        const { lt } = await getDrizzleOperators();
         await this.drizzleClient
           .delete(this.schema)
           .where(lt(this.schema.expire, new Date(Date.now() - EXPIRED_THRESHOLD_MS)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-limiter-flexible",
-  "version": "7.3.0",
+  "version": "7.3.2",
   "description": "Node.js rate limiter by key and protection from DDoS and Brute-Force attacks in process Memory, Redis, MongoDb, Memcached, MySQL, PostgreSQL, Cluster or PM",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
     "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": "npm run prisma:postgres && npm run drizzle:postgres && nyc --reporter=html --reporter=text mocha \"test/**/*.test.js\"",
     "debug-test": "mocha --inspect-brk lib/**/**.test.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "eslint": "eslint --quiet lib/**/**.js test/**/**.js",