@orpc/experimental-ratelimit 0.0.0 → 0.0.1

package/dist/adapters/memory.mjs

@@ -25,7 +25,8 @@ class MemoryRatelimiter {
     this.lastCleanupTime = now;
     const windowStart = now - this.window;
     for (const [key, timestamps] of this.store) {
-      timestamps.splice(0, timestamps.findIndex((timestamp) => timestamp < windowStart) + 1);
+      const idx = timestamps.findIndex((timestamp) => timestamp >= windowStart);
+      timestamps.splice(0, idx === -1 ? timestamps.length : idx);
       if (timestamps.length === 0) {
         this.store.delete(key);
       }
@@ -36,7 +37,8 @@ class MemoryRatelimiter {
     const windowStart = now - this.window;
     let timestamps = this.store.get(key);
     if (timestamps) {
-      timestamps.splice(0, timestamps.findIndex((timestamp) => timestamp < windowStart) + 1);
+      const idx = timestamps.findIndex((timestamp) => timestamp >= windowStart);
+      timestamps.splice(0, idx === -1 ? timestamps.length : idx);
     } else {
       this.store.set(key, timestamps = []);
     }

package/dist/adapters/redis.d.mts

@@ -1,7 +1,7 @@
 import { a as Ratelimiter, R as RatelimiterLimitResult } from '../shared/experimental-ratelimit.C8zlaHwR.mjs';
 
 interface RedisRatelimiterOptions {
-    eval: (script: string, numKeys: number, ...args: string[]) => Promise<unknown>;
+    eval: (script: string, numKeys: number, ...rest: string[]) => Promise<unknown>;
     /**
      * Block until the request may pass or timeout is reached.
      */

package/dist/adapters/redis.d.ts

@@ -1,7 +1,7 @@
 import { a as Ratelimiter, R as RatelimiterLimitResult } from '../shared/experimental-ratelimit.C8zlaHwR.js';
 
 interface RedisRatelimiterOptions {
-    eval: (script: string, numKeys: number, ...args: string[]) => Promise<unknown>;
+    eval: (script: string, numKeys: number, ...rest: string[]) => Promise<unknown>;
     /**
      * Block until the request may pass or timeout is reached.
      */

package/dist/adapters/redis.mjs

@@ -65,7 +65,14 @@ class RedisRatelimiter {
     if (!Array.isArray(result) || result.length !== 4) {
       throw new TypeError("Invalid response from rate limit script");
     }
-    const [success, limit, remaining, reset] = result;
+    const numbers = result.map((item) => {
+      const num = Number(item);
+      if (!Number.isInteger(num)) {
+        throw new TypeError("Invalid response from rate limit script");
+      }
+      return num;
+    });
+    const [success, limit, remaining, reset] = numbers;
     return {
       success: success === 1,
       limit,

package/dist/adapters/upstash-ratelimit.d.mts

@@ -17,7 +17,7 @@ interface UpstashRatelimiterOptions {
      * On Vercel Edge or Cloudflare workers, you might need `.bind` before assign:
      * ```ts
      * const ratelimiter = new UpstashRatelimiter(ratelimit, {
-     *   waitUtil: ctx.waitUntil.bind(ctx),
+     *   waitUntil: ctx.waitUntil.bind(ctx),
      * })
      * ```
      */

package/dist/adapters/upstash-ratelimit.d.ts

@@ -17,7 +17,7 @@ interface UpstashRatelimiterOptions {
      * On Vercel Edge or Cloudflare workers, you might need `.bind` before assign:
      * ```ts
      * const ratelimiter = new UpstashRatelimiter(ratelimit, {
-     *   waitUtil: ctx.waitUntil.bind(ctx),
+     *   waitUntil: ctx.waitUntil.bind(ctx),
      * })
      * ```
      */

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { R as RatelimiterLimitResult, a as Ratelimiter } from './shared/experime
 import { Value, Promisable } from '@orpc/shared';
 
 declare const RATELIMIT_HANDLER_CONTEXT_SYMBOL: unique symbol;
-interface RatelimitHandlerPluginContext extends Context {
+interface RatelimitHandlerPluginContext {
     [RATELIMIT_HANDLER_CONTEXT_SYMBOL]?: {
         /**
          * The result of the ratelimiter after applying limits
@@ -12,12 +12,7 @@ interface RatelimitHandlerPluginContext extends Context {
         ratelimitResult?: RatelimiterLimitResult;
     };
 }
-declare class RatelimitHandlerPlugin<T extends RatelimitHandlerPluginContext> implements StandardHandlerPlugin<T> {
-    /**
-     * this plugin should lower priority than response headers plugin,
-     * if user want override rate limit headers
-     */
-    order: number;
+declare class RatelimitHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     init(options: StandardHandlerOptions<T>): void;
 }
 
@@ -43,7 +38,7 @@ interface CreateRatelimitMiddlewareOptions<TInContext extends Context, TInput, T
      */
     key: Value<Promisable<string>, [middlewareOptions: MiddlewareOptions<TInContext, unknown, Record<never, never>, TMeta>, input: TInput]>;
     /**
-     * If you ratelimit middleware is used multiple times
+     * If your ratelimit middleware is used multiple times
      * or you invoke a procedure inside another procedure (shared the same context) that also has
      * ratelimit middleware **with the same limiter and key**, this option
      * will ensure that the limit is only applied once per request.

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { R as RatelimiterLimitResult, a as Ratelimiter } from './shared/experime
 import { Value, Promisable } from '@orpc/shared';
 
 declare const RATELIMIT_HANDLER_CONTEXT_SYMBOL: unique symbol;
-interface RatelimitHandlerPluginContext extends Context {
+interface RatelimitHandlerPluginContext {
     [RATELIMIT_HANDLER_CONTEXT_SYMBOL]?: {
         /**
          * The result of the ratelimiter after applying limits
@@ -12,12 +12,7 @@ interface RatelimitHandlerPluginContext extends Context {
         ratelimitResult?: RatelimiterLimitResult;
     };
 }
-declare class RatelimitHandlerPlugin<T extends RatelimitHandlerPluginContext> implements StandardHandlerPlugin<T> {
-    /**
-     * this plugin should lower priority than response headers plugin,
-     * if user want override rate limit headers
-     */
-    order: number;
+declare class RatelimitHandlerPlugin<T extends Context> implements StandardHandlerPlugin<T> {
     init(options: StandardHandlerOptions<T>): void;
 }
 
@@ -43,7 +38,7 @@ interface CreateRatelimitMiddlewareOptions<TInContext extends Context, TInput, T
      */
     key: Value<Promisable<string>, [middlewareOptions: MiddlewareOptions<TInContext, unknown, Record<never, never>, TMeta>, input: TInput]>;
     /**
-     * If you ratelimit middleware is used multiple times
+     * If your ratelimit middleware is used multiple times
      * or you invoke a procedure inside another procedure (shared the same context) that also has
      * ratelimit middleware **with the same limiter and key**, this option
      * will ensure that the limit is only applied once per request.

package/dist/index.mjs

@@ -3,14 +3,9 @@ import { value, toArray } from '@orpc/shared';
 
 const RATELIMIT_HANDLER_CONTEXT_SYMBOL = Symbol("ORPC_RATE_LIMIT_HANDLER_CONTEXT");
 class RatelimitHandlerPlugin {
-  /**
-   * this plugin should lower priority than response headers plugin,
-   * if user want override rate limit headers
-   */
-  order = 1e5;
   init(options) {
     options.rootInterceptors ??= [];
-    options.rootInterceptors.push(async (interceptorOptions) => {
+    options.rootInterceptors.unshift(async (interceptorOptions) => {
       const handlerContext = {};
       const result = await interceptorOptions.next({
         ...interceptorOptions,
@@ -67,7 +62,7 @@ function createRatelimitMiddleware({ dedupe = true, ...options }) {
     return middlewareOptions.next({
       context: {
         [RATELIMIT_MIDDLEWARE_CONTEXT_SYMBOL]: {
-          ...middlewareOptions,
+          ...middlewareContext,
           limits: [
             ...toArray(middlewareContext?.limits),
             { limiter, key }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/experimental-ratelimit",
   "type": "module",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -49,8 +49,8 @@
   "dependencies": {
     "@orpc/client": "1.10.3",
     "@orpc/server": "1.10.3",
-    "@orpc/shared": "1.10.3",
-    "@orpc/standard-server": "1.10.3"
+    "@orpc/standard-server": "1.10.3",
+    "@orpc/shared": "1.10.3"
   },
   "devDependencies": {
     "@upstash/ratelimit": "^2.0.7",