new realtime log page

Author: andrewshell

app.js

@@ -7,8 +7,8 @@ const config = require('./config'),
     getDayjs = require('./services/dayjs-wrapper'),
     mongodb = require('./services/mongodb'),
     morgan = require('morgan'),
-    { setupLogRetention } = require('./services/log-cleanup'),
-    removeExpiredSubscriptions = require('./services/remove-expired-subscriptions');
+    removeExpiredSubscriptions = require('./services/remove-expired-subscriptions'),
+    websocket = require('./services/websocket');
 
 let app, hbs, server, dayjs;
 
@@ -69,13 +69,6 @@ async function startServer() {
     await initializeDayjs();
     await mongodb.connect('rsscloud', config.mongodbUri);
 
-    // Setup log retention TTL index
-    try {
-        await setupLogRetention();
-    } catch (error) {
-        console.error('Failed to setup log retention, continuing without it:', error);
-    }
-
     // Start cleanup scheduling
     scheduleCleanupTasks();
 
@@ -87,6 +80,9 @@ async function startServer() {
             app.locals.host = '[' + app.locals.host + ']';
         }
 
+        // Initialize WebSocket server for /wsLog
+        websocket.initialize(server);
+
         console.log(`Listening at http://${app.locals.host}:${app.locals.port}`);
     })
         .on('error', (error) => {

config.js

@@ -21,6 +21,5 @@ module.exports = {
     maxResourceSize: getNumericConfig('MAX_RESOURCE_SIZE', 256000),
     ctSecsResourceExpire: getNumericConfig('CT_SECS_RESOURCE_EXPIRE', 90000),
     minSecsBetweenPings: getNumericConfig('MIN_SECS_BETWEEN_PINGS', 0),
-    requestTimeout: getNumericConfig('REQUEST_TIMEOUT', 4000),
-    logRetentionHours: getNumericConfig('LOG_RETENTION_HOURS', 2)
+    requestTimeout: getNumericConfig('REQUEST_TIMEOUT', 4000)
 };

controllers/view-log.js

@@ -1,64 +1,11 @@
-
-const ErrorResponse = require('../services/error-response'),
-    errorResult = require('../services/error-result'),
-    express = require('express'),
-    getDayjs = require('../services/dayjs-wrapper'),
-    mongodb = require('../services/mongodb'),
+const express = require('express'),
     router = new express.Router();
 
-async function fetchVals(_db, _callback) {
-    const dayjs = await getDayjs();
-    const vals = {
-            'eventlog': []
-        },
-
-        res = await mongodb.get('rsscloud')
-            .collection('events')
-            .find()
-            .sort({ time: -1 })
-            .limit(1000)
-            .toArray();
-
-    vals.eventlog = res.map(item => {
-        item.id = item._id.toHexString();
-        delete item._id;
-
-        item.headers = JSON.parse(item.headers);
-
-        // Format time for display (hour:minute AM/PM)
-        item.time = dayjs(item.time).format('h:mmA');
-
-        return item;
-    });
-
-    return vals;
-}
-
-function processResponse(req, res, vals) {
-    switch (req.accepts('html', 'json')) {
-    case 'html':
-        res.render('view-log', vals);
-        break;
-    case 'json':
-        res.json(vals.eventlog);
-        break;
-    default:
-        res.status(406).send('Not Acceptable');
-        break;
-    }
-}
-
-function handleError(req, res, err) {
-    if (!(err instanceof ErrorResponse)) {
-        console.error(err);
-    }
-    processResponse(req, res, errorResult(err.message));
-}
-
 router.get('/', function(req, res) {
-    fetchVals()
-        .then(vals => processResponse(req, res, vals))
-        .catch(err => handleError(req, res, err));
+    res.render('view-log', {
+        host: req.app.locals.host,
+        port: req.app.locals.port
+    });
 });
 
 module.exports = router;