Added 300s limit on connections

Author: plasmadice

server.js

@@ -25,6 +25,20 @@ app.use(function (req, res, next) {
 // initializes as empty client array
 const clients = {};
 
+// loops through clients and removes clients exceeding 300 seconds
+const trimClients = () => {
+  for (const client in clients) {
+    const time = new Date().getTime();
+    if (Math.abs(clients[client].lastAccessed - time) > 300000) {
+      // if client is older than 300 seconds
+      delete clients[client];
+    }
+  }
+};
+
+// starts client trimmer on an interval of 30 seconds
+setInterval(trimClients, 30000);
+
 // basic-ftp
 
 app.post("/navigate", (req, res) => {
@@ -36,33 +50,19 @@ app.post("/navigate", (req, res) => {
     const { ftpHost, ftpUser, ftpPassword, ftpSecure, path } = decryptedData;
 
     // if user is found and logged in
-    if (
-      clients[ftpUser] !== undefined &&
-      clients[ftpUser].status === "connected"
-    ) {
-      let status;
-
-      // tries to access connection status
-      try {
-        status = await clients[ftpUser].send("STAT", (err) => {
-          if (err) {
-            console.log(err);
-          }
-        });
-      } catch (e) {
-        clients[ftpUser].status = "disconnected";
-      }
-
+    if (clients[ftpHost + ftpUser] !== undefined) {
       // if connection status is good: return list
-      if (clients[ftpUser].status === "connected") {
-        const list = await clients[ftpUser].list(path);
+      if (!clients[ftpHost + ftpUser].closed) {
+        const list = await clients[ftpHost + ftpUser].list(path);
+        clients[ftpHost + ftpUser].lastAccessed = new Date().getTime();
         res.status(200).send(list);
       } else {
         // if connection status is bad: RETRY
         init();
       }
     } else {
       // if no user found OR user found but not connected: reconnects
+
       const client = new ftp.Client();
 
       try {
@@ -73,8 +73,9 @@ app.post("/navigate", (req, res) => {
           secure: ftpSecure,
         });
 
-        clients[ftpUser] = client;
-        clients[ftpUser].status = "connected";
+        client.lastAccessed = new Date().getTime();
+
+        clients[ftpHost + ftpUser] = client;
 
         const list = await client.list(path);
         res.status(200).send(list);
@@ -102,18 +103,18 @@ app.post("/disconnect", (req, res) => {
     var bytes = CryptoJS.AES.decrypt(cipherText, process.env.PASSWORD);
     var decryptedData = JSON.parse(bytes.toString(CryptoJS.enc.Utf8));
 
-    const { ftpUser } = decryptedData;
+    const { ftpHost, ftpUser } = decryptedData;
 
     if (
-      clients[ftpUser] !== undefined &&
-      clients[ftpUser].status === "connected"
+      clients[ftpHost + ftpUser] !== undefined &&
+      !clients[ftpHost + ftpUser].closed
     ) {
-      clients[ftpUser].close();
-      delete clients[ftpUser];
-      res.status(200).send("Successfully logged out");
-    } else if (clients[ftpUser] === undefined) {
+      clients[ftpHost + ftpUser].close();
+      delete clients[ftpHost + ftpUser];
+      res.status(200).send("Successfully closed connection.");
+    } else if (clients[ftpHost + ftpUser] === undefined) {
       // if user is not at all logged in
-      res.status(204).send("User already disconnected");
+      res.status(204).send("User already disconnected.");
     }
   };