@imksh/create 1.0.28 → 1.0.31

package/templates/layers/node/javascript/src/controllers/push.controller.js

@@ -6,26 +6,47 @@ export const subscribe = async (req, res, next) => {
     const subscription = req.body;
     const userId = req.user?._id || req.user?.id; // supports both mongoose and prisma IDs
     
-    if (!subscription || !subscription.endpoint) {
+    if (!subscription) {
       return next({ status: 400, message: "Invalid subscription payload" });
     }
 
-    const existingSub = await PushSubscription.findOne({ endpoint: subscription.endpoint });
+    const isExpo = !!subscription.token;
+    const isWeb = !!(subscription.endpoint && subscription.keys);
 
-    if (existingSub) {
-      if (userId) {
-        existingSub.user = userId; await existingSub.save();
-      }
-      return res.status(200).json({ success: true, message: "Already subscribed." });
+    if (!isExpo && !isWeb) {
+      return next({ status: 400, message: "Missing token (EXPO) or endpoint/keys (WEB)" });
     }
 
-    
-    await PushSubscription.create({
-      endpoint: subscription.endpoint,
-      keys: subscription.keys,
-      user: userId || undefined
-    });
-    
+    if (isExpo) {
+      const existingSub = await PushSubscription.findOne({ expoPushToken: subscription.token });
+      if (existingSub) {
+        if (userId && String(existingSub.user) !== String(userId)) {
+          existingSub.user = userId; await existingSub.save();
+        }
+        return res.status(200).json({ success: true, message: "Already subscribed." });
+      }
+
+      await PushSubscription.create({
+        type: "EXPO",
+        expoPushToken: subscription.token,
+        user: userId || undefined
+      });
+    } else {
+      const existingSub = await PushSubscription.findOne({ endpoint: subscription.endpoint });
+      if (existingSub) {
+        if (userId && String(existingSub.user) !== String(userId)) {
+          existingSub.user = userId; await existingSub.save();
+        }
+        return res.status(200).json({ success: true, message: "Already subscribed." });
+      }
+
+      await PushSubscription.create({
+        type: "WEB",
+        endpoint: subscription.endpoint,
+        keys: subscription.keys,
+        user: userId || undefined
+      });
+    }
 
     res.status(201).json({ success: true, message: "Subscription created." });
   } catch (error) {

package/templates/layers/node/javascript/src/models/pushSubscription.model.js

@@ -3,6 +3,11 @@ import mongoose from "mongoose";
 // Handles both Web Push (endpoint + keys) and Expo Push (expoPushToken)
 const pushSubscriptionSchema = new mongoose.Schema(
   {
+    type: {
+      type: String,
+      enum: ["WEB", "EXPO"],
+      default: "WEB",
+    },
     // Web Push fields
     endpoint: {
       type: String,

package/templates/layers/node/javascript/src/utils/pushHelper.js

@@ -1,20 +1,67 @@
 import webpush from "../config/webPush.js";
+import { Expo } from "expo-server-sdk";
 import logger from "./logger.js";
 import PushSubscription from "../models/pushSubscription.model.js";
 
-export const sendPushToUser = async (userId, title, body, url = "/") => {
+const expo = new Expo();
+
+export const sendPushToUser = async (
+  userId,
+  title,
+  body,
+  url = "/",
+) => {
   try {
-    const payload = JSON.stringify({ title, body, url });
-    const subs = await PushSubscription.find({ user: userId });
-       for (const sub of subs) {
-         await webpush.sendNotification({ endpoint: sub.endpoint, keys: sub.keys }, payload).catch(err => {
-           if (err.statusCode === 404 || err.statusCode === 410) {
-             sub.deleteOne();
-           } else {
-             logger.error("Push Error", err);
-           }
-         });
-       }
+    const subscriptions = await PushSubscription.find({ user: userId });
+
+    if (subscriptions.length === 0) return;
+
+    const webSubs = subscriptions.filter(s => s.type === "WEB");
+    const expoSubs = subscriptions.filter(s => s.type === "EXPO");
+
+    // Web Push
+    if (webSubs.length > 0) {
+      const payload = JSON.stringify({ title, body, url });
+      await Promise.allSettled(
+        webSubs.map(async (sub) => {
+          if (!sub.endpoint || !sub.keys) return;
+          const pushSub = { endpoint: sub.endpoint, keys: sub.keys };
+          try {
+            await webpush.sendNotification(pushSub, payload);
+          } catch (err) {
+            if (err.statusCode === 404 || err.statusCode === 410) {
+              await sub.deleteOne();
+            } else {
+              logger.error("Web Push Error", err);
+            }
+          }
+        })
+      );
+    }
+
+    // Expo Push
+    if (expoSubs.length > 0) {
+      const messages = [];
+      for (const sub of expoSubs) {
+        if (!sub.expoPushToken || !Expo.isExpoPushToken(sub.expoPushToken)) continue;
+        messages.push({
+          to: sub.expoPushToken,
+          sound: "default",
+          title,
+          body,
+          data: { url },
+        });
+      }
+
+      const chunks = expo.chunkPushNotifications(messages);
+      for (const chunk of chunks) {
+        try {
+          await expo.sendPushNotificationsAsync(chunk);
+        } catch (error) {
+          logger.error("Error sending push notification chunk", error);
+        }
+      }
+    }
   } catch (error) {
     logger.error("Error sending push notification to user", error);
   }