queen-mq 0.1.0 → 0.1.2

package/src/server.js

@@ -1,10 +1,9 @@
 import uWS from 'uWebSockets.js';
-import pg from 'pg';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import config from './config.js';
-import { initDatabase } from './database/connection.js';
+import { createPool, initDatabase } from './database/connection.js';
 import { createOptimizedQueueManager } from './managers/queueManagerOptimized.js';
 import { createResourceCache } from './managers/resourceCache.js';
 import { createEventManager } from './managers/eventManager.js';
@@ -15,14 +14,15 @@ import { createPushRoute } from './routes/push.js';
 import { createPopRoute } from './routes/pop.js';
 import { createAckRoute } from './routes/ack.js';
 import { createConfigureRoute } from './routes/configure.js';
-import { createAnalyticsRoutes } from './routes/analytics.js';
 import { createMessagesRoutes } from './routes/messages.js';
 import { createResourcesRoutes } from './routes/resources.js';
+import { createStatusRoutes } from './routes/status.js';
 import { createWebSocketServer } from './websocket/wsServer.js';
 import { initEncryption } from './services/encryptionService.js';
 import { startRetentionJob } from './services/retentionService.js';
 import { startEvictionJob } from './services/evictionService.js';
 import { log } from './utils/logger.js';
+import { streamJSON, sendJSON, sendError } from './utils/streaming.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -38,26 +38,11 @@ let requestCount = 0;
 let messageCount = 0;
 const startTime = Date.now();
 
-// Create optimized connection pool
-const { Pool } = pg;
-const createOptimizedPool = () => {
-  return new Pool({
-    user: config.DATABASE.USER,
-    host: config.DATABASE.HOST,
-    database: config.DATABASE.DATABASE,
-    password: config.DATABASE.PASSWORD,
-    port: config.DATABASE.PORT,
-    max: config.DATABASE.POOL_SIZE,
-    idleTimeoutMillis: config.DATABASE.IDLE_TIMEOUT,
-    connectionTimeoutMillis: config.DATABASE.CONNECTION_TIMEOUT,
-    statement_timeout: config.DATABASE.STATEMENT_TIMEOUT,
-    query_timeout: config.DATABASE.QUERY_TIMEOUT,
-    application_name: config.SERVER.APPLICATION_NAME
-  });
-};
+// Shutdown flag to prevent background jobs from running during shutdown
+let isShuttingDown = false;
 
 // Initialize components
-const pool = createOptimizedPool();
+const pool = createPool();
 const resourceCache = createResourceCache();
 const eventManager = createEventManager();
 
@@ -69,9 +54,9 @@ resourceCache.registerEventHandlers(systemEventManager);
 
 // Always use optimized queue manager - it's better for all scenarios
 const queueManager = createOptimizedQueueManager(pool, resourceCache, eventManager, systemEventManager);
-const analyticsRoutes = createAnalyticsRoutes(queueManager);
 const messagesRoutes = createMessagesRoutes(pool, queueManager);
-const resourcesRoutes = createResourcesRoutes(pool);
+const resourcesRoutes = createResourcesRoutes(pool, systemEventManager);
+const statusRoutes = createStatusRoutes(pool);
 
 // Initialize database with migrations
 const initDatabaseWithMigrations = async () => {
@@ -136,14 +121,17 @@ const stopRetention = startRetentionJob(pool);
 const stopEviction = startEvictionJob(pool, eventManager);
 
 // Background job for lease reclamation
-setInterval(async () => {
+const leaseReclaimInterval = setInterval(async () => {
+  if (isShuttingDown) return;
   try {
     const reclaimed = await queueManager.reclaimExpiredLeases();
     if (reclaimed > 0) {
       log(`Reclaimed ${reclaimed} expired leases`);
     }
   } catch (error) {
-    log('Error reclaiming leases:', error);
+    if (!isShuttingDown) {
+      log('Error reclaiming leases:', error);
+    }
   }
 }, config.JOBS.LEASE_RECLAIM_INTERVAL);
 
@@ -154,13 +142,27 @@ const app = uWS.App();
 const wsServer = createWebSocketServer(app, eventManager);
 
 // Background job for queue depth updates
-setInterval(async () => {
-  await wsServer.updateQueueDepths(queueManager);
+const queueDepthInterval = setInterval(async () => {
+  if (isShuttingDown) return;
+  try {
+    await wsServer.updateQueueDepths(queueManager);
+  } catch (error) {
+    if (!isShuttingDown) {
+      log('Error updating queue depths:', error);
+    }
+  }
 }, config.JOBS.QUEUE_DEPTH_UPDATE_INTERVAL);
 
 // Background job for system stats
-setInterval(async () => {
-  await wsServer.sendSystemStats(pool);
+const systemStatsInterval = setInterval(async () => {
+  if (isShuttingDown) return;
+  try {
+    await wsServer.sendSystemStats(pool);
+  } catch (error) {
+    if (!isShuttingDown) {
+      log('Error sending system stats:', error);
+    }
+  }
 }, config.JOBS.SYSTEM_STATS_UPDATE_INTERVAL);
 
 // CORS headers helper
@@ -363,21 +365,26 @@ app.get('/api/v1/pop/queue/:queue/partition/:partition', (res, req) => {
       });
     }
     
-    res.cork(() => {
-      setCorsHeaders(res);
-      if (result.messages.length > 0) {
-        res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
-      } else {
+    // Use streaming with backpressure for large responses
+    if (result.messages.length === 0) {
+      res.cork(() => {
+        setCorsHeaders(res);
         res.writeStatus(config.HTTP_STATUS.NO_CONTENT.toString()).end();
-      }
-    });
+      });
+    } else {
+      res.cork(() => {
+        setCorsHeaders(res);
+        res.writeStatus(config.HTTP_STATUS.OK.toString());
+      });
+      streamJSON(res, result, { aborted });
+    }
   }).catch(error => {
     if (aborted) return;
     log('Pop error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
     });
+    sendError(res, error, config.HTTP_STATUS.INTERNAL_SERVER_ERROR);
   });
 });
 
@@ -415,21 +422,26 @@ app.get('/api/v1/pop/queue/:queue', (res, req) => {
       });
     }
     
-    res.cork(() => {
-      setCorsHeaders(res);
-      if (result.messages.length > 0) {
-        res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
-      } else {
+    // Use streaming with backpressure for large responses
+    if (result.messages.length === 0) {
+      res.cork(() => {
+        setCorsHeaders(res);
         res.writeStatus(config.HTTP_STATUS.NO_CONTENT.toString()).end();
-      }
-    });
+      });
+    } else {
+      res.cork(() => {
+        setCorsHeaders(res);
+        res.writeStatus(config.HTTP_STATUS.OK.toString());
+      });
+      streamJSON(res, result, { aborted });
+    }
   }).catch(error => {
     if (aborted) return;
     log('Pop error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
     });
+    sendError(res, error, config.HTTP_STATUS.INTERNAL_SERVER_ERROR);
   });
 });
 
@@ -470,21 +482,26 @@ app.get('/api/v1/pop', (res, req) => {
       });
     }
     
-    res.cork(() => {
-      setCorsHeaders(res);
-      if (result.messages.length > 0) {
-        res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
-      } else {
+    // Use streaming with backpressure for large responses
+    if (result.messages.length === 0) {
+      res.cork(() => {
+        setCorsHeaders(res);
         res.writeStatus(config.HTTP_STATUS.NO_CONTENT.toString()).end();
-      }
-    });
+      });
+    } else {
+      res.cork(() => {
+        setCorsHeaders(res);
+        res.writeStatus(config.HTTP_STATUS.OK.toString());
+      });
+      streamJSON(res, result, { aborted });
+    }
   }).catch(error => {
     if (aborted) return;
     log('Pop error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
     });
+    sendError(res, error, config.HTTP_STATUS.INTERNAL_SERVER_ERROR);
   });
 });
 
@@ -575,30 +592,34 @@ app.post('/api/v1/ack/batch', (res, req) => {
   }, abortedRef);
 });
 
-// Analytics routes
-app.get('/api/v1/analytics/queues', (res, req) => {
+// Messages routes
+app.get('/api/v1/messages', (res, req) => {
   const query = new URLSearchParams(req.getQuery());
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
-  const queue = query.get('queue');
-  const namespace = query.get('namespace');
-  const task = query.get('task');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Analytics request aborted');
+    log('Messages list request aborted');
   });
   
-  analyticsRoutes.getQueues({ fromDateTime, toDateTime, queue, namespace, task }).then(result => {
+  const filters = {
+    ns: query.get('ns'),
+    task: query.get('task'),
+    queue: query.get('queue'),
+    status: query.get('status'),
+    limit: parseInt(query.get('limit') || config.API.DEFAULT_LIMIT.toString()),
+    offset: parseInt(query.get('offset') || config.API.DEFAULT_OFFSET.toString())
+  };
+  
+  messagesRoutes.listMessages(filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ messages: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Analytics error:', error.message || error);
+    log('List messages error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -606,19 +627,16 @@ app.get('/api/v1/analytics/queues', (res, req) => {
   });
 });
 
-app.get('/api/v1/analytics/queue/:queue', (res, req) => {
-  const queue = req.getParameter(0);
-  const query = new URLSearchParams(req.getQuery());
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
+app.get('/api/v1/messages/:transactionId', (res, req) => {
+  const transactionId = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Analytics request aborted');
+    log('Get message request aborted');
   });
   
-  analyticsRoutes.getQueueStats(queue, { fromDateTime, toDateTime }).then(result => {
+  messagesRoutes.getMessage(transactionId).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -626,37 +644,25 @@ app.get('/api/v1/analytics/queue/:queue', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Analytics error:', error.message || error);
+    log('Get message error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
+      res.writeStatus(error.message === 'Message not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
+        .end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-// Analytics with filters
-app.get('/api/v1/analytics', (res, req) => {
-  const query = new URLSearchParams(req.getQuery());
-  const namespace = query.get('namespace');
-  const task = query.get('task');
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
-  const queue = query.get('queue');
+app.del('/api/v1/messages/:transactionId', (res, req) => {
+  const transactionId = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Analytics request aborted');
+    log('Delete message request aborted');
   });
   
-  const filters = { fromDateTime, toDateTime };
-  const getStats = namespace 
-    ? analyticsRoutes.getNamespaceStats(namespace, filters)
-    : task 
-    ? analyticsRoutes.getTaskStats(task, filters)
-    : analyticsRoutes.getQueues({ ...filters, queue, namespace, task });
-    
-  getStats.then(result => {
+  messagesRoutes.deleteMessage(transactionId).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -664,29 +670,25 @@ app.get('/api/v1/analytics', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Analytics error:', error.message || error);
+    log('Delete message error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
+      res.writeStatus(error.message === 'Message not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
+        .end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-app.get('/api/v1/analytics/queue-depths', (res, req) => {
-  const query = new URLSearchParams(req.getQuery());
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
-  const queue = query.get('queue');
-  const namespace = query.get('namespace');
-  const task = query.get('task');
+app.post('/api/v1/messages/:transactionId/retry', (res, req) => {
+  const transactionId = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Analytics request aborted');
+    log('Retry message request aborted');
   });
   
-  analyticsRoutes.getQueueDepths({ fromDateTime, toDateTime, queue, namespace, task }).then(result => {
+  messagesRoutes.retryMessage(transactionId).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -694,7 +696,7 @@ app.get('/api/v1/analytics/queue-depths', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Analytics error:', error.message || error);
+    log('Retry message error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -702,21 +704,16 @@ app.get('/api/v1/analytics/queue-depths', (res, req) => {
   });
 });
 
-app.get('/api/v1/analytics/throughput', (res, req) => {
-  const query = new URLSearchParams(req.getQuery());
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
-  const queue = query.get('queue');
-  const namespace = query.get('namespace');
-  const task = query.get('task');
+app.post('/api/v1/messages/:transactionId/dlq', (res, req) => {
+  const transactionId = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Analytics request aborted');
+    log('Move to DLQ request aborted');
   });
   
-  analyticsRoutes.getThroughput(pool, { fromDateTime, toDateTime, queue, namespace, task }).then(result => {
+  messagesRoutes.moveToDLQ(transactionId).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -724,7 +721,7 @@ app.get('/api/v1/analytics/throughput', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Analytics error:', error.message || error);
+    log('Move to DLQ error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -732,29 +729,24 @@ app.get('/api/v1/analytics/throughput', (res, req) => {
   });
 });
 
-app.get('/api/v1/analytics/queue-lag', (res, req) => {
-  const query = new URLSearchParams(req.getQuery());
-  const queue = query.get('queue');
-  const namespace = query.get('namespace');
-  const task = query.get('task');
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
+app.get('/api/v1/messages/:transactionId/related', (res, req) => {
+  const transactionId = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Queue lag request aborted');
+    log('Get related messages request aborted');
   });
   
-  analyticsRoutes.getQueueLag({ queue, namespace, task, fromDateTime, toDateTime }).then(result => {
+  messagesRoutes.getRelatedMessages(transactionId).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ messages: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Queue lag error:', error);
+    log('Get related messages error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -762,22 +754,18 @@ app.get('/api/v1/analytics/queue-lag', (res, req) => {
   });
 });
 
-// Queue stats route
-app.get('/api/v1/analytics/queue-stats', (res, req) => {
+app.del('/api/v1/queues/:queue/clear', (res, req) => {
+  const queue = req.getParameter(0);
   const query = new URLSearchParams(req.getQuery());
-  const queue = query.get('queue');
-  const namespace = query.get('namespace');
-  const task = query.get('task');
-  const fromDateTime = query.get('fromDateTime');
-  const toDateTime = query.get('toDateTime');
+  const partition = query.get('partition');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Queue stats request aborted');
+    log('Clear queue request aborted');
   });
   
-  queueManager.getQueueStats({ queue, namespace, task, fromDateTime, toDateTime }).then(result => {
+  messagesRoutes.clearQueue(queue, partition).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -785,7 +773,7 @@ app.get('/api/v1/analytics/queue-stats', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Queue stats error:', error);
+    log('Clear queue error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -793,34 +781,27 @@ app.get('/api/v1/analytics/queue-stats', (res, req) => {
   });
 });
 
-// Messages routes
-app.get('/api/v1/messages', (res, req) => {
+// Resources routes
+app.get('/api/v1/resources/queues', (res, req) => {
   const query = new URLSearchParams(req.getQuery());
+  const namespace = query.get('namespace');
+  const task = query.get('task');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Messages list request aborted');
+    log('Get queues request aborted');
   });
   
-  const filters = {
-    ns: query.get('ns'),
-    task: query.get('task'),
-    queue: query.get('queue'),
-    status: query.get('status'),
-    limit: parseInt(query.get('limit') || config.API.DEFAULT_LIMIT.toString()),
-    offset: parseInt(query.get('offset') || config.API.DEFAULT_OFFSET.toString())
-  };
-  
-  messagesRoutes.listMessages(filters).then(result => {
+  resourcesRoutes.getQueues({ namespace, task }).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ messages: result }));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ queues: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('List messages error:', error);
+    log('Get queues error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -828,16 +809,16 @@ app.get('/api/v1/messages', (res, req) => {
   });
 });
 
-app.get('/api/v1/messages/:transactionId', (res, req) => {
-  const transactionId = req.getParameter(0);
+app.get('/api/v1/resources/queues/:queue', (res, req) => {
+  const queue = req.getParameter(0);
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get message request aborted');
+    log('Get queue request aborted');
   });
   
-  messagesRoutes.getMessage(transactionId).then(result => {
+  resourcesRoutes.getQueue(queue).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -845,59 +826,58 @@ app.get('/api/v1/messages/:transactionId', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get message error:', error);
+    log('Get queue error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(error.message === 'Message not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
+      res.writeStatus(error.message === 'Queue not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
         .end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-app.del('/api/v1/messages/:transactionId', (res, req) => {
-  const transactionId = req.getParameter(0);
+app.get('/api/v1/resources/partitions', (res, req) => {
+  const query = new URLSearchParams(req.getQuery());
+  const queue = query.get('queue');
+  const minDepth = query.get('minDepth');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Delete message request aborted');
+    log('Get partitions request aborted');
   });
   
-  messagesRoutes.deleteMessage(transactionId).then(result => {
+  resourcesRoutes.getPartitions({ queue, minDepth: minDepth ? parseInt(minDepth) : null }).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ partitions: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Delete message error:', error);
+    log('Get partitions error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(error.message === 'Message not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
-        .end(JSON.stringify({ error: error.message }));
+      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-app.post('/api/v1/messages/:transactionId/retry', (res, req) => {
-  const transactionId = req.getParameter(0);
-  
+app.get('/api/v1/resources/namespaces', (res, req) => {
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Retry message request aborted');
+    log('Get namespaces request aborted');
   });
   
-  messagesRoutes.retryMessage(transactionId).then(result => {
+  resourcesRoutes.getNamespaces().then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ namespaces: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Retry message error:', error);
+    log('Get namespaces error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -905,24 +885,22 @@ app.post('/api/v1/messages/:transactionId/retry', (res, req) => {
   });
 });
 
-app.post('/api/v1/messages/:transactionId/dlq', (res, req) => {
-  const transactionId = req.getParameter(0);
-  
+app.get('/api/v1/resources/tasks', (res, req) => {
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Move to DLQ request aborted');
+    log('Get tasks request aborted');
   });
   
-  messagesRoutes.moveToDLQ(transactionId).then(result => {
+  resourcesRoutes.getTasks().then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ tasks: result }));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Move to DLQ error:', error);
+    log('Get tasks error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -930,24 +908,22 @@ app.post('/api/v1/messages/:transactionId/dlq', (res, req) => {
   });
 });
 
-app.get('/api/v1/messages/:transactionId/related', (res, req) => {
-  const transactionId = req.getParameter(0);
-  
+app.get('/api/v1/resources/overview', (res, req) => {
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get related messages request aborted');
+    log('Get overview request aborted');
   });
   
-  messagesRoutes.getRelatedMessages(transactionId).then(result => {
+  resourcesRoutes.getSystemOverview().then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ messages: result }));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get related messages error:', error);
+    log('Get overview error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -955,18 +931,17 @@ app.get('/api/v1/messages/:transactionId/related', (res, req) => {
   });
 });
 
-app.del('/api/v1/queues/:queue/clear', (res, req) => {
+// Delete queue
+app.del('/api/v1/resources/queues/:queue', (res, req) => {
   const queue = req.getParameter(0);
-  const query = new URLSearchParams(req.getQuery());
-  const partition = query.get('partition');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Clear queue request aborted');
+    log('Delete queue request aborted');
   });
   
-  messagesRoutes.clearQueue(queue, partition).then(result => {
+  resourcesRoutes.deleteQueue(queue).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -974,7 +949,7 @@ app.del('/api/v1/queues/:queue/clear', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Clear queue error:', error);
+    log('Delete queue error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -982,27 +957,37 @@ app.del('/api/v1/queues/:queue/clear', (res, req) => {
   });
 });
 
-// Resources routes
-app.get('/api/v1/resources/queues', (res, req) => {
+// ============================================================================
+// Status/Dashboard Routes (New unified API)
+// ============================================================================
+
+// 1. Dashboard Status - GET /api/v1/status
+app.get('/api/v1/status', (res, req) => {
   const query = new URLSearchParams(req.getQuery());
-  const namespace = query.get('namespace');
-  const task = query.get('task');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get queues request aborted');
+    log('Status request aborted');
   });
   
-  resourcesRoutes.getQueues({ namespace, task }).then(result => {
+  const filters = {
+    from: query.get('from'),
+    to: query.get('to'),
+    queue: query.get('queue'),
+    namespace: query.get('namespace'),
+    task: query.get('task')
+  };
+  
+  statusRoutes.getStatus(filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ queues: result }));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get queues error:', error);
+    log('Status error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -1010,16 +995,26 @@ app.get('/api/v1/resources/queues', (res, req) => {
   });
 });
 
-app.get('/api/v1/resources/queues/:queue', (res, req) => {
-  const queue = req.getParameter(0);
+// 2. Queues List - GET /api/v1/status/queues
+app.get('/api/v1/status/queues', (res, req) => {
+  const query = new URLSearchParams(req.getQuery());
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get queue request aborted');
+    log('Status queues request aborted');
   });
   
-  resourcesRoutes.getQueue(queue).then(result => {
+  const filters = {
+    from: query.get('from'),
+    to: query.get('to'),
+    namespace: query.get('namespace'),
+    task: query.get('task'),
+    limit: query.get('limit'),
+    offset: query.get('offset')
+  };
+  
+  statusRoutes.getQueues(filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -1027,81 +1022,78 @@ app.get('/api/v1/resources/queues/:queue', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get queue error:', error);
+    log('Status queues error:', error);
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(error.message === 'Queue not found' ? config.HTTP_STATUS.NOT_FOUND.toString() : config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString())
-        .end(JSON.stringify({ error: error.message }));
+      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-app.get('/api/v1/resources/partitions', (res, req) => {
+// 3. Queue Detail - GET /api/v1/status/queues/:queueName
+app.get('/api/v1/status/queues/:queue', (res, req) => {
+  const queueName = req.getParameter(0);
   const query = new URLSearchParams(req.getQuery());
-  const queue = query.get('queue');
-  const minDepth = query.get('minDepth');
   
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get partitions request aborted');
+    log('Status queue detail request aborted');
   });
   
-  resourcesRoutes.getPartitions({ queue, minDepth: minDepth ? parseInt(minDepth) : null }).then(result => {
-    if (aborted) return;
-    res.cork(() => {
-      setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ partitions: result }));
-    });
-  }).catch(error => {
-    if (aborted) return;
-    log('Get partitions error:', error);
-    res.cork(() => {
-      setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
-    });
-  });
-});
-
-app.get('/api/v1/resources/namespaces', (res, req) => {
-  let aborted = false;
-  res.onAborted(() => {
-    aborted = true;
-    log('Get namespaces request aborted');
-  });
+  const filters = {
+    from: query.get('from'),
+    to: query.get('to')
+  };
   
-  resourcesRoutes.getNamespaces().then(result => {
+  statusRoutes.getQueueDetail(queueName, filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ namespaces: result }));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get namespaces error:', error);
+    log('Status queue detail error:', error);
+    const statusCode = error.message === 'Queue not found' 
+      ? config.HTTP_STATUS.NOT_FOUND 
+      : config.HTTP_STATUS.INTERNAL_SERVER_ERROR;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
+      res.writeStatus(statusCode.toString()).end(JSON.stringify({ error: error.message }));
     });
   });
 });
 
-app.get('/api/v1/resources/tasks', (res, req) => {
+// 4. Queue Messages - GET /api/v1/status/queues/:queueName/messages
+app.get('/api/v1/status/queues/:queue/messages', (res, req) => {
+  const queueName = req.getParameter(0);
+  const query = new URLSearchParams(req.getQuery());
+  
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get tasks request aborted');
+    log('Status queue messages request aborted');
   });
   
-  resourcesRoutes.getTasks().then(result => {
+  const filters = {
+    status: query.get('status'),
+    partition: query.get('partition'),
+    from: query.get('from'),
+    to: query.get('to'),
+    limit: query.get('limit'),
+    offset: query.get('offset')
+  };
+  
+  statusRoutes.getQueueMessages(queueName, filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
-      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify({ tasks: result }));
+      res.writeStatus(config.HTTP_STATUS.OK.toString()).end(JSON.stringify(result));
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get tasks error:', error);
+    log('Status queue messages error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -1109,14 +1101,26 @@ app.get('/api/v1/resources/tasks', (res, req) => {
   });
 });
 
-app.get('/api/v1/resources/overview', (res, req) => {
+// 5. Analytics - GET /api/v1/status/analytics
+app.get('/api/v1/status/analytics', (res, req) => {
+  const query = new URLSearchParams(req.getQuery());
+  
   let aborted = false;
   res.onAborted(() => {
     aborted = true;
-    log('Get overview request aborted');
+    log('Status analytics request aborted');
   });
   
-  resourcesRoutes.getSystemOverview().then(result => {
+  const filters = {
+    from: query.get('from'),
+    to: query.get('to'),
+    queue: query.get('queue'),
+    namespace: query.get('namespace'),
+    task: query.get('task'),
+    interval: query.get('interval') || 'hour'
+  };
+  
+  statusRoutes.getAnalytics(filters).then(result => {
     if (aborted) return;
     res.cork(() => {
       setCorsHeaders(res);
@@ -1124,7 +1128,7 @@ app.get('/api/v1/resources/overview', (res, req) => {
     });
   }).catch(error => {
     if (aborted) return;
-    log('Get overview error:', error);
+    log('Status analytics error:', error);
     res.cork(() => {
       setCorsHeaders(res);
       res.writeStatus(config.HTTP_STATUS.INTERNAL_SERVER_ERROR.toString()).end(JSON.stringify({ error: error.message }));
@@ -1217,38 +1221,41 @@ app.listen(HOST, PORT, async (token) => {
     log(`✅ Queen Server running at http://${HOST}:${PORT}`);
     log(`📊 Features enabled:`);
     log(`   - Encryption: ${encryptionEnabled ? '✅' : '❌ (set QUEEN_ENCRYPTION_KEY)'}`);
+    log(`   - System Events: ${config.SYSTEM_EVENTS.ENABLED ? '✅' : '❌ (disabled via config)'}`);
     log(`   - Retention: ✅`);
     log(`   - Eviction: ✅`);
     log(`   - WebSocket Dashboard: ws://${HOST}:${PORT}/ws/dashboard`);
     log(`   - Server Instance ID: ${SERVER_INSTANCE_ID}`);
     
-    // Start system event synchronization and consumption
-    try {
-      // Create temporary client for synchronization
-      const syncClient = createQueenClient({ 
-        baseUrl: `http://localhost:${PORT}` 
-      });
-      
-      // Synchronize system events (catch up on missed events)
-      await syncSystemEvents(syncClient, systemEventManager, SERVER_INSTANCE_ID);
-      
-      // Start consuming system events
-      // Note: consume() returns the stop function directly
-      stopSystemEventConsumer = syncClient.consume({
-        queue: SYSTEM_QUEUE,
-        consumerGroup: SERVER_INSTANCE_ID,
-        handler: async (message) => {
-          await systemEventManager.processSystemEvent(message.payload);
-        },
-        options: {
-          batch: 10,
-          wait: true
-        }
-      });
-      
-      log(`✅ System event consumer started`);
-    } catch (error) {
-      log(`⚠️ Failed to start system event consumer: ${error.message}`);
+    // Start system event synchronization and consumption (only if enabled)
+    if (config.SYSTEM_EVENTS.ENABLED) {
+      try {
+        // Create temporary client for synchronization
+        const syncClient = createQueenClient({ 
+          baseUrl: `http://localhost:${PORT}` 
+        });
+        
+        // Synchronize system events (catch up on missed events)
+        await syncSystemEvents(syncClient, systemEventManager, SERVER_INSTANCE_ID);
+        
+        // Start consuming system events
+        // Note: consume() returns the stop function directly
+        stopSystemEventConsumer = syncClient.consume({
+          queue: SYSTEM_QUEUE,
+          consumerGroup: SERVER_INSTANCE_ID,
+          handler: async (message) => {
+            await systemEventManager.processSystemEvent(message.payload);
+          },
+          options: {
+            batch: 10,
+            wait: true
+          }
+        });
+        
+        log(`✅ System event consumer started`);
+      } catch (error) {
+        log(`⚠️ Failed to start system event consumer: ${error.message}`);
+      }
     }
     
     log(`🎯 Ready to process messages with high performance!`);
@@ -1262,6 +1269,9 @@ app.listen(HOST, PORT, async (token) => {
 const shutdown = async (signal) => {
   log(`\n🛑 Received ${signal}, shutting down gracefully...`);
   
+  // Set shutdown flag immediately to prevent new operations
+  isShuttingDown = true;
+  
   // Stop system event consumer
   if (stopSystemEventConsumer) {
     stopSystemEventConsumer();
@@ -1269,8 +1279,31 @@ const shutdown = async (signal) => {
   }
   
   // Stop background jobs
-  if (stopRetention) stopRetention();
-  if (stopEviction) stopEviction();
+  if (stopRetention) {
+    stopRetention();
+    log('✅ Retention job stopped');
+  }
+  if (stopEviction) {
+    stopEviction();
+    log('✅ Eviction job stopped');
+  }
+  
+  // Clear background intervals
+  if (leaseReclaimInterval) {
+    clearInterval(leaseReclaimInterval);
+    log('✅ Lease reclaim interval stopped');
+  }
+  if (queueDepthInterval) {
+    clearInterval(queueDepthInterval);
+    log('✅ Queue depth update interval stopped');
+  }
+  if (systemStatsInterval) {
+    clearInterval(systemStatsInterval);
+    log('✅ System stats interval stopped');
+  }
+  
+  // Wait a moment for any in-flight operations to complete
+  await new Promise(resolve => setTimeout(resolve, 100));
   
   const uptime = (Date.now() - startTime) / 1000;
   if (messageCount > 0) {
@@ -1278,7 +1311,10 @@ const shutdown = async (signal) => {
     log(`   Average: ${(messageCount / uptime).toFixed(2)} messages/second`);
   }
   
+  // Close database pool last
   await pool.end();
+  log('✅ Database pool closed');
+  
   process.exit(0);
 };