Added heartbeat mechanism

Author: uddeshsingh

.github/workflows/deploy.yml

@@ -42,31 +42,63 @@ jobs:
       go_url: ${{ steps.deploy-go.outputs.url }}
     steps:
       - uses: actions/checkout@v4
+      
       - uses: google-github-actions/auth@v2
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
-      - name: Deploy Python API
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2
+
+      # 🚨 Authorize Docker to push to your new Artifact Registry
+      - name: Configure Docker
+        run: gcloud auth configure-docker us-central1-docker.pkg.dev --quiet
+
+      # ---------------------------------------------------
+      # 🚀 FAST DEPLOY: PYTHON API
+      # ---------------------------------------------------
+      - name: Build and Push Python Image
+        run: |
+          cd backend-python
+          IMAGE="us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/watchparty-repo/watchparty-api:latest"
+          docker build -t $IMAGE .
+          docker push $IMAGE
+
+      - name: Deploy Python to Cloud Run
         id: deploy-python
         uses: google-github-actions/deploy-cloudrun@v2
         with:
           service: watchparty-api
           region: us-central1
-          source: ./backend-python
-          flags: --add-cloudsql-instances=watchparty-482106:us-central1:watchparty-db          
+          # 🚨 Deploy the pre-built image instead of building from source
+          image: us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/watchparty-repo/watchparty-api:latest
+          flags: |
+            --add-cloudsql-instances=watchparty-482106:us-central1:watchparty-db
+            --port=8080
           env_vars: |
             DATABASE_URL=${{ secrets.DATABASE_URL }}
             JWT_SECRET=${{ secrets.JWT_SECRET }}
             GCP_PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}
             GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}
 
-      - name: Deploy Go WebSocket
+      # ---------------------------------------------------
+      # 🚀 FAST DEPLOY: GO WEBSOCKET
+      # ---------------------------------------------------
+      - name: Build and Push Go Image
+        run: |
+          cd backend-go
+          IMAGE="us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/watchparty-repo/watchparty-ws:latest"
+          docker build -t $IMAGE .
+          docker push $IMAGE
+
+      - name: Deploy Go to Cloud Run
         id: deploy-go
         uses: google-github-actions/deploy-cloudrun@v2
         with:
           service: watchparty-ws
           region: us-central1
-          source: ./backend-go
+          # 🚨 Deploy the pre-built image
+          image: us-central1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/watchparty-repo/watchparty-ws:latest
           env_vars: |
             REDIS_ADDR=${{ secrets.REDIS_ADDR }}
             JWT_SECRET=${{ secrets.JWT_SECRET }}

backend-go/internal/handlers/websockets.go

@@ -35,7 +35,6 @@ func WebSocketHandler(rm domain.RoomManager) http.HandlerFunc {
 			roomID = "general"
 		}
 
-		// 🚨 SECURE JWT VERIFICATION
 		secret := os.Getenv("JWT_SECRET")
 		if secret == "" {
 			secret = "super-secret-fallback"
@@ -133,6 +132,8 @@ func WebSocketHandler(rm domain.RoomManager) http.HandlerFunc {
 			}
 
 			switch msg.Type {
+			case "ping":
+				continue
 			case "play", "pause", "seek", "sync_state":
 				if err := rm.HandleVideoCommand(r.Context(), roomID, msg); err != nil {
 					log.Printf("Failed video command: %v", err)

frontend/wpfe/src/components/Dashboard.jsx

@@ -49,9 +49,15 @@ const Dashboard = ({ user, onLogout }) => {
   useEffect(() => {
     if (error && !hasAlerted.current) {
       hasAlerted.current = true;
-      alert(
-        error === "room_exists" ? "Room name taken!" : "Room does not exist!",
-      );
+
+      let alertMsg = error;
+      if (error === "room_exists") alertMsg = "Room name taken!";
+      else if (error === "room_not_found_silent")
+        alertMsg = "Room does not exist!";
+      else if (error === "connection_lost")
+        alertMsg = "Connection lost. Please rejoin.";
+
+      alert(alertMsg);
       navigate("/");
     }
   }, [error, navigate]);

frontend/wpfe/src/hooks/useWatchParty.jsx

@@ -43,6 +43,10 @@ export const useWatchParty = (urlRoom = null, action = "join") => {
   const [typingUsers, setTypingUsers] = useState([]);
 
   const playerRef = useRef(null);
+  const playingRef = useRef(false);
+  useEffect(() => {
+    playingRef.current = playing;
+  }, [playing]);
   const ws = useRef(null);
   const lastTypingTime = useRef(0);
   const typingTimeout = useRef({});
@@ -112,8 +116,15 @@ export const useWatchParty = (urlRoom = null, action = "join") => {
 
     if (msg.type === "request_sync") {
         if (isHostRef.current && playerRef.current) {
-            const currentTime = playerRef.current.getCurrentTime();            
-            sendSignal("sync_state", currentTime); 
+            const currentTime = playerRef.current.getCurrentTime(); 
+            ws.current.send(JSON.stringify({
+                type: "sync_state",
+                username: usernameRef.current,
+                room: room,
+                timestamp: currentTime,
+                video_id: currentVideoRef.current ? currentVideoRef.current.id : 0,
+                content: playingRef.current ? "playing" : "paused" 
+            }));
         }
         return;
     }
@@ -384,6 +395,23 @@ export const useWatchParty = (urlRoom = null, action = "join") => {
         );
     };
 
+    const heartbeat = setInterval(() => {
+      if (ws.current?.readyState === WebSocket.OPEN) {
+        ws.current.send(JSON.stringify({
+          type: "ping",
+          username: username,
+          room: room
+        }));
+      }
+    }, 25000);
+
+    return () => {
+      clearInterval(heartbeat);
+      intentionalClose.current = true;
+      if (ws.current) ws.current.close();
+    };
+  }, [room, username, action]);
+
     return () => {
       intentionalClose.current = true;
       if (ws.current) ws.current.close();