fix (notifications): push notifications

Author: itsskofficial

src/client/app/actions.js

@@ -64,7 +64,7 @@ export async function subscribeUser(subscription) {
 
 		await userProfiles.updateOne(
 			{ user_id: userId },
-			{ $set: { "userData.pwa_subscription": subscription } },
+			{ $addToSet: { "userData.pwa_subscriptions": subscription } },
 			{ upsert: true }
 		)
 
@@ -79,7 +79,7 @@ export async function subscribeUser(subscription) {
 	}
 }
 
-export async function unsubscribeUser() {
+export async function unsubscribeUser(endpoint) {
 	const session = await auth0.getSession()
 	if (!session?.user) {
 		throw new Error("Not authenticated")
@@ -92,10 +92,12 @@ export async function unsubscribeUser() {
 
 		await userProfiles.updateOne(
 			{ user_id: userId },
-			{ $unset: { "userData.pwa_subscription": "" } }
+			{ $pull: { "userData.pwa_subscriptions": { endpoint: endpoint } } }
 		)
 
-		console.log(`[Actions] Subscription removed for user: ${userId}`)
+		console.log(
+			`[Actions] Subscription with endpoint ${endpoint} removed for user: ${userId}`
+		)
 		return { success: true }
 	} catch (error) {
 		console.error("[Actions] Error removing subscription:", error)
@@ -132,39 +134,64 @@ export async function sendNotificationToCurrentUser(payload) {
 			.collection("user_profiles")
 			.findOne(
 				{ user_id: userId },
-				{ projection: { "userData.pwa_subscription": 1 } }
+				{ projection: { "userData.pwa_subscriptions": 1 } }
 			)
 
-		const subscription = userProfile?.userData?.pwa_subscription
+		const subscriptions = userProfile?.userData?.pwa_subscriptions
 
-		if (!subscription) {
+		if (
+			!subscriptions ||
+			!Array.isArray(subscriptions) ||
+			subscriptions.length === 0
+		) {
 			console.log(
 				`[Actions] No push subscription found for user ${userId}.`
 			)
 			return { success: false, error: "No subscription found for user." }
 		}
 
-		await webpush.sendNotification(subscription, JSON.stringify(payload))
-
-		console.log(
-			`[Actions] Push notification sent successfully to user ${userId}.`
-		)
-		return { success: true }
+		let successCount = 0
+		const promises = subscriptions.map((subscription) => {
+			return webpush
+				.sendNotification(subscription, JSON.stringify(payload))
+				.then(() => {
+					successCount++
+					console.log(
+						`[Actions] Push notification sent successfully to endpoint for user ${userId}.`
+					)
+				})
+				.catch(async (error) => {
+					console.error(
+						`[Actions] Error sending push notification to an endpoint for user ${userId}:`,
+						error.statusCode
+					)
+					if (error.statusCode === 410 || error.statusCode === 404) {
+						console.log(
+							`[Actions] Subscription for user ${userId} is invalid. Removing from DB.`
+						)
+						await unsubscribeUser(subscription.endpoint)
+					}
+				})
+		})
+
+		await Promise.all(promises)
+
+		if (successCount > 0) {
+			return {
+				success: true,
+				message: `Sent notifications to ${successCount} of ${subscriptions.length} devices.`
+			}
+		} else {
+			return {
+				success: false,
+				error: "Failed to send notifications to any device."
+			}
+		}
 	} catch (error) {
 		console.error(
-			`[Actions] Error sending push notification to user ${userId}:`,
+			`[Actions] General error sending push notifications to user ${userId}:`,
 			error
 		)
-
-		// If the subscription is expired or invalid, the push service returns an error (e.g., 410 Gone).
-		// We should handle this by removing the invalid subscription from the database.
-		if (error.statusCode === 410 || error.statusCode === 404) {
-			console.log(
-				`[Actions] Subscription for user ${userId} is invalid. Removing from DB.`
-			)
-			await unsubscribeUser()
-		}
-
-		return { success: false, error: "Failed to send push notification." }
+		return { success: false, error: "A general error occurred." }
 	}
 }

src/client/app/api/testing/notification/route.js

@@ -0,0 +1,27 @@
+import { NextResponse } from "next/server"
+import { withAuth } from "@lib/api-utils"
+
+const appServerUrl =
+	process.env.NEXT_PUBLIC_ENVIRONMENT === "selfhost"
+		? process.env.INTERNAL_APP_SERVER_URL
+		: process.env.NEXT_PUBLIC_APP_SERVER_URL
+
+export const POST = withAuth(async function POST(request, { authHeader }) {
+	try {
+		const body = await request.json() // { type: 'in-app' }
+		const response = await fetch(`${appServerUrl}/testing/notification`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json", ...authHeader },
+			body: JSON.stringify(body)
+		})
+
+		const data = await response.json()
+		if (!response.ok) {
+			throw new Error(data.detail || "Failed to send test notification")
+		}
+		return NextResponse.json(data)
+	} catch (error) {
+		console.error("API Error in /testing/notification:", error)
+		return NextResponse.json({ detail: error.message }, { status: 500 })
+	}
+})

src/client/app/settings/page.js

@@ -29,6 +29,7 @@ import { Switch } from "@headlessui/react"
 
 import InteractiveNetworkBackground from "@components/ui/InteractiveNetworkBackground"
 import CollapsibleSection from "@components/tasks/CollapsibleSection"
+import { sendNotificationToCurrentUser } from "@app/actions"
 
 const HelpTooltip = ({ content }) => (
 	<div className="fixed bottom-6 left-6 z-40">
@@ -53,6 +54,48 @@ const questionSections = {
 	}
 }
 
+const handleTestInApp = async () => {
+	const toastId = toast.loading("Sending test in-app notification...")
+	try {
+		const response = await fetch("/api/testing/notification", {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ type: "in-app" })
+		})
+		const result = await response.json()
+		if (!response.ok) {
+			throw new Error(result.detail || "Failed to send notification.")
+		}
+		// The notification will arrive via WebSocket, so no success toast here.
+		// The LayoutWrapper will show the toast. I'll just dismiss the loading one.
+		toast.dismiss(toastId)
+		toast("In-app notification sent. It should appear shortly.")
+	} catch (error) {
+		toast.error(`Error: ${error.message}`, { id: toastId })
+	}
+}
+
+const handleTestPush = async () => {
+	const toastId = toast.loading("Sending test push notification...")
+	try {
+		const result = await sendNotificationToCurrentUser({
+			title: "Test Push Notification",
+			body: "This is a test push notification from Sentient.",
+			data: { url: "/tasks" } // Example data
+		})
+		if (result.success) {
+			toast.success(
+				result.message || "Push notification sent successfully!",
+				{ id: toastId }
+			)
+		} else {
+			toast.error(`Failed to send: ${result.error}`, { id: toastId })
+		}
+	} catch (error) {
+		toast.error(`Error: ${error.message}`, { id: toastId })
+	}
+}
+
 const questions = [
 	{
 		id: "user-name",
@@ -629,6 +672,31 @@ const TestingTools = () => {
 					</p>
 				)}
 			</div>
+			{/* Notification Test Tools */}
+			<div className="bg-neutral-900/50 p-6 rounded-2xl border border-neutral-800 mt-6">
+				<h3 className="font-semibold text-lg text-white mb-2">
+					Test Notifications
+				</h3>
+				<p className="text-gray-400 text-sm mb-4">
+					Send test notifications to verify your setup. In-app
+					notifications appear as toasts, while push notifications are
+					sent to your subscribed devices.
+				</p>
+				<div className="flex flex-col sm:flex-row gap-4">
+					<button
+						onClick={handleTestInApp}
+						className="flex items-center justify-center py-2 px-4 rounded-lg bg-blue-600 hover:bg-blue-500 text-white font-medium transition-colors"
+					>
+						Test In-App Notification
+					</button>
+					<button
+						onClick={handleTestPush}
+						className="flex items-center justify-center py-2 px-4 rounded-lg bg-green-600 hover:bg-green-500 text-white font-medium transition-colors"
+					>
+						Test Push Notification
+					</button>
+				</div>
+			</div>
 			{/* Poller Test Tool */}
 			<div className="bg-neutral-900/50 p-6 rounded-2xl border border-neutral-800 mt-6">
 				<h3 className="font-semibold text-lg text-white mb-2">

src/client/components/LayoutWrapper.js

@@ -33,6 +33,7 @@ export default function LayoutWrapper({ children }) {
 	const [isSidebarCollapsed, setSidebarCollapsed] = useState(true)
 	const [isMobileNavOpen, setMobileNavOpen] = useState(false)
 	const [unreadCount, setUnreadCount] = useState(0)
+	const [notifRefreshKey, setNotifRefreshKey] = useState(0)
 	const [userDetails, setUserDetails] = useState(null)
 	const wsRef = useRef(null)
 	const pathname = usePathname()
@@ -116,6 +117,7 @@ export default function LayoutWrapper({ children }) {
 					const data = JSON.parse(event.data)
 					if (data.type === "new_notification") {
 						setUnreadCount((prev) => prev + 1)
+						setNotifRefreshKey((prev) => prev + 1)
 						toast(
 							(t) => (
 								<div className="flex items-center gap-3">
@@ -374,6 +376,7 @@ export default function LayoutWrapper({ children }) {
 			<AnimatePresence>
 				{isNotificationsOpen && (
 					<NotificationsOverlay
+						notifRefreshKey={notifRefreshKey}
 						onClose={() => setNotificationsOpen(false)}
 					/>
 				)}

src/client/components/NotificationsOverlay.js

@@ -216,7 +216,7 @@ const NotificationItem = ({
 	)
 }
 
-const NotificationsOverlay = ({ onClose }) => {
+const NotificationsOverlay = ({ onClose, notifRefreshKey }) => {
 	const [notifications, setNotifications] = useState([])
 	const [isLoading, setIsLoading] = useState(true)
 	const [error, setError] = useState(null)
@@ -271,7 +271,7 @@ const NotificationsOverlay = ({ onClose }) => {
 	useEffect(() => {
 		fetchNotifications()
 		fetchUserTimezone()
-	}, [fetchNotifications, fetchUserTimezone])
+	}, [fetchNotifications, fetchUserTimezone, notifRefreshKey])
 
 	const handleDelete = async (e, notificationId) => {
 		if (e && e.stopPropagation) e.stopPropagation()

src/server/main/testing/models.py

@@ -6,4 +6,6 @@ class ContextInjectionRequest(BaseModel):
     event_data: Dict[str, Any]
 
 class WhatsAppTestRequest(BaseModel):
-    phone_number: str
+    phone_number: str
+class TestNotificationRequest(BaseModel):
+    type: str

src/server/main/testing/routes.py

@@ -3,16 +3,17 @@
 import json
 from typing import List
 
-from fastapi import APIRouter, Depends, HTTPException, status
+from fastapi import APIRouter, Depends, HTTPException, status, Body
 
 from main.config import ENVIRONMENT
 from main.dependencies import auth_helper
 from main.notifications.whatsapp_client import (check_phone_number_exists,
                                                  send_whatsapp_message)
+from main.notifications.utils import create_and_push_notification
 from workers.tasks import (cud_memory_task, proactive_reasoning_pipeline, run_due_tasks,
                            schedule_proactivity_polling, schedule_trigger_polling)
 
-from .models import ContextInjectionRequest, WhatsAppTestRequest
+from .models import ContextInjectionRequest, WhatsAppTestRequest, TestNotificationRequest
 
 logger = logging.getLogger(__name__)
 router = APIRouter(
@@ -148,6 +149,31 @@ async def trigger_poller(
         )
 
 
+@router.post("/notification", summary="Send a test notification")
+async def send_test_notification(
+    request: TestNotificationRequest,
+    user_id: str = Depends(auth_helper.get_current_user_id)
+):
+    _check_allowed_environments(
+        ["dev-local", "selfhost"],
+        "This endpoint is only available in development or self-host environments."
+    )
+
+    if request.type == "in-app":
+        try:
+            await create_and_push_notification(
+                user_id=user_id,
+                message="This is a test in-app notification from the developer tools.",
+                notification_type="general"
+            )
+            return {"message": "Test in-app notification sent successfully."}
+        except Exception as e:
+            logger.error(f"Failed to send test in-app notification for user {user_id}: {e}", exc_info=True)
+            raise HTTPException(status_code=500, detail="Failed to send test notification.")
+    else:
+        raise HTTPException(status_code=400, detail="Invalid notification type specified.")
+
+
 @router.post("/whatsapp/verify", summary="Verify if a WhatsApp number exists")
 async def verify_whatsapp_number(
     request: WhatsAppTestRequest,