@fefade/common 1.0.5 → 1.0.7

package/dist/index.d.mts

@@ -34,11 +34,13 @@ 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>;
 
-declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey: string): Handler<E>;
+declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey?: string): Handler<E>;
 
 declare const ORG_NAME = "Fefade";
 declare const ACRONYM = "ff";

package/dist/index.d.ts

@@ -34,11 +34,13 @@ 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>;
 
-declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey: string): Handler<E>;
+declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey?: string): Handler<E>;
 
 declare const ORG_NAME = "Fefade";
 declare const ACRONYM = "ff";

package/dist/index.js

@@ -14010,9 +14010,9 @@ function handleError_default(err) {
   if (err instanceof external_exports.ZodError) {
     return new Errors(err.issues[0].message, "VALIDATION_ERROR", 400);
   }
-  const parsedError = firebaseError(err);
-  if (parsedError instanceof Errors) {
-    return parsedError;
+  const fbError = firebaseError(err);
+  if (fbError instanceof Errors) {
+    return fbError;
   }
   return new Errors("Internal server error", "INTERNAL_SERVER_ERROR", 500);
 }
@@ -14042,45 +14042,50 @@ 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 ipAddress = getIp_default(event.request);
     try {
-      await limiter.consume(ip);
+      await limiter.consume(ipAddress);
     } catch (err) {
       if (isRateLimiterRes(err)) {
-        Response.json(
-          { error: "Too many requests" },
-          {
-            status: 429,
-            headers: {
-              "Retry-After": "1800",
-              "Content-Type": "application/json"
-            }
+        return new Response(JSON.stringify({ error: "Too many requests" }), {
+          status: 429,
+          headers: {
+            "Retry-After": "1800",
+            "Content-Type": "application/json"
           }
-        );
+        });
       }
-      return Response.json(
-        { error: "Internal server error" },
-        {
-          status: 500
-        }
-      );
+      throw err;
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 
 // src/validateTurnstile.ts
 function validateTurnstile_default(handler, secretKey) {
   return async (event) => {
+    if (!secretKey) {
+      return new Response(JSON.stringify({ error: "Invalid secret key" }), {
+        status: 500,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
+    }
     const body = await event.request.json();
     const token = body["cf-turnstile-response"];
-    const ip = getIp_default(event.request);
+    const ipAddress = getIp_default(event.request);
     if (!token) {
-      return Response.json({ 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",
@@ -14092,14 +14097,19 @@ function validateTurnstile_default(handler, secretKey) {
         body: JSON.stringify({
           secret: secretKey,
           response: token.toString(),
-          remoteip: ip
+          remoteip: ipAddress
         })
       }
     );
     if (!response.ok) {
-      return Response.json({ error: "Invalid verification" }, { status: 400 });
+      return new Response(JSON.stringify({ error: "Invalid verification" }), {
+        status: 400,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 

package/dist/index.mjs

@@ -13982,9 +13982,9 @@ function handleError_default(err) {
   if (err instanceof external_exports.ZodError) {
     return new Errors(err.issues[0].message, "VALIDATION_ERROR", 400);
   }
-  const parsedError = firebaseError(err);
-  if (parsedError instanceof Errors) {
-    return parsedError;
+  const fbError = firebaseError(err);
+  if (fbError instanceof Errors) {
+    return fbError;
   }
   return new Errors("Internal server error", "INTERNAL_SERVER_ERROR", 500);
 }
@@ -14014,45 +14014,50 @@ 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 ipAddress = getIp_default(event.request);
     try {
-      await limiter.consume(ip);
+      await limiter.consume(ipAddress);
     } catch (err) {
       if (isRateLimiterRes(err)) {
-        Response.json(
-          { error: "Too many requests" },
-          {
-            status: 429,
-            headers: {
-              "Retry-After": "1800",
-              "Content-Type": "application/json"
-            }
+        return new Response(JSON.stringify({ error: "Too many requests" }), {
+          status: 429,
+          headers: {
+            "Retry-After": "1800",
+            "Content-Type": "application/json"
           }
-        );
+        });
       }
-      return Response.json(
-        { error: "Internal server error" },
-        {
-          status: 500
-        }
-      );
+      throw err;
     }
-    return handler({ ...event, ip });
+    return handler(event);
   };
 }
 
 // src/validateTurnstile.ts
 function validateTurnstile_default(handler, secretKey) {
   return async (event) => {
+    if (!secretKey) {
+      return new Response(JSON.stringify({ error: "Invalid secret key" }), {
+        status: 500,
+        headers: {
+          "Content-Type": "application/json"
+        }
+      });
+    }
     const body = await event.request.json();
     const token = body["cf-turnstile-response"];
-    const ip = getIp_default(event.request);
+    const ipAddress = getIp_default(event.request);
     if (!token) {
-      return Response.json({ 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",
@@ -14064,14 +14069,19 @@ function validateTurnstile_default(handler, secretKey) {
         body: JSON.stringify({
           secret: secretKey,
           response: token.toString(),
-          remoteip: ip
+          remoteip: ipAddress
         })
       }
     );
     if (!response.ok) {
-      return Response.json({ error: "Invalid verification" }, { status: 400 });
+      return new Response(JSON.stringify({ error: "Invalid verification" }), {
+        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.5",
+  "version": "1.0.7",
   "private": false,
   "publishConfig": {
     "access": "public"