Merge branch 'ahmd'

Favazmubarak · Favazmubarak · commit 3e8313e9c6ec · 2026-03-10T17:44:11.000+05:30
:wq# the commit.
diff --git a/frontend/app/home/page.tsx b/frontend/app/home/page.tsx
@@ -8,6 +8,7 @@ import { toast } from 'sonner';
 import { useRouter } from 'next/navigation';
 import Loading from '@/components/CenterLoader';
 import ProfileHover from '@/components/ProfileIcon';
+import { posthog } from '@/lib/posthog';
 
 export default function FindMatchPage() {
   const [isSearching, setIsSearching] = useState(false);
@@ -165,6 +166,7 @@ export default function FindMatchPage() {
         setPeerProfile(null);
         setCurrentQuote(0);
         socket.emit('match:start', { skills });
+        posthog.capture('match_search_started', { skill_count: skills.length });
       } catch {
         toast.error('Unable to start matching');
       }
@@ -201,6 +203,7 @@ export default function FindMatchPage() {
       setPeerId(peerId);
       setIsSearching(false);
       setMatchFound(true);
+      posthog.capture('match_found', { session_id: sessionId });
     };
 
     socket.on('match:found', onMatchFound);
@@ -229,6 +232,7 @@ export default function FindMatchPage() {
       clearInterval(autoJoinRef.current);
       autoJoinRef.current = null;
     }
+    posthog.capture('match_accepted');
     router.push(`/session?callId=${sessionId}&peerId=${peerId}`);
   };
 
@@ -238,6 +242,7 @@ export default function FindMatchPage() {
       autoJoinRef.current = null;
     }
     socket.emit('match:decline', { sessionId, peerId });
+    posthog.capture('match_declined');
     setMatchFound(false);
     setSessionId(null);
     setPeerId(null);
diff --git a/frontend/app/session/page.tsx b/frontend/app/session/page.tsx
@@ -22,6 +22,7 @@ import {
   Clock,
 } from 'lucide-react';
 import Link from 'next/link';
+import { posthog } from '@/lib/posthog';
 
 type PermissionState = 'idle' | 'requesting' | 'granted' | 'denied';
 type CallEndReason =
@@ -290,6 +291,7 @@ function VideoCallInner() {
       peerUserIdRef.current = peer;
       iceServersRef.current = iceServers;
       setStatus('Partner ready — connecting...');
+      posthog.capture('call_started', { session_id: cId });
 
       try {
         const pc = getOrCreatePC(iceServers);
@@ -377,6 +379,10 @@ function VideoCallInner() {
       localStreamRef.current = null;
       cleanup();
       setCallEndReason(reason ?? 'USER_ENDED');
+      posthog.capture('call_ended', {
+        reason: reason ?? 'USER_ENDED',
+        duration_seconds: callDurationRef.current,
+      });
       setCallEnded(true);
     };
 
@@ -426,6 +432,10 @@ function VideoCallInner() {
       callId: callIdRef.current,
       reason: 'USER_ENDED',
     });
+    posthog.capture('call_ended', {
+      reason: 'USER_ENDED',
+      duration_seconds: callDurationRef.current,
+    });
     cleanup();
     setSelfLeft(true);
   };
diff --git a/frontend/app/verifyotp/verifyOtp.tsx b/frontend/app/verifyotp/verifyOtp.tsx
@@ -69,7 +69,7 @@ export default function VerifyOtpPage() {
       setLoading(true);
 
       await axiosInstance.post(
-        '/auth/verifyOtp',
+        '/auth/verifyotp',
         { otp },
         {
           headers: {
diff --git a/frontend/components/PostHogPageView.tsx b/frontend/components/PostHogPageView.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import { usePathname, useSearchParams } from 'next/navigation';
+import { useEffect } from 'react';
+import { posthog } from '@/lib/posthog';
+
+export function PostHogPageView() {
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  useEffect(() => {
+    if (!pathname) return;
+
+    let url = window.origin + pathname;
+    if (searchParams.toString()) {
+      url += `?${searchParams.toString()}`;
+    }
+
+    posthog.capture('$pageview', { $current_url: url });
+  }, [pathname, searchParams]);
+
+  return null;
+}
diff --git a/frontend/components/auth/GoogleButton.tsx b/frontend/components/auth/GoogleButton.tsx
@@ -5,6 +5,7 @@ import { GoogleLogin } from '@react-oauth/google';
 import axios from 'axios';
 import { ArrowRight, MonitorX } from 'lucide-react';
 import { useRouter } from 'next/navigation';
+import { posthog } from '@/lib/posthog';
 import { useState } from 'react';
 import { toast } from 'sonner';
 
@@ -63,6 +64,10 @@ export default function GoogleButton() {
             const role = res.data.role;
             console.log(role);
             const target = role === 'admin' ? '/admin' : '/home';
+            posthog.identify(res.data.userId, {
+              role,
+            });
+            posthog.capture('login_completed', { method: 'google' });
             console.log('navigating navigating');
             router.replace(target);
             router.refresh();
diff --git a/frontend/components/auth/LoginForm.tsx b/frontend/components/auth/LoginForm.tsx
@@ -14,6 +14,7 @@ import { axiosInstance } from '@/lib/axiosInstance';
 import { useRouter } from 'next/navigation';
 import axios from 'axios';
 import { toast } from 'sonner';
+import { posthog } from '@/lib/posthog';
 
 export function LoginRight() {
   const [email, setEmail] = useState('');
@@ -50,6 +51,11 @@ export function LoginRight() {
 
       const role = res.data.role;
       const target = role === 'admin' ? '/admin' : '/home';
+      posthog.identify(res.data.userId, {
+        email,
+        role,
+      });
+      posthog.capture('login_completed', { method: 'email' });
       router.replace(target);
       router.refresh();
 
diff --git a/frontend/components/auth/LogoutButton.tsx b/frontend/components/auth/LogoutButton.tsx
@@ -3,6 +3,7 @@ import { axiosInstance } from '@/lib/axiosInstance';
 import { useRouter } from 'next/navigation';
 import { toast } from 'sonner';
 import { socket } from '@/lib/socket';
+import { posthog } from '@/lib/posthog';
 
 export default function LogoutButton() {
   const router = useRouter();
@@ -17,6 +18,7 @@ export default function LogoutButton() {
     }
 
     setTimeout(() => {
+      posthog.reset();
       router.push('/login');
     }, 1200);
   };
diff --git a/frontend/components/auth/SignUpForm.tsx b/frontend/components/auth/SignUpForm.tsx
@@ -10,6 +10,7 @@ import { Button } from '../ui/button';
 import { axiosInstance } from '@/lib/axiosInstance';
 import Link from 'next/link';
 import axios from 'axios';
+import { posthog } from '@/lib/posthog';
 
 export function SignUpForm() {
   const router = useRouter();
@@ -51,6 +52,7 @@ export function SignUpForm() {
       const temp_token = res.data.verificationToken;
 
       localStorage.setItem('temp_token', temp_token);
+      posthog.capture('signup_completed');
       router.push('/verifyotp');
     } catch (error: unknown) {
       if (axios.isAxiosError(error)) {
diff --git a/frontend/lib/posthog.ts b/frontend/lib/posthog.ts
@@ -0,0 +1,17 @@
+import posthog from 'posthog-js';
+
+export const initPostHog = () => {
+  if (typeof window === 'undefined') return;
+
+  posthog.init(process.env.NEXT_PUBLIC_POSTHOG_KEY!, {
+    api_host:
+      process.env.NEXT_PUBLIC_POSTHOG_HOST ?? 'https://us.i.posthog.com',
+    capture_pageview: false,
+    capture_pageleave: true,
+    session_recording: {
+      maskAllInputs: true,
+    },
+  });
+};
+
+export { posthog };
diff --git a/frontend/lib/providers.tsx b/frontend/lib/providers.tsx
@@ -1,10 +1,22 @@
 'use client';
 
+import { useEffect, Suspense } from 'react';
 import { GoogleOAuthProvider } from '@react-oauth/google';
+import { Toaster } from '@/components/ui/sonner';
+import { initPostHog } from '@/lib/posthog';
+import { PostHogPageView } from '@/components/PostHogPageView';
 
 export default function Providers({ children }: { children: React.ReactNode }) {
+  useEffect(() => {
+    initPostHog();
+  }, []);
+
   return (
     <GoogleOAuthProvider clientId={process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID!}>
+      <Suspense fallback={null}>
+        <PostHogPageView />
+      </Suspense>
+      <Toaster richColors position="top-right" />
       {children}
     </GoogleOAuthProvider>
   );
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,6 +20,7 @@
     "lucide-react": "^0.562.0",
     "next": "16.1.1",
     "next-themes": "^0.4.6",
+    "posthog-js": "^1.360.0",
     "radix-ui": "^1.4.3",
     "react": "19.2.3",
     "react-dom": "19.2.3",
diff --git a/gateway/src/app.ts b/gateway/src/app.ts
@@ -32,5 +32,8 @@ app.use('/auth', authRouter);
 app.use('/live', liveProxy);
 app.use('/users', userRouter);
 app.use('/admin', adminRouter);
+app.get('/health', (req, res) => {
+  res.status(200).json({ status: 'ok', service: 'gateway' });
+});
 
 export default app;
diff --git a/live-service/package.json b/live-service/package.json
@@ -14,6 +14,8 @@
   "license": "ISC",
   "packageManager": "pnpm@10.26.2",
   "dependencies": {
+    "@logtail/node": "^0.5.8",
+    "@logtail/winston": "^0.5.8",
     "amqplib": "0.10.3",
     "cookie": "^1.1.1",
     "cors": "^2.8.5",
diff --git a/live-service/src/config/logger.ts b/live-service/src/config/logger.ts
@@ -1,10 +1,20 @@
 import winston from 'winston';
+import { Logtail } from '@logtail/node';
+import { LogtailTransport } from '@logtail/winston';
+
+const transports: winston.transport[] = [new winston.transports.Console()];
+
+if (process.env.BETTERSTACK_SOURCE_TOKEN) {
+  const logtail = new Logtail(process.env.BETTERSTACK_SOURCE_TOKEN);
+  transports.push(new LogtailTransport(logtail));
+}
 
 export const logger = winston.createLogger({
   level: 'info',
   format: winston.format.combine(
     winston.format.timestamp(),
     winston.format.json()
   ),
-  transports: [new winston.transports.Console()],
+  defaultMeta: { service: 'live-service' },
+  transports,
 });
diff --git a/live-service/src/controllers/socketController.ts b/live-service/src/controllers/socketController.ts
@@ -83,6 +83,6 @@ export const socketController = async (socket: Socket) => {
       PresenceService.clearInCall(user.userId),
     ]);
 
-    logger.info(`User disconnected and Redis cleaned: ${user.userId}`);
+    logger.info('User disconnected & Redis Cleaned', { userId: user.userId });
   });
 };
diff --git a/live-service/src/service/matchService.ts b/live-service/src/service/matchService.ts
@@ -13,7 +13,7 @@ export const matchingService = {
     skills: string[]
   ): Promise<MatchSession | 'ALREADY_SEARCHING' | null> {
     const isOnline = await presenceRepository.isOnline(userId);
-    console.log(isOnline);
+    // console.log(isOnline);
     if (!isOnline) return null;
 
     const state = await matchingRepository.getState(userId);
diff --git a/live-service/src/service/rabbitPublisher.ts b/live-service/src/service/rabbitPublisher.ts
@@ -3,7 +3,7 @@ import { getChannel } from '../config/rabbitmq';
 export const publishEvent = async (routingKey: string, payload: any) => {
   const channel = getChannel();
 
-  console.log('rabbit is getiing the event');
+  // console.log('rabbit is getiing the event');
 
   channel.publish(
     'live.exchange',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/repomix-output.xml b/repomix-output.xml
diff --git a/services/auth-service/package.json b/services/auth-service/package.json
diff --git a/services/auth-service/src/config/logger.ts b/services/auth-service/src/config/logger.ts
diff --git a/services/auth-service/src/controllers/authController.ts b/services/auth-service/src/controllers/authController.ts

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export default function VerifyOtpPage() {`
`69`	`69`	`setLoading(true);`
`70`	`70`
`71`	`71`	`await axiosInstance.post(`
`72`		`- '/auth/verifyOtp',`
	`72`	`+ '/auth/verifyotp',`
`73`	`73`	`{ otp },`
`74`	`74`	`{`
`75`	`75`	`headers: {`