av6-core 1.5.6 → 1.5.8

package/dist/index.js

@@ -2451,167 +2451,121 @@ var SmsProvider = class {
   constructor(logger = console, args) {
     this.logger = logger;
     this.args = args;
-    this.logger.info(`[NotificationService] args for sms : ${JSON.stringify(args)}`);
+    const safeArgs = { ...args, apiKey: args.apiKey ? "***" : "" };
+    this.logger.info(`[NotificationService] args for sms : ${JSON.stringify(safeArgs)}`);
     this.url = args.apiUrl || "https://web.nsemfua.com/api/http/sms/send";
-    this.token = "13|R3XfH6wHx3zdflBzpGMlNiTWKuOUEkGutORyGcuS";
+    this.token = (args.apiKey || "").trim();
     this.sender = args.senderId || "AlmaMedLab";
+    this.countryCode = (args.countryCode || "+233").trim();
   }
   url;
   token;
   sender;
+  countryCode;
+  /**
+   * Single recipient wrapper (still same API).
+   */
   async send(args) {
-    const to = args.recipient;
-    if (!to) {
-      return {
-        ok: false,
-        provider: "SMS" /* SMS */,
-        error: "Missing recipient.phone"
-      };
+    const phone = args?.recipient?.phone;
+    if (!phone) {
+      return { ok: false, provider: "SMS" /* SMS */, error: "Missing recipient.phone" };
+    }
+    const bulk = await this.sendBulk({
+      phones: [phone],
+      message: args.body,
+      includeMaster: true
+    });
+    if (!bulk.ok) {
+      return { ok: false, provider: "SMS" /* SMS */, error: bulk.error, meta: bulk.meta };
     }
-    const allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push({ phone: this.args.masterNumber });
+    return { ok: true, provider: "SMS" /* SMS */, externalId: bulk.externalId, meta: bulk.meta };
+  }
+  /**
+   * ✅ Bulk SMS in ONE HTTP call (like PHP: recipient: "988.., 977..")
+   */
+  async sendBulk(args) {
+    if (!this.url) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiUrl" };
     }
-    const recipients = this.normalizeRecipients(allRecipients);
+    if (!this.token) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiKey" };
+    }
+    const includeMaster = args.includeMaster ?? true;
+    const phones = [...args.phones ?? []];
+    if (includeMaster && this.args.masterNumber) phones.push(this.args.masterNumber);
+    const recipients = this.normalizePhones(phones);
     if (!recipients.length) {
-      return {
-        ok: false,
-        provider: "SMS" /* SMS */,
-        error: "Missing recipient.phone"
-      };
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "No valid phone recipients" };
     }
+    const recipientStr = recipients.join(", ");
     try {
       const payload = {
         api_token: this.token,
-        recipient: recipients.join(", "),
-        // API accepts comma-separated list
+        recipient: recipientStr,
         sender_id: this.sender,
         type: "plain",
-        message: this.cleanMessage(args.body)
-        // schedule_time: "" // add if you need scheduling
+        message: this.cleanMessage(args.message)
       };
       const res = await fetch(this.url, {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json"
-        },
+        headers: { "Content-Type": "application/json", Accept: "application/json" },
         body: JSON.stringify(payload)
       });
       const data = await res.json().catch(() => ({}));
-      const isError = data?.status === "error" || !res.ok;
+      const isError = !res.ok || data?.status === "error";
       if (isError) {
         return {
           ok: false,
           provider: "SMS" /* SMS */,
-          error: data?.message || data?.error || `Gateway error (${res.status} ${res.statusText})`
+          recipients,
+          error: data?.message || data?.error || `Gateway error (${res.status} ${res.statusText})`,
+          meta: data
         };
       }
-      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id || void 0;
+      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id;
       return {
         ok: true,
         provider: "SMS" /* SMS */,
+        recipients,
         externalId,
-        meta: {
-          gatewayStatus: data?.status,
-          recipient: payload.recipient
-        }
+        meta: data
       };
     } catch (err) {
       return {
         ok: false,
         provider: "SMS" /* SMS */,
+        recipients,
         error: err?.message ?? String(err)
       };
     }
   }
-  /** Accepts single/multiple Recipient objects and returns sanitized numbers */
-  normalizeRecipients(input) {
-    return input.map((r) => r?.phone || "").map((p) => this.stripCountryCode(p)).map((p) => this.onlyDialable(p)).filter(Boolean);
-  }
-  /** Match PHP: remove leading +233 (Ghana) only */
-  stripCountryCode(phone) {
-    return (phone || "").trim().replace(this.args.countryCode || "+233", "");
-  }
-  /** Remove spaces, dashes, parentheses; keep numbers only (and commas handled elsewhere) */
-  onlyDialable(phone) {
-    return phone.replace(/[^\d]/g, "");
+  // ---------------- helpers ----------------
+  /**
+   * Normalize phones:
+   * - trim
+   * - strip leading country code digits if present (e.g., +233 or 233)
+   * - keep digits only
+   * - dedupe
+   */
+  normalizePhones(input) {
+    const ccDigits = this.countryCode.replace(/[^\d]/g, "");
+    const normalized = (input ?? []).map((x) => String(x ?? "").trim()).filter(Boolean).map((x) => x.replace(/[^\d]/g, "")).map((digits) => {
+      if (ccDigits && digits.startsWith(ccDigits) && digits.length > ccDigits.length) {
+        return digits.slice(ccDigits.length);
+      }
+      return digits;
+    }).filter((x) => x.length >= 6);
+    return Array.from(new Set(normalized));
   }
   /** Mirror PHP cleanup (strip tags, collapse nbsp, trim) */
   cleanMessage(msg) {
-    const noTags = msg.replace(/<\/?[^>]+(>|$)/g, "");
+    const noTags = String(msg ?? "").replace(/<\/?[^>]+(>|$)/g, "");
     return noTags.replace(/&nbsp;|&amp;nbsp;/g, " ").trim();
   }
 };
 
 // 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 +2838,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"));
@@ -3046,32 +3171,57 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
     if (!tpl) return;
-    const recipients = args.recipients;
+    const recipients = args.recipients ?? [];
     if (!recipients.length) {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
     }
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
     const provider = new SmsProvider(this.logger, {
-      apiUrl: cfg.serviceEvent.smsApiUrl,
+      apiUrl: cfg.serviceEvent.smsApiUrl ?? void 0,
+      apiKey: cfg.serviceEvent.smsApiKey ?? void 0,
       countryCode: cfg.serviceEvent.countryCode ?? "+91",
-      senderId: cfg.serviceEvent.smsSenderId ?? void 0
-      // apiKey: cfg.serviceEvent.smsApiKey ?? undefined, // if your SmsProvider supports it
+      senderId: cfg.serviceEvent.smsSenderId ?? void 0,
+      masterNumber: cfg.serviceEvent.masterPhone ?? void 0
+      // if you want master included here too
     });
-    await this.sendPerRecipient({
-      deliveryId,
-      notificationType: "SMS" /* SMS */,
-      recipients,
-      messageContent: body,
-      sendOne: async (recipient) => {
-        const res = await provider.send({
-          recipient: { phone: recipient },
-          body,
-          priority: evt.priority
-        });
-        return this.mapProviderResult(res);
-      }
+    const bulk = await provider.sendBulk({
+      phones: recipients,
+      message: body,
+      includeMaster: true
     });
+    const now = /* @__PURE__ */ new Date();
+    const auditRecipients = (bulk.recipients?.length ? bulk.recipients : recipients).filter(Boolean);
+    if (bulk.ok) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: auditRecipients.map((r) => ({
+          deliveryId,
+          notificationType: "SMS" /* SMS */,
+          recipient: r,
+          messageContent: body,
+          thirdPartyResponse: bulk.meta ?? void 0,
+          isSent: true,
+          sentAt: now,
+          externalId: bulk.externalId ?? null,
+          error: null
+        }))
+      });
+    } else {
+      const errMsg = bulk.error ?? "SMS bulk send failed";
+      await this.prisma.eventDeliveryItem.createMany({
+        data: auditRecipients.map((r) => ({
+          deliveryId,
+          notificationType: "SMS" /* SMS */,
+          recipient: r,
+          messageContent: body,
+          thirdPartyResponse: bulk.meta ?? void 0,
+          isSent: false,
+          sentAt: null,
+          externalId: bulk.externalId ?? null,
+          error: errMsg
+        }))
+      });
+    }
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
@@ -3249,7 +3399,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 +3421,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

@@ -2401,167 +2401,121 @@ var SmsProvider = class {
   constructor(logger = console, args) {
     this.logger = logger;
     this.args = args;
-    this.logger.info(`[NotificationService] args for sms : ${JSON.stringify(args)}`);
+    const safeArgs = { ...args, apiKey: args.apiKey ? "***" : "" };
+    this.logger.info(`[NotificationService] args for sms : ${JSON.stringify(safeArgs)}`);
     this.url = args.apiUrl || "https://web.nsemfua.com/api/http/sms/send";
-    this.token = "13|R3XfH6wHx3zdflBzpGMlNiTWKuOUEkGutORyGcuS";
+    this.token = (args.apiKey || "").trim();
     this.sender = args.senderId || "AlmaMedLab";
+    this.countryCode = (args.countryCode || "+233").trim();
   }
   url;
   token;
   sender;
+  countryCode;
+  /**
+   * Single recipient wrapper (still same API).
+   */
   async send(args) {
-    const to = args.recipient;
-    if (!to) {
-      return {
-        ok: false,
-        provider: "SMS" /* SMS */,
-        error: "Missing recipient.phone"
-      };
+    const phone = args?.recipient?.phone;
+    if (!phone) {
+      return { ok: false, provider: "SMS" /* SMS */, error: "Missing recipient.phone" };
+    }
+    const bulk = await this.sendBulk({
+      phones: [phone],
+      message: args.body,
+      includeMaster: true
+    });
+    if (!bulk.ok) {
+      return { ok: false, provider: "SMS" /* SMS */, error: bulk.error, meta: bulk.meta };
     }
-    const allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push({ phone: this.args.masterNumber });
+    return { ok: true, provider: "SMS" /* SMS */, externalId: bulk.externalId, meta: bulk.meta };
+  }
+  /**
+   * ✅ Bulk SMS in ONE HTTP call (like PHP: recipient: "988.., 977..")
+   */
+  async sendBulk(args) {
+    if (!this.url) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiUrl" };
     }
-    const recipients = this.normalizeRecipients(allRecipients);
+    if (!this.token) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiKey" };
+    }
+    const includeMaster = args.includeMaster ?? true;
+    const phones = [...args.phones ?? []];
+    if (includeMaster && this.args.masterNumber) phones.push(this.args.masterNumber);
+    const recipients = this.normalizePhones(phones);
     if (!recipients.length) {
-      return {
-        ok: false,
-        provider: "SMS" /* SMS */,
-        error: "Missing recipient.phone"
-      };
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "No valid phone recipients" };
     }
+    const recipientStr = recipients.join(", ");
     try {
       const payload = {
         api_token: this.token,
-        recipient: recipients.join(", "),
-        // API accepts comma-separated list
+        recipient: recipientStr,
         sender_id: this.sender,
         type: "plain",
-        message: this.cleanMessage(args.body)
-        // schedule_time: "" // add if you need scheduling
+        message: this.cleanMessage(args.message)
       };
       const res = await fetch(this.url, {
         method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Accept: "application/json"
-        },
+        headers: { "Content-Type": "application/json", Accept: "application/json" },
         body: JSON.stringify(payload)
       });
       const data = await res.json().catch(() => ({}));
-      const isError = data?.status === "error" || !res.ok;
+      const isError = !res.ok || data?.status === "error";
       if (isError) {
         return {
           ok: false,
           provider: "SMS" /* SMS */,
-          error: data?.message || data?.error || `Gateway error (${res.status} ${res.statusText})`
+          recipients,
+          error: data?.message || data?.error || `Gateway error (${res.status} ${res.statusText})`,
+          meta: data
         };
       }
-      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id || void 0;
+      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id;
       return {
         ok: true,
         provider: "SMS" /* SMS */,
+        recipients,
         externalId,
-        meta: {
-          gatewayStatus: data?.status,
-          recipient: payload.recipient
-        }
+        meta: data
       };
     } catch (err) {
       return {
         ok: false,
         provider: "SMS" /* SMS */,
+        recipients,
         error: err?.message ?? String(err)
       };
     }
   }
-  /** Accepts single/multiple Recipient objects and returns sanitized numbers */
-  normalizeRecipients(input) {
-    return input.map((r) => r?.phone || "").map((p) => this.stripCountryCode(p)).map((p) => this.onlyDialable(p)).filter(Boolean);
-  }
-  /** Match PHP: remove leading +233 (Ghana) only */
-  stripCountryCode(phone) {
-    return (phone || "").trim().replace(this.args.countryCode || "+233", "");
-  }
-  /** Remove spaces, dashes, parentheses; keep numbers only (and commas handled elsewhere) */
-  onlyDialable(phone) {
-    return phone.replace(/[^\d]/g, "");
+  // ---------------- helpers ----------------
+  /**
+   * Normalize phones:
+   * - trim
+   * - strip leading country code digits if present (e.g., +233 or 233)
+   * - keep digits only
+   * - dedupe
+   */
+  normalizePhones(input) {
+    const ccDigits = this.countryCode.replace(/[^\d]/g, "");
+    const normalized = (input ?? []).map((x) => String(x ?? "").trim()).filter(Boolean).map((x) => x.replace(/[^\d]/g, "")).map((digits) => {
+      if (ccDigits && digits.startsWith(ccDigits) && digits.length > ccDigits.length) {
+        return digits.slice(ccDigits.length);
+      }
+      return digits;
+    }).filter((x) => x.length >= 6);
+    return Array.from(new Set(normalized));
   }
   /** Mirror PHP cleanup (strip tags, collapse nbsp, trim) */
   cleanMessage(msg) {
-    const noTags = msg.replace(/<\/?[^>]+(>|$)/g, "");
+    const noTags = String(msg ?? "").replace(/<\/?[^>]+(>|$)/g, "");
     return noTags.replace(/&nbsp;|&amp;nbsp;/g, " ").trim();
   }
 };
 
 // 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 +2788,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";
@@ -2996,32 +3121,57 @@ var NotificationService = class {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.smsTemplateId } });
     if (!tpl) return;
-    const recipients = args.recipients;
+    const recipients = args.recipients ?? [];
     if (!recipients.length) {
       this.logger.info("[NotificationService] SMS: no recipients resolved");
       return;
     }
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
     const provider = new SmsProvider(this.logger, {
-      apiUrl: cfg.serviceEvent.smsApiUrl,
+      apiUrl: cfg.serviceEvent.smsApiUrl ?? void 0,
+      apiKey: cfg.serviceEvent.smsApiKey ?? void 0,
       countryCode: cfg.serviceEvent.countryCode ?? "+91",
-      senderId: cfg.serviceEvent.smsSenderId ?? void 0
-      // apiKey: cfg.serviceEvent.smsApiKey ?? undefined, // if your SmsProvider supports it
+      senderId: cfg.serviceEvent.smsSenderId ?? void 0,
+      masterNumber: cfg.serviceEvent.masterPhone ?? void 0
+      // if you want master included here too
     });
-    await this.sendPerRecipient({
-      deliveryId,
-      notificationType: "SMS" /* SMS */,
-      recipients,
-      messageContent: body,
-      sendOne: async (recipient) => {
-        const res = await provider.send({
-          recipient: { phone: recipient },
-          body,
-          priority: evt.priority
-        });
-        return this.mapProviderResult(res);
-      }
+    const bulk = await provider.sendBulk({
+      phones: recipients,
+      message: body,
+      includeMaster: true
     });
+    const now = /* @__PURE__ */ new Date();
+    const auditRecipients = (bulk.recipients?.length ? bulk.recipients : recipients).filter(Boolean);
+    if (bulk.ok) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: auditRecipients.map((r) => ({
+          deliveryId,
+          notificationType: "SMS" /* SMS */,
+          recipient: r,
+          messageContent: body,
+          thirdPartyResponse: bulk.meta ?? void 0,
+          isSent: true,
+          sentAt: now,
+          externalId: bulk.externalId ?? null,
+          error: null
+        }))
+      });
+    } else {
+      const errMsg = bulk.error ?? "SMS bulk send failed";
+      await this.prisma.eventDeliveryItem.createMany({
+        data: auditRecipients.map((r) => ({
+          deliveryId,
+          notificationType: "SMS" /* SMS */,
+          recipient: r,
+          messageContent: body,
+          thirdPartyResponse: bulk.meta ?? void 0,
+          isSent: false,
+          sentAt: null,
+          externalId: bulk.externalId ?? null,
+          error: errMsg
+        }))
+      });
+    }
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
@@ -3199,7 +3349,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 +3371,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.8",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",