From 8786a121f6e678662cc9a469ca9751c84b09c5fc Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Mon, 11 Apr 2022 14:45:54 +0200
Subject: [PATCH] feat(utilities): FOSS&EE heapsnapshot

---
 ee/utilities/.gitignore |  3 ++-
 ee/utilities/server.js  | 16 ++++++++++------
 utilities/server.js     |  5 +----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ee/utilities/.gitignore b/ee/utilities/.gitignore
index fc05191e0..2dd72c808 100644
--- a/ee/utilities/.gitignore
+++ b/ee/utilities/.gitignore
@@ -10,4 +10,5 @@ build.sh
 servers/peerjs-server.js
 servers/sourcemaps-handler.js
 servers/sourcemaps-server.js
-#servers/websocket.js
\ No newline at end of file
+#servers/websocket.js
+/utils/dump.js
diff --git a/ee/utilities/server.js b/ee/utilities/server.js
index d049faa19..8f5a34d7b 100644
--- a/ee/utilities/server.js
+++ b/ee/utilities/server.js
@@ -1,8 +1,9 @@
-var sourcemapsReaderServer = require('./servers/sourcemaps-server');
-var {peerRouter, peerConnection, peerDisconnect, peerError} = require('./servers/peerjs-server');
-var express = require('express');
+const dumps = require('./utils/dump');
+const sourcemapsReaderServer = require('./servers/sourcemaps-server');
+const {peerRouter, peerConnection, peerDisconnect, peerError} = require('./servers/peerjs-server');
+const express = require('express');
 const {ExpressPeerServer} = require('peer');
-var socket;
+let socket;
 if (process.env.redis === "true") {
     console.log("Using Redis");
     socket = require("./servers/websocket-cluster");
@@ -13,7 +14,7 @@ if (process.env.redis === "true") {
 const HOST = '0.0.0.0';
 const PORT = 9000;
 
-var app = express();
+const app = express();
 
 let debug = process.env.debug === "1" || false;
 const request_logger = (identity) => {
@@ -50,6 +51,8 @@ peerServer.on('disconnect', peerDisconnect);
 peerServer.on('error', peerError);
 app.use('/', peerServer);
 app.enable('trust proxy');
+app.get('/heapdump', dumps.sendHeapSnapshot);
+app.get('/heapdump/save', dumps.saveHeapSnapshot);
 
 if (process.env.uws !== "true") {
     var wsapp = express();
@@ -125,4 +128,5 @@ if (process.env.uws !== "true") {
         // process.exit(1);
     });
     module.exports = {uapp, server};
-}
\ No newline at end of file
+}
+console.log(`Heapdump enabled. Send a request to "/heapdump" to download a heapdump,\nor "/heapdump/save" to only generate a heapdump.`);
\ No newline at end of file
diff --git a/utilities/server.js b/utilities/server.js
index 225db88f4..fcbdb5c62 100644
--- a/utilities/server.js
+++ b/utilities/server.js
@@ -32,10 +32,6 @@ wsapp.use('/assist', socket.wsRouter);
 
 app.get('/heapdump', dumps.sendHeapSnapshot);
 app.get('/heapdump/save', dumps.saveHeapSnapshot);
-wsapp.get('/heapdump', dumps.sendHeapSnapshot);
-wsapp.get('/heapdump/save', dumps.saveHeapSnapshot);
-
-console.log(`Heapdump enabled. Send a request to "/heapdump" to download a heapdump,\nor "/heapdump/save" to only generate a heapdump.`);
 
 const server = app.listen(PORT, HOST, () => {
     console.log(`App listening on http://${HOST}:${PORT}`);
@@ -59,3 +55,4 @@ app.enable('trust proxy');
 wsapp.enable('trust proxy');
 socket.start(wsserver);
 module.exports = {wsserver, server};
+console.log(`Heapdump enabled. Send a request to "/heapdump" to download a heapdump,\nor "/heapdump/save" to only generate a heapdump.`);
\ No newline at end of file