Update server.js

server.js

@@ -6,7 +6,6 @@ import { spawn, exec } from "child_process";
 import httpProxy from "http-proxy";
 
 const app = express();
-
 const PORT = 7860;
 const VITE_PORT = 5173;
 const PROJECT_DIR = path.join(process.cwd(), "project");
@@ -24,7 +23,6 @@ const FOUNDATION_LOCK = path.join(process.cwd(), ".foundation_lock");
 const DEPS_LOCK       = path.join(process.cwd(), ".deps_lock");
 
 /* ================= IDLE TRACKER ================= */
-
 let lastActivityTime = Date.now();
 const IDLE_TIMEOUT = 10 * 60 * 1000; // 10 min koi na ho toh Vite band
 
@@ -42,7 +40,6 @@ setInterval(async () => {
 }, 60 * 1000);
 
 /* ================= LOG STREAM ================= */
-
 let logs = [];
 let clients = new Set();
 const logHistory = new Map(); // sessionId -> logs
@@ -55,7 +52,6 @@ function pushLog(message, type = "info") {
     message,
     type // info | error | success | warning | system
   };
-
   logs.push(entry);
   if (logs.length > 500) logs.shift();
 
@@ -63,13 +59,11 @@ function pushLog(message, type = "info") {
   clients.forEach(c => {
     try { c.write(payload); } catch { clients.delete(c); }
   });
-
   console.log(`[${type.toUpperCase()}] ${message}`);
 }
 
 /* ================= ALLOWED ORIGINS ================= */
 // Sirf yahi domains server access kar sakte hain — baaki sab DENIED
-
 const ALLOWED_ORIGINS = [
   // ===== HuggingFace Spaces =====
   "https://avneesh123-autodev-mark2.hf.space",         // HF Frontend Space
@@ -84,7 +78,6 @@ const ALLOWED_ORIGINS = [
 ];
 
 /* ================= MIDDLEWARE ================= */
-
 app.use(cors({
   origin: (origin, callback) => {
     // Origin nahi hai = direct server call = token se protected hai waise bhi
@@ -121,7 +114,6 @@ if (!fs.existsSync(PROJECT_DIR)) {
 }
 
 /* ================= RATE LIMITER ================= */
-
 const rateLimitMap = new Map();
 
 function rateLimit(req, res, maxRequests = 30, windowMs = 60000) {
@@ -130,7 +122,6 @@ function rateLimit(req, res, maxRequests = 30, windowMs = 60000) {
   const windowStart = now - windowMs;
 
   if (!rateLimitMap.has(ip)) rateLimitMap.set(ip, []);
-
   const requests = rateLimitMap.get(ip).filter(t => t > windowStart);
   requests.push(now);
   rateLimitMap.set(ip, requests);
@@ -154,10 +145,8 @@ setInterval(() => {
 }, 300000);
 
 /* ================= TOKEN SECURITY ================= */
-
 function verifyToken(req, res) {
   const token = req.body?.token || req.query?.token || req.headers?.["x-api-key"];
-
   if (token !== MASTER_KEY) {
     pushLog(`[SECURITY] Unauthorized access attempt from ${req.ip}`, "error");
     res.status(403).json({ error: "ACTION_DENIED", message: "Invalid token" });
@@ -167,7 +156,6 @@ function verifyToken(req, res) {
 }
 
 /* ================= SSE LOG STREAM ================= */
-
 app.get("/api/logs", (req, res) => {
   res.setHeader("Content-Type", "text/event-stream");
   res.setHeader("Cache-Control", "no-cache");
@@ -198,17 +186,20 @@ app.get("/api/logs", (req, res) => {
 });
 
 /* ================= VITE MANAGER ================= */
-
 function killVite() {
   return new Promise((resolve) => {
-    if (!viteProcess) return resolve();
-    pushLog("[SYSTEM] Killing existing Vite process", "system");
-    viteProcess.kill("SIGTERM");
-    setTimeout(() => {
-      if (viteProcess) viteProcess.kill("SIGKILL");
+    if (viteProcess) {
+      pushLog("[SYSTEM] Killing existing Vite process", "system");
+      viteProcess.kill("SIGKILL");
       viteProcess = null;
-      resolve();
-    }, 2000);
+    }
+    
+    // Pura port clear karo taaki shell command se bache zombies kill ho jayein
+    exec("fuser -k 5173/tcp", () => {
+      setTimeout(() => {
+        resolve();
+      }, 1500);
+    });
   });
 }
 
@@ -228,7 +219,6 @@ function startVite(forceRestart = false) {
 function bootVite() {
   pushLog("[SYSTEM] Starting Vite dev server...", "system");
   isBooting = true;
-
   const nodeModules = path.join(PROJECT_DIR, "node_modules");
 
   const boot = () => {
@@ -242,6 +232,7 @@ function bootVite() {
       const msg = d.toString().trim();
       if (!msg) return;
       pushLog("[VITE] " + msg, "info");
+      
       if (msg.includes("Local:") || msg.includes("ready in") || msg.includes("localhost")) {
         isBooting = false;
         buildRetryCount = 0;
@@ -264,7 +255,10 @@ function bootVite() {
       if (code !== null && code !== 0 && buildRetryCount < MAX_RETRIES) {
         buildRetryCount++;
         pushLog(`[SYSTEM] Auto-restarting Vite (attempt ${buildRetryCount}/${MAX_RETRIES})...`, "warning");
-        setTimeout(() => bootVite(), 3000);
+        setTimeout(() => {
+          // Retry se pehle zombie process clear karo
+          killVite().then(() => bootVite());
+        }, 3000);
       }
     });
   };
@@ -277,7 +271,6 @@ function bootVite() {
   }
 
   pushLog("[INSTALL] node_modules not found. Installing dependencies...", "system");
-
   const install = spawn("pnpm", ["install"], {
     cwd: PROJECT_DIR,
     shell: true
@@ -300,7 +293,6 @@ function bootVite() {
 }
 
 /* ================= STATUS ================= */
-
 app.get("/api/status", (req, res) => {
   res.json({
     ready: !!viteProcess && !isBooting,
@@ -314,7 +306,6 @@ app.get("/api/status", (req, res) => {
 });
 
 /* ================= FILE UPDATE ================= */
-
 app.post("/api/update", async (req, res) => {
   if (!verifyToken(req, res)) return;
   if (!rateLimit(req, res, 20, 60000)) return;
@@ -324,6 +315,7 @@ app.post("/api/update", async (req, res) => {
   // FOUNDATION LOCK — agar pehle foundation files aa chuki hain toh dobara mat likho
   // Sirf AI ke naye files (fileTree) likhne do — foundation skip
   const foundationAlreadyWritten = fs.existsSync(FOUNDATION_LOCK);
+  
   if (foundationAlreadyWritten) {
     pushLog("[FOUNDATION] ✅ Foundation already locked — skipping base files", "system");
   }
@@ -365,7 +357,6 @@ app.post("/api/update", async (req, res) => {
     }
 
     res.json({ success: true, filesUpdated: Object.keys(files || {}).length });
-
   } catch (e) {
     pushLog("[ERROR] File update failed: " + e.message, "error");
     res.status(500).json({ error: e.message });
@@ -373,12 +364,10 @@ app.post("/api/update", async (req, res) => {
 });
 
 /* ================= FILE READ ================= */
-
 app.post("/api/read", async (req, res) => {
   if (!verifyToken(req, res)) return;
-
+  
   const { filePath } = req.body;
-
   try {
     const safePath = path.normalize(filePath).replace(/^(\.\.[\/\\])+/, "");
     const fp = path.join(PROJECT_DIR, safePath);
@@ -393,14 +382,12 @@ app.post("/api/read", async (req, res) => {
 
     const content = await fs.readFile(fp, "utf-8");
     res.json({ success: true, content, path: safePath });
-
   } catch (e) {
     res.status(500).json({ error: e.message });
   }
 });
 
 /* ================= FILE LIST ================= */
-
 app.post("/api/files", async (req, res) => {
   if (!verifyToken(req, res)) return;
 
@@ -410,6 +397,7 @@ app.post("/api/files", async (req, res) => {
       const entries = await fs.readdir(dir, { withFileTypes: true });
       for (const entry of entries) {
         if (["node_modules", ".git", "dist", ".cache"].includes(entry.name)) continue;
+        
         const relPath = path.join(base, entry.name);
         if (entry.isDirectory()) {
           const children = await walkDir(path.join(dir, entry.name), relPath);
@@ -427,12 +415,10 @@ app.post("/api/files", async (req, res) => {
 });
 
 /* ================= FILE DELETE ================= */
-
 app.post("/api/delete", async (req, res) => {
   if (!verifyToken(req, res)) return;
 
   const { filePath } = req.body;
-
   try {
     const safePath = path.normalize(filePath).replace(/^(\.\.[\/\\])+/, "");
     const fp = path.join(PROJECT_DIR, safePath);
@@ -444,14 +430,12 @@ app.post("/api/delete", async (req, res) => {
     await fs.remove(fp);
     pushLog(`[FILES] Deleted: ${safePath}`, "warning");
     res.json({ success: true });
-
   } catch (e) {
     res.status(500).json({ error: e.message });
   }
 });
 
 /* ================= COMMAND EXEC ================= */
-
 // Dangerous commands blocked
 const BLOCKED_COMMANDS = ["rm -rf /", "mkfs", ":(){ :|:& };:", "shutdown", "reboot", "format"];
 
@@ -477,19 +461,18 @@ app.post("/api/execute", (req, res) => {
   }, (err, stdout, stderr) => {
     const output = stdout || stderr || err?.message || "";
     const success = !err;
-
+    
     if (success) {
       pushLog("[TERMINAL] ✅ Done", "success");
     } else {
       pushLog("[TERMINAL] ❌ " + (err?.message || "Command failed"), "error");
     }
-
+    
     res.json({ success, output, exitCode: err?.code || 0 });
   });
 });
 
 /* ================= VITE CONTROL ================= */
-
 app.post("/api/vite/restart", async (req, res) => {
   if (!verifyToken(req, res)) return;
   pushLog("[SYSTEM] Manual Vite restart requested", "system");
@@ -505,12 +488,12 @@ app.post("/api/vite/stop", async (req, res) => {
 });
 
 /* ================= PROJECT RESET ================= */
-
 app.post("/api/reset", async (req, res) => {
   if (!verifyToken(req, res)) return;
 
   try {
     pushLog("[SYSTEM] 🔄 Resetting project...", "warning");
+    
     await killVite();
     await fs.remove(PROJECT_DIR);
     fs.mkdirSync(PROJECT_DIR, { recursive: true });
@@ -527,7 +510,6 @@ app.post("/api/reset", async (req, res) => {
 });
 
 /* ================= HEALTH CHECK ================= */
-
 app.get("/health", (req, res) => {
   res.json({
     status: "ok",
@@ -539,7 +521,6 @@ app.get("/health", (req, res) => {
 });
 
 /* ================= PROXY ================= */
-
 const proxy = httpProxy.createProxyServer({
   target: `http://127.0.0.1:${VITE_PORT}`,
   changeOrigin: true,
@@ -636,9 +617,11 @@ app.use((req, res, next) => {
   // SECRET CHECK — sirf root "/" pe check karo
   // JS/CSS/assets ko allow karo — warna React app toot jaayega
   const isRootRequest = req.path === "/" || req.path === "";
+  
   if (isRootRequest) {
     const previewHeader = req.headers["x-autodev-preview"];
     const previewParam  = req.query["__autodev"];
+
     if (previewHeader !== PREVIEW_SECRET && previewParam !== PREVIEW_SECRET) {
       pushLog(`[SECURITY] Preview blocked — direct access attempt`, "warning");
       res.status(403).send(ACCESS_DENIED_PAGE);
@@ -669,7 +652,6 @@ server.on("upgrade", (req, socket, head) => {
 });
 
 /* ================= GRACEFUL SHUTDOWN ================= */
-
 process.on("SIGTERM", async () => {
   pushLog("[SYSTEM] Shutting down gracefully...", "system");
   await killVite();