@voltro/plugin-ratelimit 0.32.0 → 0.34.0

package/dist/index.js

@@ -2,9 +2,9 @@ import { RateLimited as e } from "./errors.js";
 import { n as t, t as n } from "./window-lyQ6LXhj.js";
 import { redisStore as r } from "./redisStore.js";
 import { Effect as i } from "effect";
-import { definePlugin as a } from "@voltro/protocol";
+import { definePlugin as a, pluginInstanceName as o } from "@voltro/protocol";
 //#region src/store.ts
-var o = (e = {}) => {
+var s = (e = {}) => {
 	let t = e.maxKeys ?? 1e5, r = e.staleAfterMs ?? 36e5, a = /* @__PURE__ */ new Map(), o = (e) => {
 		if (a.size <= t) return;
 		let n = a.size - t, r = 0;
@@ -27,15 +27,15 @@ var o = (e = {}) => {
 		},
 		size: () => a.size
 	};
-}, s = (e, t) => ({
+}, c = (e, t) => ({
 	allowed: !0,
 	remaining: e.limit,
 	resetAtMs: t + e.windowMs,
 	retryAfterMs: 0
-}), c = (e = {}) => {
+}), l = (e = {}) => {
 	let t = null;
 	return {
-		consume: (e, n, r) => t ? t.consume(e, n, r) : i.succeed(s(n, r)),
+		consume: (e, n, r) => t ? t.consume(e, n, r) : i.succeed(c(n, r)),
 		sweep: (e) => t?.sweep(e),
 		size: () => t ? t.size() : -1,
 		bindSql: async (n) => {
@@ -43,7 +43,11 @@ var o = (e = {}) => {
 			await i.bindSql(n), t = i;
 		}
 	};
-}, l = (e, t) => typeof e == "function" ? e(t) : e, u = (e, t) => e === void 0 ? !0 : typeof e == "string" ? e === t : Array.isArray(e) ? e.includes(t) : e.test(t), d = (e, t) => e === void 0 ? !0 : Array.isArray(e) ? e.includes(t) : e === t, f = (e, t) => {
+}, u = (e, t) => typeof e == "function" ? e(t) : e, d = /* @__PURE__ */ new WeakMap(), f = (e) => {
+	if (!e.global && !e.sticky) return e;
+	let t = d.get(e);
+	return t === void 0 && (t = new RegExp(e.source, e.flags.replace(/[gy]/g, "")), d.set(e, t)), t;
+}, p = (e, t) => e === void 0 ? !0 : typeof e == "string" ? e === t : Array.isArray(e) ? e.includes(t) : f(e).test(t), m = (e, t) => e === void 0 ? !0 : Array.isArray(e) ? e.includes(t) : e === t, h = (e, t) => {
 	let n = t === null ? void 0 : e.tenants?.[t];
 	return {
 		limit: n?.limit ?? e.limit,
@@ -54,27 +58,27 @@ var o = (e = {}) => {
 		scope: e.scope ?? "tag",
 		disabled: n?.disabled ?? !1
 	};
-}, p = (e, t, n) => {
+}, g = (e, t, n) => {
 	for (let t = 0; t < e.length; t++) {
 		let r = e[t];
-		if (u(r.match, n.tag) && d(r.kind, n.kind)) return {
-			effective: f(r, n.tenantId),
+		if (p(r.match, n.tag) && m(r.kind, n.kind)) return {
+			effective: h(r, n.tenantId),
 			ruleId: `r${t}`
 		};
 	}
-	if (t && d(t.kind, n.kind)) return {
-		effective: f(t, n.tenantId),
+	if (t && m(t.kind, n.kind)) return {
+		effective: h(t, n.tenantId),
 		ruleId: "default"
 	};
-}, m = (e, n) => {
-	let r = l(e.limit, n);
+}, _ = (e, n) => {
+	let r = u(e.limit, n);
 	return {
 		limit: r,
-		windowMs: t(l(e.window, n)),
+		windowMs: t(u(e.window, n)),
 		algorithm: e.algorithm ?? "sliding-window",
-		burst: e.burst === void 0 ? r : l(e.burst, n)
+		burst: e.burst === void 0 ? r : u(e.burst, n)
 	};
-}, h = (e) => {
+}, v = (e) => {
 	let n = e.limit;
 	return {
 		limit: n,
@@ -82,12 +86,12 @@ var o = (e = {}) => {
 		algorithm: e.algorithm ?? "sliding-window",
 		burst: e.burst ?? n
 	};
-}, g = (e) => ({
+}, y = (e) => ({
 	limit: e.limit,
 	window: e.windowMs,
 	algorithm: e.algorithm,
 	burst: e.burst
-}), _ = (e, t) => {
+}), b = (e, t) => {
 	if (typeof e == "function") return e(t);
 	switch (e) {
 		case "subject": return `s:${t.tenantId ?? "∅"}:${t.subject.id ?? "anon"}`;
@@ -95,20 +99,20 @@ var o = (e = {}) => {
 		case "apiKey": return t.subject.type === "apiKey" ? `k:${t.subject.id}` : `s:${t.tenantId ?? "∅"}:${t.subject.id ?? "anon"}`;
 		case "global": return "g";
 	}
-}, v = (e, t) => {
+}, x = (e, t) => {
 	let { effective: n, ruleId: r } = e, i = n.scope === "rule" ? `rule#${r}` : `tag:${t.tag}`, a = n.by;
-	return `${i}|${Array.isArray(a) ? a.map((e) => _(e, t)).join("|") : _(a, t)}`;
-}, y = (e) => ({
+	return `${i}|${Array.isArray(a) ? a.map((e) => b(e, t)).join("|") : b(a, t)}`;
+}, S = (e) => ({
 	tag: e.tag,
 	kind: e.kind,
 	subject: e.subject,
 	tenantId: e.subject.tenantId ?? null,
 	traceId: e.traceId
-}), b = (n = {}) => {
-	let s = n.rules ?? [], l = n.store === void 0 || n.store === "memory" ? o() : n.store === "postgres" ? c() : n.store === "redis" ? r() : n.store, u = (e) => {
+}), C = (n = {}) => {
+	let c = n.rules ?? [], u = n.store === void 0 || n.store === "memory" ? s() : n.store === "postgres" ? l() : n.store === "redis" ? r() : n.store, d = (e) => {
 		let t = n.enabled;
 		return t === void 0 ? !0 : typeof t == "function" ? t(e) : t;
-	}, d = (e, t, r, i) => {
+	}, f = (e, t, r, i) => {
 		if (!n.onLimited) return;
 		let a = {
 			tag: e.tag,
@@ -122,27 +126,27 @@ var o = (e = {}) => {
 		try {
 			n.onLimited(a);
 		} catch {}
-	}, f = (e, t) => {
+	}, p = (e, t) => {
 		let r = n.resolve;
 		return r ? i.suspend(() => {
 			let n = r(e, t);
-			return (i.isEffect(n) ? n : n instanceof Promise ? i.promise(() => n) : i.succeed(n)).pipe(i.map((e) => e === "exempt" ? "exempt" : h(e === void 0 ? t : e)));
-		}) : i.succeed(h(t));
-	}, _ = (t, r) => i.suspend(() => {
-		let a = y(r);
-		if (!u(a)) return t;
-		let o = p(s, n.default, a);
+			return (i.isEffect(n) ? n : n instanceof Promise ? i.promise(() => n) : i.succeed(n)).pipe(i.map((e) => e === "exempt" ? "exempt" : v(e === void 0 ? t : e)));
+		}) : i.succeed(v(t));
+	}, m = (t, r) => i.suspend(() => {
+		let a = S(r);
+		if (!d(a)) return t;
+		let o = g(c, n.default, a);
 		if (!o || o.effective.disabled) return t;
-		let c = g(m(o.effective, a));
-		return f(a, c).pipe(i.flatMap((n) => {
+		let s = y(_(o.effective, a));
+		return p(a, s).pipe(i.flatMap((n) => {
 			if (n === "exempt") return t;
-			let r = v(o, a);
-			return l.consume(r, n, Date.now()).pipe(i.catchAllDefect((e) => i.as(i.logWarning(`[ratelimit] store error — failing open for ${a.tag}: ${String(e)}`), {
+			let r = x(o, a);
+			return u.consume(r, n, Date.now()).pipe(i.catchAllDefect((e) => i.as(i.logWarning(`[ratelimit] store error — failing open for ${a.tag}: ${String(e)}`), {
 				allowed: !0,
 				remaining: n.limit,
 				resetAtMs: Date.now(),
 				retryAfterMs: 0
-			})), i.flatMap((o) => o.allowed ? t : i.zipRight(i.sync(() => d(a, r, n, o)), i.fail(new e({
+			})), i.flatMap((o) => o.allowed ? t : i.zipRight(i.sync(() => f(a, r, n, o)), i.fail(new e({
 				tag: a.tag,
 				limit: n.limit,
 				windowMs: n.windowMs,
@@ -150,34 +154,37 @@ var o = (e = {}) => {
 				resetAtMs: o.resetAtMs
 			})))));
 		}));
-	}), b = n.http ? async (e, r) => {
+	}), h = n.http ? async (e, r) => {
 		let a = n.http, o = {
 			limit: a.limit,
 			windowMs: t(a.window),
 			algorithm: a.algorithm ?? "fixed-window",
 			burst: a.limit
-		}, s = r.remoteAddr ?? "unknown", c = Date.now(), u = await i.runPromise(l.consume(`http:ip:${s}`, o, c)), d = String(Math.max(0, Math.ceil((u.resetAtMs - c) / 1e3)));
-		return u.allowed ? e() : {
+		}, s = r.remoteAddr ?? "unknown", c = Date.now(), l = await i.runPromise(u.consume(`http:ip:${s}`, o, c)), d = String(Math.max(0, Math.ceil((l.resetAtMs - c) / 1e3)));
+		return l.allowed ? e() : {
 			status: 429,
 			body: "Too Many Requests",
 			headers: {
 				"content-type": "text/plain; charset=utf-8",
-				"retry-after": String(Math.max(1, Math.ceil(u.retryAfterMs / 1e3))),
+				"retry-after": String(Math.max(1, Math.ceil(l.retryAfterMs / 1e3))),
 				"ratelimit-limit": String(o.limit),
-				"ratelimit-remaining": String(Math.max(0, u.remaining)),
+				"ratelimit-remaining": String(Math.max(0, l.remaining)),
 				"ratelimit-reset": d
 			}
 		};
-	} : void 0, x = [
+	} : void 0, b = [
 		"rpc:intercept:mutation",
 		"rpc:intercept:query",
 		"rpc:intercept:action",
 		...n.http ? ["http:intercept"] : []
-	], S, C;
+	], C, w;
 	return a({
-		name: n.name ? `@voltro/plugin-ratelimit#${n.name}` : "@voltro/plugin-ratelimit",
+		name: o({
+			base: "@voltro/plugin-ratelimit",
+			instance: n.name
+		}),
 		description: "Per-endpoint / per-subject / per-tenant rate limiting via the rpc interceptors. Configurable rules, three algorithms, static + dynamic per-tenant overrides.",
-		permissions: x,
+		permissions: b,
 		declaredEnv: [
 			{
 				name: "CACHE_REDIS_URL",
@@ -210,7 +217,7 @@ var o = (e = {}) => {
 				description: "Fallback Upstash REST token for the http redis driver."
 			}
 		],
-		...b ? { onHttpRequest: b } : {},
+		...h ? { onHttpRequest: h } : {},
 		errorSchemas: [{
 			schema: e,
 			import: {
@@ -218,26 +225,26 @@ var o = (e = {}) => {
 				name: "RateLimited"
 			}
 		}],
-		interceptMutation: _,
-		interceptQuery: _,
-		interceptAction: _,
+		interceptMutation: m,
+		interceptQuery: m,
+		interceptAction: m,
 		bindDataStore: (e, t) => {
 			let n = t?.sql;
-			n && l.bindSql && l.bindSql(n).catch((e) => {
-				C = e;
+			n && u.bindSql && u.bindSql(n).catch((e) => {
+				w = e;
 			});
 		},
 		onActivate: (e) => i.gen(function* () {
-			l.activate && (yield* i.promise(() => l.activate(e.env))), S = setInterval(() => l.sweep(Date.now()), 6e4), S.unref?.(), C !== void 0 && e.logger.warn("rate-limit: SQL store bind failed — limiter runs fail-open", { error: C instanceof Error ? C.message : String(C) }), e.logger.info("rate-limit active", {
-				rules: s.length,
+			u.activate && (yield* i.promise(() => u.activate(e.env))), C = setInterval(() => u.sweep(Date.now()), 6e4), C.unref?.(), w !== void 0 && e.logger.warn("rate-limit: SQL store bind failed — limiter runs fail-open", { error: w instanceof Error ? w.message : String(w) }), e.logger.info("rate-limit active", {
+				rules: c.length,
 				hasDefault: n.default !== void 0,
 				store: typeof n.store == "string" ? n.store : n.store === void 0 ? "memory" : "custom"
 			});
 		}),
 		onDeactivate: () => i.gen(function* () {
-			S && clearInterval(S), l.deactivate && (yield* i.promise(() => l.deactivate()));
+			C && clearInterval(C), u.deactivate && (yield* i.promise(() => u.deactivate()));
 		})
 	});
 };
 //#endregion
-export { e as RateLimited, n as consumeBucket, o as memoryStore, t as parseWindow, b as rateLimitPlugin, r as redisStore };
+export { e as RateLimited, n as consumeBucket, s as memoryStore, t as parseWindow, C as rateLimitPlugin, r as redisStore };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-ratelimit",
-  "version": "0.32.0",
+  "version": "0.34.0",
   "description": "Rate-limiting plugin — per-endpoint, per-subject and per-tenant request limits via the RPC interceptors. Highly configurable rules (fixed-window / sliding-window / token-bucket), composite keying, static per-tenant overrides and a dynamic resolve() hook. Stores: memory (default, single-node), postgres + redis (multi-node, atomic).",
   "keywords": [
     "voltro",
@@ -37,7 +37,8 @@
       "types": "./dist/errors.d.ts",
       "import": "./dist/errors.js",
       "default": "./dist/errors.js"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -47,8 +48,8 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/kv": "0.32.0",
-    "@voltro/protocol": "0.32.0"
+    "@voltro/kv": "0.34.0",
+    "@voltro/protocol": "0.34.0"
   },
   "optionalDependencies": {
     "@effect/sql": "^0.52.0"