Merge pull request #104 from dvishal485/main

update test notif code

.env.local

@@ -13,3 +13,4 @@ HOST="http://team.dtutimes.com"
 ENABLE_EMAIL="false" # set to true if you want to enable email service
 TOTP_SECRET=--TOTP 2FA SECRET--
 NOTIF_SECRET=--PASSWORD-- # this is for notifications
+NOTIF_PRIVATE_KEY=--PASSWORD-- # this is for notifications

package.json

@@ -24,7 +24,8 @@
     "multer": "^1.4.5-lts.1",
     "nodemailer": "^6.9.14",
     "sharp": "^0.32.6",
-    "totp-generator": "^1.0.0"
+    "totp-generator": "^1.0.0",
+    "web-push": "^3.6.7"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
@@ -38,6 +39,7 @@
     "@types/multer": "^1.4.11",
     "@types/node": "^20.14.12",
     "@types/nodemailer": "^6.4.15",
+    "@types/web-push": "^3.6.3",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
     "@typescript-eslint/parser": "^7.17.0",
     "colors": "^1.4.0",

src/api/controllers/notificationController.ts

@@ -7,6 +7,39 @@ import {
   Notification,
 } from "../models/notificationModel";
 import { Subscription } from "../models/subscriptionModel";
+import webpush from "web-push";
+
+export const push_notification = async () => {
+  const PRIVATE_KEY = process.env.NOTIF_PRIVATE_KEY;
+  if (!PRIVATE_KEY) {
+    throw new Error("Private key for notification API not configured");
+  }
+
+  const subscriptions = await Subscription.find();
+
+  const notificationPayload = JSON.stringify({
+    title: "New Notification",
+    body: "This is a new notification",
+    icon: "https://dtutimes.com/favicon.ico",
+  });
+
+  webpush.setVapidDetails(
+    `mailto:${process.env.EMAIL_SERVICE_USER}`,
+    "BCOsRaxpJeR0KyIPIg1rHx3pUtWVsGDGOxH65dDkqyU5ycF-CjPJxuqiXF4M0LpUMG_rk_YxSZX34uHbrV5umJQ",
+    PRIVATE_KEY,
+  );
+
+  for (const subscription of subscriptions) {
+    await webpush.sendNotification(subscription, notificationPayload);
+  }
+};
+
+export const test_notif = asyncErrorHandler(async (req, res, _next) => {
+  await push_notification();
+  res.json({
+    done: true,
+  });
+});
 
 export const save_notif = asyncErrorHandler(async (req, res, _next) => {
   if (req.body.secret != process.env.NOTIF_SECRET) {

src/api/models/subscriptionModel.ts

@@ -1,8 +1,7 @@
 import mongoose, { Schema } from "mongoose";
+import { type PushSubscription } from "web-push";
 
-const susbcriberSchema = new Schema<
-  Omit<PushSubscriptionJSON, "expirationTime">
->({
+const susbcriberSchema = new Schema<PushSubscription>({
   endpoint: {
     type: String,
     required: true,
@@ -19,8 +18,9 @@ const susbcriberSchema = new Schema<
   },
 });
 
-const Subscription = mongoose.model<
-  Omit<PushSubscriptionJSON, "expirationTime">
->("subscriber", susbcriberSchema);
+const Subscription = mongoose.model<PushSubscription>(
+  "subscriber",
+  susbcriberSchema,
+);
 
 export { Subscription };

src/api/routes/notificationRouter.ts

@@ -3,12 +3,14 @@ import {
   get_notif,
   save_notif,
   subscribe,
+  test_notif,
 } from "../controllers/notificationController";
 
 const router = express.Router();
 
 router.route("/").get(get_notif);
 router.route("/subscribe").post(subscribe);
 router.route("/save").post(save_notif);
+router.route("/test_notif").get(test_notif);
 
 export default router;