web-log-viewer 0.0.4 → 0.2.0

package/build/server.js

@@ -24,8 +24,6 @@ var stream_utils_1 = require("./stream-utils");
 var config_1 = require("./config");
 var log_index_1 = require("./log-index");
 var path_1 = __importDefault(require("path"));
-var LOG_WINDOW_SIZE = 100;
-var clients = [];
 /**Contains all the logs that came into the server up until now */
 var logs = [];
 // setup the server
@@ -50,11 +48,15 @@ server.listen(config_1.config.port, function () {
  * pipes them to all registered clients using websockets.
  */
 var setupLogStream = function () {
-    return ramda_1.pipe(function () { return stream_utils_1.createReadlineStream(); }, core_1.tap(function (rawMessage) {
+    return ramda_1.pipe(function () { return stream_utils_1.createReadlineStream(); }, 
+    // optionally log the message to the server's console
+    core_1.tap(function (rawMessage) {
         if (config_1.config.stdout) {
             console.log(rawMessage);
         }
-    }), core_1.map(function (rawMessage) {
+    }), 
+    // parse the message with the currently configured parser
+    core_1.map(function (rawMessage) {
         var data = config_1.config.parseRawMessage(rawMessage);
         var msg = {
             seq: logs.length + 1,
@@ -63,55 +65,92 @@ var setupLogStream = function () {
         };
         logs.push(msg);
         return msg;
-    }), core_1.tap(function (rawLog) {
-        var updateMsg = {
-            type: 'update',
-            size: logs.length,
-            message: rawLog,
-        };
+    }), 
+    // potentially, send the message to all currently connected clients
+    core_1.tap(function (rawLog) {
         wss.clients.forEach(function (ws) {
-            ws.send(encode(updateMsg));
+            updateWsClientStatus(ws, function (status) {
+                var updateMsg = {
+                    type: 'update',
+                    size: status.count + 1,
+                    message: rawLog,
+                };
+                // only send the new message to the client if it passes the client's filter
+                var matcher = log_index_1.isIndexMatch(status.filter);
+                if (matcher(updateMsg.message.index)) {
+                    ws.send(encode(__assign(__assign({}, updateMsg), { message: __assign({}, updateMsg.message) })));
+                    return __assign(__assign({}, status), { count: updateMsg.size });
+                }
+                else {
+                    return status;
+                }
+            });
         });
     }));
 };
+/**
+ * Update the status associated with a particular WS client
+ * @param ws the WS client instance
+ * @param statusFn a function that receives the current status and returns the new one
+ */
+function updateWsClientStatus(ws, statusFn) {
+    var currentStatus = getWsClientStatus(ws);
+    ws._status = statusFn(currentStatus);
+}
+/**
+ * Get the status associated with a particular wS client
+ */
+function getWsClientStatus(ws) {
+    return ws._status;
+}
 /**
  * Function executed every time a new WS client connects to the server.
  * This will send a `InitMessage` to that client, so it can immediately start showing to the user.
  */
 function setupNewClient(ws) {
-    var clientId = clients.length;
-    clients.push({ mode: 'tail' });
-    // send a window with the last logs to newly registered clients
-    ws.send(encode(buildTailMessage('')));
+    updateWsClientStatus(ws, function () { return ({ mode: 'tail', filter: '', count: 0 }); });
+    // when the client send a message, it means one of the following:
+    // - change mode to tail/static
+    // - specify a new filter query
+    // - change the offset of static mode
     ws.on('message', function (encodedMsg) {
         var msg = decode(encodedMsg);
+        var matcher = log_index_1.isIndexMatch(msg.filter);
+        var filteredLogs = logs.filter(function (l) { return matcher(l.index); });
         if (msg.mode == 'tail') {
-            ws.send(encode(buildTailMessage(msg.filter)));
+            updateWsClientStatus(ws, function (currentStatus) { return (__assign(__assign({}, currentStatus), { mode: 'tail', filter: msg.filter, count: filteredLogs.length })); });
+            ws.send(encode(buildTailMessage(filteredLogs, msg.maxMessages)));
         }
         else if (msg.mode == 'static') {
-            ws.send(encode(buildStaticMessage(msg.filter, msg.offsetSeq)));
+            updateWsClientStatus(ws, function (currentStatus) { return (__assign(__assign({}, currentStatus), { mode: 'static', offsetStart: msg.offsetStart, maxMessages: msg.maxMessages, filter: msg.filter, count: filteredLogs.length })); });
+            ws.send(encode(buildStaticMessage(filteredLogs, msg.offsetStart, msg.maxMessages)));
         }
     });
-    function buildTailMessage(filter) {
-        var matcher = log_index_1.isIndexMatch(filter);
-        var filteredLogs = logs.filter(function (l) { return matcher(l.index); }).map(function (l, i) { return (__assign(__assign({}, l), { seq: i + 1 })); });
+    function buildTailMessage(filteredLogs, maxMessages) {
         return {
             type: 'init',
             mode: 'tail',
-            size: filteredLogs.length,
-            offsetSeq: -1,
-            window: filteredLogs.slice(-LOG_WINDOW_SIZE),
+            totalSize: logs.length,
+            window: {
+                size: filteredLogs.length,
+                maxMessages: maxMessages,
+                messages: filteredLogs.slice(-maxMessages),
+            },
         };
     }
-    function buildStaticMessage(filter, offsetSeq) {
-        var matcher = log_index_1.isIndexMatch(filter);
-        var filteredLogs = logs.filter(function (l) { return matcher(l.index); }).map(function (l, i) { return (__assign(__assign({}, l), { seq: i + 1 })); });
+    function buildStaticMessage(filteredLogs, offsetStart, maxMessages) {
+        var totalSize = logs.length;
+        var filteredSize = filteredLogs.length;
         return {
             type: 'init',
             mode: 'static',
-            size: filteredLogs.length,
-            offsetSeq: offsetSeq,
-            window: filteredLogs.slice(Math.max(offsetSeq - LOG_WINDOW_SIZE / 2, 0), offsetSeq + LOG_WINDOW_SIZE / 2),
+            totalSize: totalSize,
+            window: {
+                size: filteredSize,
+                offsetStart: offsetStart,
+                maxMessages: maxMessages,
+                messages: filteredLogs.slice(offsetStart, offsetStart + maxMessages),
+            },
         };
     }
 }

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "web-log-viewer",
-  "version": "0.0.4",
+  "version": "0.2.0",
   "description": "",
   "main": "index.js",
-  "files": ["build/"],
+  "files": [
+    "build/"
+  ],
   "scripts": {
-    "tail": "tail -n 100000 -f nginx.log | node --inspect=0 --enable-source-maps build/server.js -k",
+    "tail": "tail -n 1000 -f ~/app-logs.log | node --inspect=0 --enable-source-maps build/server.js -k",
     "cat": "cat log.log | node --inspect=0 --enable-source-maps build/server.js",
     "start": "concurrently 'npm:tsc-watch' 'npm:public:dev'",
     "tsc-watch": "tsc-watch --outDir build --noClear --onSuccess 'npm run tail'",
@@ -20,7 +22,14 @@
     "web-log-viewer": "./bin/global.js"
   },
   "preferGlobal": true,
-  "keywords": ["json-log-viewer", "json", "web-log-viewer", "logs", "log4j", "winston"],
+  "keywords": [
+    "json-log-viewer",
+    "json",
+    "web-log-viewer",
+    "logs",
+    "log4j",
+    "winston"
+  ],
   "author": "rjbma",
   "license": "ISC",
   "dependencies": {
@@ -42,6 +51,7 @@
     "@types/node": "^14.14.27",
     "@types/ramda": "^0.27.38",
     "@types/ws": "^7.4.0",
+    "concurrently": "^6.0.2",
     "parcel-bundler": "^1.12.4",
     "ts-node-dev": "^1.1.1",
     "tsc-watch": "^4.2.9",