From e324248724a130a84b459a072dc846f500f8d9b0 Mon Sep 17 00:00:00 2001
From: Sam Wilkins <samwilkins333@gmail.com>
Date: Sat, 23 Nov 2019 18:19:27 -0500
Subject: heartbeats

---
 src/server/ApiManagers/DiagnosticManager.ts | 26 ++++++++++++++++++++++++++
 src/server/ApiManagers/UserManager.ts       |  2 +-
 src/server/Initialization.ts                | 13 +++++++------
 src/server/index.ts                         |  2 ++
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 src/server/ApiManagers/DiagnosticManager.ts

(limited to 'src/server')

diff --git a/src/server/ApiManagers/DiagnosticManager.ts b/src/server/ApiManagers/DiagnosticManager.ts
new file mode 100644
index 000000000..b775167b6
--- /dev/null
+++ b/src/server/ApiManagers/DiagnosticManager.ts
@@ -0,0 +1,26 @@
+import ApiManager, { Registration } from "./ApiManager";
+import { Method } from "../RouteManager";
+import request = require('request-promise');
+
+export default class DiagnosticManager extends ApiManager {
+
+    protected initialize(register: Registration): void {
+
+        register({
+            method: Method.GET,
+            subscription: "/serverHeartbeat",
+            onValidation: ({ res }) => res.send(true)
+        });
+
+        register({
+            method: Method.GET,
+            subscription: "/solrHeartbeat",
+            onValidation: async ({ res }) => {
+                const response = await request("http://localhost:8983");
+                res.send(response !== undefined);
+            }
+        });
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 4ee5a2b85..8edeab16d 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -56,7 +56,7 @@ export default class UserManager extends ApiManager {
                 const process = (target: { user: string, duration: number }[]) => {
                     const comparator = (first: ActivityUnit, second: ActivityUnit) => first.duration - second.duration;
                     const sorted = target.sort(comparator);
-                    return sorted.map(({ user, duration }) => `${user} (last active ${msToTime(duration)} ago)`);
+                    return sorted.map(({ user, duration }) => `${user} (${msToTime(duration)})`);
                 };
 
                 res.render("user_activity.pug", {
diff --git a/src/server/Initialization.ts b/src/server/Initialization.ts
index 7fad5556d..76acb4363 100644
--- a/src/server/Initialization.ts
+++ b/src/server/Initialization.ts
@@ -20,7 +20,6 @@ import * as request from 'request';
 import RouteSubscriber from './RouteSubscriber';
 import { publicDirectory } from '.';
 import { ConsoleColors, logPort } from './ActionUtilities';
-import { WebSocket } from './Websocket/Websocket';
 import { timeMap } from './ApiManagers/UserManager';
 
 /* RouteSetter is a wrapper around the server that prevents the server
@@ -38,11 +37,13 @@ export default async function InitializeServer(options: InitializationOptions) {
     server.use(express.static(publicDirectory));
     server.use("/images", express.static(publicDirectory));
 
-    server.use("*", (req, _res, next) => {
-        const userEmail = req.user?.email;
-        console.log(ConsoleColors.Cyan, req.originalUrl, userEmail ?? "<user logged out>");
-        if (userEmail) {
-            timeMap[userEmail] = Date.now();
+    server.use("*", ({ user, originalUrl }, _res, next) => {
+        if (!originalUrl.includes("Heartbeat")) {
+            const userEmail = user?.email;
+            console.log(ConsoleColors.Cyan, originalUrl, userEmail ?? "<user logged out>");
+            if (userEmail) {
+                timeMap[userEmail] = Date.now();
+            }
         }
         next();
     });
diff --git a/src/server/index.ts b/src/server/index.ts
index 9c48aca45..d02a6005e 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -21,6 +21,7 @@ import UploadManager from "./ApiManagers/UploadManager";
 import { log_execution } from "./ActionUtilities";
 import GeneralGoogleManager from "./ApiManagers/GeneralGoogleManager";
 import GooglePhotosManager from "./ApiManagers/GooglePhotosManager";
+import DiagnosticManager from "./ApiManagers/DiagnosticManager";
 
 export const publicDirectory = path.resolve(__dirname, "public");
 export const filesDirectory = path.resolve(publicDirectory, "files") + "/";
@@ -55,6 +56,7 @@ function routeSetter({ isRelease, addSupervisedRoute }: RouteManager) {
         new UserManager(),
         new UploadManager(),
         new DownloadManager(),
+        new DiagnosticManager(),
         new SearchManager(),
         new PDFManager(),
         new DeleteManager(),
-- 
cgit v1.2.3-70-g09d2