@voltro/plugin-ratelimit 0.84.0 → 0.86.0

package/dist/resolve.js

@@ -0,0 +1,65 @@
+import { parseWindow as e } from "./window.js";
+//#region src/resolve.ts
+var t = (e, t) => typeof e == "function" ? e(t) : e, n = /* @__PURE__ */ new WeakMap(), r = (e) => {
+	if (!e.global && !e.sticky) return e;
+	let t = n.get(e);
+	return t === void 0 && (t = new RegExp(e.source, e.flags.replace(/[gy]/g, "")), n.set(e, t)), t;
+}, i = (e, t) => e === void 0 ? !0 : typeof e == "string" ? e === t : Array.isArray(e) ? e.includes(t) : r(e).test(t), a = (e, t) => e === void 0 ? !0 : Array.isArray(e) ? e.includes(t) : e === t, o = (e, t) => {
+	let n = t === null ? void 0 : e.tenants?.[t];
+	return {
+		limit: n?.limit ?? e.limit,
+		window: n?.window ?? e.window,
+		algorithm: n?.algorithm ?? e.algorithm,
+		burst: n?.burst ?? e.burst,
+		by: e.by ?? "subject",
+		scope: e.scope ?? "tag",
+		disabled: n?.disabled ?? !1
+	};
+}, s = (e, t, n) => {
+	for (let t = 0; t < e.length; t++) {
+		let r = e[t];
+		if (i(r.match, n.tag) && a(r.kind, n.kind)) return {
+			effective: o(r, n.tenantId),
+			ruleId: `r${t}`
+		};
+	}
+	if (t && a(t.kind, n.kind)) return {
+		effective: o(t, n.tenantId),
+		ruleId: "default"
+	};
+}, c = (n, r) => {
+	let i = t(n.limit, r);
+	return {
+		limit: i,
+		windowMs: e(t(n.window, r)),
+		algorithm: n.algorithm ?? "sliding-window",
+		burst: n.burst === void 0 ? i : t(n.burst, r)
+	};
+}, l = (t) => {
+	let n = t.limit;
+	return {
+		limit: n,
+		windowMs: e(t.window),
+		algorithm: t.algorithm ?? "sliding-window",
+		burst: t.burst ?? n
+	};
+}, u = (e) => ({
+	limit: e.limit,
+	window: e.windowMs,
+	algorithm: e.algorithm,
+	burst: e.burst
+}), d = (e, t) => {
+	if (typeof e == "function") return e(t);
+	switch (e) {
+		case "subject": return `s:${t.tenantId ?? "∅"}:${t.subject.id ?? "anon"}`;
+		case "tenant": return `t:${t.tenantId ?? "∅"}`;
+		case "apiKey": return t.subject.type === "apiKey" ? `k:${t.subject.id}` : `s:${t.tenantId ?? "∅"}:${t.subject.id ?? "anon"}`;
+		case "global": return "g";
+		case "ip": return `i:${t.remoteAddr ?? "unknown"}`;
+	}
+}, f = (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) => d(e, t)).join("|") : d(a, t)}`;
+};
+//#endregion
+export { f as buildKey, l as limitFromOverride, s as matchRule, c as resolveLimit, u as toOverride };

package/dist/store.js

@@ -0,0 +1,29 @@
+import { consumeBucket as e } from "./window.js";
+import { Effect as t } from "effect";
+//#region src/store.ts
+var n = (n = {}) => {
+	let r = n.maxKeys ?? 1e5, i = n.staleAfterMs ?? 36e5, a = /* @__PURE__ */ new Map(), o = (e) => {
+		if (a.size <= r) return;
+		let t = a.size - r, n = 0;
+		for (let r of a.keys()) {
+			if (n >= t) break;
+			r !== e && (a.delete(r), n += 1);
+		}
+	};
+	return {
+		consume: (n, r, i) => t.sync(() => {
+			let t = a.get(n), { state: s, decision: c } = e(t?.state, r, i);
+			return a.set(n, {
+				state: s,
+				touched: i
+			}), o(n), c;
+		}),
+		sweep: (e) => {
+			let t = e - i;
+			for (let [e, n] of a) n.touched < t && a.delete(e);
+		},
+		size: () => a.size
+	};
+};
+//#endregion
+export { n as memoryStore };

package/dist/window.js

@@ -0,0 +1,117 @@
+//#region src/window.ts
+var e = {
+	ms: 1,
+	s: 1e3,
+	m: 6e4,
+	h: 36e5,
+	d: 864e5
+}, t = (t) => {
+	if (typeof t == "number") {
+		if (!Number.isFinite(t) || t <= 0) throw Error(`@voltro/plugin-ratelimit: window must be a positive number, got ${t}`);
+		return t;
+	}
+	let n = /^(\d+(?:\.\d+)?)(ms|s|m|h|d)$/.exec(t.trim());
+	if (!n) throw Error(`@voltro/plugin-ratelimit: invalid window "${t}" — use e.g. "1m", "10s", "500ms", "2h", "1d"`);
+	return Number(n[1]) * e[n[2]];
+}, n = (e, t, n) => {
+	switch (t.algorithm) {
+		case "fixed-window": return r(e, t, n);
+		case "sliding-window": return i(e, t, n);
+		case "token-bucket": return a(e, t, n);
+	}
+}, r = (e, t, n) => {
+	let r = e?.kind === "fixed" ? e.windowStart : n, i = e?.kind === "fixed" ? e.count : 0;
+	n - r >= t.windowMs && (r = n, i = 0);
+	let a = r + t.windowMs;
+	return i >= t.limit ? {
+		state: {
+			kind: "fixed",
+			windowStart: r,
+			count: i
+		},
+		decision: {
+			allowed: !1,
+			remaining: 0,
+			resetAtMs: a,
+			retryAfterMs: a - n
+		}
+	} : (i += 1, {
+		state: {
+			kind: "fixed",
+			windowStart: r,
+			count: i
+		},
+		decision: {
+			allowed: !0,
+			remaining: t.limit - i,
+			resetAtMs: a,
+			retryAfterMs: 0
+		}
+	});
+}, i = (e, t, n) => {
+	let r = t.windowMs, i = e?.kind === "sliding" ? e.currStart : n, a = e?.kind === "sliding" ? e.currCount : 0, o = e?.kind === "sliding" ? e.prevCount : 0, s = Math.floor((n - i) / r);
+	s >= 2 ? (o = 0, a = 0, i = n) : s === 1 && (o = a, a = 0, i += r);
+	let c = (r - (n - i)) / r, l = o * c + a, u = i + r;
+	return l >= t.limit ? {
+		state: {
+			kind: "sliding",
+			currStart: i,
+			currCount: a,
+			prevCount: o
+		},
+		decision: {
+			allowed: !1,
+			remaining: 0,
+			resetAtMs: u,
+			retryAfterMs: u - n
+		}
+	} : (a += 1, {
+		state: {
+			kind: "sliding",
+			currStart: i,
+			currCount: a,
+			prevCount: o
+		},
+		decision: {
+			allowed: !0,
+			remaining: Math.max(0, Math.floor(t.limit - l - 1)),
+			resetAtMs: u,
+			retryAfterMs: 0
+		}
+	});
+}, a = (e, t, n) => {
+	let r = t.burst, i = t.limit / t.windowMs, a = e?.kind === "token" ? e.tokens : r, o = e?.kind === "token" ? e.lastRefill : n;
+	if (a = Math.min(r, a + (n - o) * i), a >= 1) {
+		--a;
+		let e = n + Math.ceil((r - a) / i);
+		return {
+			state: {
+				kind: "token",
+				tokens: a,
+				lastRefill: n
+			},
+			decision: {
+				allowed: !0,
+				remaining: Math.floor(a),
+				resetAtMs: e,
+				retryAfterMs: 0
+			}
+		};
+	}
+	let s = Math.ceil((1 - a) / i);
+	return {
+		state: {
+			kind: "token",
+			tokens: a,
+			lastRefill: n
+		},
+		decision: {
+			allowed: !1,
+			remaining: 0,
+			resetAtMs: n + s,
+			retryAfterMs: s
+		}
+	};
+};
+//#endregion
+export { n as consumeBucket, t as parseWindow };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-ratelimit",
-  "version": "0.84.0",
+  "version": "0.86.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",
@@ -48,16 +48,14 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@voltro/database": "0.84.0",
-    "@voltro/kv": "0.84.0",
-    "@voltro/logger": "0.84.0",
-    "@voltro/protocol": "0.84.0"
-  },
-  "optionalDependencies": {
-    "@effect/sql": "^0.52.1"
+    "@voltro/database": "0.86.0",
+    "@voltro/kv": "0.86.0",
+    "@voltro/logger": "0.86.0",
+    "@voltro/protocol": "0.86.0",
+    "@voltro/runtime": "0.86.0"
   },
   "peerDependencies": {
-    "effect": "^3.22.2"
+    "effect": "4.0.1"
   },
   "publishConfig": {
     "access": "public"

package/dist/postgresStore-CDP61pxx.js

@@ -1,160 +0,0 @@
-import { Effect as e } from "effect";
-import { dropped as t, eq as n, id as r, json as i, lt as a, queryFor as o, table as s, text as c, timestamp as l } from "@voltro/database";
-//#region src/window.ts
-var u = {
-	ms: 1,
-	s: 1e3,
-	m: 6e4,
-	h: 36e5,
-	d: 864e5
-}, d = (e) => {
-	if (typeof e == "number") {
-		if (!Number.isFinite(e) || e <= 0) throw Error(`@voltro/plugin-ratelimit: window must be a positive number, got ${e}`);
-		return e;
-	}
-	let t = /^(\d+(?:\.\d+)?)(ms|s|m|h|d)$/.exec(e.trim());
-	if (!t) throw Error(`@voltro/plugin-ratelimit: invalid window "${e}" — use e.g. "1m", "10s", "500ms", "2h", "1d"`);
-	return Number(t[1]) * u[t[2]];
-}, f = (e, t, n) => {
-	switch (t.algorithm) {
-		case "fixed-window": return p(e, t, n);
-		case "sliding-window": return m(e, t, n);
-		case "token-bucket": return h(e, t, n);
-	}
-}, p = (e, t, n) => {
-	let r = e?.kind === "fixed" ? e.windowStart : n, i = e?.kind === "fixed" ? e.count : 0;
-	n - r >= t.windowMs && (r = n, i = 0);
-	let a = r + t.windowMs;
-	return i >= t.limit ? {
-		state: {
-			kind: "fixed",
-			windowStart: r,
-			count: i
-		},
-		decision: {
-			allowed: !1,
-			remaining: 0,
-			resetAtMs: a,
-			retryAfterMs: a - n
-		}
-	} : (i += 1, {
-		state: {
-			kind: "fixed",
-			windowStart: r,
-			count: i
-		},
-		decision: {
-			allowed: !0,
-			remaining: t.limit - i,
-			resetAtMs: a,
-			retryAfterMs: 0
-		}
-	});
-}, m = (e, t, n) => {
-	let r = t.windowMs, i = e?.kind === "sliding" ? e.currStart : n, a = e?.kind === "sliding" ? e.currCount : 0, o = e?.kind === "sliding" ? e.prevCount : 0, s = Math.floor((n - i) / r);
-	s >= 2 ? (o = 0, a = 0, i = n) : s === 1 && (o = a, a = 0, i += r);
-	let c = (r - (n - i)) / r, l = o * c + a, u = i + r;
-	return l >= t.limit ? {
-		state: {
-			kind: "sliding",
-			currStart: i,
-			currCount: a,
-			prevCount: o
-		},
-		decision: {
-			allowed: !1,
-			remaining: 0,
-			resetAtMs: u,
-			retryAfterMs: u - n
-		}
-	} : (a += 1, {
-		state: {
-			kind: "sliding",
-			currStart: i,
-			currCount: a,
-			prevCount: o
-		},
-		decision: {
-			allowed: !0,
-			remaining: Math.max(0, Math.floor(t.limit - l - 1)),
-			resetAtMs: u,
-			retryAfterMs: 0
-		}
-	});
-}, h = (e, t, n) => {
-	let r = t.burst, i = t.limit / t.windowMs, a = e?.kind === "token" ? e.tokens : r, o = e?.kind === "token" ? e.lastRefill : n;
-	if (a = Math.min(r, a + (n - o) * i), a >= 1) {
-		--a;
-		let e = n + Math.ceil((r - a) / i);
-		return {
-			state: {
-				kind: "token",
-				tokens: a,
-				lastRefill: n
-			},
-			decision: {
-				allowed: !0,
-				remaining: Math.floor(a),
-				resetAtMs: e,
-				retryAfterMs: 0
-			}
-		};
-	}
-	let s = Math.ceil((1 - a) / i);
-	return {
-		state: {
-			kind: "token",
-			tokens: a,
-			lastRefill: n
-		},
-		decision: {
-			allowed: !1,
-			remaining: 0,
-			resetAtMs: n + s,
-			retryAfterMs: s
-		}
-	};
-}, g = "_voltro_ratelimit", _ = s(g, {
-	id: r({ scheme: "numeric" }),
-	key: c().maxLength(512),
-	state: i().nullable(),
-	touchedAt: l().default("now"),
-	touched: t()
-}).unique("rateLimitKey", ["key"]).nonReactive(), v = (t = {}) => {
-	let r = t.staleAfterMs ?? 36e5, i = null, s = (e, t, n) => ({
-		failOpenReason: n,
-		allowed: !0,
-		remaining: e.limit,
-		resetAtMs: t + e.windowMs,
-		retryAfterMs: 0
-	}), c = async (e, t, r, i) => {
-		let a = new Date(i);
-		return await e.insertIgnore(g, {
-			key: t,
-			state: null,
-			touchedAt: a
-		}, { conflictColumns: ["key"] }), e.transactional(async (e) => {
-			let { state: s, decision: c } = f((await e.query(o(_).where(n("key", t)).forUpdate().descriptor))[0]?.state ?? void 0 ?? void 0, r, i);
-			return await e.updateMany(g, {
-				state: s,
-				touchedAt: a
-			}, { where: n("key", t) }), c;
-		});
-	};
-	return {
-		consume: (t, n, r) => {
-			let a = i;
-			return a ? e.tryPromise(() => c(a, t, n, r)).pipe(e.catchAll(() => e.succeed(s(n, r, "store-error")))) : e.succeed(s(n, r, "unbound"));
-		},
-		sweep: (e) => {
-			let t = i;
-			t && t.deleteMany(g, { where: a("touchedAt", new Date(e - r)) }).catch(() => {});
-		},
-		size: () => -1,
-		bind: async (e) => {
-			i = e;
-		}
-	};
-};
-//#endregion
-export { d as a, f as i, v as n, _ as r, g as t };