@gymspace/evolution 1.0.0 → 1.0.2

package/dist/index.mjs

@@ -1,5 +1,3 @@
-import { isValidPhoneNumber, parsePhoneNumber } from 'libphonenumber-js';
-
 // src/types/webhooks.ts
 var ConnectionState = /* @__PURE__ */ ((ConnectionState2) => {
   ConnectionState2["OPEN"] = "open";
@@ -64,7 +62,7 @@ var EvolutionApiError = class _EvolutionApiError extends Error {
           relevantDetails.push(`Server Message: ${response.message}`);
         }
       }
-      if (relevantDetails.length > 0) {
+      if (relevantDetails?.length > 0) {
         result += `
   ${relevantDetails.join("\n  ")}`;
       }
@@ -92,54 +90,59 @@ function extractErrorMessage(response) {
     return response;
   }
   if (typeof response === "object" && response !== null) {
-    const errorObj = response;
-    const messagePaths = [
-      // Evolution API specific nested structure (most common)
-      errorObj.response?.response?.message?.[0],
-      errorObj.response?.response?.error,
-      errorObj.response?.response?.description,
-      // Evolution API first level nested
-      Array.isArray(errorObj.response?.message) ? errorObj.response.message[0] : null,
-      errorObj.response?.error,
-      errorObj.response?.description,
-      // Direct error message
-      Array.isArray(errorObj.message) ? errorObj.message[0] : errorObj.message,
-      errorObj.error,
-      errorObj.description,
-      errorObj.detail,
-      // Other nested error messages
-      errorObj.data?.error,
-      errorObj.data?.message,
-      // Array format messages (fallback)
-      Array.isArray(errorObj.error) ? errorObj.error[0] : null,
-      Array.isArray(errorObj.errors) ? errorObj.errors[0] : null
-    ];
-    for (const path of messagePaths) {
-      if (typeof path === "string" && path.trim()) {
-        return path.trim();
+    try {
+      const errorObj = response;
+      const messagePaths = [
+        // Evolution API specific nested structure (most common)
+        errorObj.response?.response?.message?.[0],
+        errorObj.response?.response?.error,
+        errorObj.response?.response?.description,
+        // Evolution API first level nested
+        Array.isArray(errorObj.response?.message) ? errorObj.response.message[0] : null,
+        errorObj.response?.error,
+        errorObj.response?.description,
+        // Direct error message
+        Array.isArray(errorObj.message) ? errorObj.message[0] : errorObj.message,
+        errorObj.error,
+        errorObj.description,
+        errorObj.detail,
+        // Other nested error messages
+        errorObj.data?.error,
+        errorObj.data?.message,
+        // Array format messages (fallback)
+        Array.isArray(errorObj.error) ? errorObj.error[0] : null,
+        Array.isArray(errorObj.errors) ? errorObj.errors[0] : null
+      ].filter(Boolean);
+      for (const path of messagePaths) {
+        if (path && typeof path === "string" && path.length > 0 && path.trim()) {
+          return path.trim();
+        }
+        if (path && typeof path === "object" && path !== null) {
+          const nestedMessage = extractErrorMessage(path);
+          if (nestedMessage) {
+            return nestedMessage;
+          }
+        }
       }
-      if (typeof path === "object" && path !== null) {
-        const nestedMessage = extractErrorMessage(path);
-        if (nestedMessage) {
-          return nestedMessage;
+      if (errorObj.validation && Array.isArray(errorObj.validation)) {
+        const validationErrors = errorObj.validation.map((v) => v?.message || v?.error || String(v)).filter(Boolean).join(", ");
+        if (validationErrors) {
+          return `Validation error: ${validationErrors}`;
         }
       }
-    }
-    if (errorObj.validation && Array.isArray(errorObj.validation)) {
-      const validationErrors = errorObj.validation.map((v) => v.message || v.error || String(v)).filter(Boolean).join(", ");
-      if (validationErrors) {
-        return `Validation error: ${validationErrors}`;
+      if (errorObj.statusCode && errorObj.statusText) {
+        return `${errorObj.statusCode}: ${errorObj.statusText}`;
       }
-    }
-    if (errorObj.statusCode && errorObj.statusText) {
-      return `${errorObj.statusCode}: ${errorObj.statusText}`;
-    }
-    if (Object.keys(errorObj).length > 0) {
-      try {
-        return JSON.stringify(errorObj);
-      } catch {
-        return "[Complex error object]";
+      const keys = Object.keys(errorObj);
+      if (keys && keys.length > 0) {
+        try {
+          return JSON.stringify(errorObj);
+        } catch {
+          return "[Complex error object]";
+        }
       }
+    } catch (error) {
+      return "[Error parsing error message]";
     }
   }
   return null;
@@ -154,6 +157,18 @@ var ApiService = class {
     this.options.instance = instance;
   }
   async request(path, options = {}) {
+    if (!path || typeof path !== "string" || path?.trim()?.length === 0) {
+      throw new EvolutionApiError("Invalid path parameter", {
+        message: "Path must be a non-empty string",
+        path
+      });
+    }
+    if (!this.options.serverUrl || typeof this.options.serverUrl !== "string") {
+      throw new EvolutionApiError("Invalid server URL configuration", {
+        message: "Server URL must be configured and be a valid string",
+        serverUrl: this.options.serverUrl
+      });
+    }
     const { isInstanceUrl = true } = options;
     let instance = this.options.instance;
     if (options.instance) {
@@ -162,7 +177,9 @@ var ApiService = class {
     }
     if (isInstanceUrl && !instance) {
       throw new EvolutionApiError("Instance not set", {
-        message: "Please set the instance before making a request or pass instance in the method options."
+        message: "Please set the instance before making a request or pass instance in the method options.",
+        path,
+        isInstanceUrl
       });
     }
     const { init, params } = this.makeInit(options);
@@ -171,24 +188,65 @@ var ApiService = class {
     if (params.toString()) {
       url.search = params.toString();
     }
+    const curlCommand = this.generateCurlCommand(
+      init.method || "GET",
+      url.toString(),
+      init.headers,
+      init.body
+    );
+    if (this.options.debug) {
+      console.log("\n=== CURL COMMAND ===");
+      console.log(curlCommand);
+      console.log("===================\n");
+    }
     let response;
     let data;
+    let responseText = "";
     try {
       response = await fetch(url, init);
-      data = await response.json();
+      responseText = await response.text();
+      data = responseText ? JSON.parse(responseText) : null;
     } catch (error) {
-      throw new EvolutionApiError("Network or parsing error", error);
+      if (this.options.debug) {
+        console.log(error);
+        console.log("\n=== CURL COMMAND (ERROR) ===");
+        console.log(curlCommand);
+        console.log("============================\n");
+      }
+      if (error instanceof SyntaxError && error.message.includes("JSON")) {
+        throw new EvolutionApiError("Failed to parse response as JSON", {
+          originalError: error,
+          responseText: responseText || "Empty response",
+          url: url.toString(),
+          status: response?.status
+        });
+      }
+      throw new EvolutionApiError("Network or parsing error", {
+        originalError: error,
+        url: url.toString(),
+        responseText: responseText || "No response"
+      });
+    }
+    if (this.options.debug) {
+      console.log("\n=== API RESPONSE ===");
+      console.log(JSON.stringify(data, null, 2));
+      console.log("===================\n");
     }
     if (!response.ok) {
+      if (this.options.debug) {
+        console.log("\n=== CURL COMMAND (HTTP ERROR) ===");
+        console.log(curlCommand);
+        console.log("================================\n");
+      }
       const errorMessage = extractErrorMessage(data) || `Request failed with status ${response.status}: ${response.statusText}`;
       throw new EvolutionApiError(
         errorMessage,
         {
           message: errorMessage,
-          response: JSON.stringify(data),
+          response: data || {},
           url: url.toString(),
           params: params.toString(),
-          body: JSON.stringify(options.body)
+          body: options.body || {}
         },
         response.status
       );
@@ -219,6 +277,35 @@ var ApiService = class {
     }
     return { init, params };
   }
+  generateCurlCommand(method, url, headers, body) {
+    const curlParts = ["curl"];
+    if (method !== "GET") {
+      curlParts.push(`-X ${method}`);
+    }
+    let headerEntries;
+    if (headers instanceof Headers) {
+      const entries = [];
+      headers.forEach((value, key) => {
+        entries.push([key, value]);
+      });
+      headerEntries = entries;
+    } else {
+      headerEntries = Object.entries(headers);
+    }
+    headerEntries.forEach(([key, value]) => {
+      if (key.toLowerCase() !== "apikey") {
+        curlParts.push(`-H '${key}: ${value}'`);
+      } else {
+        curlParts.push(`-H '${key}: [REDACTED]'`);
+      }
+    });
+    if (body) {
+      const bodyStr = typeof body === "string" ? body : JSON.stringify(body);
+      curlParts.push(`-d '${bodyStr}'`);
+    }
+    curlParts.push(`'${url}'`);
+    return curlParts.join(" \\\n  ");
+  }
   async get(path, options = {}) {
     return this.request(path, { ...options, method: "GET" });
   }
@@ -312,10 +399,43 @@ var Routes = {
     SetPresence: "instance/setPresence"
   }
 };
-var validatePhoneNumber = (value) => isValidPhoneNumber(value);
+
+// src/schemas/common.ts
+var validatePhoneNumber = (value) => {
+  const phoneRegex = /^\+\d{7,15}$/;
+  return phoneRegex.test(value);
+};
 var validateJid = (value) => value.endsWith("@s.whatsapp.net");
 var validateGroupJid = (value) => value.endsWith("@g.us");
 
+// src/types/tags.ts
+var Jid = (jid) => jid;
+var GroupJid = (jid) => jid;
+var MessageId = (id) => id;
+var ChatId = (id) => id;
+
+// src/utils/phone-numer-from-jid.ts
+function phoneNumberFromJid(jid) {
+  const numberPart = jid.split("@")[0];
+  if (jid.endsWith("@s.whatsapp.net")) {
+    return `+${numberPart}`;
+  }
+  return numberPart;
+}
+
+// src/modules/chats/schemas/find-all.ts
+var FindAllChatsResponseTransform = (chats) => chats.map((chat) => ({
+  id: ChatId(chat.id),
+  jid: chat.remoteJid.endsWith("@g.us") ? GroupJid(chat.remoteJid) : Jid(chat.remoteJid),
+  phoneNumber: phoneNumberFromJid(chat.remoteJid),
+  name: chat.name || void 0,
+  labels: chat.labels || void 0,
+  createdAt: new Date(chat.createdAt),
+  updatedAt: new Date(chat.updatedAt),
+  pushName: chat.pushName || void 0,
+  pictureUrl: chat.profilePicUrl || void 0
+}));
+
 // src/modules/chats/index.ts
 var ChatsModule = class {
   constructor(api) {
@@ -345,7 +465,7 @@ var ChatsModule = class {
       body: {},
       ...methodOptions
     });
-    return response;
+    return FindAllChatsResponseTransform(response);
   }
   /**
    * Updates presence status
@@ -975,9 +1095,6 @@ var WebhookModule = class {
     return response;
   }
 };
-function phoneNumberFromJid(jid) {
-  return parsePhoneNumber(`+${jid.split("@")[0]}`).number;
-}
 
 // src/types/messages.ts
 var MessageUpdateStatus = /* @__PURE__ */ ((MessageUpdateStatus2) => {
@@ -987,12 +1104,6 @@ var MessageUpdateStatus = /* @__PURE__ */ ((MessageUpdateStatus2) => {
   return MessageUpdateStatus2;
 })(MessageUpdateStatus || {});
 
-// src/types/tags.ts
-var Jid = (jid) => jid;
-var GroupJid = (jid) => jid;
-var MessageId = (id) => id;
-var ChatId = (id) => id;
-
 // src/types/events.ts
 var WebhookEvent = /* @__PURE__ */ ((WebhookEvent2) => {
   WebhookEvent2["APPLICATION_STARTUP"] = "application.startup";