chore: add @types/deno dependency and update KvStore constructor to support Deno.Kv

Author: Keyrxng

bun.lock

@@ -58,6 +58,9 @@
     "@eslint/js": "9.14.0",
     "@jest/globals": "29.7.0",
     "@mswjs/data": "0.16.1",
+    "@swc/core": "^1.3.107",
+    "@swc/jest": "^0.2.29",
+    "@types/deno": "^2.5.0",
     "@types/jest": "29.5.12",
     "@types/ms": "^0.7.34",
     "@types/node": "20.14.5",
@@ -77,8 +80,6 @@
     "npm-run-all": "4.1.5",
     "prettier": "3.3.2",
     "rimraf": "^6.0.1",
-    "@swc/core": "^1.3.107",
-    "@swc/jest": "^0.2.29",
     "ts-node": "^10.9.2",
     "tsup": "^8.4.0",
     "typescript": "5.5.4",

package.json

@@ -9,7 +9,7 @@ export class KvStore implements Store {
   _options: ConfigType | undefined;
   prefix = "rate-limiter";
 
-  constructor(readonly _store: Kv) {}
+  constructor(readonly _store: Kv | Deno.Kv) {}
 
   init(options: ConfigType): void {
     this._options = options;
@@ -80,9 +80,7 @@ export class KvStore implements Store {
 }
 
 export async function createKvStore(): Promise<KvStore> {
-  // @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
   if (typeof Deno !== "undefined" && Deno.openKv) {
-    // @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
     const kv = await Deno.openKv();
     if (!kv) {
       throw new Error("Failed to open Deno KV");
@@ -136,31 +134,6 @@ export async function createUserRateLimiter(c: Context, next: () => Promise<void
     return;
   }
 
-  // Helper to create rate limit response
-  function createRateLimitResponse(resetAt: number, user: { id: number }) {
-    const logMessage = logger.warn("RateLimit: exceeded", {
-      key: `user:${user.id}:${mode}`,
-      resetAt,
-      limit,
-    });
-
-    return Response.json(
-      {
-        ok: false,
-        reasons: [logMessage.logMessage.raw],
-        resetAt,
-      },
-      {
-        status: 429,
-        headers: {
-          "x-ratelimit-limit": limit.toString(),
-          "x-ratelimit-reset": resetAt.toString(),
-        },
-      }
-    );
-  }
-
-  // Use hono-rate-limiter with user-specific key and custom handler
   const rateLimitKey = `user:${user.id}:${mode}`;
   const { rateLimiter } = await import("hono-rate-limiter");
   const userLimiter = rateLimiter({
@@ -171,22 +144,7 @@ export async function createUserRateLimiter(c: Context, next: () => Promise<void
     store: kvStore,
     skipSuccessfulRequests: false,
     skipFailedRequests: false,
-    handler: async (c) => {
-      const rateLimitInfo = await kvStore.get(rateLimitKey);
-      const resetAt = rateLimitInfo?.resetTime?.getTime() ?? Date.now() + 60 * 1000;
-      const response = createRateLimitResponse(resetAt, user);
-      c.res = response;
-    },
   });
 
-  // Execute rate limiter - it will call next() internally if not rate limited
-  // If rate limited, it will call our custom handler which sets c.res
-  await userLimiter(c, next);
-
-  // If rate limit was exceeded, the handler set c.res
-  // hono-rate-limiter should prevent next() from being called, but we check anyway
-  // to ensure we don't continue processing if a response was already set
-  if (c.res && c.res.status === 429) {
-    return;
-  }
+  return await userLimiter(c, next);
 }

src/handlers/start/api/helpers/rate-limit.ts

@@ -35,18 +35,14 @@ function mockOpenKv() {
   return Promise.resolve(mockKv);
 }
 
-// @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
 if (globalThis.Deno) {
-  // @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
   Object.defineProperty(globalThis.Deno, "openKv", {
     value: mockOpenKv,
     writable: true,
     configurable: true,
   });
 } else {
-  // @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
   globalThis.Deno = {
     openKv: mockOpenKv,
-    // @ts-expect-error - Deno isn't defined without having the DenoLand extension installed or within the runtime
   } as unknown as typeof Deno;
 }

tests/__mocks__/deno-kv.ts

@@ -29,7 +29,7 @@
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
+    "types": ["deno"] /* Specify type package names to be included without being referenced in a source file. */,
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */
     // "allowImportingTsExtensions": true,               /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */