av6-core 1.5.9 → 1.5.11

package/dist/index.js

@@ -2447,31 +2447,47 @@ var EmailProvider = class {
 };
 
 // src/providers/sms.provider.ts
+var import_axios2 = __toESM(require("axios"));
+var import_node_https = __toESM(require("https"));
+var import_promises = __toESM(require("dns/promises"));
+var import_node_url = require("url");
+var DEFAULT_SMS_URL = "https://web.nsemfua.com/api/http/sms/send";
+var FALLBACK_SMS_IPS = [
+  "185.38.109.200",
+  "185.38.109.201",
+  "185.38.109.202",
+  "185.38.109.203",
+  "185.38.109.204",
+  "185.38.109.205",
+  "185.38.109.206",
+  "185.38.109.207",
+  "185.38.109.208",
+  "185.38.109.209"
+];
+var rr = 0;
 var SmsProvider = class {
   constructor(logger = console, args) {
     this.logger = logger;
     this.args = 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 = (args.apiKey || "").trim();
-    this.sender = args.senderId || "AlmaMedLab";
-    this.countryCode = (args.countryCode || "+233").trim();
+    this.url = this.normalizeUrl(args.apiUrl);
+    this.token = (args.apiKey ?? "").trim();
+    this.sender = (args.senderId ?? "AlmaMedLab").trim();
+    this.countryCode = (args.countryCode ?? "+233").trim();
+    this.masterNumber = args.masterNumber ?? void 0;
   }
   url;
   token;
   sender;
   countryCode;
+  masterNumber;
   /**
-   * Single recipient wrapper (still same API).
+   * Single wrapper (still uses bulk API with one number)
    */
   async send(args) {
-    const phone = args?.recipient?.phone;
-    if (!phone) {
-      return { ok: false, provider: "SMS" /* SMS */, error: "Missing recipient.phone" };
-    }
     const bulk = await this.sendBulk({
-      phones: [phone],
+      phones: [args.phone],
       message: args.body,
       includeMaster: true
     });
@@ -2481,38 +2497,31 @@ var SmsProvider = class {
     return { ok: true, provider: "SMS" /* SMS */, externalId: bulk.externalId, meta: bulk.meta };
   }
   /**
-   * ✅ Bulk SMS in ONE HTTP call (like PHP: recipient: "988.., 977..")
+   * ✅ Bulk SMS in ONE API call (recipient: "988..., 977...")
    */
   async sendBulk(args) {
-    if (!this.url) {
-      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiUrl" };
-    }
     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);
+    if (includeMaster && this.masterNumber) phones.push(this.masterNumber);
     const recipients = this.normalizePhones(phones);
     if (!recipients.length) {
       return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "No valid phone recipients" };
     }
-    const recipientStr = recipients.join(", ");
+    const payload = {
+      api_token: this.token,
+      recipient: recipients.join(", "),
+      // PHP parity: comma-space separated
+      sender_id: this.sender,
+      type: "plain",
+      message: this.cleanMessage(args.message)
+    };
     try {
-      const payload = {
-        api_token: this.token,
-        recipient: recipientStr,
-        sender_id: this.sender,
-        type: "plain",
-        message: this.cleanMessage(args.message)
-      };
-      const res = await fetch(this.normalizeUrl(this.url), {
-        method: "POST",
-        headers: { "Content-Type": "application/json", Accept: "application/json" },
-        body: JSON.stringify(payload)
-      });
-      const data = await res.json().catch(() => ({}));
-      const isError = !res.ok || data?.status === "error";
+      const res = await this.postByIp(this.url, payload);
+      const data = res.data ?? {};
+      const isError = res.status >= 400 || data?.status === "error";
       if (isError) {
         return {
           ok: false,
@@ -2522,7 +2531,7 @@ var SmsProvider = class {
           meta: data
         };
       }
-      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id;
+      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id || void 0;
       return {
         ok: true,
         provider: "SMS" /* SMS */,
@@ -2531,22 +2540,27 @@ var SmsProvider = class {
         meta: data
       };
     } catch (err) {
+      const cause = err?.cause ?? err;
       return {
         ok: false,
         provider: "SMS" /* SMS */,
         recipients,
-        error: err?.message ?? String(err)
+        error: `SMS request failed: ${cause?.code ?? cause?.message ?? String(cause)}`,
+        meta: {
+          url: this.url,
+          code: cause?.code,
+          message: cause?.message
+        }
       };
     }
   }
-  // ---------------- helpers ----------------
-  /**
-   * Normalize phones:
-   * - trim
-   * - strip leading country code digits if present (e.g., +233 or 233)
-   * - keep digits only
-   * - dedupe
-   */
+  // --------------------- internal helpers ---------------------
+  normalizeUrl(u) {
+    const x = (u ?? "").trim();
+    if (!x) return DEFAULT_SMS_URL;
+    if (!/^https?:\/\//i.test(x)) return `https://${x}`;
+    return x;
+  }
   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) => {
@@ -2557,21 +2571,51 @@ var SmsProvider = class {
     }).filter((x) => x.length >= 6);
     return Array.from(new Set(normalized));
   }
-  normalizeUrl(u) {
-    const x = (u ?? "").trim();
-    if (!x) return "https://web.nsemfua.com/api/http/sms/send";
-    if (!/^https?:\/\//i.test(x)) return `https://${x}`;
-    return x;
-  }
-  /** Mirror PHP cleanup (strip tags, collapse nbsp, trim) */
   cleanMessage(msg) {
     const noTags = String(msg ?? "").replace(/<\/?[^>]+(>|$)/g, "");
     return noTags.replace(/&nbsp;|&amp;nbsp;/g, " ").trim();
   }
+  pickFallbackIp() {
+    const ip = FALLBACK_SMS_IPS[rr++ % FALLBACK_SMS_IPS.length];
+    return ip;
+  }
+  async resolveHostToIp(host) {
+    try {
+      const ips = await import_promises.default.resolve4(host);
+      if (ips?.length) return ips[0];
+    } catch (e) {
+      this.logger.error(`[SmsProvider] DNS resolve4 failed for ${host}: ${e?.code || e?.message}`);
+    }
+    const ip = this.pickFallbackIp();
+    this.logger.info(`[SmsProvider] Using fallback IP for ${host}: ${ip}`);
+    return ip;
+  }
+  async postByIp(urlStr, payload) {
+    const u = new import_node_url.URL(urlStr);
+    const host = u.hostname;
+    const ip = await this.resolveHostToIp(host);
+    const ipUrl = urlStr.replace(host, ip);
+    const httpsAgent = new import_node_https.default.Agent({
+      keepAlive: true,
+      servername: host
+      // ✅ TLS SNI
+    });
+    return import_axios2.default.post(ipUrl, payload, {
+      timeout: 15e3,
+      httpsAgent,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        Host: host
+        // ✅ important
+      },
+      validateStatus: () => true
+    });
+  }
 };
 
 // src/providers/whatsapp.provider.ts
-var import_axios2 = __toESM(require("axios"));
+var import_axios3 = __toESM(require("axios"));
 
 // src/utils/notification.utils.ts
 function defaultValueField(t) {
@@ -2886,7 +2930,7 @@ var WhatsAppProvider = class {
     }
     try {
       const { requestBody, headers } = this.buildRequest(to, inp);
-      const response = await import_axios2.default.post(this.apiUrl, requestBody, { headers });
+      const response = await import_axios3.default.post(this.apiUrl, requestBody, { headers });
       const data = response.data;
       return {
         ok: true,
@@ -2944,7 +2988,7 @@ var WhatsAppProvider = class {
     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 response = await import_axios3.default.post(this.apiUrl, requestBody, { headers });
         const data = response.data;
         return {
           recipient,
@@ -3198,36 +3242,19 @@ var NotificationService = class {
     });
     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
-        }))
-      });
-    }
+    await this.prisma.eventDeliveryItem.createMany({
+      data: auditRecipients.map((r) => ({
+        deliveryId,
+        notificationType: "SMS" /* SMS */,
+        recipient: r,
+        messageContent: body,
+        thirdPartyResponse: bulk.meta ?? void 0,
+        isSent: bulk.ok,
+        sentAt: bulk.ok ? now : null,
+        externalId: bulk.externalId ?? null,
+        error: bulk.ok ? null : bulk.error ?? "SMS bulk send failed"
+      }))
+    });
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;

package/dist/index.mjs

@@ -2397,31 +2397,47 @@ var EmailProvider = class {
 };
 
 // src/providers/sms.provider.ts
+import axios2 from "axios";
+import https from "https";
+import dns from "dns/promises";
+import { URL } from "url";
+var DEFAULT_SMS_URL = "https://web.nsemfua.com/api/http/sms/send";
+var FALLBACK_SMS_IPS = [
+  "185.38.109.200",
+  "185.38.109.201",
+  "185.38.109.202",
+  "185.38.109.203",
+  "185.38.109.204",
+  "185.38.109.205",
+  "185.38.109.206",
+  "185.38.109.207",
+  "185.38.109.208",
+  "185.38.109.209"
+];
+var rr = 0;
 var SmsProvider = class {
   constructor(logger = console, args) {
     this.logger = logger;
     this.args = 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 = (args.apiKey || "").trim();
-    this.sender = args.senderId || "AlmaMedLab";
-    this.countryCode = (args.countryCode || "+233").trim();
+    this.url = this.normalizeUrl(args.apiUrl);
+    this.token = (args.apiKey ?? "").trim();
+    this.sender = (args.senderId ?? "AlmaMedLab").trim();
+    this.countryCode = (args.countryCode ?? "+233").trim();
+    this.masterNumber = args.masterNumber ?? void 0;
   }
   url;
   token;
   sender;
   countryCode;
+  masterNumber;
   /**
-   * Single recipient wrapper (still same API).
+   * Single wrapper (still uses bulk API with one number)
    */
   async send(args) {
-    const phone = args?.recipient?.phone;
-    if (!phone) {
-      return { ok: false, provider: "SMS" /* SMS */, error: "Missing recipient.phone" };
-    }
     const bulk = await this.sendBulk({
-      phones: [phone],
+      phones: [args.phone],
       message: args.body,
       includeMaster: true
     });
@@ -2431,38 +2447,31 @@ var SmsProvider = class {
     return { ok: true, provider: "SMS" /* SMS */, externalId: bulk.externalId, meta: bulk.meta };
   }
   /**
-   * ✅ Bulk SMS in ONE HTTP call (like PHP: recipient: "988.., 977..")
+   * ✅ Bulk SMS in ONE API call (recipient: "988..., 977...")
    */
   async sendBulk(args) {
-    if (!this.url) {
-      return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "Missing sms apiUrl" };
-    }
     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);
+    if (includeMaster && this.masterNumber) phones.push(this.masterNumber);
     const recipients = this.normalizePhones(phones);
     if (!recipients.length) {
       return { ok: false, provider: "SMS" /* SMS */, recipients: [], error: "No valid phone recipients" };
     }
-    const recipientStr = recipients.join(", ");
+    const payload = {
+      api_token: this.token,
+      recipient: recipients.join(", "),
+      // PHP parity: comma-space separated
+      sender_id: this.sender,
+      type: "plain",
+      message: this.cleanMessage(args.message)
+    };
     try {
-      const payload = {
-        api_token: this.token,
-        recipient: recipientStr,
-        sender_id: this.sender,
-        type: "plain",
-        message: this.cleanMessage(args.message)
-      };
-      const res = await fetch(this.normalizeUrl(this.url), {
-        method: "POST",
-        headers: { "Content-Type": "application/json", Accept: "application/json" },
-        body: JSON.stringify(payload)
-      });
-      const data = await res.json().catch(() => ({}));
-      const isError = !res.ok || data?.status === "error";
+      const res = await this.postByIp(this.url, payload);
+      const data = res.data ?? {};
+      const isError = res.status >= 400 || data?.status === "error";
       if (isError) {
         return {
           ok: false,
@@ -2472,7 +2481,7 @@ var SmsProvider = class {
           meta: data
         };
       }
-      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id;
+      const externalId = data?.id || data?.data?.id || data?.message_id || data?.data?.message_id || void 0;
       return {
         ok: true,
         provider: "SMS" /* SMS */,
@@ -2481,22 +2490,27 @@ var SmsProvider = class {
         meta: data
       };
     } catch (err) {
+      const cause = err?.cause ?? err;
       return {
         ok: false,
         provider: "SMS" /* SMS */,
         recipients,
-        error: err?.message ?? String(err)
+        error: `SMS request failed: ${cause?.code ?? cause?.message ?? String(cause)}`,
+        meta: {
+          url: this.url,
+          code: cause?.code,
+          message: cause?.message
+        }
       };
     }
   }
-  // ---------------- helpers ----------------
-  /**
-   * Normalize phones:
-   * - trim
-   * - strip leading country code digits if present (e.g., +233 or 233)
-   * - keep digits only
-   * - dedupe
-   */
+  // --------------------- internal helpers ---------------------
+  normalizeUrl(u) {
+    const x = (u ?? "").trim();
+    if (!x) return DEFAULT_SMS_URL;
+    if (!/^https?:\/\//i.test(x)) return `https://${x}`;
+    return x;
+  }
   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) => {
@@ -2507,21 +2521,51 @@ var SmsProvider = class {
     }).filter((x) => x.length >= 6);
     return Array.from(new Set(normalized));
   }
-  normalizeUrl(u) {
-    const x = (u ?? "").trim();
-    if (!x) return "https://web.nsemfua.com/api/http/sms/send";
-    if (!/^https?:\/\//i.test(x)) return `https://${x}`;
-    return x;
-  }
-  /** Mirror PHP cleanup (strip tags, collapse nbsp, trim) */
   cleanMessage(msg) {
     const noTags = String(msg ?? "").replace(/<\/?[^>]+(>|$)/g, "");
     return noTags.replace(/&nbsp;|&amp;nbsp;/g, " ").trim();
   }
+  pickFallbackIp() {
+    const ip = FALLBACK_SMS_IPS[rr++ % FALLBACK_SMS_IPS.length];
+    return ip;
+  }
+  async resolveHostToIp(host) {
+    try {
+      const ips = await dns.resolve4(host);
+      if (ips?.length) return ips[0];
+    } catch (e) {
+      this.logger.error(`[SmsProvider] DNS resolve4 failed for ${host}: ${e?.code || e?.message}`);
+    }
+    const ip = this.pickFallbackIp();
+    this.logger.info(`[SmsProvider] Using fallback IP for ${host}: ${ip}`);
+    return ip;
+  }
+  async postByIp(urlStr, payload) {
+    const u = new URL(urlStr);
+    const host = u.hostname;
+    const ip = await this.resolveHostToIp(host);
+    const ipUrl = urlStr.replace(host, ip);
+    const httpsAgent = new https.Agent({
+      keepAlive: true,
+      servername: host
+      // ✅ TLS SNI
+    });
+    return axios2.post(ipUrl, payload, {
+      timeout: 15e3,
+      httpsAgent,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json",
+        Host: host
+        // ✅ important
+      },
+      validateStatus: () => true
+    });
+  }
 };
 
 // src/providers/whatsapp.provider.ts
-import axios2 from "axios";
+import axios3 from "axios";
 
 // src/utils/notification.utils.ts
 function defaultValueField(t) {
@@ -2836,7 +2880,7 @@ var WhatsAppProvider = class {
     }
     try {
       const { requestBody, headers } = this.buildRequest(to, inp);
-      const response = await axios2.post(this.apiUrl, requestBody, { headers });
+      const response = await axios3.post(this.apiUrl, requestBody, { headers });
       const data = response.data;
       return {
         ok: true,
@@ -2894,7 +2938,7 @@ var WhatsAppProvider = class {
     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 response = await axios3.post(this.apiUrl, requestBody, { headers });
         const data = response.data;
         return {
           recipient,
@@ -3148,36 +3192,19 @@ var NotificationService = class {
     });
     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
-        }))
-      });
-    }
+    await this.prisma.eventDeliveryItem.createMany({
+      data: auditRecipients.map((r) => ({
+        deliveryId,
+        notificationType: "SMS" /* SMS */,
+        recipient: r,
+        messageContent: body,
+        thirdPartyResponse: bulk.meta ?? void 0,
+        isSent: bulk.ok,
+        sentAt: bulk.ok ? now : null,
+        externalId: bulk.externalId ?? null,
+        error: bulk.ok ? null : bulk.error ?? "SMS bulk send failed"
+      }))
+    });
   }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;

package/package.json

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