From e8f5cdd06febe4b8659d2bc04ff4c7f66873649f Mon Sep 17 00:00:00 2001
From: MCHost <hypermc@ssh.surf>
Date: Wed, 25 Jun 2025 03:42:32 -0400
Subject: [PATCH] Add SFTP Client Connection on Load

---
 public/index.html |   2 +-
 public/js/app.js  | 148 +++++++++++++++++++++++++---------------------
 2 files changed, 82 insertions(+), 68 deletions(-)

diff --git a/public/index.html b/public/index.html
index bf4b634..34e4569 100644
--- a/public/index.html
+++ b/public/index.html
@@ -180,7 +180,7 @@
               <button id="stopBtn" class="bg-red-600 hover:bg-red-700 rounded font-medium control-btn">Stop</button>
               <button id="restartBtn"
                 class="bg-yellow-600 hover:bg-yellow-700 rounded font-medium control-btn">Restart</button>
-                <button id="sftpBtn" class="bg-green-600 hover:bg-green-700 px-4 py-2 rounded">SFTP</button>
+                <!-- <button id="sftpBtn" class="bg-green-600 hover:bg-green-700 px-4 py-2 rounded">SFTP</button> -->
 
             </div>
             <button id="editPropertiesBtn"
diff --git a/public/js/app.js b/public/js/app.js
index b38e457..c1be2fb 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -15,6 +15,7 @@ document.addEventListener('DOMContentLoaded', () => {
   let allProperties = {};
   let sftpCredentials = null;
   let isSftpOnline = false;
+  let hasAttemptedSftpConnect = false;
   const filteredSettings = [
     'bug-report-link',
     'query.port',
@@ -493,78 +494,85 @@ document.addEventListener('DOMContentLoaded', () => {
     const editPropertiesBtn = elements.editPropertiesBtn;
     const updateModsBtn = elements.updateModsBtn;
     const backupBtn = elements.backupBtn;
-    const sftpBtn = elements.sftpBtn;
+    // const sftpBtn = elements.sftpBtn; // Commented out as it appears to be disabled in the provided code
     const startBtn = document.getElementById('startBtn');
     const stopBtn = elements.stopBtn;
     const restartBtn = elements.restartBtn;
+    const sftpBrowserSection = elements.sftpBrowserSection;
 
     if (startBtn) {
-      if (status.toLowerCase() === 'running') {
-        startBtn.disabled = true;
-        startBtn.classList.add('disabled-btn');
-      } else {
-        startBtn.disabled = false;
-        startBtn.classList.remove('disabled-btn');
-      }
+        if (status.toLowerCase() === 'running') {
+            startBtn.disabled = true;
+            startBtn.classList.add('disabled-btn');
+        } else {
+            startBtn.disabled = false;
+            startBtn.classList.remove('disabled-btn');
+        }
     }
 
     if (status.toLowerCase() !== 'running') {
-      sections.forEach(section => {
-        if (section !== serverStatusSection) {
-          section.classList.add('hidden');
+        sections.forEach(section => {
+            if (section !== serverStatusSection) {
+                section.classList.add('hidden');
+            }
+        });
+        if (editPropertiesBtn) {
+            editPropertiesBtn.classList.add('hidden');
+        }
+        if (updateModsBtn) {
+            updateModsBtn.classList.add('hidden');
+        }
+        if (backupBtn) {
+            backupBtn.classList.add('hidden');
+        }
+        // if (sftpBtn) {
+        //     sftpBtn.classList.add('hidden');
+        // }
+        if (stopBtn) {
+            stopBtn.disabled = true;
+            stopBtn.classList.add('disabled-btn');
+        }
+        if (restartBtn) {
+            restartBtn.disabled = true;
+            restartBtn.classList.add('disabled-btn');
+        }
+        if (sftpBrowserSection) {
+            sftpBrowserSection.style.display = 'none';
+        }
+        if (!state.hasShownStartNotification) {
+            showNotification('Server is stopped. Click "Start" to enable all features.', 'error', 'server-stopped');
+            state.hasShownStartNotification = true;
         }
-      });
-      if (editPropertiesBtn) {
-        editPropertiesBtn.classList.add('hidden');
-      }
-      if (updateModsBtn) {
-        updateModsBtn.classList.add('hidden');
-      }
-      if (backupBtn) {
-        backupBtn.classList.add('hidden');
-      }
-      if (sftpBtn) {
-        sftpBtn.classList.add('hidden');
-      }
-      if (stopBtn) {
-        stopBtn.disabled = true;
-        stopBtn.classList.add('disabled-btn');
-      }
-      if (restartBtn) {
-        restartBtn.disabled = true;
-        restartBtn.classList.add('disabled-btn');
-      }
-      if (!state.hasShownStartNotification) {
-        showNotification('Server is stopped. Click "Start" to enable all features.', 'error', 'server-stopped');
-        state.hasShownStartNotification = true;
-      }
     } else {
-      sections.forEach(section => {
-        section.classList.remove('hidden');
-      });
-      if (editPropertiesBtn) {
-        editPropertiesBtn.classList.remove('hidden');
-      }
-      if (updateModsBtn) {
-        updateModsBtn.classList.remove('hidden');
-      }
-      if (backupBtn) {
-        backupBtn.classList.remove('hidden');
-      }
-      if (sftpBtn) {
-        sftpBtn.classList.remove('hidden');
-      }
-      if (stopBtn) {
-        stopBtn.disabled = false;
-        stopBtn.classList.remove('disabled-btn');
-      }
-      if (restartBtn) {
-        restartBtn.disabled = false;
-        restartBtn.classList.remove('disabled-btn');
-      }
-      state.hasShownStartNotification = false;
+        sections.forEach(section => {
+            section.classList.remove('hidden');
+        });
+        if (editPropertiesBtn) {
+            editPropertiesBtn.classList.remove('hidden');
+        }
+        if (updateModsBtn) {
+            updateModsBtn.classList.remove('hidden');
+        }
+        if (backupBtn) {
+            backupBtn.classList.remove('hidden');
+        }
+        // if (sftpBtn) {
+        //     sftpBtn.classList.remove('hidden');
+        // }
+        if (stopBtn) {
+            stopBtn.disabled = false;
+            stopBtn.classList.remove('disabled-btn');
+        }
+        if (restartBtn) {
+            restartBtn.disabled = false;
+            restartBtn.classList.remove('disabled-btn');
+        }
+        if (sftpBrowserSection) {
+            sftpBrowserSection.style.display = 'block';
+        }
+        state.hasShownStartNotification = false;
     }
-  }
+}
 
   function updateDockerLogsUI(message) {
     if (message.error) {
@@ -621,13 +629,14 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   }
 
+
   function updateSftpCacheUI(message) {
+    // For testing, this is currently configured to be internally networked to port 22 for the given container. 
+    // The IP Address is sent from server side on page load, in theory, this should allow us to always allow 
+    // SFTP Client to WORK! Even if SFTP Holesail ports are down! 
+    // To Revert, move hostname to message.data.hostname and port to message.data.port
+    // Doing so will configure the connection to the Jump node. 
     if (message.data?.hostname && message.data?.port && message.data?.user && message.data?.password) {
-     // For testing, this is currently configured to be internally networked to port 22 for the given container. 
-     // The IP Address is sent from server side on page load, in theory, this should allow us to always allow 
-     // SFTP Client to WORK! Even if SFTP Holesail ports are down! 
-     // To Revert, move hostname to message.data.hostname and port to message.data.port
-     // Doing so will configure the connection to the Jump node. 
       sftpCredentials = {
         hostname: message.data.ipAddress,
         port: 22,
@@ -639,6 +648,11 @@ document.addEventListener('DOMContentLoaded', () => {
         elements.sftpLink.textContent = sftpLinkText;
         state.sftpLink = sftpLinkText;
       }
+      // Call connectSftp only if it hasn't been attempted yet
+      if (!hasAttemptedSftpConnect) {
+        hasAttemptedSftpConnect = true;
+        connectSftp();
+      }
     }
   }
 
@@ -1655,7 +1669,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   });
 
-  elements.sftpBtn.addEventListener('click', connectSftp);
+  // elements.sftpBtn.addEventListener('click', connectSftp);
 
   document.getElementById('refresh').addEventListener('click', async () => {
     if (ws && ws.readyState === WebSocket.OPEN) {