@fefade/common 1.0.6 → 1.0.8

package/dist/index.d.mts

@@ -34,7 +34,9 @@ type MaybePromise<T> = T | Promise<T>;
 type Handler<E extends HasRequest> = (event: E) => MaybePromise<Response>;
 
 type RateLimiterLike = {
-    consume: (ip: string) => Promise<unknown>;
+    consume(key: string | number, pointsToConsume?: number, options?: {
+        [key: string]: any;
+    }): Promise<unknown>;
 };
 declare function export_default$1<E extends HasRequest>(handler: Handler<E>, limiter: RateLimiterLike): Handler<E>;
 

package/dist/index.d.ts

@@ -34,7 +34,9 @@ type MaybePromise<T> = T | Promise<T>;
 type Handler<E extends HasRequest> = (event: E) => MaybePromise<Response>;
 
 type RateLimiterLike = {
-    consume: (ip: string) => Promise<unknown>;
+    consume(key: string | number, pointsToConsume?: number, options?: {
+        [key: string]: any;
+    }): Promise<unknown>;
 };
 declare function export_default$1<E extends HasRequest>(handler: Handler<E>, limiter: RateLimiterLike): Handler<E>;
 

package/dist/index.js

@@ -14042,16 +14042,17 @@ function getIp_default(request) {
 
 // src/withRateLimit.ts
 function isRateLimiterRes(err) {
-  return err && typeof err === "object" && "msBeforeNext" in err && "remainingPoints" in err;
+  return typeof err === "object" && err !== null && "msBeforeNext" in err && "remainingPoints" in err;
 }
 function withRateLimit_default(handler, limiter) {
   return async (event) => {
-    const ip = getIp_default(event.request);
+    const requestCloned = event.request.clone();
+    const ipAddress = getIp_default(requestCloned);
     try {
-      await limiter.consume(ip);
+      await limiter.consume(ipAddress);
     } catch (err) {
       if (isRateLimiterRes(err)) {
-        new Response(JSON.stringify({ error: "Too many requests" }), {
+        return new Response(JSON.stringify({ error: "Too many requests" }), {
           status: 429,
           headers: {
             "Retry-After": "1800",
@@ -14059,11 +14060,9 @@ function withRateLimit_default(handler, limiter) {
           }
         });
       }
-      return new Response(JSON.stringify({ error: "Internal server error" }), {
-        status: 500
-      });
+      throw err;
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 
@@ -14071,13 +14070,24 @@ function withRateLimit_default(handler, limiter) {
 function validateTurnstile_default(handler, secretKey) {
   return async (event) => {
     if (!secretKey) {
-      return new Response(JSON.stringify({ error: "Invalid secret key" }));
+      return new Response(JSON.stringify({ error: "Invalid secret key" }), {
+        status: 500,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
     }
-    const body = await event.request.json();
+    const requestCloned = event.request.clone();
+    const body = await requestCloned.json();
     const token = body["cf-turnstile-response"];
-    const ip = getIp_default(event.request);
+    const ipAddress = getIp_default(event.request);
     if (!token) {
-      return new Response(JSON.stringify({ error: "Captcha not sent" }));
+      return new Response(JSON.stringify({ error: "Captcha not sent" }), {
+        status: 400,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
     }
     const response = await fetch(
       "https://challenges.cloudflare.com/turnstile/v0/siteverify",
@@ -14089,16 +14099,19 @@ function validateTurnstile_default(handler, secretKey) {
         body: JSON.stringify({
           secret: secretKey,
           response: token.toString(),
-          remoteip: ip
+          remoteip: ipAddress
         })
       }
     );
     if (!response.ok) {
       return new Response(JSON.stringify({ error: "Invalid verification" }), {
-        status: 400
+        status: 400,
+        headers: {
+          "Content-Type": "application/json"
+        }
       });
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 

package/dist/index.mjs

@@ -14014,16 +14014,17 @@ function getIp_default(request) {
 
 // src/withRateLimit.ts
 function isRateLimiterRes(err) {
-  return err && typeof err === "object" && "msBeforeNext" in err && "remainingPoints" in err;
+  return typeof err === "object" && err !== null && "msBeforeNext" in err && "remainingPoints" in err;
 }
 function withRateLimit_default(handler, limiter) {
   return async (event) => {
-    const ip = getIp_default(event.request);
+    const requestCloned = event.request.clone();
+    const ipAddress = getIp_default(requestCloned);
     try {
-      await limiter.consume(ip);
+      await limiter.consume(ipAddress);
     } catch (err) {
       if (isRateLimiterRes(err)) {
-        new Response(JSON.stringify({ error: "Too many requests" }), {
+        return new Response(JSON.stringify({ error: "Too many requests" }), {
           status: 429,
           headers: {
             "Retry-After": "1800",
@@ -14031,11 +14032,9 @@ function withRateLimit_default(handler, limiter) {
           }
         });
       }
-      return new Response(JSON.stringify({ error: "Internal server error" }), {
-        status: 500
-      });
+      throw err;
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 
@@ -14043,13 +14042,24 @@ function withRateLimit_default(handler, limiter) {
 function validateTurnstile_default(handler, secretKey) {
   return async (event) => {
     if (!secretKey) {
-      return new Response(JSON.stringify({ error: "Invalid secret key" }));
+      return new Response(JSON.stringify({ error: "Invalid secret key" }), {
+        status: 500,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
     }
-    const body = await event.request.json();
+    const requestCloned = event.request.clone();
+    const body = await requestCloned.json();
     const token = body["cf-turnstile-response"];
-    const ip = getIp_default(event.request);
+    const ipAddress = getIp_default(event.request);
     if (!token) {
-      return new Response(JSON.stringify({ error: "Captcha not sent" }));
+      return new Response(JSON.stringify({ error: "Captcha not sent" }), {
+        status: 400,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
     }
     const response = await fetch(
       "https://challenges.cloudflare.com/turnstile/v0/siteverify",
@@ -14061,16 +14071,19 @@ function validateTurnstile_default(handler, secretKey) {
         body: JSON.stringify({
           secret: secretKey,
           response: token.toString(),
-          remoteip: ip
+          remoteip: ipAddress
         })
       }
     );
     if (!response.ok) {
       return new Response(JSON.stringify({ error: "Invalid verification" }), {
-        status: 400
+        status: 400,
+        headers: {
+          "Content-Type": "application/json"
+        }
       });
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fefade/common",
   "description": "Containing common resources, constants, images, and utility functions that are used across various projects. This package aims to promote reusability and maintain consistency across different applications by centralizing commonly used assets and code.",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "private": false,
   "publishConfig": {
     "access": "public"