av6-core 1.5.6 → 1.5.7

package/dist/index.js

@@ -2546,72 +2546,6 @@ var SmsProvider = class {
 
 // src/providers/whatsapp.provider.ts
 var import_axios2 = __toESM(require("axios"));
-var WhatsAppProvider = class {
-  constructor(args, logger) {
-    this.args = args;
-    this.logger = logger;
-    this.logger.info(`[NotificationService] args for whatsapp : ${JSON.stringify(args)}`);
-    this.apiUrl = args.apiUrl || "https://api.interakt.ai/v1/public/message/";
-    this.apiKey = "RW9FTlFWM3h3aTdGbmJhVFFRU0RQdzVUdERyQl84VkU2RFRJWVdhcW8xZzo=";
-  }
-  apiKey;
-  apiUrl;
-  async send(inp) {
-    const to = inp.recipient;
-    if (!to) {
-      return {
-        ok: false,
-        provider: "WHATSAPP" /* WHATSAPP */,
-        error: "Missing recipient.whatsapp/phone"
-      };
-    }
-    const allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push(this.args.masterNumber);
-    }
-    try {
-      for (const recipient of allRecipients) {
-        const requestBody = {
-          countryCode: this.args.countryCode ?? "+233",
-          phoneNumber: recipient.replace(this.args.countryCode ?? "+233", ""),
-          callbackData: this.args.callbackData || "default-callback",
-          type: "Template",
-          template: {
-            name: this.args.templateName,
-            languageCode: this.args.languageCode,
-            bodyValues: inp.bodyValues ?? []
-          }
-        };
-        if (inp.fileUrl) {
-          requestBody.template.headerValues = [inp.fileUrl];
-          if (inp.fileName) requestBody.template.fileName = inp.fileName;
-        }
-        const headers = {
-          Authorization: `Basic ${this.apiKey}`,
-          "Content-Type": "application/json"
-        };
-        const response = await import_axios2.default.post(this.apiUrl, requestBody, { headers });
-        const data = response.data;
-        return {
-          ok: true,
-          provider: "WHATSAPP" /* WHATSAPP */,
-          externalId: data?.message_id || "unknown",
-          meta: data
-        };
-      }
-      return {
-        ok: true,
-        provider: "WHATSAPP" /* WHATSAPP */
-      };
-    } catch (err) {
-      return {
-        ok: false,
-        provider: "WHATSAPP" /* WHATSAPP */,
-        error: err?.response?.data || err?.message || String(err)
-      };
-    }
-  }
-};
 
 // src/utils/notification.utils.ts
 function defaultValueField(t) {
@@ -2884,6 +2818,177 @@ async function resolveAllRecipients(args) {
   }
   return res;
 }
+async function mapWithConcurrency(items, limit, fn) {
+  const results = new Array(items.length);
+  let idx = 0;
+  const workers = new Array(limit).fill(null).map(async () => {
+    while (idx < items.length) {
+      const cur = idx++;
+      results[cur] = await fn(items[cur]);
+    }
+  });
+  await Promise.all(workers);
+  return results;
+}
+
+// src/providers/whatsapp.provider.ts
+var WhatsAppProvider = class {
+  constructor(args, logger) {
+    this.args = args;
+    this.logger = logger;
+    const safeArgs = { ...args, apiKey: args.apiKey ? "***" : "" };
+    this.logger.info(`[NotificationService] args for whatsapp : ${JSON.stringify(safeArgs)}`);
+    this.apiUrl = args.apiUrl ?? "";
+    this.apiKey = args.apiKey;
+  }
+  apiKey;
+  apiUrl;
+  /**
+   * Existing single-recipient send (kept as-is, but fixed phone normalization a bit).
+   * NOTE: This method sends to inp.recipient ONLY (no master). sendBulk handles master inclusion.
+   */
+  async send(inp) {
+    const to = inp.recipient;
+    if (!to) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing recipient" };
+    }
+    if (!this.apiUrl) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing WhatsApp apiUrl" };
+    }
+    if (!this.apiKey) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing WhatsApp apiKey" };
+    }
+    try {
+      const { requestBody, headers } = this.buildRequest(to, inp);
+      const response = await import_axios2.default.post(this.apiUrl, requestBody, { headers });
+      const data = response.data;
+      return {
+        ok: true,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        externalId: data?.message_id || "unknown",
+        meta: data
+      };
+    } catch (err) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        error: err?.response?.data || err?.message || String(err)
+      };
+    }
+  }
+  /**
+   * Proper bulk send:
+   * - Accepts list of recipients
+   * - Optionally includes masterNumber
+   * - Dedupe recipients
+   * - Concurrency-limited sending
+   * - Returns per-recipient results + overall ok
+   */
+  async sendBulk(args) {
+    if (!this.apiUrl) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        items: [{ recipient: "", ok: false, error: "Missing WhatsApp apiUrl" }]
+      };
+    }
+    if (!this.apiKey) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        items: [{ recipient: "", ok: false, error: "Missing WhatsApp apiKey" }]
+      };
+    }
+    const includeMaster = args.includeMaster ?? true;
+    const concurrency = Math.max(1, Math.min(args.concurrency ?? 5, 25));
+    const cleaned = (args.recipients ?? []).map((x) => String(x ?? "").trim()).filter(Boolean);
+    const uniq = new Set(cleaned);
+    if (includeMaster && this.args.masterNumber) {
+      uniq.add(String(this.args.masterNumber).trim());
+    }
+    const recipients = Array.from(uniq);
+    if (!recipients.length) {
+      return { ok: true, provider: "WHATSAPP" /* WHATSAPP */, items: [] };
+    }
+    const baseInp = {
+      bodyValues: args.bodyValues ?? [],
+      fileUrl: args.fileUrl,
+      fileName: args.fileName
+    };
+    const items = await mapWithConcurrency(recipients, concurrency, async (recipient) => {
+      try {
+        const { requestBody, headers } = this.buildRequest(recipient, baseInp);
+        const response = await import_axios2.default.post(this.apiUrl, requestBody, { headers });
+        const data = response.data;
+        return {
+          recipient,
+          ok: true,
+          externalId: data?.message_id || "unknown",
+          meta: data
+        };
+      } catch (err) {
+        const errorPayload = err?.response?.data || err?.message || String(err);
+        return {
+          recipient,
+          ok: false,
+          error: typeof errorPayload === "string" ? errorPayload : JSON.stringify(errorPayload),
+          meta: err?.response?.data
+        };
+      }
+    });
+    const ok = items.every((x) => x.ok);
+    return {
+      ok,
+      provider: "WHATSAPP" /* WHATSAPP */,
+      items
+    };
+  }
+  // ------------------------- helpers -------------------------
+  buildRequest(recipient, inp) {
+    const countryCode = (this.args.countryCode ?? "+233").trim();
+    const languageCode = (this.args.languageCode ?? "en").trim();
+    const callbackData = (this.args.callbackData ?? "default-callback").trim();
+    const phoneNumber = this.normalizePhoneNumber(recipient, countryCode);
+    const requestBody = {
+      countryCode,
+      phoneNumber,
+      callbackData,
+      type: "Template",
+      template: {
+        name: this.args.templateName,
+        languageCode,
+        bodyValues: inp.bodyValues ?? []
+      }
+    };
+    if (inp.fileUrl) {
+      requestBody.template.headerValues = [inp.fileUrl];
+      if (inp.fileName) requestBody.template.fileName = inp.fileName;
+    }
+    const headers = {
+      Authorization: `Basic ${this.apiKey}`,
+      "Content-Type": "application/json"
+    };
+    return { requestBody, headers };
+  }
+  /**
+   * Normalize a phone number into Interakt's expected format:
+   * - requestBody.countryCode = "+91"
+   * - requestBody.phoneNumber = "9883984351" (digits, without country code)
+   *
+   * Handles input formats:
+   * - "9883984351"
+   * - "+919883984351"
+   * - "91 98839 84351"
+   */
+  normalizePhoneNumber(input, countryCode) {
+    const ccDigits = countryCode.replace(/[^\d]/g, "");
+    const digits = String(input ?? "").replace(/[^\d]/g, "");
+    if (ccDigits && digits.startsWith(ccDigits) && digits.length > ccDigits.length) {
+      return digits.slice(ccDigits.length);
+    }
+    return digits;
+  }
+};
 
 // src/utils/renderer.ts
 var import_handlebars = __toESM(require("handlebars"));
@@ -3249,7 +3354,7 @@ var NotificationService = class {
         this.logger.error("[NotificationService] WhatsApp sendBulk failed, falling back", e);
       }
     }
-    const items = await this.mapWithConcurrency(
+    const items = await mapWithConcurrency(
       uniq,
       Math.max(1, args.concurrency),
       async (recipient) => {
@@ -3271,18 +3376,6 @@ var NotificationService = class {
     const ok = items.length > 0 && items.every((x) => x.ok);
     return { ok, items };
   }
-  async mapWithConcurrency(items, limit, fn) {
-    const results = new Array(items.length);
-    let idx = 0;
-    const workers = new Array(limit).fill(null).map(async () => {
-      while (idx < items.length) {
-        const cur = idx++;
-        results[cur] = await fn(items[cur]);
-      }
-    });
-    await Promise.all(workers);
-    return results;
-  }
 };
 
 // src/events/eventEmitter.ts

package/dist/index.mjs

@@ -2496,72 +2496,6 @@ var SmsProvider = class {
 
 // src/providers/whatsapp.provider.ts
 import axios2 from "axios";
-var WhatsAppProvider = class {
-  constructor(args, logger) {
-    this.args = args;
-    this.logger = logger;
-    this.logger.info(`[NotificationService] args for whatsapp : ${JSON.stringify(args)}`);
-    this.apiUrl = args.apiUrl || "https://api.interakt.ai/v1/public/message/";
-    this.apiKey = "RW9FTlFWM3h3aTdGbmJhVFFRU0RQdzVUdERyQl84VkU2RFRJWVdhcW8xZzo=";
-  }
-  apiKey;
-  apiUrl;
-  async send(inp) {
-    const to = inp.recipient;
-    if (!to) {
-      return {
-        ok: false,
-        provider: "WHATSAPP" /* WHATSAPP */,
-        error: "Missing recipient.whatsapp/phone"
-      };
-    }
-    const allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push(this.args.masterNumber);
-    }
-    try {
-      for (const recipient of allRecipients) {
-        const requestBody = {
-          countryCode: this.args.countryCode ?? "+233",
-          phoneNumber: recipient.replace(this.args.countryCode ?? "+233", ""),
-          callbackData: this.args.callbackData || "default-callback",
-          type: "Template",
-          template: {
-            name: this.args.templateName,
-            languageCode: this.args.languageCode,
-            bodyValues: inp.bodyValues ?? []
-          }
-        };
-        if (inp.fileUrl) {
-          requestBody.template.headerValues = [inp.fileUrl];
-          if (inp.fileName) requestBody.template.fileName = inp.fileName;
-        }
-        const headers = {
-          Authorization: `Basic ${this.apiKey}`,
-          "Content-Type": "application/json"
-        };
-        const response = await axios2.post(this.apiUrl, requestBody, { headers });
-        const data = response.data;
-        return {
-          ok: true,
-          provider: "WHATSAPP" /* WHATSAPP */,
-          externalId: data?.message_id || "unknown",
-          meta: data
-        };
-      }
-      return {
-        ok: true,
-        provider: "WHATSAPP" /* WHATSAPP */
-      };
-    } catch (err) {
-      return {
-        ok: false,
-        provider: "WHATSAPP" /* WHATSAPP */,
-        error: err?.response?.data || err?.message || String(err)
-      };
-    }
-  }
-};
 
 // src/utils/notification.utils.ts
 function defaultValueField(t) {
@@ -2834,6 +2768,177 @@ async function resolveAllRecipients(args) {
   }
   return res;
 }
+async function mapWithConcurrency(items, limit, fn) {
+  const results = new Array(items.length);
+  let idx = 0;
+  const workers = new Array(limit).fill(null).map(async () => {
+    while (idx < items.length) {
+      const cur = idx++;
+      results[cur] = await fn(items[cur]);
+    }
+  });
+  await Promise.all(workers);
+  return results;
+}
+
+// src/providers/whatsapp.provider.ts
+var WhatsAppProvider = class {
+  constructor(args, logger) {
+    this.args = args;
+    this.logger = logger;
+    const safeArgs = { ...args, apiKey: args.apiKey ? "***" : "" };
+    this.logger.info(`[NotificationService] args for whatsapp : ${JSON.stringify(safeArgs)}`);
+    this.apiUrl = args.apiUrl ?? "";
+    this.apiKey = args.apiKey;
+  }
+  apiKey;
+  apiUrl;
+  /**
+   * Existing single-recipient send (kept as-is, but fixed phone normalization a bit).
+   * NOTE: This method sends to inp.recipient ONLY (no master). sendBulk handles master inclusion.
+   */
+  async send(inp) {
+    const to = inp.recipient;
+    if (!to) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing recipient" };
+    }
+    if (!this.apiUrl) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing WhatsApp apiUrl" };
+    }
+    if (!this.apiKey) {
+      return { ok: false, provider: "WHATSAPP" /* WHATSAPP */, error: "Missing WhatsApp apiKey" };
+    }
+    try {
+      const { requestBody, headers } = this.buildRequest(to, inp);
+      const response = await axios2.post(this.apiUrl, requestBody, { headers });
+      const data = response.data;
+      return {
+        ok: true,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        externalId: data?.message_id || "unknown",
+        meta: data
+      };
+    } catch (err) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        error: err?.response?.data || err?.message || String(err)
+      };
+    }
+  }
+  /**
+   * Proper bulk send:
+   * - Accepts list of recipients
+   * - Optionally includes masterNumber
+   * - Dedupe recipients
+   * - Concurrency-limited sending
+   * - Returns per-recipient results + overall ok
+   */
+  async sendBulk(args) {
+    if (!this.apiUrl) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        items: [{ recipient: "", ok: false, error: "Missing WhatsApp apiUrl" }]
+      };
+    }
+    if (!this.apiKey) {
+      return {
+        ok: false,
+        provider: "WHATSAPP" /* WHATSAPP */,
+        items: [{ recipient: "", ok: false, error: "Missing WhatsApp apiKey" }]
+      };
+    }
+    const includeMaster = args.includeMaster ?? true;
+    const concurrency = Math.max(1, Math.min(args.concurrency ?? 5, 25));
+    const cleaned = (args.recipients ?? []).map((x) => String(x ?? "").trim()).filter(Boolean);
+    const uniq = new Set(cleaned);
+    if (includeMaster && this.args.masterNumber) {
+      uniq.add(String(this.args.masterNumber).trim());
+    }
+    const recipients = Array.from(uniq);
+    if (!recipients.length) {
+      return { ok: true, provider: "WHATSAPP" /* WHATSAPP */, items: [] };
+    }
+    const baseInp = {
+      bodyValues: args.bodyValues ?? [],
+      fileUrl: args.fileUrl,
+      fileName: args.fileName
+    };
+    const items = await mapWithConcurrency(recipients, concurrency, async (recipient) => {
+      try {
+        const { requestBody, headers } = this.buildRequest(recipient, baseInp);
+        const response = await axios2.post(this.apiUrl, requestBody, { headers });
+        const data = response.data;
+        return {
+          recipient,
+          ok: true,
+          externalId: data?.message_id || "unknown",
+          meta: data
+        };
+      } catch (err) {
+        const errorPayload = err?.response?.data || err?.message || String(err);
+        return {
+          recipient,
+          ok: false,
+          error: typeof errorPayload === "string" ? errorPayload : JSON.stringify(errorPayload),
+          meta: err?.response?.data
+        };
+      }
+    });
+    const ok = items.every((x) => x.ok);
+    return {
+      ok,
+      provider: "WHATSAPP" /* WHATSAPP */,
+      items
+    };
+  }
+  // ------------------------- helpers -------------------------
+  buildRequest(recipient, inp) {
+    const countryCode = (this.args.countryCode ?? "+233").trim();
+    const languageCode = (this.args.languageCode ?? "en").trim();
+    const callbackData = (this.args.callbackData ?? "default-callback").trim();
+    const phoneNumber = this.normalizePhoneNumber(recipient, countryCode);
+    const requestBody = {
+      countryCode,
+      phoneNumber,
+      callbackData,
+      type: "Template",
+      template: {
+        name: this.args.templateName,
+        languageCode,
+        bodyValues: inp.bodyValues ?? []
+      }
+    };
+    if (inp.fileUrl) {
+      requestBody.template.headerValues = [inp.fileUrl];
+      if (inp.fileName) requestBody.template.fileName = inp.fileName;
+    }
+    const headers = {
+      Authorization: `Basic ${this.apiKey}`,
+      "Content-Type": "application/json"
+    };
+    return { requestBody, headers };
+  }
+  /**
+   * Normalize a phone number into Interakt's expected format:
+   * - requestBody.countryCode = "+91"
+   * - requestBody.phoneNumber = "9883984351" (digits, without country code)
+   *
+   * Handles input formats:
+   * - "9883984351"
+   * - "+919883984351"
+   * - "91 98839 84351"
+   */
+  normalizePhoneNumber(input, countryCode) {
+    const ccDigits = countryCode.replace(/[^\d]/g, "");
+    const digits = String(input ?? "").replace(/[^\d]/g, "");
+    if (ccDigits && digits.startsWith(ccDigits) && digits.length > ccDigits.length) {
+      return digits.slice(ccDigits.length);
+    }
+    return digits;
+  }
+};
 
 // src/utils/renderer.ts
 import Handlebars from "handlebars";
@@ -3199,7 +3304,7 @@ var NotificationService = class {
         this.logger.error("[NotificationService] WhatsApp sendBulk failed, falling back", e);
       }
     }
-    const items = await this.mapWithConcurrency(
+    const items = await mapWithConcurrency(
       uniq,
       Math.max(1, args.concurrency),
       async (recipient) => {
@@ -3221,18 +3326,6 @@ var NotificationService = class {
     const ok = items.length > 0 && items.every((x) => x.ok);
     return { ok, items };
   }
-  async mapWithConcurrency(items, limit, fn) {
-    const results = new Array(items.length);
-    let idx = 0;
-    const workers = new Array(limit).fill(null).map(async () => {
-      while (idx < items.length) {
-        const cur = idx++;
-        results[cur] = await fn(items[cur]);
-      }
-    });
-    await Promise.all(workers);
-    return results;
-  }
 };
 
 // src/events/eventEmitter.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",