Update server.js

server.js

@@ -1,84 +1,77 @@
 const express = require('express');
 const axios = require('axios');
 const cheerio = require('cheerio');
+const { parseStudentData } = require('./contentModel.js');
+
 const app = express();
 const PORT = 7860;
 
-// Enhanced logging middleware
+// Middleware
+app.use(express.static('public'));
 app.use((req, res, next) => {
-    console.log(`[${new Date().toISOString()}] ${req.method} ${req.originalUrl}`);
-    next();
+  res.header({
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET, OPTIONS",
+    "Access-Control-Allow-Headers": "Content-Type"
+  });
+  next();
 });
 
-// Data cleaning utility
-const cleanData = (text) => {
-    return text
-        .replace(/\n/g, ' ')      // Remove newlines
-        .replace(/\s+/g, ' ')     // Collapse whitespace
-        .replace(/\\/g, '')       // Remove backslashes
-        .trim();
-};
+// API Endpoint
+app.get('/fetch-regno-:regno', async (req, res) => {
+  try {
+    const { regno } = req.params;
+    
+    // Validate registration number
+    if (!/^\d{11}$/.test(regno)) {
+      return res.status(400).json({
+        error: "Invalid registration number",
+        example: "22104134026"
+      });
+    }
+
+    // Fetch data with retries
+    const html = await fetchWithRetries(regno);
+    if (!html) return res.status(404).json({ error: "Result not found" });
 
-// Improved error handling middleware
-app.use((err, req, res, next) => {
-    console.error(`[ERROR] ${req.method} ${req.originalUrl}: ${err.message}`);
+    // Parse and return
+    const result = parseStudentData(html, regno);
+    res.json(result);
+
+  } catch (error) {
+    console.error(error);
     res.status(500).json({
-        error: 'Internal server error',
-        regno: req.params.regno
+      error: "Server error",
+      details: error.message
     });
+  }
 });
 
-app.get('/fetch-regno-:regno', async (req, res) => {
-    const { regno } = req.params;
-    const startTime = Date.now();
-    
+// Fetch helper with exponential backoff
+async function fetchWithRetries(regno) {
+  const url = `https://results.beup.ac.in/ResultsBTech1stSem2023_B2023Pub.aspx?Sem=I&RegNo=${regno}`;
+  let retries = 3;
+  let delay = 1000;
+
+  for (let attempt = 0; attempt < retries; attempt++) {
     try {
-        // Validate registration number format
-        if (!/^\d{11}$/.test(regno)) {
-            return res.status(400).json({
-                error: 'Invalid registration number format',
-                regno
-            });
+      const response = await axios.get(url, {
+        timeout: 10000,
+        headers: {
+          'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+          'Referer': 'https://results.beup.ac.in/'
         }
+      });
 
-        const response = await axios.get(
-            `https://results.beup.ac.in/ResultsBTech1stSem2023_B2023Pub.aspx?Sem=I&RegNo=${regno}`,
-            {
-                headers: {
-                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
-                    'Referer': 'https://results.beup.ac.in/'
-                },
-                timeout: 10000
-            }
-        );
-
-        const $ = cheerio.load(response.data);
-        
-        // Extract and clean data
-        const result = {
-            name: cleanData($('#lblName').text()),
-            regno: regno, // Using parameter instead of page value
-            sgpa: cleanData($('#lblSGPA').text())
-                      .match(/\d+\.\d+/)?.[0] || 'N/A' // Extract numeric SGPA
-        };
-
-        // Log performance
-        console.log(`[SUCCESS] ${regno} (${Date.now() - startTime}ms)`);
-        
-        res.json(result);
-
+      if (response.data.includes("No Record Found !!!")) return null;
+      return response.data;
+      
     } catch (error) {
-        console.error(`[FAILED] ${regno}: ${error.message}`);
-        const status = error.response?.status || 500;
-        res.status(status).json({
-            error: 'Failed to fetch result',
-            regno,
-            details: status === 404 ? 'Result not found' : 'Server error'
-        });
+      if (attempt === retries - 1) throw error;
+      await new Promise(resolve => setTimeout(resolve, delay));
+      delay *= 2;
     }
-});
+  }
+}
 
-app.listen(PORT, () => {
-    console.log(`==== Server Started at ${new Date().toISOString()} ====`);
-    console.log(`Listening on port ${PORT}`);
-});
+app.listen(PORT, () => console.log(`Server running on port ${PORT}`));