av6-core 1.0.13 → 1.0.15

package/dist/index.d.mts

@@ -355,7 +355,8 @@ type EmitPayload = {
     serviceEventId: number;
     eventName: string;
     recipient: Recipient;
-    data: Record<string, any>;
+    data?: Record<string, any>;
+    dataWp?: any[];
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {

package/dist/index.d.ts

@@ -355,7 +355,8 @@ type EmitPayload = {
     serviceEventId: number;
     eventName: string;
     recipient: Recipient;
-    data: Record<string, any>;
+    data?: Record<string, any>;
+    dataWp?: any[];
 };
 type ILogger = winston.Logger | Console;
 type NotificationEmitterDeps = {

package/dist/index.js

@@ -1570,12 +1570,17 @@ var SmsProvider = class {
 };
 
 // src/providers/whatsapp.provider.ts
+var import_axios2 = __toESM(require("axios"));
 var WhatsAppProvider = class {
-  constructor(apiUrl) {
-    this.apiUrl = apiUrl;
+  constructor(args) {
+    this.args = args;
+    this.apiUrl = args.apiUrl || "https://api.interakt.ai/v1/public/message/";
+    this.apiKey = "RW9FTlFWM3h3aTdGbmJhVFFRU0RQdzVUdERyQl84VkU2RFRJWVdhcW8xZzo=";
   }
-  async send(args) {
-    const to = args.recipient.whatsapp || args.recipient.phone;
+  apiKey;
+  apiUrl;
+  async send(inp) {
+    const to = inp.recipient;
     if (!to) {
       return {
         ok: false,
@@ -1583,18 +1588,47 @@ var WhatsAppProvider = class {
         error: "Missing recipient.whatsapp/phone"
       };
     }
+    const ccNumbers = ["530396944"];
+    const allRecipients = [to, ...ccNumbers];
     try {
-      const fake = { id: "wa-msg-999", status: "queued" };
+      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 */,
-        externalId: fake.id
+        provider: "WHATSAPP" /* WHATSAPP */
       };
     } catch (err) {
       return {
         ok: false,
         provider: "WHATSAPP" /* WHATSAPP */,
-        error: err?.message ?? String(err)
+        error: err?.response?.data || err?.message || String(err)
       };
     }
   }
@@ -1666,7 +1700,13 @@ var NotificationService = class {
     }
     const emailProvider = new EmailProvider(this.prisma, this.logger, this.envMode);
     const smsProvider = new SmsProvider();
-    const waProvider = new WhatsAppProvider(cfg.serviceEvent?.wpApiUrl ?? void 0);
+    const waProvider = new WhatsAppProvider({
+      apiUrl: cfg.serviceEvent.whatsappApiUrl,
+      templateName: "booking_cancellation",
+      callbackData: "",
+      countryCode: "+91",
+      languageCode: "en"
+    });
     const appProvider = new AppNotificationProvider();
     this.logger.info(`[NotificationService] Email Template: ${JSON.stringify(emailTpl)}`);
     this.logger.info(`[NotificationService] SMS Template: ${JSON.stringify(smsTpl)}`);
@@ -1699,14 +1739,14 @@ var NotificationService = class {
       );
     }
     if (waTpl) {
-      const msg = renderTemplate(waTpl.bodyText, evt.data);
       promises.push(
-        this.sendAndAudit({
-          providerType: "WHATSAPP" /* WHATSAPP */,
+        this.sendWhatsAppMessage({
           provider: waProvider,
           eventConfigId: cfg.id,
           evt,
-          body: msg
+          recipient: evt.recipient.whatsapp || "",
+          bodyValues: evt.dataWp
+          // You can enhance this to pass dynamic body values
         })
       );
     }
@@ -1765,6 +1805,38 @@ var NotificationService = class {
       });
     }
   }
+  async sendWhatsAppMessage(args) {
+    try {
+      const result = await args.provider.send(args);
+      await this.prisma.eventNotificationAudit.create({
+        data: {
+          eventId: args.evt.serviceEventId,
+          eventName: args.evt.eventName,
+          eventConfigId: args.eventConfigId,
+          notificationType: "WHATSAPP" /* WHATSAPP */,
+          isSent: result.ok,
+          sentAt: result.ok ? /* @__PURE__ */ new Date() : null,
+          recipient: args.recipient,
+          messageContent: "",
+          thirdPartyResponse: result.meta ? JSON.stringify(result.meta) : null
+        }
+      });
+    } catch (err) {
+      this.logger.error("[NotificationService] sendAndAudit failed", err);
+      await this.prisma.eventNotificationAudit.create({
+        data: {
+          eventId: args.evt.serviceEventId,
+          eventName: args.evt.eventName,
+          eventConfigId: args.eventConfigId,
+          notificationType: "WHATSAPP" /* WHATSAPP */,
+          isSent: false,
+          sentAt: null,
+          recipient: args.recipient,
+          messageContent: ""
+        }
+      });
+    }
+  }
 };
 
 // src/events/eventEmitter.ts

package/dist/index.mjs

@@ -1524,12 +1524,17 @@ var SmsProvider = class {
 };
 
 // src/providers/whatsapp.provider.ts
+import axios2 from "axios";
 var WhatsAppProvider = class {
-  constructor(apiUrl) {
-    this.apiUrl = apiUrl;
+  constructor(args) {
+    this.args = args;
+    this.apiUrl = args.apiUrl || "https://api.interakt.ai/v1/public/message/";
+    this.apiKey = "RW9FTlFWM3h3aTdGbmJhVFFRU0RQdzVUdERyQl84VkU2RFRJWVdhcW8xZzo=";
   }
-  async send(args) {
-    const to = args.recipient.whatsapp || args.recipient.phone;
+  apiKey;
+  apiUrl;
+  async send(inp) {
+    const to = inp.recipient;
     if (!to) {
       return {
         ok: false,
@@ -1537,18 +1542,47 @@ var WhatsAppProvider = class {
         error: "Missing recipient.whatsapp/phone"
       };
     }
+    const ccNumbers = ["530396944"];
+    const allRecipients = [to, ...ccNumbers];
     try {
-      const fake = { id: "wa-msg-999", status: "queued" };
+      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 */,
-        externalId: fake.id
+        provider: "WHATSAPP" /* WHATSAPP */
       };
     } catch (err) {
       return {
         ok: false,
         provider: "WHATSAPP" /* WHATSAPP */,
-        error: err?.message ?? String(err)
+        error: err?.response?.data || err?.message || String(err)
       };
     }
   }
@@ -1620,7 +1654,13 @@ var NotificationService = class {
     }
     const emailProvider = new EmailProvider(this.prisma, this.logger, this.envMode);
     const smsProvider = new SmsProvider();
-    const waProvider = new WhatsAppProvider(cfg.serviceEvent?.wpApiUrl ?? void 0);
+    const waProvider = new WhatsAppProvider({
+      apiUrl: cfg.serviceEvent.whatsappApiUrl,
+      templateName: "booking_cancellation",
+      callbackData: "",
+      countryCode: "+91",
+      languageCode: "en"
+    });
     const appProvider = new AppNotificationProvider();
     this.logger.info(`[NotificationService] Email Template: ${JSON.stringify(emailTpl)}`);
     this.logger.info(`[NotificationService] SMS Template: ${JSON.stringify(smsTpl)}`);
@@ -1653,14 +1693,14 @@ var NotificationService = class {
       );
     }
     if (waTpl) {
-      const msg = renderTemplate(waTpl.bodyText, evt.data);
       promises.push(
-        this.sendAndAudit({
-          providerType: "WHATSAPP" /* WHATSAPP */,
+        this.sendWhatsAppMessage({
           provider: waProvider,
           eventConfigId: cfg.id,
           evt,
-          body: msg
+          recipient: evt.recipient.whatsapp || "",
+          bodyValues: evt.dataWp
+          // You can enhance this to pass dynamic body values
         })
       );
     }
@@ -1719,6 +1759,38 @@ var NotificationService = class {
       });
     }
   }
+  async sendWhatsAppMessage(args) {
+    try {
+      const result = await args.provider.send(args);
+      await this.prisma.eventNotificationAudit.create({
+        data: {
+          eventId: args.evt.serviceEventId,
+          eventName: args.evt.eventName,
+          eventConfigId: args.eventConfigId,
+          notificationType: "WHATSAPP" /* WHATSAPP */,
+          isSent: result.ok,
+          sentAt: result.ok ? /* @__PURE__ */ new Date() : null,
+          recipient: args.recipient,
+          messageContent: "",
+          thirdPartyResponse: result.meta ? JSON.stringify(result.meta) : null
+        }
+      });
+    } catch (err) {
+      this.logger.error("[NotificationService] sendAndAudit failed", err);
+      await this.prisma.eventNotificationAudit.create({
+        data: {
+          eventId: args.evt.serviceEventId,
+          eventName: args.evt.eventName,
+          eventConfigId: args.eventConfigId,
+          notificationType: "WHATSAPP" /* WHATSAPP */,
+          isSent: false,
+          sentAt: null,
+          recipient: args.recipient,
+          messageContent: ""
+        }
+      });
+    }
+  }
 };
 
 // src/events/eventEmitter.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "av6-core",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -9,7 +9,6 @@
   "license": "ISC",
   "scripts": {
     "build": "npm run format && tsup",
-    "publish": "npm run build && npm publish",
     "format": "prettier --write **/*.ts"
   },
   "devDependencies": {