av6-core 1.5.7 → 1.5.8

package/dist/index.js

@@ -2451,95 +2451,115 @@ 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 };
+    }
+    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 allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push({ phone: this.args.masterNumber });
+    if (!this.token) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiKey" };
     }
-    const recipients = this.normalizeRecipients(allRecipients);
+    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();
   }
 };
@@ -3151,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;

package/dist/index.mjs

@@ -2401,95 +2401,115 @@ 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 };
+    }
+    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 allRecipients = [to];
-    if (this.args.masterNumber) {
-      allRecipients.push({ phone: this.args.masterNumber });
+    if (!this.token) {
+      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiKey" };
     }
-    const recipients = this.normalizeRecipients(allRecipients);
+    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();
   }
 };
@@ -3101,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;

package/package.json

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