pull

.gitignore

@@ -134,4 +134,5 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
-.idea
+.idea
+.vercel

routes/checkMessageLimit.js

@@ -1,63 +1,125 @@
 import { pool } from "./pool.js";
 
+// Cache for user settings to reduce database queries
+const userSettingsCache = new Map();
+const CACHE_TTL = 5 * 60 * 1000; // 5 minutes in milliseconds
+
+// Clear cache periodically
+setInterval(() => {
+  userSettingsCache.clear();
+}, CACHE_TTL);
+
 export const checkMessageLimit = async (req, res, next) => {
-    try {
-      const username = req.session.user.username;
-      const role = req.session.user.role;
-
-      console.log(`[checkMessageLimit] User: ${username}, Role: ${role}`);
-
-      // SuperAdmin has unlimited messages
-      if (role === "SuperAdmin") {
-        console.log(`[checkMessageLimit] User ${username} is a SuperAdmin. Skipping message limit check.`);
-        return next();
-      }
-
-      // Fetch user's daily message limit
-      console.log(`[checkMessageLimit] Fetching daily message limit for user: ${username}`);
-      const userSettings = await pool.query(
+  // Start performance measurement
+  const startTime = process.hrtime();
+
+  try {
+    const { username, role } = req.session.user;
+
+    if (!username || !role) {
+      console.warn('[checkMessageLimit] Missing username or role in session');
+      return res.status(401).json({ message: "Unauthorized - missing user information" });
+    }
+
+    // SuperAdmin bypass
+    if (role === "SuperAdmin") {
+      console.log(`[checkMessageLimit] SuperAdmin ${username} bypassed message limit check`);
+      return next();
+    }
+
+    // Get current date in user's timezone
+    const today = new Date();
+    const timezoneOffset = req.headers['timezone-offset'] || 0;
+    today.setMinutes(today.getMinutes() - timezoneOffset);
+    const dateString = today.toISOString().split('T')[0];
+
+    // Try to get settings from cache first
+    let userSettings = userSettingsCache.get(username);
+
+    if (!userSettings) {
+      console.log(`[checkMessageLimit] Fetching settings for user: ${username}`);
+      const settingsQuery = await pool.query(
         `SELECT daily_message_limit FROM user_settings WHERE username = $1`,
         [username]
       );
-
-      const dailyLimit = userSettings.rows[0]?.daily_message_limit || 100; // Default to 100 if not set
-      console.log(`[checkMessageLimit] Daily message limit for user ${username}: ${dailyLimit}`);
-
-      // Check today's message count
-      const today = new Date().toISOString().split("T")[0]; // Get current date in YYYY-MM-DD format
-      console.log(`[checkMessageLimit] Checking message count for user ${username} on date: ${today}`);
-      const messageLog = await pool.query(
-        `SELECT message_count FROM user_message_logs WHERE username = $1 AND date = $2`,
-        [username, today]
+
+      userSettings = {
+        dailyLimit: settingsQuery.rows[0]?.daily_message_limit || 100,
+        lastUpdated: Date.now()
+      };
+
+      userSettingsCache.set(username, userSettings);
+    }
+
+    const { dailyLimit } = userSettings;
+
+    // Check message count with a single query using upsert approach
+    const messageCountResult = await pool.query(
+      `INSERT INTO user_message_logs (username, date, message_count)
+       VALUES ($1, $2, 1)
+       ON CONFLICT (username, date)
+       DO UPDATE SET message_count = user_message_logs.message_count + 1
+       RETURNING message_count`,
+      [username, dateString]
+    );
+
+    const currentCount = messageCountResult.rows[0]?.message_count || 1;
+
+    if (currentCount > dailyLimit) {
+      console.warn(`[checkMessageLimit] User ${username} exceeded daily limit (${currentCount}/${dailyLimit})`);
+
+      // Rollback the increment since they're over limit
+      await pool.query(
+        `UPDATE user_message_logs 
+         SET message_count = message_count - 1 
+         WHERE username = $1 AND date = $2`,
+        [username, dateString]
       );
-
-      const messageCount = messageLog.rows[0]?.message_count || 0;
-      console.log(`[checkMessageLimit] Current message count for user ${username} on ${today}: ${messageCount}`);
-
-      if (messageCount >= dailyLimit) {
-        console.warn(`[checkMessageLimit] User ${username} has reached the daily message limit of ${dailyLimit}.`);
-        return res.status(403).json({ message: "Daily message limit reached." });
-      }
-
-      // Increment message count for the user
-      if (messageLog.rows.length > 0) {
-        console.log(`[checkMessageLimit] Incrementing message count for user ${username} on ${today}.`);
-        await pool.query(
-          `UPDATE user_message_logs SET message_count = message_count + 1 WHERE username = $1 AND date = $2`,
-          [username, today]
-        );
-      } else {
-        console.log(`[checkMessageLimit] Creating new message log entry for user ${username} on ${today}.`);
-        await pool.query(
-          `INSERT INTO user_message_logs (username, message_count, date) VALUES ($1, $2, $3)`,
-          [username, 1, today]
-        );
-      }
-
-      console.log(`[checkMessageLimit] Message count updated successfully for user ${username}.`);
-      next();
-    } catch (error) {
-      console.error("[checkMessageLimit] Error in middleware:", error);
-      res.status(500).json({ message: "Internal server error." });
+
+      return res.status(429).json({
+        message: "Daily message limit reached",
+        limit: dailyLimit,
+        current: currentCount - 1, // Show count before this attempt
+        reset: getResetTime(timezoneOffset)
+      });
     }
-  };
+
+    // Log performance
+    const [seconds, nanoseconds] = process.hrtime(startTime);
+    const duration = (seconds * 1000 + nanoseconds / 1e6).toFixed(2);
+    console.log(`[checkMessageLimit] Processed in ${duration}ms for ${username}`);
+
+    next();
+  } catch (error) {
+    console.error("[checkMessageLimit] Error:", error);
+
+    // Include error details in development
+    const errorResponse = {
+      message: "Message limit check failed",
+      ...(process.env.NODE_ENV === 'development' && {
+        error: error.message,
+        stack: error.stack
+      })
+    };
+
+    res.status(500).json(errorResponse);
+  }
+};
+
+// Helper function to get reset time in user's timezone
+function getResetTime(offsetMinutes = 0) {
+  const now = new Date();
+  const reset = new Date(now);
+
+  // Adjust for timezone offset
+  reset.setMinutes(reset.getMinutes() - offsetMinutes);
+
+  // Set to midnight of next day
+  reset.setDate(reset.getDate() + 1);
+  reset.setHours(0, 0, 0, 0);
+
+  // Convert back to server time
+  reset.setMinutes(reset.getMinutes() + offsetMinutes);
+
+  return reset.toISOString();
+}