av6-core 1.5.19 → 1.6.0

package/dist/index.js

@@ -2369,6 +2369,42 @@ var uinConfigService = (uinDeps) => {
   };
 };
 
+// src/providers/app.provider.ts
+var ExpoAppNotificationProvider = class {
+  constructor(logger = console, url = "https://api.expo.dev/v2/push/send") {
+    this.logger = logger;
+    this.url = url;
+  }
+  /**
+   * Bulk send: one HTTP request with many messages.
+   */
+  async sendBulk(messages) {
+    const payload = (messages ?? []).filter((m) => !!m?.to);
+    if (!payload.length) return { ok: true, tickets: [] };
+    try {
+      const res = await fetch(this.url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload)
+      });
+      const data = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        return { ok: false, error: `Expo HTTP ${res.status} ${res.statusText}`, meta: data };
+      }
+      const tickets = data?.data ?? [];
+      const anyError = Array.isArray(tickets) && tickets.some((t) => t?.status === "error");
+      return {
+        ok: !anyError,
+        tickets,
+        meta: data
+      };
+    } catch (e) {
+      this.logger.error("[ExpoAppNotificationProvider] sendBulk failed", e);
+      return { ok: false, error: e?.message ?? String(e) };
+    }
+  }
+};
+
 // src/types/notification.ts
 var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
   TemplateType2["EMAIL"] = "EMAIL";
@@ -2379,33 +2415,6 @@ var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
   return TemplateType2;
 })(TemplateType || {});
 
-// src/providers/app.provider.ts
-var AppNotificationProvider = class {
-  async send(args) {
-    if (!args.recipient.appUserId) {
-      return {
-        ok: false,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        error: "Missing recipient.appUserId"
-      };
-    }
-    try {
-      const fake = { id: "push-abc", status: "queued" };
-      return {
-        ok: true,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        externalId: fake.id
-      };
-    } catch (err) {
-      return {
-        ok: false,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        error: err?.message ?? String(err)
-      };
-    }
-  }
-};
-
 // src/providers/email.providers.ts
 var import_nodemailer = __toESM(require("nodemailer"));
 var EmailProvider = class {
@@ -3397,33 +3406,117 @@ var NotificationService = class {
       });
     }
   }
+  async getExpoTokensByUserIds(userIds) {
+    if (!userIds.length) return /* @__PURE__ */ new Map();
+    const rows = await this.prisma.session.findMany({
+      where: {
+        userId: { in: userIds },
+        deviceNotificationToken: { not: null },
+        logoutAt: null
+      },
+      select: { userId: true, deviceNotificationToken: true }
+    });
+    const map = /* @__PURE__ */ new Map();
+    for (const r of rows) {
+      const token = r.deviceNotificationToken?.trim();
+      if (!token) continue;
+      if (!map.has(r.userId)) map.set(r.userId, []);
+      map.get(r.userId).push(token);
+    }
+    for (const [k, v] of map.entries()) map.set(k, Array.from(new Set(v)));
+    return map;
+  }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
-    const recipients = args.recipients;
-    if (!recipients.length) {
-      this.logger.info("[NotificationService] APP: no recipients resolved");
+    let appUrlTpl = null;
+    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.webNotificationUrlTemplateId) {
+      appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
+    }
+    const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
+    if (!userIds.length) {
+      this.logger.info("[NotificationService] APP: no userIds resolved");
       return;
     }
-    const subject = renderTemplate(tpl.subject ?? "", evt.data ?? {});
+    const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const provider = new AppNotificationProvider();
-    await this.sendPerRecipient({
-      deliveryId,
-      notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-      recipients,
-      messageContent: body,
-      sendOne: async (recipient) => {
-        const res = await provider.send({
-          recipient: { appUserId: recipient },
-          subject,
+    const route = appUrlTpl ? renderTemplate(appUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const tokensMap = await this.getExpoTokensByUserIds(userIds);
+    const expoProvider = new ExpoAppNotificationProvider(
+      this.logger,
+      cfg.serviceEvent.appNotificationApiUrl ?? void 0
+    );
+    const priority = cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "default";
+    const channelId = cfg.channelId ?? "default";
+    const messages = [];
+    const tokenToUserId = /* @__PURE__ */ new Map();
+    for (const userId of userIds) {
+      const tokens = tokensMap.get(userId) ?? [];
+      for (const to of tokens) {
+        messages.push({
+          to,
+          title: title || void 0,
           body,
-          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low"
+          channelId,
+          priority,
+          data: route ? { route } : void 0
         });
-        return this.mapProviderResult(res);
+        tokenToUserId.set(to, userId);
       }
+    }
+    if (!messages.length) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: userIds.map((uid) => ({
+          deliveryId,
+          notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+          recipient: String(uid),
+          messageContent: body,
+          isSent: false,
+          sentAt: null,
+          error: "No deviceNotificationToken found for user"
+        }))
+      });
+      return;
+    }
+    const expoRes = await expoProvider.sendBulk(messages);
+    const tickets = Array.isArray(expoRes.tickets) ? expoRes.tickets : [];
+    const now = /* @__PURE__ */ new Date();
+    const rows = messages.map((m, idx) => {
+      const t = tickets[idx];
+      const isOk = t?.status === "ok";
+      const errMsg = isOk ? null : t?.message ?? t?.details?.error ?? expoRes.error ?? "Expo push failed";
+      const externalId = isOk ? t?.id ?? null : null;
+      return {
+        deliveryId,
+        notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+        recipient: m.to,
+        // store token or store userId; token is more debuggable
+        messageContent: body,
+        thirdPartyResponse: t ?? void 0,
+        isSent: !!isOk,
+        sentAt: isOk ? now : null,
+        externalId,
+        error: errMsg
+      };
     });
+    await this.prisma.eventDeliveryItem.createMany({ data: rows });
+    const usersWithToken = /* @__PURE__ */ new Set();
+    for (const to of tokenToUserId.keys()) usersWithToken.add(tokenToUserId.get(to));
+    const missingUsers = userIds.filter((u) => !usersWithToken.has(u));
+    if (missingUsers.length) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: missingUsers.map((uid) => ({
+          deliveryId,
+          notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+          recipient: String(uid),
+          messageContent: body,
+          isSent: false,
+          sentAt: null,
+          error: "No deviceNotificationToken found for user"
+        }))
+      });
+    }
   }
   async processWebChannel(args) {
     const { cfg, evt, deliveryId } = args;

package/dist/index.mjs

@@ -2319,6 +2319,42 @@ var uinConfigService = (uinDeps) => {
   };
 };
 
+// src/providers/app.provider.ts
+var ExpoAppNotificationProvider = class {
+  constructor(logger = console, url = "https://api.expo.dev/v2/push/send") {
+    this.logger = logger;
+    this.url = url;
+  }
+  /**
+   * Bulk send: one HTTP request with many messages.
+   */
+  async sendBulk(messages) {
+    const payload = (messages ?? []).filter((m) => !!m?.to);
+    if (!payload.length) return { ok: true, tickets: [] };
+    try {
+      const res = await fetch(this.url, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(payload)
+      });
+      const data = await res.json().catch(() => ({}));
+      if (!res.ok) {
+        return { ok: false, error: `Expo HTTP ${res.status} ${res.statusText}`, meta: data };
+      }
+      const tickets = data?.data ?? [];
+      const anyError = Array.isArray(tickets) && tickets.some((t) => t?.status === "error");
+      return {
+        ok: !anyError,
+        tickets,
+        meta: data
+      };
+    } catch (e) {
+      this.logger.error("[ExpoAppNotificationProvider] sendBulk failed", e);
+      return { ok: false, error: e?.message ?? String(e) };
+    }
+  }
+};
+
 // src/types/notification.ts
 var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
   TemplateType2["EMAIL"] = "EMAIL";
@@ -2329,33 +2365,6 @@ var TemplateType = /* @__PURE__ */ ((TemplateType2) => {
   return TemplateType2;
 })(TemplateType || {});
 
-// src/providers/app.provider.ts
-var AppNotificationProvider = class {
-  async send(args) {
-    if (!args.recipient.appUserId) {
-      return {
-        ok: false,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        error: "Missing recipient.appUserId"
-      };
-    }
-    try {
-      const fake = { id: "push-abc", status: "queued" };
-      return {
-        ok: true,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        externalId: fake.id
-      };
-    } catch (err) {
-      return {
-        ok: false,
-        provider: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-        error: err?.message ?? String(err)
-      };
-    }
-  }
-};
-
 // src/providers/email.providers.ts
 import nodemailer from "nodemailer";
 var EmailProvider = class {
@@ -3347,33 +3356,117 @@ var NotificationService = class {
       });
     }
   }
+  async getExpoTokensByUserIds(userIds) {
+    if (!userIds.length) return /* @__PURE__ */ new Map();
+    const rows = await this.prisma.session.findMany({
+      where: {
+        userId: { in: userIds },
+        deviceNotificationToken: { not: null },
+        logoutAt: null
+      },
+      select: { userId: true, deviceNotificationToken: true }
+    });
+    const map = /* @__PURE__ */ new Map();
+    for (const r of rows) {
+      const token = r.deviceNotificationToken?.trim();
+      if (!token) continue;
+      if (!map.has(r.userId)) map.set(r.userId, []);
+      map.get(r.userId).push(token);
+    }
+    for (const [k, v] of map.entries()) map.set(k, Array.from(new Set(v)));
+    return map;
+  }
   async processAppChannel(args) {
     const { cfg, evt, deliveryId } = args;
     const tpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationTemplateId } });
     if (!tpl) return;
-    const recipients = args.recipients;
-    if (!recipients.length) {
-      this.logger.info("[NotificationService] APP: no recipients resolved");
+    let appUrlTpl = null;
+    if (cfg.allowAppNotification && cfg.serviceEvent.allowAppNotification && cfg.webNotificationUrlTemplateId) {
+      appUrlTpl = await this.prisma.template.findUnique({ where: { id: cfg.appNotificationUrlTemplateId } });
+    }
+    const userIds = (args.recipients ?? []).map((x) => Number(x)).filter((n) => Number.isFinite(n) && n > 0);
+    if (!userIds.length) {
+      this.logger.info("[NotificationService] APP: no userIds resolved");
       return;
     }
-    const subject = renderTemplate(tpl.subject ?? "", evt.data ?? {});
+    const title = renderTemplate(tpl.subject ?? "", evt.data ?? {});
     const body = renderTemplate(tpl.bodyText ?? "", evt.data ?? {});
-    const provider = new AppNotificationProvider();
-    await this.sendPerRecipient({
-      deliveryId,
-      notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
-      recipients,
-      messageContent: body,
-      sendOne: async (recipient) => {
-        const res = await provider.send({
-          recipient: { appUserId: recipient },
-          subject,
+    const route = appUrlTpl ? renderTemplate(appUrlTpl.bodyText ?? "", evt.data ?? {}) : null;
+    const tokensMap = await this.getExpoTokensByUserIds(userIds);
+    const expoProvider = new ExpoAppNotificationProvider(
+      this.logger,
+      cfg.serviceEvent.appNotificationApiUrl ?? void 0
+    );
+    const priority = cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "default";
+    const channelId = cfg.channelId ?? "default";
+    const messages = [];
+    const tokenToUserId = /* @__PURE__ */ new Map();
+    for (const userId of userIds) {
+      const tokens = tokensMap.get(userId) ?? [];
+      for (const to of tokens) {
+        messages.push({
+          to,
+          title: title || void 0,
           body,
-          priority: cfg.priority === "PRIMARY" ? "high" : cfg.priority === "SECONDARY" ? "normal" : "low"
+          channelId,
+          priority,
+          data: route ? { route } : void 0
         });
-        return this.mapProviderResult(res);
+        tokenToUserId.set(to, userId);
       }
+    }
+    if (!messages.length) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: userIds.map((uid) => ({
+          deliveryId,
+          notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+          recipient: String(uid),
+          messageContent: body,
+          isSent: false,
+          sentAt: null,
+          error: "No deviceNotificationToken found for user"
+        }))
+      });
+      return;
+    }
+    const expoRes = await expoProvider.sendBulk(messages);
+    const tickets = Array.isArray(expoRes.tickets) ? expoRes.tickets : [];
+    const now = /* @__PURE__ */ new Date();
+    const rows = messages.map((m, idx) => {
+      const t = tickets[idx];
+      const isOk = t?.status === "ok";
+      const errMsg = isOk ? null : t?.message ?? t?.details?.error ?? expoRes.error ?? "Expo push failed";
+      const externalId = isOk ? t?.id ?? null : null;
+      return {
+        deliveryId,
+        notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+        recipient: m.to,
+        // store token or store userId; token is more debuggable
+        messageContent: body,
+        thirdPartyResponse: t ?? void 0,
+        isSent: !!isOk,
+        sentAt: isOk ? now : null,
+        externalId,
+        error: errMsg
+      };
     });
+    await this.prisma.eventDeliveryItem.createMany({ data: rows });
+    const usersWithToken = /* @__PURE__ */ new Set();
+    for (const to of tokenToUserId.keys()) usersWithToken.add(tokenToUserId.get(to));
+    const missingUsers = userIds.filter((u) => !usersWithToken.has(u));
+    if (missingUsers.length) {
+      await this.prisma.eventDeliveryItem.createMany({
+        data: missingUsers.map((uid) => ({
+          deliveryId,
+          notificationType: "APP_NOTIFICATION" /* APP_NOTIFICATION */,
+          recipient: String(uid),
+          messageContent: body,
+          isSent: false,
+          sentAt: null,
+          error: "No deviceNotificationToken found for user"
+        }))
+      });
+    }
   }
   async processWebChannel(args) {
     const { cfg, evt, deliveryId } = args;

package/package.json

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