limitly 2.0.0 → 3.0.0

package/dist/utils/scripts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../../src/utils/scripts.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAiB5C,wBAAsB,aAAa,CACjC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,CAWjB;AAED,wBAAsB,UAAU,CAC9B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACxB,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CA0B9B;AAeD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1B;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB,CAQA"}
+{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../../src/utils/scripts.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAM5C,eAAO,MAAM,eAAe;;;;;;CAMlB,CAAC;AAEX,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,eAAe,CAAC;AAiBtD,wBAAgB,2BAA2B,IAAI,MAAM,CACnD,MAAM,EACN;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CACtC,CAuBA;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAc7D;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB1E;AAmBD,wBAAsB,UAAU,CAC9B,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GACxB,OAAO,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAK9B;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1B;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAgBA"}

package/dist/utils/scripts.js

@@ -1,12 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadScriptSha = loadScriptSha;
+exports.SCRIPT_COMMANDS = void 0;
+exports.getClusterScriptDefinitions = getClusterScriptDefinitions;
+exports.registerRedisScripts = registerRedisScripts;
+exports.warmupRedisScripts = warmupRedisScripts;
 exports.evalScript = evalScript;
 exports.parseScriptResult = parseScriptResult;
 const fs_1 = require("fs");
 const path_1 = require("path");
+const ioredis_1 = require("ioredis");
+function isRedisCluster(client) {
+    return client instanceof ioredis_1.Cluster || client.isCluster === true;
+}
+exports.SCRIPT_COMMANDS = {
+    sliding: "limitlySliding",
+    token: "limitlyToken",
+    concurrencyAcquire: "limitlyConcurrencyAcquire",
+    concurrencyRelease: "limitlyConcurrencyRelease",
+    gcra: "limitlyGcra",
+};
 const scriptCache = new Map();
-const shaCache = new Map();
+const registeredClients = new WeakSet();
 function loadScript(name) {
     const cached = scriptCache.get(name);
     if (cached) {
@@ -17,50 +31,82 @@ function loadScript(name) {
     scriptCache.set(name, script);
     return script;
 }
-async function loadScriptSha(redis, name) {
-    const cacheKey = getCacheKey(redis, name);
-    const cached = shaCache.get(cacheKey);
-    if (cached) {
-        return cached;
+function getClusterScriptDefinitions() {
+    return {
+        [exports.SCRIPT_COMMANDS.sliding]: {
+            numberOfKeys: 1,
+            lua: loadScript("sliding"),
+        },
+        [exports.SCRIPT_COMMANDS.token]: {
+            numberOfKeys: 1,
+            lua: loadScript("token"),
+        },
+        [exports.SCRIPT_COMMANDS.concurrencyAcquire]: {
+            numberOfKeys: 1,
+            lua: loadScript("concurrencyAcquire"),
+        },
+        [exports.SCRIPT_COMMANDS.concurrencyRelease]: {
+            numberOfKeys: 1,
+            lua: loadScript("concurrencyRelease"),
+        },
+        [exports.SCRIPT_COMMANDS.gcra]: {
+            numberOfKeys: 1,
+            lua: loadScript("gcra"),
+        },
+    };
+}
+function registerRedisScripts(redis) {
+    if (registeredClients.has(redis)) {
+        return;
     }
-    const script = loadScript(name);
-    const sha = (await redis.script("LOAD", script));
-    shaCache.set(cacheKey, sha);
-    return sha;
+    for (const name of Object.keys(exports.SCRIPT_COMMANDS)) {
+        const command = exports.SCRIPT_COMMANDS[name];
+        redis.defineCommand(command, {
+            numberOfKeys: 1,
+            lua: loadScript(name),
+        });
+    }
+    registeredClients.add(redis);
 }
-async function evalScript(redis, name, keys, args) {
-    const sha = await loadScriptSha(redis, name);
-    try {
-        const result = await redis.evalsha(sha, keys.length, ...keys, ...args.map(String));
-        return result;
+async function warmupRedisScripts(redis) {
+    registerRedisScripts(redis);
+    if (!isRedisCluster(redis)) {
+        return;
     }
-    catch (error) {
-        if (isNoScriptError(error)) {
-            const script = loadScript(name);
-            const result = await redis.eval(script, keys.length, ...keys, ...args.map(String));
-            const newSha = (await redis.script("LOAD", script));
-            shaCache.set(getCacheKey(redis, name), newSha);
-            return result;
-        }
-        throw error;
+    const masters = redis.nodes("master");
+    if (masters.length === 0) {
+        return;
     }
+    const definitions = getClusterScriptDefinitions();
+    await Promise.all(masters.flatMap((node) => Object.values(definitions).map((definition) => node.script("LOAD", definition.lua))));
 }
-function getCacheKey(redis, name) {
-    const status = redis.status ?? "unknown";
-    return `${status}:${name}`;
+function getScriptRunner(redis, name) {
+    const command = exports.SCRIPT_COMMANDS[name];
+    const runner = redis[command];
+    if (!runner) {
+        throw new Error(`Redis script command "${command}" is not registered`);
+    }
+    return runner.bind(redis);
 }
-function isNoScriptError(error) {
-    return (error instanceof Error &&
-        (error.message.includes("NOSCRIPT") ||
-            error.message.includes("No matching script")));
+async function evalScript(redis, name, keys, args) {
+    registerRedisScripts(redis);
+    const runner = getScriptRunner(redis, name);
+    const result = await runner(...keys, ...args);
+    return result;
 }
 function parseScriptResult(result) {
-    return {
+    const parsed = {
         allowed: Number(result[0]) === 1,
         limit: Number(result[1]),
         remaining: Number(result[2]),
         reset: Number(result[3]),
         retryAfter: Number(result[4]),
+        slotId: undefined,
     };
+    const slotId = result[5];
+    if (parsed.allowed && slotId !== undefined && String(slotId).length > 0) {
+        parsed.slotId = String(slotId);
+    }
+    return parsed;
 }
 //# sourceMappingURL=scripts.js.map

package/dist/utils/scripts.js.map

@@ -1 +1 @@
-{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../src/utils/scripts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../src/utils/scripts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "limitly",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "description": "Express-rate-limit, but distributed, Redis-powered, and production ready.",
   "author": "Arpan Das <dasarpan471@gmail.com>",
   "license": "MIT",
@@ -50,6 +50,16 @@
       "types": "./dist/middleware/bun.d.ts",
       "import": "./dist/middleware/bun.js",
       "require": "./dist/middleware/bun.js"
+    },
+    "./otel": {
+      "types": "./dist/observability/index.d.ts",
+      "import": "./dist/observability/index.js",
+      "require": "./dist/observability/index.js"
+    },
+    "./prometheus": {
+      "types": "./dist/prometheus.d.ts",
+      "import": "./dist/prometheus.js",
+      "require": "./dist/prometheus.js"
     }
   },
   "files": [
@@ -88,7 +98,13 @@
     "valkey",
     "dragonfly",
     "dragonflydb",
-    "memcached"
+    "memcached",
+    "opentelemetry",
+    "otel",
+    "observability",
+    "tracing",
+    "metrics",
+    "prometheus"
   ],
   "publishConfig": {
     "access": "public",
@@ -102,7 +118,9 @@
     "hono": ">=4.0.0",
     "ioredis": ">=5.0.0",
     "koa": ">=2.14.0",
-    "memcached": ">=2.2.0"
+    "memcached": ">=2.2.0",
+    "@opentelemetry/api": ">=1.4.0",
+    "prom-client": ">=15.0.0"
   },
   "peerDependenciesMeta": {
     "@nestjs/common": {
@@ -125,9 +143,17 @@
     },
     "memcached": {
       "optional": true
+    },
+    "@opentelemetry/api": {
+      "optional": true
+    },
+    "prom-client": {
+      "optional": true
     }
   },
   "devDependencies": {
+    "@opentelemetry/api": "^1.9.0",
+    "prom-client": "^15.1.3",
     "@nestjs/common": "^10.4.0",
     "@nestjs/core": "^10.4.0",
     "@nestjs/testing": "^10.4.0",