Updated Server

Author: hackall360

ai/storage.js

@@ -1,6 +1,6 @@
 document.addEventListener("DOMContentLoaded", () => {
   const SERVER_URL = "https://vps.unityailab.online:3000";
-  const USE_LOCAL_FALLBACK = true;
+  const USE_LOCAL_FALLBACK = false; // Set to false for live server interaction
 
   const sessionListEl = document.getElementById("session-list");
   let sessions = loadSessions();
@@ -258,6 +258,14 @@ document.addEventListener("DOMContentLoaded", () => {
     }
     checkOrGenerateUserId().then(() => {
       console.log("User ID validation complete");
+      // Force registration every load
+      const userId = localStorage.getItem("uniqueUserId");
+      if (userId) {
+        registerUserIdWithServer(userId).catch(err => {
+          console.warn("Server registration failed:", err);
+          ensureLocalUserId();
+        });
+      }
     }).catch(err => {
       console.warn("Problem with user ID, using local fallback:", err);
       ensureLocalUserId();
@@ -276,19 +284,9 @@ document.addEventListener("DOMContentLoaded", () => {
     let userId = localStorage.getItem("uniqueUserId");
     if (!userId) {
       userId = generateRandomId();
-      let success = false;
-      if (!USE_LOCAL_FALLBACK) {
-        try {
-          success = await registerUserIdWithServer(userId);
-        } catch (err) {
-          console.warn("Server registration failed, using local fallback:", err);
-          success = true;
-        }
-      } else {
-        success = true;
-      }
       localStorage.setItem("uniqueUserId", userId);
     }
+    await registerUserIdWithServer(userId); // Always register on load
     return userId;
   }
 
@@ -298,32 +296,33 @@ document.addEventListener("DOMContentLoaded", () => {
       await new Promise(resolve => setTimeout(resolve, 100));
       return true;
     }
+    const storedToken = localStorage.getItem("userToken");
     try {
       const response = await fetch(`${SERVER_URL}/api/registerUser`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ userId })
+        body: JSON.stringify({ userId, token: storedToken })
       });
-      if (!response.ok) {
-        throw new Error(`Server error: ${response.status}`);
-      }
+      if (!response.ok) throw new Error(`Server error: ${response.status}`);
       const data = await response.json();
+      if (data.token) localStorage.setItem("userToken", data.token);
       return data.status === "registered" || data.status === "exists";
     } catch (err) {
       console.warn("Server registration failed:", err);
-      return true;
+      return false;
     }
   }
 
   function generateRandomId() {
-    return Math.random().toString(36).substr(2, 12) + Date.now().toString(36);
+    // Ensure 18-20 chars, lowercase alphanumeric
+    return (Math.random().toString(36) + Date.now().toString(36)).substr(2, 20).toLowerCase().replace(/[^a-z0-9]/g, '');
   }
 
   function startVisitorCountPolling() {
     updateVisitorCount();
     setInterval(() => {
       updateVisitorCount();
-    }, 300000);
+    }, 60000); // 60 seconds
   }
 
   async function updateVisitorCount() {
@@ -340,9 +339,7 @@ document.addEventListener("DOMContentLoaded", () => {
         signal: controller.signal
       });
       clearTimeout(timeoutId);
-      if (!response.ok) {
-        throw new Error(`Server error: ${response.status}`);
-      }
+      if (!response.ok) throw new Error(`Server error: ${response.status}`);
       const data = await response.json();
       visitorDisplay.textContent = data.count.toLocaleString();
     } catch (err) {

server/server.js

@@ -14,12 +14,16 @@ app.use(express.json());
 const dataFilePath = path.join(__dirname, "userData.json");
 
 // Load existing user IDs into memory at startup
-let userIds = new Set();
+let userIds = new Map(); // id -> token
 if (fs.existsSync(dataFilePath)) {
   try {
     const data = JSON.parse(fs.readFileSync(dataFilePath, "utf8"));
     if (Array.isArray(data.userIds)) {
-      userIds = new Set(data.userIds);
+      // Backward compatibility with old format
+      data.userIds.forEach(id => userIds.set(id, null));
+    } else if (data.userIds) {
+      // New format: { "userIds": { "id1": "token1", "id2": "token2" } }
+      Object.entries(data.userIds).forEach(([id, token]) => userIds.set(id, token));
     }
   } catch (err) {
     console.error("Error reading userData.json:", err.message);
@@ -29,7 +33,7 @@ if (fs.existsSync(dataFilePath)) {
 // Helper to save user IDs to file
 function saveUserIdsToFile() {
   try {
-    const data = { userIds: [...userIds] };
+    const data = { userIds: Object.fromEntries(userIds) };
     fs.writeFileSync(dataFilePath, JSON.stringify(data, null, 2));
   } catch (err) {
     console.error("Error writing to userData.json:", err.message);
@@ -38,11 +42,15 @@ function saveUserIdsToFile() {
 
 // Helper to validate user ID format
 function isValidUserId(userId) {
-  // Must be a string, 18-20 characters, lowercase alphanumeric (a-z, 0-9)
   const userIdRegex = /^[a-z0-9]{18,20}$/;
   return typeof userId === "string" && userIdRegex.test(userId);
 }
 
+// Helper to generate a token
+function generateToken() {
+  return Math.random().toString(36).substr(2, 10);
+}
+
 // Middleware for logging requests
 app.use((req, res, next) => {
   console.log(`[${new Date().toISOString()}] ${req.method} ${req.url} - IP: ${req.ip}`);
@@ -53,7 +61,7 @@ app.use((req, res, next) => {
 //   REGISTER USER ID
 // =======================
 app.post("/api/registerUser", (req, res) => {
-  const { userId } = req.body;
+  const { userId, token } = req.body;
 
   // Validate request body
   if (!userId) {
@@ -67,13 +75,21 @@ app.post("/api/registerUser", (req, res) => {
 
   // Check if userId already exists
   if (userIds.has(userId)) {
-    return res.status(200).json({ status: "exists" });
+    const storedToken = userIds.get(userId);
+    if (token && storedToken && token === storedToken) {
+      return res.status(200).json({ status: "exists" });
+    } else if (!token && !storedToken) {
+      // Allow old clients without tokens (backward compatibility)
+      return res.status(200).json({ status: "exists" });
+    }
+    return res.status(403).json({ error: "Invalid or missing token" });
   }
 
-  // Add new userId
-  userIds.add(userId);
+  // New userId: generate token, store, and return it
+  const newToken = generateToken();
+  userIds.set(userId, newToken);
   saveUserIdsToFile();
-  return res.status(201).json({ status: "registered" });
+  return res.status(201).json({ status: "registered", token: newToken });
 });
 
 // =======================