@voltro/plugin-ratelimit 0.86.0 → 0.87.0

package/dist/index.d.ts

@@ -1,8 +1,12 @@
 import { ColumnBuilder } from '@voltro/database';
+import { ConnectionRef } from '@voltro/kv/connection';
+import { ConnectionRegistryShape } from '@voltro/kv/connection';
 import { DataStore } from '@voltro/database';
 import { Effect } from 'effect';
 import { FieldDefinitions } from '@voltro/database';
-import { RespClient } from '@voltro/kv/connection';
+import { HotRateLimitState } from '@voltro/kv/hot';
+import { HotRateLimitState as HotRateLimitState_2 } from '@voltro/kv/hot/contract';
+import { HotStoreShape } from '@voltro/kv/hot';
 import { RpcKind } from '@voltro/protocol';
 import { Schema } from 'effect';
 import { Subject } from '@voltro/protocol';
@@ -19,20 +23,7 @@ declare interface BucketResult {
 
 /** Opaque per-key state. The store persists it verbatim; only this
  *  module reads its shape. */
-export declare type BucketState = {
-    readonly kind: 'fixed';
-    readonly windowStart: number;
-    readonly count: number;
-} | {
-    readonly kind: 'sliding';
-    readonly currStart: number;
-    readonly currCount: number;
-    readonly prevCount: number;
-} | {
-    readonly kind: 'token';
-    readonly tokens: number;
-    readonly lastRefill: number;
-};
+export declare type BucketState = HotRateLimitState_2;
 
 export declare const consumeBucket: (prev: BucketState | undefined, limit: ResolvedLimit, now: number) => BucketResult;
 
@@ -180,17 +171,16 @@ export declare interface RateLimitPluginOptions {
     /**
      * Counter backend:
      *   - `'memory'` (default) — single-node, zero-config.
-     *   - `'postgres'` — multi-node correct; opens its own pool from the
-     *     same `DB_*`/`PG_*` env the framework reads, creates
-     *     `_voltro_ratelimit`, mutates state under a row lock. Fails OPEN
-     *     on db errors (degrades to no-limit, never to 500s).
-     *   - `'redis'` — multi-node, fastest; connects ioredis from
-     *     `CACHE_REDIS_URL`/`REDIS_URL`, runs the whole decision in one
-     *     atomic Lua script. For a custom client/url use the
-     *     `redisStore({...})` factory from `@voltro/plugin-ratelimit/redis`.
+     * - `'postgres'` — counters in the app's declared schema, bound through
+     *   `DataStore`; atomic transactions, fail-open on unavailable storage.
+     * - `'redis'` — atomic HotStore decisions over the app-owned registry.
+     *   Use `redis.connection` to select a declared Redis connection or
+     *   `redis.hotStore` to borrow a replacement port.
      *   - a custom `RateLimitStore`.
      */
     readonly store?: 'memory' | 'postgres' | 'redis' | RateLimitStore;
+    /** Registry reference or replacement HotStore for the Redis counter backend. */
+    readonly redis?: RedisStoreOptions;
     /**
      * Master gate. `false` disables all limiting; a function lets you gate
      * per-call (e.g. exempt a tenant, or a maintenance bypass). Returning
@@ -263,7 +253,7 @@ export declare interface RateLimitStore {
     readonly size: () => number;
     /** Optional one-shot setup at plugin activate (open pools, create
      *  tables). Receives the process env. */
-    readonly activate?: (env: NodeJS.ProcessEnv) => Promise<void>;
+    readonly activate?: (env: NodeJS.ProcessEnv, connectionRegistry?: ConnectionRegistryShape) => Promise<void>;
     /** Optional teardown at plugin deactivate (close pools). */
     readonly deactivate?: () => Promise<void>;
     /** Optional bind of the app's `DataStore` (the plugin's `bindDataStore`).
@@ -278,37 +268,20 @@ export declare interface RateLimitStore {
 export declare const rateLimitTable: Table<"_voltro_ratelimit", FieldDefinitions<{
     readonly id: ColumnBuilder<number, "id", boolean>;
     readonly key: ColumnBuilder<string, "text", boolean>;
-    readonly state: ColumnBuilder<BucketState | null, "json", boolean>;
+    readonly state: ColumnBuilder< HotRateLimitState | null, "json", boolean>;
     readonly touchedAt: ColumnBuilder<Date, "timestamp", true>;
     readonly touched: ColumnBuilder<unknown, "text", boolean>;
 }>, false, never>;
 
+/** Redis limiter decisions go only through HotStore. The app owns every socket. */
 export declare const redisStore: (options?: RedisStoreOptions) => RateLimitStore;
 
 export declare interface RedisStoreOptions {
-    /** Connection url. `resp` driver: `redis://…` / `rediss://…`. `http`
-     *  driver: the Upstash REST url. Falls back to `CACHE_REDIS_URL` /
-     *  `REDIS_URL` env at activate time. */
-    readonly url?: string;
-    /**
-     * How to talk to the server — mirrors the cache plugin's axis:
-     *   - `'resp'` (default) — ioredis over TCP. Works for Redis, Valkey,
-     *     KeyDB, Dragonfly, and Upstash's TCP endpoint.
-     *   - `'http'` — `@upstash/redis` over REST, for serverless/edge where
-     *     TCP isn't available.
-     * Resolved from `CACHE_REDIS_DRIVER` env when omitted. `'redis'` as a
-     * store value is the umbrella for the whole RESP family — the server
-     * brand is just the url; only the DRIVER is a real choice.
-     */
-    readonly driver?: 'resp' | 'http';
-    /** Auth token — `http` (Upstash REST) driver only. Falls back to
-     *  `CACHE_REDIS_TOKEN` / `UPSTASH_REDIS_REST_TOKEN` env. */
-    readonly token?: string;
-    /** Bring your own already-connected RESP client (from
-     *  `@voltro/kv/connection`'s `connect`, or the shared registry). Takes
-     *  precedence over `url` / `driver`. */
-    readonly client?: RespClient;
-    /** Key namespace. Default `'voltro:rl:'`. */
+    /** Registry reference. Omit to use the app's default Redis connection. */
+    readonly connection?: ConnectionRef<'redis'>;
+    /** Borrow a replacement HotStore port. Its owner retains disposal. */
+    readonly hotStore?: HotStoreShape;
+    /** HotStore namespace. Default 'voltro:rl'; cannot contain braces. */
     readonly keyPrefix?: string;
 }
 

package/dist/index.js

@@ -6,9 +6,9 @@ import { RATELIMIT_TABLE as a, postgresStore as o, rateLimitTable as s } from ".
 import { redisStore as c } from "./redisStore.js";
 import { buildKey as l, limitFromOverride as u, matchRule as d, resolveLimit as f, toOverride as p } from "./resolve.js";
 import { Effect as m } from "effect";
-import { restError as h } from "@voltro/protocol/rest";
-import { createLogger as g } from "@voltro/logger";
-import { newTraceId as _ } from "@voltro/runtime";
+import { newTraceId as h } from "@voltro/shared";
+import { restError as g } from "@voltro/protocol/rest";
+import { createLogger as _ } from "@voltro/logger";
 import { replicaEvidence as v } from "@voltro/protocol/identity";
 import { definePlugin as y, pluginInstanceName as b } from "@voltro/protocol";
 //#region src/index.ts
@@ -40,8 +40,9 @@ var x = (e) => ({
 		"ratelimit-remaining": "0",
 		"ratelimit-reset": String(Math.max(0, Math.ceil((t.resetAtMs - n) / 1e3)))
 	};
-}, w = g({ scope: "voltro:ratelimit" }), T = (t = {}) => {
-	let a = t.rules ?? [], g = t.store === void 0 || t.store === "memory" ? i() : t.store === "postgres" ? o() : t.store === "redis" ? c() : t.store, T = r(t, g), E = (e) => {
+}, w = _({ scope: "voltro:ratelimit" }), T = (t = {}) => {
+	if (t.redis !== void 0 && t.store !== "redis") throw Error("Rate limiter redis options require store: redis");
+	let a = t.rules ?? [], _ = t.store === void 0 || t.store === "memory" ? i() : t.store === "postgres" ? o() : t.store === "redis" ? c(t.redis) : t.store, T = r(t, _), E = (e) => {
 		let n = t.enabled;
 		return n === void 0 ? !0 : typeof n == "function" ? n(e) : n;
 	}, D = (e, n, r, i) => {
@@ -73,7 +74,7 @@ var x = (e) => ({
 		return O(i, s).pipe(m.flatMap((t) => {
 			if (t === "exempt") return T.bypass(), n;
 			let r = l(o, i);
-			return g.consume(r, t, Date.now()).pipe(m.catchDefect((e) => m.as(m.logWarning(`[ratelimit] store error — failing open for ${i.tag}: ${String(e)}`), {
+			return _.consume(r, t, Date.now()).pipe(m.catchDefect((e) => m.as(m.logWarning(`[ratelimit] store error — failing open for ${i.tag}: ${String(e)}`), {
 				allowed: !0,
 				failOpenReason: "store-error",
 				remaining: t.limit,
@@ -95,7 +96,7 @@ var x = (e) => ({
 			burst: i.limit
 		}, o = r.remoteAddr ?? "unknown", s = Date.now(), c;
 		try {
-			c = await m.runPromise(g.consume(`http:ip:${o}`, a, s));
+			c = await m.runPromise(_.consume(`http:ip:${o}`, a, s));
 		} catch (t) {
 			return T.record("http", {
 				allowed: !0,
@@ -144,38 +145,7 @@ var x = (e) => ({
 				data: T.snapshot()
 			}))
 		}],
-		declaredEnv: [
-			{
-				name: "CACHE_REDIS_URL",
-				required: !1,
-				secret: !0,
-				description: "Redis connection URL for the redis store (credential-carrying). Falls back to REDIS_URL."
-			},
-			{
-				name: "REDIS_URL",
-				required: !1,
-				secret: !0,
-				description: "Fallback Redis connection URL for the redis store (credential-carrying)."
-			},
-			{
-				name: "CACHE_REDIS_DRIVER",
-				required: !1,
-				secret: !1,
-				description: "Redis driver selector: \"http\" for the Upstash REST client, otherwise RESP."
-			},
-			{
-				name: "CACHE_REDIS_TOKEN",
-				required: !1,
-				secret: !0,
-				description: "Upstash REST token for the http redis driver. Falls back to UPSTASH_REDIS_REST_TOKEN."
-			},
-			{
-				name: "UPSTASH_REDIS_REST_TOKEN",
-				required: !1,
-				secret: !0,
-				description: "Fallback Upstash REST token for the http redis driver."
-			}
-		],
+		declaredEnv: [],
 		...A ? { onHttpRequest: A } : {},
 		errorSchemas: [{
 			schema: e,
@@ -193,11 +163,11 @@ var x = (e) => ({
 			kind: "action",
 			input: void 0,
 			subject: n.subject,
-			traceId: _(),
+			traceId: h(),
 			surface: "rest",
 			publicApi: { rateLimit: t },
 			...n.remoteAddr === void 0 ? {} : { remoteAddr: n.remoteAddr }
-		}).pipe(m.catch((t) => m.fail(t instanceof e ? h(429, {
+		}).pipe(m.catch((t) => m.fail(t instanceof e ? g(429, {
 			error: "RateLimited",
 			message: "Rate limit exceeded"
 		}, C(t)) : t))),
@@ -207,14 +177,14 @@ var x = (e) => ({
 		interceptWorkflow: k,
 		...t.store === "postgres" ? { extendSchema: { tables: [s] } } : {},
 		bindDataStore: (e) => {
-			g.bind && (T.binding("binding"), g.bind(e).then(() => {
+			_.bind && (T.binding("binding"), _.bind(e).then(() => {
 				N = void 0, T.binding("bound");
 			}).catch((e) => {
 				T.binding("failed"), N = e;
 			}));
 		},
 		onActivate: (e) => m.gen(function* () {
-			g.activate && (yield* m.promise(() => g.activate(e.env))), M = setInterval(() => g.sweep(Date.now()), 6e4), M.unref?.(), N !== void 0 && e.logger.warn("rate-limit: SQL store bind failed — limiter runs fail-open", { error: N instanceof Error ? N.message : String(N) });
+			_.activate && (yield* m.promise(() => _.activate(e.env, e.connectionRegistry))), M = setInterval(() => _.sweep(Date.now()), 6e4), M.unref?.(), N !== void 0 && e.logger.warn("rate-limit: SQL store bind failed — limiter runs fail-open", { error: N instanceof Error ? N.message : String(N) });
 			let n = t.store === void 0 || t.store === "memory" ? v(e.env) : null;
 			n !== null && e.logger.warn(`rate-limit: the counter store is PROCESS-LOCAL (the default), but ${n}, which means several replicas. Each pod counts on its own, so every limit is effectively multiplied by the number of replicas. Set \`store: 'redis'\` or \`store: 'postgres'\` to share the counters.`), e.logger.info("rate-limit active", {
 				rules: a.length,
@@ -223,7 +193,7 @@ var x = (e) => ({
 			});
 		}),
 		onDeactivate: () => m.gen(function* () {
-			M && clearInterval(M), g.deactivate && (yield* m.promise(() => g.deactivate()));
+			M && clearInterval(M), _.deactivate && (yield* m.promise(() => _.deactivate()));
 		})
 	});
 };

package/dist/inspect.js

@@ -41,7 +41,7 @@ var t = (e) => typeof e == "function" ? "dynamic" : e, n = (e) => typeof e == "f
 				let e = n.size();
 				Number.isFinite(e) && e >= 0 && (i = e);
 			} catch {}
-			let c = typeof t.store == "string" ? t.store : t.store === void 0 ? "memory" : "custom";
+			let c = t.store === "redis" && t.redis?.hotStore !== void 0 ? "custom" : typeof t.store == "string" ? t.store : t.store === void 0 ? "memory" : "custom";
 			return {
 				capturedAt: Date.now(),
 				startedAt: a,

package/dist/postgresStore.d.ts

@@ -1,28 +1,13 @@
 import { ColumnBuilder } from '@voltro/database';
+import { ConnectionRegistryShape } from '@voltro/kv/connection';
 import { DataStore } from '@voltro/database';
 import { Effect } from 'effect';
 import { FieldDefinitions } from '@voltro/database';
+import { HotRateLimitState } from '@voltro/kv/hot';
 import { Table } from '@voltro/database';
 
 declare type Algorithm = 'fixed-window' | 'sliding-window' | 'token-bucket';
 
-/** Opaque per-key state. The store persists it verbatim; only this
- *  module reads its shape. */
-declare type BucketState = {
-    readonly kind: 'fixed';
-    readonly windowStart: number;
-    readonly count: number;
-} | {
-    readonly kind: 'sliding';
-    readonly currStart: number;
-    readonly currCount: number;
-    readonly prevCount: number;
-} | {
-    readonly kind: 'token';
-    readonly tokens: number;
-    readonly lastRefill: number;
-};
-
 export declare const postgresStore: (options?: PostgresStoreOptions) => RateLimitStore;
 
 export declare interface PostgresStoreOptions {
@@ -55,7 +40,7 @@ declare interface RateLimitStore {
     readonly size: () => number;
     /** Optional one-shot setup at plugin activate (open pools, create
      *  tables). Receives the process env. */
-    readonly activate?: (env: NodeJS.ProcessEnv) => Promise<void>;
+    readonly activate?: (env: NodeJS.ProcessEnv, connectionRegistry?: ConnectionRegistryShape) => Promise<void>;
     /** Optional teardown at plugin deactivate (close pools). */
     readonly deactivate?: () => Promise<void>;
     /** Optional bind of the app's `DataStore` (the plugin's `bindDataStore`).
@@ -70,7 +55,7 @@ declare interface RateLimitStore {
 export declare const rateLimitTable: Table<"_voltro_ratelimit", FieldDefinitions<{
     readonly id: ColumnBuilder<number, "id", boolean>;
     readonly key: ColumnBuilder<string, "text", boolean>;
-    readonly state: ColumnBuilder<BucketState | null, "json", boolean>;
+    readonly state: ColumnBuilder< HotRateLimitState | null, "json", boolean>;
     readonly touchedAt: ColumnBuilder<Date, "timestamp", true>;
     readonly touched: ColumnBuilder<unknown, "text", boolean>;
 }>, false, never>;

package/dist/redisStore.d.ts

@@ -1,6 +1,8 @@
+import { ConnectionRef } from '@voltro/kv/connection';
+import { ConnectionRegistryShape } from '@voltro/kv/connection';
 import { DataStore } from '@voltro/database';
 import { Effect } from 'effect';
-import { RespClient } from '@voltro/kv/connection';
+import { HotStoreShape } from '@voltro/kv/hot';
 
 declare type Algorithm = 'fixed-window' | 'sliding-window' | 'token-bucket';
 
@@ -27,7 +29,7 @@ declare interface RateLimitStore {
     readonly size: () => number;
     /** Optional one-shot setup at plugin activate (open pools, create
      *  tables). Receives the process env. */
-    readonly activate?: (env: NodeJS.ProcessEnv) => Promise<void>;
+    readonly activate?: (env: NodeJS.ProcessEnv, connectionRegistry?: ConnectionRegistryShape) => Promise<void>;
     /** Optional teardown at plugin deactivate (close pools). */
     readonly deactivate?: () => Promise<void>;
     /** Optional bind of the app's `DataStore` (the plugin's `bindDataStore`).
@@ -37,32 +39,15 @@ declare interface RateLimitStore {
     readonly bind?: (store: DataStore) => Promise<void>;
 }
 
+/** Redis limiter decisions go only through HotStore. The app owns every socket. */
 export declare const redisStore: (options?: RedisStoreOptions) => RateLimitStore;
 
 export declare interface RedisStoreOptions {
-    /** Connection url. `resp` driver: `redis://…` / `rediss://…`. `http`
-     *  driver: the Upstash REST url. Falls back to `CACHE_REDIS_URL` /
-     *  `REDIS_URL` env at activate time. */
-    readonly url?: string;
-    /**
-     * How to talk to the server — mirrors the cache plugin's axis:
-     *   - `'resp'` (default) — ioredis over TCP. Works for Redis, Valkey,
-     *     KeyDB, Dragonfly, and Upstash's TCP endpoint.
-     *   - `'http'` — `@upstash/redis` over REST, for serverless/edge where
-     *     TCP isn't available.
-     * Resolved from `CACHE_REDIS_DRIVER` env when omitted. `'redis'` as a
-     * store value is the umbrella for the whole RESP family — the server
-     * brand is just the url; only the DRIVER is a real choice.
-     */
-    readonly driver?: 'resp' | 'http';
-    /** Auth token — `http` (Upstash REST) driver only. Falls back to
-     *  `CACHE_REDIS_TOKEN` / `UPSTASH_REDIS_REST_TOKEN` env. */
-    readonly token?: string;
-    /** Bring your own already-connected RESP client (from
-     *  `@voltro/kv/connection`'s `connect`, or the shared registry). Takes
-     *  precedence over `url` / `driver`. */
-    readonly client?: RespClient;
-    /** Key namespace. Default `'voltro:rl:'`. */
+    /** Registry reference. Omit to use the app's default Redis connection. */
+    readonly connection?: ConnectionRef<'redis'>;
+    /** Borrow a replacement HotStore port. Its owner retains disposal. */
+    readonly hotStore?: HotStoreShape;
+    /** HotStore namespace. Default 'voltro:rl'; cannot contain braces. */
     readonly keyPrefix?: string;
 }
 

package/dist/redisStore.js

@@ -1,44 +1,48 @@
-import { Effect as e } from "effect";
-import { connect as t } from "@voltro/kv/connection";
+import { Effect as e, Layer as t, ManagedRuntime as n } from "effect";
+import { ConnectionRegistry as r } from "@voltro/kv/connection";
+import { HotStore as i, layerRoutedHotRedis as a } from "@voltro/kv/hot";
 //#region src/redisStore.ts
-var n = "\nlocal key = KEYS[1]\nlocal algo = ARGV[1]\nlocal limit = tonumber(ARGV[2])\nlocal windowMs = tonumber(ARGV[3])\nlocal burst = tonumber(ARGV[4])\nlocal now = tonumber(ARGV[5])\n\nlocal raw = redis.call('GET', key)\nlocal s = nil\nif raw then s = cjson.decode(raw) end\n\nlocal allowed, remaining, resetAt, retryAfter\nlocal newstate\n\nif algo == 'fixed-window' then\n  local windowStart = (s and s.windowStart) or now\n  local count = (s and s.count) or 0\n  if now - windowStart >= windowMs then windowStart = now; count = 0 end\n  resetAt = windowStart + windowMs\n  if count >= limit then\n    allowed = false; remaining = 0; retryAfter = resetAt - now\n  else\n    count = count + 1; allowed = true; remaining = limit - count; retryAfter = 0\n  end\n  newstate = { kind = 'fixed', windowStart = windowStart, count = count }\n\nelseif algo == 'token-bucket' then\n  local capacity = burst\n  local refillPerMs = limit / windowMs\n  local tokens = (s and s.tokens) or capacity\n  local lastRefill = (s and s.lastRefill) or now\n  tokens = math.min(capacity, tokens + (now - lastRefill) * refillPerMs)\n  if tokens >= 1 then\n    tokens = tokens - 1\n    resetAt = now + math.ceil((capacity - tokens) / refillPerMs)\n    allowed = true; remaining = math.floor(tokens); retryAfter = 0\n  else\n    retryAfter = math.ceil((1 - tokens) / refillPerMs)\n    resetAt = now + retryAfter; allowed = false; remaining = 0\n  end\n  newstate = { kind = 'token', tokens = tokens, lastRefill = now }\n\nelse\n  -- sliding-window (weighted counter)\n  local w = windowMs\n  local currStart = (s and s.currStart) or now\n  local currCount = (s and s.currCount) or 0\n  local prevCount = (s and s.prevCount) or 0\n  local elapsed = math.floor((now - currStart) / w)\n  if elapsed >= 2 then\n    prevCount = 0; currCount = 0; currStart = now\n  elseif elapsed == 1 then\n    prevCount = currCount; currCount = 0; currStart = currStart + w\n  end\n  local intoCurr = now - currStart\n  local weight = (w - intoCurr) / w\n  local estimate = prevCount * weight + currCount\n  resetAt = currStart + w\n  if estimate >= limit then\n    allowed = false; remaining = 0; retryAfter = resetAt - now\n  else\n    currCount = currCount + 1\n    allowed = true\n    remaining = math.max(0, math.floor(limit - estimate - 1))\n    retryAfter = 0\n  end\n  newstate = { kind = 'sliding', currStart = currStart, currCount = currCount, prevCount = prevCount }\nend\n\nlocal ttl = math.max(windowMs * 2, 60000) + 1000\nredis.call('SET', key, cjson.encode(newstate), 'PX', ttl)\nreturn cjson.encode({ allowed = allowed, remaining = remaining, resetAtMs = resetAt, retryAfterMs = retryAfter })\n", r = (r = {}) => {
-	let i = r.keyPrefix ?? "voltro:rl:", a = r.client ?? null, o = !1, s = (e, t, n) => ({
+var o = (o = {}) => {
+	if (typeof o != "object" || !o || Array.isArray(o)) throw Error("Redis rate-limit options must be an object");
+	if (Object.keys(o).some((e) => ![
+		"connection",
+		"hotStore",
+		"keyPrefix"
+	].includes(e))) throw Error("Redis rate-limit options accept only connection, hotStore and keyPrefix; configure credentials in the app connection registry");
+	if (o.hotStore !== void 0 && (o.connection !== void 0 || o.keyPrefix !== void 0)) throw Error("An injected rate limiter HotStore owns its connection and namespace");
+	let s = o.hotStore, c, l, u, d = !1, f = (e, t, n) => ({
 		failOpenReason: n,
 		allowed: !0,
 		remaining: e.limit,
 		resetAtMs: t + e.windowMs,
 		retryAfterMs: 0
-	}), c, l = (e) => r.url ?? e.RATELIMIT_REDIS_URL ?? e.CACHE_REDIS_URL ?? e.REDIS_URL, u = (n) => a ? Promise.resolve() : (c === void 0 && (c = (async () => {
-		let i = l(n);
-		if (!i) throw Error("@voltro/plugin-ratelimit redisStore: no client and no url (set RATELIMIT_REDIS_URL / REDIS_URL or pass { url }).");
-		let s = r.driver ?? ((n.RATELIMIT_REDIS_DRIVER ?? n.CACHE_REDIS_DRIVER) === "http" ? "http" : "resp"), c = r.token ?? n.RATELIMIT_REDIS_TOKEN ?? n.CACHE_REDIS_TOKEN ?? n.UPSTASH_REDIS_REST_TOKEN, u = {
-			url: i,
-			driver: s,
-			...c === void 0 ? {} : { token: c }
-		};
-		a = await e.runPromise(t(u)), o = !0;
-	})().finally(() => {
-		c = void 0;
-	})), c), d = (t, r, o) => {
-		let c = a;
-		return c ? e.tryPromise(async () => {
-			let e = await c.eval(n, 1, `${i}${t}`, r.algorithm, r.limit, r.windowMs, r.burst, o);
-			return JSON.parse(String(e));
-		}).pipe(e.catch(() => e.succeed(s(r, o, "store-error")))) : e.succeed(s(r, o, "unbound"));
-	};
+	});
 	return {
-		consume: (t, n, r) => a ? d(t, n, r) : l(process.env) === void 0 ? e.succeed(s(n, r, "unbound")) : e.tryPromise(() => u(process.env)).pipe(e.matchEffect({
-			onFailure: () => e.succeed(s(n, r, "store-error")),
-			onSuccess: () => d(t, n, r)
-		})),
+		consume: (t, n, r) => e.suspend(() => {
+			let i = s;
+			return i === void 0 || d ? e.succeed(f(n, r, "unbound")) : i.rateLimit(t, n, r).pipe(e.catch(() => e.succeed(f(n, r, "store-error"))));
+		}),
 		sweep: () => {},
 		size: () => -1,
-		activate: (e) => u(e),
-		deactivate: async () => {
-			let e = a;
-			a = null, e && o && await e.close();
-		}
+		activate: (e, u) => d ? Promise.reject(/* @__PURE__ */ Error("Rate limiter HotStore scope is closed")) : s === void 0 ? l === void 0 ? u === void 0 ? Promise.reject(/* @__PURE__ */ Error("Redis rate limiter requires the app connection registry or an injected HotStore port")) : (l = (async () => {
+			let e = n.make(a({
+				consumer: "ratelimit",
+				namespace: o.keyPrefix ?? "voltro:rl",
+				...o.connection === void 0 ? {} : { connection: o.connection }
+			}).pipe(t.provide(t.succeed(r, u))));
+			c = e;
+			try {
+				s = await e.runPromise(i);
+			} catch {
+				throw await e.dispose(), c = void 0, Error("Redis rate limiter HotStore activation failed; check the registry reference and environment declarations");
+			}
+		})().finally(() => {
+			l = void 0;
+		}), l) : l : Promise.resolve(),
+		deactivate: () => u ??= (async () => {
+			d = !0, await l?.catch(() => void 0), s = void 0, await c?.dispose();
+		})()
 	};
 };
 //#endregion
-export { r as redisStore };
+export { o as redisStore };

package/dist/window.js

@@ -1,117 +1,19 @@
+import { consumeHotRateLimit as e } from "@voltro/kv/hot/contract";
 //#region src/window.ts
-var e = {
+var t = {
 	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;
+}, n = (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 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
-		}
-	};
-};
+	let n = /^(\d+(?:\.\d+)?)(ms|s|m|h|d)$/.exec(e.trim());
+	if (!n) throw Error(`@voltro/plugin-ratelimit: invalid window "${e}" — use e.g. "1m", "10s", "500ms", "2h", "1d"`);
+	return Number(n[1]) * t[n[2]];
+}, r = e;
 //#endregion
-export { n as consumeBucket, t as parseWindow };
+export { r as consumeBucket, n as parseWindow };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-ratelimit",
-  "version": "0.86.0",
+  "version": "0.87.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,11 +48,12 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@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"
+    "@voltro/shared": "0.87.0",
+    "@voltro/database": "0.87.0",
+    "@voltro/kv": "0.87.0",
+    "@voltro/logger": "0.87.0",
+    "@voltro/protocol": "0.87.0",
+    "@voltro/runtime": "0.87.0"
   },
   "peerDependencies": {
     "effect": "4.0.1"