@arkyn/server 3.0.1-beta.2 → 3.0.1-beta.21

package/src/mapper/arkynLogRequestMapper.ts

@@ -0,0 +1,73 @@
+type InputProps = {
+  status: number;
+  url: string;
+  method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+  requestHeaders: HeadersInit;
+  responseHeaders: HeadersInit;
+  requestBody: any;
+  elapsedTime: number;
+  responseBody: any;
+  queryParams: URLSearchParams;
+};
+
+type OutputProps = {
+  rawUrl: string;
+  status: number;
+  method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH";
+  token: string | null;
+  elapsedTime: number;
+  requestHeaders: Record<string, string>;
+  requestBody: Record<string, string>;
+  queryParams: Record<string, string>;
+  responseHeaders: Record<string, string>;
+  responseBody: any;
+};
+
+class ArkynLogRequestMapper {
+  private static mapHeaders(headers: HeadersInit): Record<string, string> {
+    if (headers instanceof Headers) {
+      return Object.fromEntries(headers.entries());
+    } else if (typeof headers === "object") {
+      return Object.entries(headers).reduce((acc, [key, value]) => {
+        if (typeof value === "string") {
+          acc[key] = value;
+        } else if (Array.isArray(value)) {
+          acc[key] = value.join(", ");
+        } else {
+          acc[key] = JSON.stringify(value);
+        }
+        return acc;
+      }, {} as Record<string, string>);
+    }
+    return {};
+  }
+
+  private static mapQueryParams(
+    queryParams: URLSearchParams
+  ): Record<string, string> {
+    const params: Record<string, string> = {};
+
+    queryParams.forEach((value, key) => {
+      params[key] = value;
+    });
+
+    return params;
+  }
+
+  static handle(props: InputProps): OutputProps {
+    return {
+      rawUrl: props.url,
+      status: props.status,
+      method: props.method,
+      token: null,
+      elapsedTime: props.elapsedTime,
+      requestHeaders: this.mapHeaders(props.requestHeaders),
+      requestBody: props.requestBody || null,
+      queryParams: this.mapQueryParams(props.queryParams),
+      responseHeaders: this.mapHeaders(props.responseHeaders),
+      responseBody: props.responseBody || null,
+    };
+  }
+}
+
+export { ArkynLogRequestMapper };

package/src/services/formParse.ts

@@ -1,8 +1,8 @@
-import type { Schema } from "zod";
+import type { ZodType } from "zod";
 
 type SuccessResponse<T extends FormParseProps> = {
   success: true;
-  data: T[1] extends Schema<infer U> ? U : never;
+  data: T[1] extends ZodType<infer U> ? U : never;
 };
 
 type ErrorResponse = {
@@ -11,7 +11,7 @@ type ErrorResponse = {
   fieldErrors: { [x: string]: string };
 };
 
-type FormParseProps = [formData: { [k: string]: any }, schema: Schema];
+type FormParseProps = [formData: { [k: string]: any }, schema: ZodType];
 
 type FormParseReturnType<T extends FormParseProps> =
   | SuccessResponse<T>
@@ -64,10 +64,10 @@ function formParse<T extends FormParseProps>([
 
   if (zodResponse.success === false) {
     const errorsObject = Object.fromEntries(
-      zodResponse.error.errors.map((item) => [
-        item.path.join("."),
-        item.message,
-      ])
+      zodResponse.error.issues.map((item) => {
+        console.log(item);
+        return [item.path.join("."), item.message];
+      })
     );
 
     return {
@@ -76,7 +76,10 @@ function formParse<T extends FormParseProps>([
       fields: formData,
     };
   } else {
-    return { success: zodResponse.success, data: zodResponse.data };
+    return {
+      success: zodResponse.success,
+      data: zodResponse.data as T[1] extends ZodType<infer U> ? U : never,
+    };
   }
 }
 

package/src/services/getCaller.ts

@@ -11,36 +11,70 @@ import path from "path";
  * - `functionName`: The name of the function that called the current function, or "Unknown function" if it cannot be determined.
  * - `callerInfo`: The file path of the caller relative to the project root, or "Unknown caller" if it cannot be determined.
  */
-
 function getCaller() {
   const projectRoot = process.cwd();
 
   const err = new Error();
   const stack = err.stack || "";
-
   const stackLines = stack.split("\n").map((line) => line.trim());
 
-  const callerLine = stackLines[4] || "";
-
-  let functionName = "unknown";
-  let callerInfo = "unknown location";
-
-  const functionMatch = callerLine.match(/at\s+([^\s]+)\s+\((.*)\)/);
-  if (functionMatch) {
-    functionName = functionMatch[1];
-    callerInfo = functionMatch[2];
-  } else {
-    const locationMatch = callerLine.match(/at\s+(.*)/);
-    if (locationMatch) {
-      callerInfo = locationMatch[1];
-      const pathParts = callerInfo.split("/");
-      const lastPart = pathParts[pathParts.length - 1] || "";
-      const fileParts = lastPart.split(":");
-      functionName = fileParts[0] || "unknown";
+  // The first line is the error message
+  // The second line is this function (getCaller)
+  // The third line should be the direct caller
+  // We start from 2 because indexes are zero-based
+  let callerIndex = 2;
+
+  // Ignore internal or infrastructure lines if necessary
+  while (
+    callerIndex < stackLines.length &&
+    (stackLines[callerIndex].includes("node:internal") ||
+      stackLines[callerIndex].includes("/node_modules/"))
+  ) {
+    callerIndex++;
+  }
+
+  const callerLine = stackLines[callerIndex] || "";
+
+  let functionName = "Unknown function";
+  let callerInfo = "Unknown caller";
+
+  // Default for named functions: "at functionName (file:line:column)"
+  const namedFunctionMatch = callerLine.match(/at\s+([^(\s]+)\s+\(([^)]+)\)/);
+  if (namedFunctionMatch) {
+    functionName = namedFunctionMatch[1];
+    callerInfo = namedFunctionMatch[2];
+  }
+  // Default for anonymous functions or methods: "at file:line:column"
+  else {
+    const anonymousFunctionMatch = callerLine.match(/at\s+(.+)/);
+    if (anonymousFunctionMatch) {
+      callerInfo = anonymousFunctionMatch[1];
+
+      // Tenta extrair nome da função de padrões como Object.method ou Class.method
+      const objectMethodMatch = callerInfo.match(/at\s+([^(\s]+)\s+/);
+      if (objectMethodMatch && objectMethodMatch[1] !== "new") {
+        functionName = objectMethodMatch[1];
+      }
     }
   }
 
-  callerInfo = path.relative(projectRoot, callerInfo);
+  // Handles file paths
+  if (callerInfo.includes("(")) {
+    callerInfo = callerInfo.substring(
+      callerInfo.indexOf("(") + 1,
+      callerInfo.lastIndexOf(")")
+    );
+  }
+
+  // Remove the line:column part of the file path
+  callerInfo = callerInfo.split(":").slice(0, -2).join(":");
+
+  // Make the path relative to the project
+  try {
+    callerInfo = path.relative(projectRoot, callerInfo);
+  } catch (e) {
+    // If it fails to relativize, use the original path
+  }
 
   return { functionName, callerInfo };
 }

package/src/services/httpDebug.ts

@@ -1,4 +1,3 @@
-import { InboxFlowInstance } from "../config/inboxFlowInstance";
 import { getCaller } from "../services/getCaller";
 
 /**

package/src/services/measureRouteExecution.ts

@@ -0,0 +1,31 @@
+function measureRouteExecution<T = unknown>(
+  handler: (props: any) => Promise<T>
+) {
+  return async function measuredHandler(props: any): Promise<T> {
+    const startTime = performance.now();
+
+    try {
+      const result = await handler(props);
+
+      const url = new URL(props.request.url);
+      const endTime = performance.now();
+
+      const duration = (endTime - startTime).toFixed(2);
+
+      console.log({
+        domain: url.hostname,
+        pathname: url.pathname,
+        method: props.request.method,
+        duration,
+      });
+
+      return result as T;
+    } catch (error) {
+      const endTime = performance.now();
+      console.error("");
+      throw error;
+    }
+  };
+}
+
+export { measureRouteExecution };

package/src/services/schemaValidator.ts

@@ -1,4 +1,4 @@
-import { Schema, z } from "zod";
+import { ZodType, z } from "zod";
 
 import { ServerError } from "../http/badResponses/serverError";
 import { UnprocessableEntity } from "../http/badResponses/unprocessableEntity";
@@ -15,7 +15,7 @@ function formatErrorMessage(error: z.ZodError) {
   return [title, ...lines].join("\n");
 }
 
-class SchemaValidator<T extends Schema> {
+class SchemaValidator<T extends ZodType> {
   functionName: string;
   callerInfo: string;
 
@@ -29,7 +29,7 @@ class SchemaValidator<T extends Schema> {
     return this.schema.safeParse(data).success;
   }
 
-  safeValidate(data: any): z.SafeParseReturnType<z.infer<T>, z.infer<T>> {
+  safeValidate(data: any): z.ZodSafeParseResult<z.infer<T>> {
     return this.schema.safeParse(data);
   }
 
@@ -59,7 +59,7 @@ class SchemaValidator<T extends Schema> {
       );
     }
 
-    return formParsed.data;
+    return formParsed.data as z.infer<T>;
   }
 }
 

package/tsconfig.json

@@ -16,6 +16,6 @@
     "types": ["bun-types"],
     "verbatimModuleSyntax": true
   },
-  "exclude": ["node_modules", "dist"],
-  "include": ["src/**/*.ts"]
+  "exclude": ["dist", "node_modules", "**/__test__"],
+  "include": ["src/**/*.ts", "src/**/*.ts"]
 }

package/dist/api/inboxFlowRequest.d.ts

@@ -1,40 +0,0 @@
-type ConfigProps = {
-    status: number;
-    method: "POST" | "GET" | "PUT" | "DELETE" | "PATCH" | "ERROR";
-    request: string;
-    response: string;
-    token: string;
-};
-/**
- * Sends a request to the inbox flow API with the provided configuration.
- *
- * @param config - The configuration object for the request.
- * @param config.status - The HTTP status code associated with the request.
- * @param config.method - The HTTP method used for the request. Can be "POST", "GET", "PUT", "DELETE", "PATCH", or "ERROR".
- * @param config.request - The request payload or details as a string.
- * @param config.response - The response payload or details as a string.
- * @param config.token - The token associated with the request for authentication or identification.
- *
- * @remarks
- * - This function retrieves the inbox flow configuration using `InboxFlowInstance.getInboxConfig()`.
- * - If the configuration is not available, the function will return early without performing any action.
- * - In a development environment (`NODE_ENV === "development"`), the function will also return early.
- * - The request is sent as a POST request to the inbox API URL with the provided configuration details.
- * - If an error occurs during the request, it will be logged using the `httpDebug` service.
- *
- * @example
- * ```typescript
- * const config = {
- *   status: 200,
- *   method: "POST",
- *   request: JSON.stringify({ key: "value" }),
- *   response: JSON.stringify({ success: true }),
- *   token: "example-token",
- * };
- *
- * await inboxFlowRequest(config);
- * ```
- */
-declare function inboxFlowRequest(config: ConfigProps): Promise<void>;
-export { inboxFlowRequest };
-//# sourceMappingURL=inboxFlowRequest.d.ts.map

package/dist/api/inboxFlowRequest.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"inboxFlowRequest.d.ts","sourceRoot":"","sources":["../../src/api/inboxFlowRequest.ts"],"names":[],"mappings":"AAGA,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,iBAAe,gBAAgB,CAAC,MAAM,EAAE,WAAW,iBA+BlD;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/api/inboxFlowRequest.js

@@ -1,63 +0,0 @@
-import { InboxFlowInstance } from "../config/inboxFlowInstance";
-import { httpDebug } from "../services/httpDebug";
-/**
- * Sends a request to the inbox flow API with the provided configuration.
- *
- * @param config - The configuration object for the request.
- * @param config.status - The HTTP status code associated with the request.
- * @param config.method - The HTTP method used for the request. Can be "POST", "GET", "PUT", "DELETE", "PATCH", or "ERROR".
- * @param config.request - The request payload or details as a string.
- * @param config.response - The response payload or details as a string.
- * @param config.token - The token associated with the request for authentication or identification.
- *
- * @remarks
- * - This function retrieves the inbox flow configuration using `InboxFlowInstance.getInboxConfig()`.
- * - If the configuration is not available, the function will return early without performing any action.
- * - In a development environment (`NODE_ENV === "development"`), the function will also return early.
- * - The request is sent as a POST request to the inbox API URL with the provided configuration details.
- * - If an error occurs during the request, it will be logged using the `httpDebug` service.
- *
- * @example
- * ```typescript
- * const config = {
- *   status: 200,
- *   method: "POST",
- *   request: JSON.stringify({ key: "value" }),
- *   response: JSON.stringify({ success: true }),
- *   token: "example-token",
- * };
- *
- * await inboxFlowRequest(config);
- * ```
- */
-async function inboxFlowRequest(config) {
-    const inboxFlowInstance = InboxFlowInstance.getInboxConfig();
-    if (!inboxFlowInstance)
-        return;
-    const { inboxChannelId, inboxUserToken, inboxApiUrl } = inboxFlowInstance;
-    const { status, method, request, response, token } = config;
-    if (process.env.NODE_ENV === "development")
-        return;
-    try {
-        const body = JSON.stringify({
-            status,
-            channelId: inboxChannelId,
-            method,
-            token,
-            request,
-            response,
-        });
-        await fetch(inboxApiUrl, {
-            method: "POST",
-            body,
-            headers: {
-                "Content-Type": "application/json",
-                Authorization: `Bearer ${inboxUserToken}`,
-            },
-        });
-    }
-    catch (err) {
-        httpDebug("inboxFlowRequest", "Error sending inbox flow request", err);
-    }
-}
-export { inboxFlowRequest };

package/dist/config/inboxFlowInstance.d.ts

@@ -1,44 +0,0 @@
-type InboxConfigProps = {
-    inboxChannelId: string;
-    inboxUserToken: string;
-    inboxApiUrl: string;
-};
-type SetInboxConfigProps = {
-    inboxChannelId: string;
-    inboxUserToken: string;
-    inboxApiUrl?: string;
-};
-/**
- * The `InboxFlowInstance` class manages the configuration for the inbox flow.
- * It allows you to set and retrieve the inbox configuration, including the channel ID,
- * user token, and API URL.
- */
-declare class InboxFlowInstance {
-    private static inboxConfig?;
-    /**
-     * Sets the configuration for the inbox. This method initializes the inbox configuration
-     * with the provided `inboxConfig` values. If the configuration has already been set,
-     * the method will return early without making any changes.
-     *
-     * @param inboxConfig - An object containing the inbox configuration properties.
-     * @param inboxConfig.inboxChannelId - The key used to identify the inbox.
-     * @param inboxConfig.inboxUserToken - The user token for authenticating with the inbox.
-     * @param inboxConfig.inboxApiUrl - (Optional) The API URL for the inbox. If not provided,
-     * a default URL will be used.
-     */
-    static setInboxConfig(inboxConfig: SetInboxConfigProps): void;
-    /**
-     * Retrieves the current inbox configuration for the InboxFlowInstance.
-     *
-     * @returns {InboxConfigProps | undefined} The current inbox configuration if set,
-     * or `undefined` if no configuration has been initialized.
-     */
-    static getInboxConfig(): InboxConfigProps | undefined;
-    /**
-     * Resets the inbox configuration to `undefined`.
-     * This method can be used to clear the current configuration.
-     */
-    static resetInboxConfig(): void;
-}
-export { InboxFlowInstance };
-//# sourceMappingURL=inboxFlowInstance.d.ts.map

package/dist/config/inboxFlowInstance.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"inboxFlowInstance.d.ts","sourceRoot":"","sources":["../../src/config/inboxFlowInstance.ts"],"names":[],"mappings":"AAAA,KAAK,gBAAgB,GAAG;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,KAAK,mBAAmB,GAAG;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AAEH,cAAM,iBAAiB;IACrB,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAmB;IAE9C;;;;;;;;;;OAUG;IAEH,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,mBAAmB;IAWtD;;;;;OAKG;IACH,MAAM,CAAC,cAAc,IAAI,gBAAgB,GAAG,SAAS;IAIrD;;;OAGG;IAEH,MAAM,CAAC,gBAAgB;CAGxB;AAED,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/config/inboxFlowInstance.js

@@ -1,46 +0,0 @@
-/**
- * The `InboxFlowInstance` class manages the configuration for the inbox flow.
- * It allows you to set and retrieve the inbox configuration, including the channel ID,
- * user token, and API URL.
- */
-class InboxFlowInstance {
-    static inboxConfig;
-    /**
-     * Sets the configuration for the inbox. This method initializes the inbox configuration
-     * with the provided `inboxConfig` values. If the configuration has already been set,
-     * the method will return early without making any changes.
-     *
-     * @param inboxConfig - An object containing the inbox configuration properties.
-     * @param inboxConfig.inboxChannelId - The key used to identify the inbox.
-     * @param inboxConfig.inboxUserToken - The user token for authenticating with the inbox.
-     * @param inboxConfig.inboxApiUrl - (Optional) The API URL for the inbox. If not provided,
-     * a default URL will be used.
-     */
-    static setInboxConfig(inboxConfig) {
-        const defaultInboxURL = `https://logs-inbox-flow-logs.vw6wo7.easypanel.host/api/call`;
-        if (!!this.inboxConfig)
-            return;
-        this.inboxConfig = {
-            inboxChannelId: inboxConfig.inboxChannelId,
-            inboxUserToken: inboxConfig.inboxUserToken,
-            inboxApiUrl: inboxConfig.inboxApiUrl || defaultInboxURL,
-        };
-    }
-    /**
-     * Retrieves the current inbox configuration for the InboxFlowInstance.
-     *
-     * @returns {InboxConfigProps | undefined} The current inbox configuration if set,
-     * or `undefined` if no configuration has been initialized.
-     */
-    static getInboxConfig() {
-        return this.inboxConfig;
-    }
-    /**
-     * Resets the inbox configuration to `undefined`.
-     * This method can be used to clear the current configuration.
-     */
-    static resetInboxConfig() {
-        this.inboxConfig = undefined;
-    }
-}
-export { InboxFlowInstance };

package/src/api/inboxFlowRequest.ts

@@ -1,76 +0,0 @@
-import { InboxFlowInstance } from "../config/inboxFlowInstance";
-import { httpDebug } from "../services/httpDebug";
-
-type ConfigProps = {
-  status: number;
-  method: "POST" | "GET" | "PUT" | "DELETE" | "PATCH" | "ERROR";
-  request: string;
-  response: string;
-  token: string;
-};
-
-/**
- * Sends a request to the inbox flow API with the provided configuration.
- *
- * @param config - The configuration object for the request.
- * @param config.status - The HTTP status code associated with the request.
- * @param config.method - The HTTP method used for the request. Can be "POST", "GET", "PUT", "DELETE", "PATCH", or "ERROR".
- * @param config.request - The request payload or details as a string.
- * @param config.response - The response payload or details as a string.
- * @param config.token - The token associated with the request for authentication or identification.
- *
- * @remarks
- * - This function retrieves the inbox flow configuration using `InboxFlowInstance.getInboxConfig()`.
- * - If the configuration is not available, the function will return early without performing any action.
- * - In a development environment (`NODE_ENV === "development"`), the function will also return early.
- * - The request is sent as a POST request to the inbox API URL with the provided configuration details.
- * - If an error occurs during the request, it will be logged using the `httpDebug` service.
- *
- * @example
- * ```typescript
- * const config = {
- *   status: 200,
- *   method: "POST",
- *   request: JSON.stringify({ key: "value" }),
- *   response: JSON.stringify({ success: true }),
- *   token: "example-token",
- * };
- *
- * await inboxFlowRequest(config);
- * ```
- */
-
-async function inboxFlowRequest(config: ConfigProps) {
-  const inboxFlowInstance = InboxFlowInstance.getInboxConfig();
-  if (!inboxFlowInstance) return;
-
-  const { inboxChannelId, inboxUserToken, inboxApiUrl } = inboxFlowInstance;
-
-  const { status, method, request, response, token } = config;
-
-  if (process.env.NODE_ENV === "development") return;
-
-  try {
-    const body = JSON.stringify({
-      status,
-      channelId: inboxChannelId,
-      method,
-      token,
-      request,
-      response,
-    });
-
-    await fetch(inboxApiUrl, {
-      method: "POST",
-      body,
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${inboxUserToken}`,
-      },
-    });
-  } catch (err) {
-    httpDebug("inboxFlowRequest", "Error sending inbox flow request", err);
-  }
-}
-
-export { inboxFlowRequest };

package/src/config/inboxFlowInstance.ts

@@ -1,65 +0,0 @@
-type InboxConfigProps = {
-  inboxChannelId: string;
-  inboxUserToken: string;
-  inboxApiUrl: string;
-};
-
-type SetInboxConfigProps = {
-  inboxChannelId: string;
-  inboxUserToken: string;
-  inboxApiUrl?: string;
-};
-
-/**
- * The `InboxFlowInstance` class manages the configuration for the inbox flow.
- * It allows you to set and retrieve the inbox configuration, including the channel ID,
- * user token, and API URL.
- */
-
-class InboxFlowInstance {
-  private static inboxConfig?: InboxConfigProps;
-
-  /**
-   * Sets the configuration for the inbox. This method initializes the inbox configuration
-   * with the provided `inboxConfig` values. If the configuration has already been set,
-   * the method will return early without making any changes.
-   *
-   * @param inboxConfig - An object containing the inbox configuration properties.
-   * @param inboxConfig.inboxChannelId - The key used to identify the inbox.
-   * @param inboxConfig.inboxUserToken - The user token for authenticating with the inbox.
-   * @param inboxConfig.inboxApiUrl - (Optional) The API URL for the inbox. If not provided,
-   * a default URL will be used.
-   */
-
-  static setInboxConfig(inboxConfig: SetInboxConfigProps) {
-    const defaultInboxURL = `https://logs-inbox-flow-logs.vw6wo7.easypanel.host/api/call`;
-    if (!!this.inboxConfig) return;
-
-    this.inboxConfig = {
-      inboxChannelId: inboxConfig.inboxChannelId,
-      inboxUserToken: inboxConfig.inboxUserToken,
-      inboxApiUrl: inboxConfig.inboxApiUrl || defaultInboxURL,
-    };
-  }
-
-  /**
-   * Retrieves the current inbox configuration for the InboxFlowInstance.
-   *
-   * @returns {InboxConfigProps | undefined} The current inbox configuration if set,
-   * or `undefined` if no configuration has been initialized.
-   */
-  static getInboxConfig(): InboxConfigProps | undefined {
-    return this.inboxConfig;
-  }
-
-  /**
-   * Resets the inbox configuration to `undefined`.
-   * This method can be used to clear the current configuration.
-   */
-
-  static resetInboxConfig() {
-    this.inboxConfig = undefined;
-  }
-}
-
-export { InboxFlowInstance };