Adding log items live via websockets

Author: andrewshell

app.js

@@ -4,6 +4,7 @@
     var app,
         cors = require('cors'),
         express = require('express'),
+        expressWs,
         exphbs = require('express-handlebars'),
         hbs,
         moment = require('moment'),
@@ -55,6 +56,7 @@
     });
 
     app = express();
+    expressWs = require('express-ws')(app);
 
     app.use(morgan('[:mydate] :method :url :status :res[content-length] - :remote-addr - :response-time ms'));
 
@@ -84,10 +86,14 @@
 
     // Start server
     server = app.listen(nconf.get('PORT'), function () {
-        var host = server.address().address,
-            port = server.address().port;
+        app.locals.host = server.address().address;
+        app.locals.port = server.address().port;
 
-        console.log('Listening at http://%s:%s', host, port);
+        if (app.locals.host.indexOf(':') > -1) {
+            app.locals.host = '[' + app.locals.host + ']';
+        }
+
+        console.log('Listening at http://%s:%s', app.locals.host, app.locals.port);
     })
         .on('error', function (error) {
             switch (error.code) {

controllers/view-log.js

@@ -5,30 +5,32 @@
         data = require('../services/data'),
         errorResult = require('../services/error-result'),
         express = require('express'),
+        logEmitter = require('../services/log-emitter'),
         router = express.Router();
 
-    function fetchData(db, callback) {
-        var data = {
+    function fetchVals(db, id, callback) {
+        var vals = {
             'eventlog': []
         };
 
         db.serialize(function() {
-            db.each("SELECT * FROM log_events ORDER BY time DESC LIMIT 100", function(err, row) {
+            db.each("SELECT * FROM log_events ORDER BY time DESC LIMIT 1000", function(err, row) {
                 row.headers = JSON.parse(row.headers);
-                data.eventlog.push(row);
+                vals.eventlog.push(row);
             }, function () {
-                callback(null, data);
+                callback(null, vals);
             });
         });
     }
 
-    function processResponse(req, res, data) {
+    function processResponse(req, res, vals) {
         switch (req.accepts('html', 'json')) {
         case 'html':
-            res.render('view-log', data);
+            vals.wshost = res.app.locals.host + ':' + res.app.locals.port;
+            res.render('view-log', vals);
             break;
         case 'json':
-            res.json(data.eventlog);
+            res.json(vals.eventlog);
             break;
         default:
             res.status(406).send('Not Acceptable');
@@ -46,15 +48,29 @@
                 data.getDb(callback);
             },
             function (db, callback) {
-                fetchData(db, callback);
+                fetchVals(db, 0, callback);
             },
-            function (data) {
-                processResponse(req, res, data);
+            function (vals) {
+                processResponse(req, res, vals);
             }
         ], function (errorMessage) {
             handleError(req, res, errorMessage);
         });
     });
 
+    router.ws('/', function(ws, req) {
+        var id = 0;
+
+        function sendLogEvent(logEvent) {
+            ws.send(logEvent);
+        };
+
+        logEmitter.on('logged-event', sendLogEvent);
+
+        ws.on('close', function () {
+            logEmitter.removeListener('logged-event', sendLogEvent);
+        });
+    });
+
     module.exports = router;
 }());

package.json

@@ -25,6 +25,7 @@
     "db-migrate-sqlite3": "^0.2.1",
     "express": "^4.15.3",
     "express-handlebars": "^3.0.0",
+    "express-ws": "^3.0.0",
     "moment": "^2.18.1",
     "morgan": "^1.8.2",
     "nconf": "^0.8.4",

public/js/eventlog.tpl.js

@@ -0,0 +1,23 @@
+(function() {
+  var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
+templates['eventlog'] = template({"1":function(container,depth0,helpers,partials,data) {
+    var helper;
+
+  return " <i class=\"fa fa-info-circle btn btn-default btn-xs\" data-toggle=\"modal\" data-target=\"#headers"
+    + container.escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"id","hash":{},"data":data}) : helper)))
+    + "\"></i>";
+},"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
+    var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
+
+  return "<tr>\n    <td>"
+    + alias4(((helper = (helper = helpers.eventtype || (depth0 != null ? depth0.eventtype : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"eventtype","hash":{},"data":data}) : helper)))
+    + "</td>\n    <td>"
+    + ((stack1 = ((helper = (helper = helpers.htmltext || (depth0 != null ? depth0.htmltext : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"htmltext","hash":{},"data":data}) : helper))) != null ? stack1 : "")
+    + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.headers : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</td>\n    <td class=\"date\">"
+    + alias4(((helper = (helper = helpers.time || (depth0 != null ? depth0.time : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"time","hash":{},"data":data}) : helper)))
+    + "</td>\n    <td>"
+    + alias4(((helper = (helper = helpers.secs || (depth0 != null ? depth0.secs : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"secs","hash":{},"data":data}) : helper)))
+    + "</td>\n</tr>\n";
+},"useData":true});
+})();