Merge pull request #15 from ZeroHost-Code/beta

v1.0.3

Author: ddrayko

README.md

@@ -2,6 +2,8 @@
 
 Game server management dashboard for the ZeroHost platform. Provides user-facing server lifecycle management (creation, renewal, suspension, deletion) backed by a Pyrodactyl/Pterodactyl panel API.
 
+<img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/3bf1a711-9923-4089-8a12-94bbc134c41b" />
+
 ---
 
 ## Table of Contents

config/cap.js

@@ -1,14 +1,6 @@
 const CAP_SECRET = process.env.CAP_SECRET;
 const CAP_ENDPOINT = process.env.CAP_ENDPOINT;
 
-if (!CAP_SECRET) {
-  console.error('Missing CAP_SECRET environment variable');
-}
-
-if (!CAP_ENDPOINT) {
-  console.error('Missing CAP_ENDPOINT environment variable');
-}
-
 async function fetchWithTimeout(url, options = {}, timeout = 10000) {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeout);

config/db.js

@@ -17,18 +17,50 @@ const pool = mariadb.createPool({
   acquireTimeout: 10000,
   idleTimeout: 30000,
   insertIdAsNumber: true,
+  pingTimeout: 5000,
 });
 
+export async function closePool() {
+  try {
+    await pool.end();
+  } catch (err) {
+    console.error('Error closing pool:', err.message);
+  }
+}
+
+export async function getPoolStatus() {
+  try {
+    const active = pool.activeConnections();
+    const total = pool.totalConnections();
+    const idle = pool.idleConnections();
+    return { active, total, idle };
+  } catch {
+    return { active: -1, total: -1, idle: -1 };
+  }
+}
+
 export async function query(sql, params = []) {
   let lastErr;
   for (let attempt = 1; attempt <= 3; attempt++) {
     let conn;
+    let queryTimeout;
     try {
       conn = await pool.getConnection();
-      const rows = await conn.query(sql, params);
+      const timeoutPromise = new Promise((_, reject) => {
+        queryTimeout = setTimeout(() => reject(new Error('Query timeout after 30000ms')), 30000);
+      });
+      let rows = await Promise.race([
+        conn.query(sql, params),
+        timeoutPromise,
+      ]);
+      clearTimeout(queryTimeout);
+      if (Array.isArray(rows) && rows.length > 10000) {
+        console.warn(`Large result set detected: ${rows.length} rows for query: ${sql.slice(0, 100)}`);
+      }
       return rows;
     } catch (err) {
       lastErr = err;
+      clearTimeout(queryTimeout);
       if (err.code === 'ECONNRESET' || err.code === 'PROTOCOL_CONNECTION_LOST' || err.message?.includes('timeout')) {
         console.error(`DB query attempt ${attempt}/3 failed:`, err.message);
         if (attempt < 3) await new Promise(r => setTimeout(r, 100 * attempt));

config/migrate.js

@@ -56,6 +56,8 @@ const tables = {
       { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
       { name: 'ptero_nest_id', def: 'INT NOT NULL UNIQUE' },
       { name: 'name', def: 'VARCHAR(255) NOT NULL' },
+      { name: 'logo', def: 'VARCHAR(255) DEFAULT NULL' },
+      { name: 'description', def: 'TEXT DEFAULT NULL' },
       { name: 'created_at', def: 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP' },
     ],
   },
@@ -64,6 +66,7 @@ const tables = {
       { name: 'id', def: 'INT AUTO_INCREMENT PRIMARY KEY' },
       { name: 'ptero_nest_id', def: 'INT NOT NULL' },
       { name: 'ptero_egg_id', def: 'INT NOT NULL' },
+      { name: 'logo', def: 'VARCHAR(255) DEFAULT NULL' },
       { name: 'cpu_limit', def: 'INT DEFAULT NULL' },
       { name: 'memory_limit', def: 'INT DEFAULT NULL' },
       { name: 'disk_limit', def: 'INT DEFAULT NULL' },
@@ -106,7 +109,14 @@ const constraints = [
   { table: 'egg_resources', sql: 'ALTER TABLE egg_resources ADD UNIQUE INDEX idx_egg_resources_nest_egg (ptero_nest_id, ptero_egg_id)', name: 'idx_egg_resources_nest_egg' },
   { table: 'notifications', sql: 'ALTER TABLE notifications ADD INDEX idx_notif_user (user_id)', name: 'idx_notif_user' },
   { table: 'notifications', sql: 'ALTER TABLE notifications ADD INDEX idx_notif_user_read (user_id, is_read)', name: 'idx_notif_user_read' },
+  { table: 'notifications', sql: 'ALTER TABLE notifications ADD INDEX idx_notif_created (created_at)', name: 'idx_notif_created' },
   { table: 'notifications', sql: 'ALTER TABLE notifications ADD CONSTRAINT fk_notif_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE', name: 'fk_notif_user' },
+  { table: 'users', sql: 'ALTER TABLE users ADD INDEX idx_email (email)', name: 'idx_user_email' },
+  { table: 'users', sql: 'ALTER TABLE users ADD INDEX idx_username (username)', name: 'idx_user_username' },
+  { table: 'activity_log', sql: 'ALTER TABLE activity_log ADD INDEX idx_action (action)', name: 'idx_activity_action' },
+  { table: 'activity_log', sql: 'ALTER TABLE activity_log ADD CONSTRAINT fk_activity_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE', name: 'fk_activity_user' },
+  { table: 'server_meta', sql: 'ALTER TABLE server_meta ADD INDEX idx_ptero_server (ptero_server_id)', name: 'idx_ptero_server' },
+  { table: 'server_meta', sql: 'ALTER TABLE server_meta ADD CONSTRAINT fk_server_meta_user FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE', name: 'fk_server_meta_user' },
 ];
 
 export async function migrate() {

config/pyrodactyl.js

@@ -1,6 +1,6 @@
 export const PTERO_URL = process.env.PTERO_URL || 'https://panel.zero-host.org';
 export const PTERO_API_KEY = process.env.PTERO_API_KEY || '';
-export const PANEL_DB_NAME = process.env.PANEL_DB_NAME || 'panel';
+export const PANEL_DB_NAME = (process.env.PANEL_DB_NAME || 'panel').replace(/[^a-zA-Z0-9_]/g, '');
 
 export const SERVER_LIMITS = {
   memory: 512,

middleware/auth.js

@@ -3,12 +3,6 @@ import { query } from '../config/db.js';
 
 const JWT_SECRET = process.env.JWT_SECRET;
 
-if (!JWT_SECRET) {
-  console.error('Missing JWT_SECRET environment variable');
-} else if (/[\$\(\)]/.test(JWT_SECRET)) {
-  console.error('JWT_SECRET contains unresolved shell expansion characters ($(), backticks). Generate a proper random key (e.g. openssl rand -hex 32) and hardcode it in .env');
-}
-
 export async function authenticateToken(req, res, next) {
   const authHeader = req.headers['authorization'];
   const token = authHeader && authHeader.split(' ')[1];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zerohost-dashboard",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "type": "module",
   "scripts": {