Add pagination to server list menu

Author: byteful

client/src/lib/api.ts

@@ -93,11 +93,13 @@ class ApiClient {
     search?: string;
     plan?: string;
     status?: string;
+    sort?: string;
+    order?: 'asc' | 'desc';
   }) {
     const queryParams = new URLSearchParams();
     if (params) {
       Object.entries(params).forEach(([key, value]) => {
-        if (value !== undefined) {
+        if (value !== undefined && value !== null) {
           queryParams.append(key, value.toString());
         }
       });
@@ -115,6 +117,17 @@ class ApiClient {
     return this.request(`/servers/${id}/stats`);
   }
 
+  async updateServerStats(id: string, stats: {
+    userCount?: number;
+    ticketCount?: number;
+    lastActivityAt?: string;
+  }) {
+    return this.request(`/servers/${id}/stats`, {
+      method: 'PUT',
+      body: JSON.stringify(stats),
+    });
+  }
+
   async updateServer(id: string, data: any) {
     return this.request(`/servers/${id}`, {
       method: 'PUT',

client/src/pages/ServersPage.tsx

@@ -23,7 +23,7 @@
   "author": "modl-gg",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@modl-gg/shared-web": "1.0.1",
+    "@modl-gg/shared-web": "1.0.2",
     "@tanstack/react-query-devtools": "^5.81.2",
     "@vitejs/plugin-react": "^4.6.0",
     "compression": "^1.7.4",

package-lock.json

@@ -21,6 +21,7 @@ import { updateActivity } from './middleware/authMiddleware';
 import EmailService from './services/EmailService';
 import PM2LogService from './services/PM2LogService';
 import { discordWebhookService } from './services/DiscordWebhookService';
+import { webhookConfigService } from './services/WebhookConfigService';
 import { serverProvisioningMonitor } from './services/ServerProvisioningMonitor';
 
 // Load environment variables

package.json

@@ -19,6 +19,7 @@ router.use(requireAuth);
 /**
  * GET /api/servers
  * Get all servers with pagination and filtering
+ * Supports: pagination, search, filtering by plan/status, sorting
  */
 router.get('/', async (req: Request, res: Response) => {
   try {
@@ -32,22 +33,45 @@ router.get('/', async (req: Request, res: Response) => {
       order = 'desc'
     } = req.query;
 
-    const pageNum = parseInt(page as string);
-    const limitNum = parseInt(limit as string);
+    // Validate and sanitize pagination parameters
+    const pageNum = Math.max(1, parseInt(page as string) || 1);
+    const limitNum = Math.min(100, Math.max(1, parseInt(limit as string) || 20));
     const skip = (pageNum - 1) * limitNum;
 
+    // Validate sort field - only allow specific fields for security
+    const allowedSortFields = [
+      'serverName', 
+      'customDomain', 
+      'adminEmail', 
+      'plan', 
+      'createdAt', 
+      'updatedAt',
+      'userCount',
+      'ticketCount',
+      'provisioningStatus',
+      'lastActivityAt'
+    ];
+    const sortField = allowedSortFields.includes(sort as string) ? sort as string : 'createdAt';
+    const sortOrder = order === 'asc' ? 1 : -1;
+
     // Build filter object
     const filter: any = {};
 
-    if (search) {
-      filter.$text = { $search: search as string };
+    if (search && (search as string).trim()) {
+      const searchTerm = (search as string).trim();
+      // Use regex for more flexible search across multiple fields
+      filter.$or = [
+        { serverName: { $regex: searchTerm, $options: 'i' } },
+        { customDomain: { $regex: searchTerm, $options: 'i' } },
+        { adminEmail: { $regex: searchTerm, $options: 'i' } }
+      ];
     }
 
     if (plan && plan !== 'all') {
       filter.plan = plan;
     }
 
-    if (status) {
+    if (status && status !== 'all') {
       switch (status) {
         case 'active':
           filter.provisioningStatus = 'completed';
@@ -67,42 +91,52 @@ router.get('/', async (req: Request, res: Response) => {
 
     // Build sort object
     const sortObj: any = {};
-    sortObj[sort as string] = order === 'desc' ? -1 : 1;
+    sortObj[sortField] = sortOrder;
 
-    // Execute queries
+    // Execute queries with better error handling
     const ModlServerModel = getModlServerModel();
-    const [servers, total] = await Promise.all([
-      ModlServerModel
-        .find(filter)
-        .sort(sortObj)
-        .skip(skip)
-        .limit(limitNum)
-        .lean(),
-      ModlServerModel.countDocuments(filter)
-    ]);
-
-    const response: ApiResponse<{
-      servers: IModlServer[];
-      pagination: {
-        page: number;
-        limit: number;
-        total: number;
-        pages: number;
-      };
-    }> = {
-      success: true,
-      data: {
-        servers: servers as IModlServer[],
+    
+    try {
+      const [servers, total] = await Promise.all([
+        ModlServerModel
+          .find(filter)
+          .sort(sortObj)
+          .skip(skip)
+          .limit(limitNum)
+          .select('-__v -emailVerificationToken -provisioningSignInToken') // Exclude sensitive fields
+          .lean(),
+        ModlServerModel.countDocuments(filter)
+      ]);
+
+      const response: ApiResponse<{
+        servers: IModlServer[];
         pagination: {
-          page: pageNum,
-          limit: limitNum,
-          total,
-          pages: Math.ceil(total / limitNum)
+          page: number;
+          limit: number;
+          total: number;
+          pages: number;
+        };
+      }> = {
+        success: true,
+        data: {
+          servers: servers as IModlServer[],
+          pagination: {
+            page: pageNum,
+            limit: limitNum,
+            total,
+            pages: Math.ceil(total / limitNum)
+          }
         }
-      }
-    };
+      };
 
-    return res.json(response);
+      return res.json(response);
+    } catch (queryError) {
+      console.error('Database query error:', queryError);
+      return res.status(500).json({
+        success: false,
+        error: 'Database query failed'
+      });
+    }
   } catch (error) {
     console.error('Get servers error:', error);
     return res.status(500).json({
@@ -247,6 +281,64 @@ router.put('/:id', async (req: Request, res: Response) => {
   }
 });
 
+/**
+ * PUT /api/servers/:id/stats
+ * Update server statistics (userCount, ticketCount, lastActivityAt)
+ */
+router.put('/:id/stats', async (req: Request, res: Response) => {
+  try {
+    const { id } = req.params;
+    const { userCount, ticketCount, lastActivityAt } = req.body;
+
+    // Validate input
+    const updateData: any = {};
+    if (typeof userCount === 'number' && userCount >= 0) {
+      updateData.userCount = userCount;
+    }
+    if (typeof ticketCount === 'number' && ticketCount >= 0) {
+      updateData.ticketCount = ticketCount;
+    }
+    if (lastActivityAt) {
+      updateData.lastActivityAt = new Date(lastActivityAt);
+    }
+
+    if (Object.keys(updateData).length === 0) {
+      return res.status(400).json({
+        success: false,
+        error: 'No valid stats provided to update'
+      });
+    }
+
+    updateData.updatedAt = new Date();
+
+    const ModlServerModel = getModlServerModel();
+    const server = await ModlServerModel.findByIdAndUpdate(
+      id,
+      updateData,
+      { new: true, runValidators: true }
+    );
+
+    if (!server) {
+      return res.status(404).json({
+        success: false,
+        error: 'Server not found'
+      });
+    }
+
+    return res.json({
+      success: true,
+      data: server,
+      message: 'Server statistics updated successfully'
+    });
+  } catch (error) {
+    console.error('Update server stats error:', error);
+    return res.status(500).json({
+      success: false,
+      error: 'Failed to update server statistics'
+    });
+  }
+});
+
 /**
  * DELETE /api/servers/:id
  * Delete a server

server/index.ts

@@ -39,6 +39,28 @@ class DiscordWebhookService {
     this.adminRoleId = process.env.DISCORD_ADMIN_ROLE_ID;
   }
 
+  // Update webhook configuration from panel settings
+  updateConfig(webhookSettings: {
+    discordWebhookUrl?: string;
+    discordAdminRoleId?: string;
+    botName?: string;
+    avatarUrl?: string;
+    enabled?: boolean;
+  }) {
+    if (webhookSettings.enabled && webhookSettings.discordWebhookUrl) {
+      this.webhookUrl = webhookSettings.discordWebhookUrl;
+      this.adminRoleId = webhookSettings.discordAdminRoleId;
+      this.botName = webhookSettings.botName || 'MODL Admin';
+      this.avatarUrl = webhookSettings.avatarUrl || '';
+    } else {
+      // Fallback to environment variables if not configured in panel
+      this.webhookUrl = process.env.DISCORD_WEBHOOK_URL;
+      this.adminRoleId = process.env.DISCORD_ADMIN_ROLE_ID;
+      this.botName = 'MODL Admin';
+      this.avatarUrl = '';
+    }
+  }
+
   private getEmbedColor(type: NotificationType): number {
     switch (type) {
       case NotificationType.ERROR:
@@ -65,7 +87,7 @@ class DiscordWebhookService {
     additionalContent?: string
   ): Promise<void> {
     if (!this.webhookUrl) {
-      console.warn('Discord webhook URL not configured');
+      // Silently return if webhook not configured - no need to log warnings
       return;
     }
 
@@ -110,10 +132,12 @@ class DiscordWebhookService {
 
       if (!response.ok) {
         const errorText = await response.text();
-        console.error('Failed to send Discord webhook:', response.status, errorText);
+        // Silently fail - webhook errors shouldn't break the main application flow
+        return;
       }
     } catch (error) {
-      console.error('Error sending Discord webhook:', error);
+      // Silently fail - webhook errors shouldn't break the main application flow
+      return;
     }
   }