@fefade/common 1.0.3 → 1.0.5

package/dist/index.d.mts

@@ -1,13 +1,11 @@
-import { IRateLimiterOptions } from 'rate-limiter-flexible';
+declare function export_default$7(lang: string): string;
 
-declare function export_default$5(lang: string): string;
-
-declare function export_default$4<E extends string>(url: string): {
+declare function export_default$6<E extends string>(url: string): {
     on: <K extends keyof E>(event: K, handler: (data: E[K]) => void) => void;
     close: () => void;
 };
 
-declare function export_default$3(): {
+declare function export_default$5(): {
     connect: () => Response;
     broadcast: <E extends string, T>(event: E, data: T) => void;
 };
@@ -17,7 +15,7 @@ type Props = {
     domain: string;
     cookieDomain: string;
 };
-declare function export_default$2({ origin, domain, cookieDomain }: Props): boolean;
+declare function export_default$4({ origin, domain, cookieDomain }: Props): boolean;
 
 declare class Errors extends Error {
     code: string;
@@ -25,9 +23,22 @@ declare class Errors extends Error {
     constructor(message?: string, code?: string, status?: number);
 }
 
-declare function export_default$1(err: unknown): Errors;
+declare function export_default$3(err: unknown): Errors;
+
+declare function export_default$2<T extends string>(path: string | T, params?: string | string[][] | Record<string, string> | URLSearchParams | undefined): string;
+
+type HasRequest<T = {}> = {
+    request: Request;
+} & T;
+type MaybePromise<T> = T | Promise<T>;
+type Handler<E extends HasRequest> = (event: E) => MaybePromise<Response>;
+
+type RateLimiterLike = {
+    consume: (ip: string) => Promise<unknown>;
+};
+declare function export_default$1<E extends HasRequest>(handler: Handler<E>, limiter: RateLimiterLike): Handler<E>;
 
-declare function export_default<T extends string>(path: string | T, params?: string | string[][] | Record<string, string> | URLSearchParams | undefined): string;
+declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey: string): Handler<E>;
 
 declare const ORG_NAME = "Fefade";
 declare const ACRONYM = "ff";
@@ -42,8 +53,7 @@ declare const URLS: {
     play_store: string;
     github: string;
 };
-declare const LANG_STRATEGY: string[];
-declare const RATE_LIMIT_DEFAULT_OPTIONS: IRateLimiterOptions;
+declare const LANG_STRATEGY: ("cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage")[];
 
 declare const constants_ACRONYM: typeof ACRONYM;
 declare const constants_DEFAULT_LOCALE: typeof DEFAULT_LOCALE;
@@ -51,11 +61,10 @@ declare const constants_IS_PROD: typeof IS_PROD;
 declare const constants_LANG_STRATEGY: typeof LANG_STRATEGY;
 declare const constants_ORG_NAME: typeof ORG_NAME;
 declare const constants_PROTOCOL: typeof PROTOCOL;
-declare const constants_RATE_LIMIT_DEFAULT_OPTIONS: typeof RATE_LIMIT_DEFAULT_OPTIONS;
 declare const constants_SUPPORT_EMAIL: typeof SUPPORT_EMAIL;
 declare const constants_URLS: typeof URLS;
 declare namespace constants {
-  export { constants_ACRONYM as ACRONYM, constants_DEFAULT_LOCALE as DEFAULT_LOCALE, constants_IS_PROD as IS_PROD, constants_LANG_STRATEGY as LANG_STRATEGY, constants_ORG_NAME as ORG_NAME, constants_PROTOCOL as PROTOCOL, constants_RATE_LIMIT_DEFAULT_OPTIONS as RATE_LIMIT_DEFAULT_OPTIONS, constants_SUPPORT_EMAIL as SUPPORT_EMAIL, constants_URLS as URLS };
+  export { constants_ACRONYM as ACRONYM, constants_DEFAULT_LOCALE as DEFAULT_LOCALE, constants_IS_PROD as IS_PROD, constants_LANG_STRATEGY as LANG_STRATEGY, constants_ORG_NAME as ORG_NAME, constants_PROTOCOL as PROTOCOL, constants_SUPPORT_EMAIL as SUPPORT_EMAIL, constants_URLS as URLS };
 }
 
-export { constants as Constants, export_default$1 as handleError, export_default$2 as isAllowedOrigin, export_default$5 as normalizeLang, export_default as pathWithParams, export_default$4 as sseClient, export_default$3 as sseServer };
+export { constants as Constants, export_default$3 as handleError, export_default$4 as isAllowedOrigin, export_default$7 as normalizeLang, export_default$2 as pathWithParams, export_default$6 as sseClient, export_default$5 as sseServer, export_default as validateTurnstile, export_default$1 as withRateLimit };

package/dist/index.d.ts

@@ -1,13 +1,11 @@
-import { IRateLimiterOptions } from 'rate-limiter-flexible';
+declare function export_default$7(lang: string): string;
 
-declare function export_default$5(lang: string): string;
-
-declare function export_default$4<E extends string>(url: string): {
+declare function export_default$6<E extends string>(url: string): {
     on: <K extends keyof E>(event: K, handler: (data: E[K]) => void) => void;
     close: () => void;
 };
 
-declare function export_default$3(): {
+declare function export_default$5(): {
     connect: () => Response;
     broadcast: <E extends string, T>(event: E, data: T) => void;
 };
@@ -17,7 +15,7 @@ type Props = {
     domain: string;
     cookieDomain: string;
 };
-declare function export_default$2({ origin, domain, cookieDomain }: Props): boolean;
+declare function export_default$4({ origin, domain, cookieDomain }: Props): boolean;
 
 declare class Errors extends Error {
     code: string;
@@ -25,9 +23,22 @@ declare class Errors extends Error {
     constructor(message?: string, code?: string, status?: number);
 }
 
-declare function export_default$1(err: unknown): Errors;
+declare function export_default$3(err: unknown): Errors;
+
+declare function export_default$2<T extends string>(path: string | T, params?: string | string[][] | Record<string, string> | URLSearchParams | undefined): string;
+
+type HasRequest<T = {}> = {
+    request: Request;
+} & T;
+type MaybePromise<T> = T | Promise<T>;
+type Handler<E extends HasRequest> = (event: E) => MaybePromise<Response>;
+
+type RateLimiterLike = {
+    consume: (ip: string) => Promise<unknown>;
+};
+declare function export_default$1<E extends HasRequest>(handler: Handler<E>, limiter: RateLimiterLike): Handler<E>;
 
-declare function export_default<T extends string>(path: string | T, params?: string | string[][] | Record<string, string> | URLSearchParams | undefined): string;
+declare function export_default<E extends HasRequest>(handler: Handler<E>, secretKey: string): Handler<E>;
 
 declare const ORG_NAME = "Fefade";
 declare const ACRONYM = "ff";
@@ -42,8 +53,7 @@ declare const URLS: {
     play_store: string;
     github: string;
 };
-declare const LANG_STRATEGY: string[];
-declare const RATE_LIMIT_DEFAULT_OPTIONS: IRateLimiterOptions;
+declare const LANG_STRATEGY: ("cookie" | "baseLocale" | "globalVariable" | "url" | "preferredLanguage" | "localStorage")[];
 
 declare const constants_ACRONYM: typeof ACRONYM;
 declare const constants_DEFAULT_LOCALE: typeof DEFAULT_LOCALE;
@@ -51,11 +61,10 @@ declare const constants_IS_PROD: typeof IS_PROD;
 declare const constants_LANG_STRATEGY: typeof LANG_STRATEGY;
 declare const constants_ORG_NAME: typeof ORG_NAME;
 declare const constants_PROTOCOL: typeof PROTOCOL;
-declare const constants_RATE_LIMIT_DEFAULT_OPTIONS: typeof RATE_LIMIT_DEFAULT_OPTIONS;
 declare const constants_SUPPORT_EMAIL: typeof SUPPORT_EMAIL;
 declare const constants_URLS: typeof URLS;
 declare namespace constants {
-  export { constants_ACRONYM as ACRONYM, constants_DEFAULT_LOCALE as DEFAULT_LOCALE, constants_IS_PROD as IS_PROD, constants_LANG_STRATEGY as LANG_STRATEGY, constants_ORG_NAME as ORG_NAME, constants_PROTOCOL as PROTOCOL, constants_RATE_LIMIT_DEFAULT_OPTIONS as RATE_LIMIT_DEFAULT_OPTIONS, constants_SUPPORT_EMAIL as SUPPORT_EMAIL, constants_URLS as URLS };
+  export { constants_ACRONYM as ACRONYM, constants_DEFAULT_LOCALE as DEFAULT_LOCALE, constants_IS_PROD as IS_PROD, constants_LANG_STRATEGY as LANG_STRATEGY, constants_ORG_NAME as ORG_NAME, constants_PROTOCOL as PROTOCOL, constants_SUPPORT_EMAIL as SUPPORT_EMAIL, constants_URLS as URLS };
 }
 
-export { constants as Constants, export_default$1 as handleError, export_default$2 as isAllowedOrigin, export_default$5 as normalizeLang, export_default as pathWithParams, export_default$4 as sseClient, export_default$3 as sseServer };
+export { constants as Constants, export_default$3 as handleError, export_default$4 as isAllowedOrigin, export_default$7 as normalizeLang, export_default$2 as pathWithParams, export_default$6 as sseClient, export_default$5 as sseServer, export_default as validateTurnstile, export_default$1 as withRateLimit };

package/dist/index.js

@@ -26,7 +26,9 @@ __export(index_exports, {
   normalizeLang: () => normalizeLang_default,
   pathWithParams: () => pathWithParams_default,
   sseClient: () => sseClient_default,
-  sseServer: () => sseServer_default
+  sseServer: () => sseServer_default,
+  validateTurnstile: () => validateTurnstile_default,
+  withRateLimit: () => withRateLimit_default
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -14033,6 +14035,74 @@ function pathWithParams_default(path, params) {
   return queryString ? `${basePath}?${queryString}` : basePath;
 }
 
+// src/getIp.ts
+function getIp_default(request) {
+  return request.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || request.headers.get("CF-Connecting-IP") || request.headers.get("X-Forwarded-For") || "unknown";
+}
+
+// src/withRateLimit.ts
+function isRateLimiterRes(err) {
+  return err && typeof err === "object" && "msBeforeNext" in err && "remainingPoints" in err;
+}
+function withRateLimit_default(handler, limiter) {
+  return async (event) => {
+    const ip = getIp_default(event.request);
+    try {
+      await limiter.consume(ip);
+    } catch (err) {
+      if (isRateLimiterRes(err)) {
+        Response.json(
+          { error: "Too many requests" },
+          {
+            status: 429,
+            headers: {
+              "Retry-After": "1800",
+              "Content-Type": "application/json"
+            }
+          }
+        );
+      }
+      return Response.json(
+        { error: "Internal server error" },
+        {
+          status: 500
+        }
+      );
+    }
+    return handler({ ...event, ip });
+  };
+}
+
+// src/validateTurnstile.ts
+function validateTurnstile_default(handler, secretKey) {
+  return async (event) => {
+    const body = await event.request.json();
+    const token = body["cf-turnstile-response"];
+    const ip = getIp_default(event.request);
+    if (!token) {
+      return Response.json({ error: "Captcha not sent" });
+    }
+    const response = await fetch(
+      "https://challenges.cloudflare.com/turnstile/v0/siteverify",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          secret: secretKey,
+          response: token.toString(),
+          remoteip: ip
+        })
+      }
+    );
+    if (!response.ok) {
+      return Response.json({ error: "Invalid verification" }, { status: 400 });
+    }
+    return handler({ ...event, ip });
+  };
+}
+
 // src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
@@ -14042,7 +14112,6 @@ __export(constants_exports, {
   LANG_STRATEGY: () => LANG_STRATEGY,
   ORG_NAME: () => ORG_NAME,
   PROTOCOL: () => PROTOCOL,
-  RATE_LIMIT_DEFAULT_OPTIONS: () => RATE_LIMIT_DEFAULT_OPTIONS,
   SUPPORT_EMAIL: () => SUPPORT_EMAIL,
   URLS: () => URLS
 });
@@ -14067,11 +14136,6 @@ var LANG_STRATEGY = [
   "baseLocale",
   "globalVariable"
 ];
-var RATE_LIMIT_DEFAULT_OPTIONS = {
-  points: 3,
-  duration: 60 * 60,
-  blockDuration: 30 * 60
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Constants,
@@ -14080,5 +14144,7 @@ var RATE_LIMIT_DEFAULT_OPTIONS = {
   normalizeLang,
   pathWithParams,
   sseClient,
-  sseServer
+  sseServer,
+  validateTurnstile,
+  withRateLimit
 });

package/dist/index.mjs

@@ -14007,6 +14007,74 @@ function pathWithParams_default(path, params) {
   return queryString ? `${basePath}?${queryString}` : basePath;
 }
 
+// src/getIp.ts
+function getIp_default(request) {
+  return request.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || request.headers.get("CF-Connecting-IP") || request.headers.get("X-Forwarded-For") || "unknown";
+}
+
+// src/withRateLimit.ts
+function isRateLimiterRes(err) {
+  return err && typeof err === "object" && "msBeforeNext" in err && "remainingPoints" in err;
+}
+function withRateLimit_default(handler, limiter) {
+  return async (event) => {
+    const ip = getIp_default(event.request);
+    try {
+      await limiter.consume(ip);
+    } catch (err) {
+      if (isRateLimiterRes(err)) {
+        Response.json(
+          { error: "Too many requests" },
+          {
+            status: 429,
+            headers: {
+              "Retry-After": "1800",
+              "Content-Type": "application/json"
+            }
+          }
+        );
+      }
+      return Response.json(
+        { error: "Internal server error" },
+        {
+          status: 500
+        }
+      );
+    }
+    return handler({ ...event, ip });
+  };
+}
+
+// src/validateTurnstile.ts
+function validateTurnstile_default(handler, secretKey) {
+  return async (event) => {
+    const body = await event.request.json();
+    const token = body["cf-turnstile-response"];
+    const ip = getIp_default(event.request);
+    if (!token) {
+      return Response.json({ error: "Captcha not sent" });
+    }
+    const response = await fetch(
+      "https://challenges.cloudflare.com/turnstile/v0/siteverify",
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          secret: secretKey,
+          response: token.toString(),
+          remoteip: ip
+        })
+      }
+    );
+    if (!response.ok) {
+      return Response.json({ error: "Invalid verification" }, { status: 400 });
+    }
+    return handler({ ...event, ip });
+  };
+}
+
 // src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
@@ -14016,7 +14084,6 @@ __export(constants_exports, {
   LANG_STRATEGY: () => LANG_STRATEGY,
   ORG_NAME: () => ORG_NAME,
   PROTOCOL: () => PROTOCOL,
-  RATE_LIMIT_DEFAULT_OPTIONS: () => RATE_LIMIT_DEFAULT_OPTIONS,
   SUPPORT_EMAIL: () => SUPPORT_EMAIL,
   URLS: () => URLS
 });
@@ -14041,11 +14108,6 @@ var LANG_STRATEGY = [
   "baseLocale",
   "globalVariable"
 ];
-var RATE_LIMIT_DEFAULT_OPTIONS = {
-  points: 3,
-  duration: 60 * 60,
-  blockDuration: 30 * 60
-};
 export {
   constants_exports as Constants,
   handleError_default as handleError,
@@ -14053,5 +14115,7 @@ export {
   normalizeLang_default as normalizeLang,
   pathWithParams_default as pathWithParams,
   sseClient_default as sseClient,
-  sseServer_default as sseServer
+  sseServer_default as sseServer,
+  validateTurnstile_default as validateTurnstile,
+  withRateLimit_default as withRateLimit
 };

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.3",
+  "version": "1.0.5",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -38,7 +38,6 @@
     "@changesets/cli": "^2.30.0",
     "@types/node": "^25.5.2",
     "prettier": "^3.8.1",
-    "rate-limiter-flexible": "^10.0.1",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
     "zod": "^4.3.6"