Update static/script.js

static/script.js

@@ -137,186 +137,135 @@
 
 
 /* ================================================================ 
-   1. INITIALIZATION & WELCOME
+   1. GLOBAL VARIABLES & VOICE SETTINGS
 ================================================================ */
-window.onload = () => {
-    const nameElement = document.getElementById('user-name-data');
-    let actualName = (nameElement && nameElement.innerText.trim() !== "") ? nameElement.innerText.trim() : "User";
-    
-    setTimeout(() => {
-        speak(`Welcome ${actualName} to the Voice Vision world.`);
-    }, 1500);
-};
-
 let cameraOn = false;
 let isDetecting = false;
 let isProcessing = false;
-let lastSpoken = "";
+let lastSpokenTime = 0; // Smoothness ke liye
+let lastMessage = "";
+
+function speak(text, force = false) {
+    const now = Date.now();
+    // Smoothness: Har 2 second se pehle dobara mat bolein (agar STOP na ho)
+    if (!force && (now - lastSpokenTime < 2000)) return; 
+    if (text === lastMessage && !force) return;
+
+    window.speechSynthesis.cancel();
+    let msg = new SpeechSynthesisUtterance(text);
+    msg.rate = 0.9; // Fast se slow kar diya (insani awaz)
+    msg.pitch = 1.0;
+    
+    lastSpokenTime = now;
+    lastMessage = text;
+    window.speechSynthesis.speak(msg);
+}
 
 /* ================================================================ 
-   2. POWER & PROCESS CONTROLS (CRITICAL FIX)
+   2. POWER OFF & LOGOUT (THE RESET FIX)
 ================================================================ */
-
-// Ye function camera aur detection loop ko mukammal rokh deta hai
-function stopEverything() {
-    isDetecting = false; 
+async function stopSystemProperly() {
+    isDetecting = false;
     cameraOn = false;
-    isProcessing = false;
-
-    // 1. Camera Hardware Release
+    
+    // Camera Hardware Release
     const video = document.getElementById('video');
     if (video && video.srcObject) {
-        const tracks = video.srcObject.getTracks();
-        tracks.forEach(track => track.stop()); // Camera light band ho jayegi
+        video.srcObject.getTracks().forEach(track => track.stop());
         video.srcObject = null;
     }
-
-    // 2. Speech Synthesis ko chup karwayein
     window.speechSynthesis.cancel();
-    
-    // 3. UI Reset
-    const canvas = document.getElementById('detectionCanvas');
-    if (canvas) {
-        const ctx = canvas.getContext('2d');
-        ctx.clearRect(0, 0, canvas.width, canvas.height);
-    }
 }
 
+async function handlePowerOff() {
+    speak("System shutting down. Please wait.", true);
+    await stopSystemProperly();
+    setTimeout(() => {
+        window.location.replace(window.location.href); // Hard reload
+    }, 1000);
+}
+
+async function logout() {
+    speak("Logging out. Goodbye.", true);
+    await stopSystemProperly();
+    setTimeout(() => {
+        window.location.replace("/logout"); // Server-side logout
+    }, 1000);
+}
+
+/* ================================================================ 
+   3. DETECTION LOGIC (WITH SMOOTHING)
+================================================================ */
 async function handlePowerOn() {
     const video = document.getElementById('video');
-    const powerBtn = document.getElementById('powerBtn');
-    
     try {
-        const stream = await navigator.mediaDevices.getUserMedia({ 
-            video: { width: 640, height: 480 } 
-        });
+        const stream = await navigator.mediaDevices.getUserMedia({ video: { width: 640, height: 480 } });
         video.srcObject = stream;
         cameraOn = true;
-        
-        powerBtn.style.display = 'none';
+        document.getElementById('powerBtn').style.display = 'none';
         document.getElementById('startDetectBtn').style.display = 'inline-block';
         document.getElementById('powerOffBtn').style.display = 'inline-block';
-        
-        speak("System online. Camera activated.");
+        speak("System Online.", true);
     } catch (err) {
-        alert("Camera access denied! Please check browser permissions.");
+        alert("Camera error. Please refresh.");
     }
 }
 
-function handlePowerOff() {
-    speak("Shutting down system.");
-    stopEverything(); // Pehle sab rokein
-    
-    setTimeout(() => {
-        sessionStorage.setItem('isShuttingDown', 'true');
-        window.location.reload();
-    }, 800);
-}
-
-function logout() {
-    speak("Logging out. Goodbye.");
-    stopEverything(); // Pehle sab rokein
-    
-    setTimeout(() => {
-        window.location.href = "/logout";
-    }, 800);
-}
-
-/* ================================================================ 
-   3. DETECTION & REALITY-BASED VI LOGIC
-================================================================ */
-
 function handleStartDetection() {
     isDetecting = true;
     document.getElementById('modeButtonsGroup').style.display = 'flex';
     document.getElementById('startDetectBtn').style.display = 'none';
-    
-    speak("Detection started. Monitoring your path.");
-    captureAndSend();
+    speak("Detection Active.", true);
+    captureLoop();
 }
 
-async function captureAndSend() {
-    // Agar hardware off hai ya detection band hai, to loop ruk jaye
+async function captureLoop() {
     if (!cameraOn || !isDetecting) return;
     if (isProcessing) {
-        setTimeout(captureAndSend, 100);
+        setTimeout(captureLoop, 200);
         return;
     }
 
     const video = document.getElementById('video');
-    const canvas = document.createElement('canvas'); 
-    canvas.width = 640;
-    canvas.height = 480;
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(video, 0, 0, 640, 480);
+    const canvas = document.createElement('canvas');
+    canvas.width = 640; canvas.height = 480;
+    canvas.getContext('2d').drawImage(video, 0, 0, 640, 480);
     
-    const dataUrl = canvas.toDataURL('image/jpeg', 0.4); 
     isProcessing = true;
-
     try {
         const response = await fetch('/process_frame', {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ image: dataUrl })
+            body: JSON.stringify({ image: canvas.toDataURL('image/jpeg', 0.4) })
         });
-
         const result = await response.json();
         if (result.detections && isDetecting) {
-            drawDetections(result.detections);
-            processVIAwareness(result.detections);
+            updateUI(result.detections);
         }
-    } catch (error) {
-        console.log("Processing frame...");
-    } finally {
-        isProcessing = false;
-        if (isDetecting) setTimeout(captureAndSend, 600); // 600ms delay for stability
-    }
+    } catch (e) { console.log("Loop skip..."); }
+    
+    isProcessing = false;
+    // Delay barha diya taake system par bojh na paray
+    setTimeout(captureLoop, 800); 
 }
 
-function drawDetections(detections) {
+function updateUI(detections) {
     const canvas = document.getElementById('detectionCanvas');
     const ctx = canvas.getContext('2d');
     ctx.clearRect(0, 0, canvas.width, canvas.height);
 
-    detections.forEach((det, index) => {
-        ctx.strokeStyle = index === 0 ? "#00FF00" : "#ffcc00"; 
-        ctx.lineWidth = 3;
-        ctx.strokeRect(det.x, det.y, det.w, det.h);
-
-        ctx.fillStyle = index === 0 ? "#00FF00" : "#ffcc00";
-        ctx.font = "bold 18px Arial";
-        ctx.fillText(det.label.toUpperCase(), det.x, det.y - 10);
-    });
-}
-
-function processVIAwareness(detections) {
-    if (detections.length === 0) return;
-
-    let obj = detections[0];
-    let centerX = obj.x + (obj.w / 2);
-    let area = (obj.w * obj.h) / (640 * 480);
-
-    // Direction Logic
-    let direction = "in front of you";
-    if (centerX < 213) direction = "on your left";
-    else if (centerX > 426) direction = "on your right";
-
-    // Proximity Alert
-    let warning = "";
-    if (area > 0.45) warning = "STOP! OBSTACLE VERY CLOSE. ";
-    else if (area > 0.2) warning = "Careful, ";
-
-    let finalMessage = `${warning}${obj.label} ${direction}`;
-
-    if (finalMessage !== lastSpoken) {
-        speak(finalMessage);
-        lastSpoken = finalMessage;
+    if (detections.length > 0) {
+        let obj = detections[0];
+        // Visuals
+        ctx.strokeStyle = "#00FF00"; ctx.lineWidth = 4;
+        ctx.strokeRect(obj.x, obj.y, obj.w, obj.h);
+        ctx.fillStyle = "#00FF00"; ctx.font = "bold 20px Arial";
+        ctx.fillText(obj.label.toUpperCase(), obj.x, obj.y - 10);
+
+        // VI Logic
+        let direction = obj.x + (obj.w/2) < 213 ? "on your left" : (obj.x + (obj.w/2) > 426 ? "on your right" : "in front");
+        let area = (obj.w * obj.h) / (640*480);
+        let msg = area > 0.4 ? `STOP! ${obj.label} very close` : `${obj.label} ${direction}`;
+        speak(msg, area > 0.4); // Force speak if very close
     }
-}
-
-function speak(text) {
-    window.speechSynthesis.cancel(); 
-    let msg = new SpeechSynthesisUtterance(text);
-    msg.rate = 1.2;
-    window.speechSynthesis.speak(msg);
 }