Update 0.2 is almost here

HydraLabs-beta · Jan 5, 2025 · 10cd6f0 · 10cd6f0
1 parent 26db691
commit 10cd6f0
Show file tree

Hide file tree

Showing 29 changed files with 441 additions and 245 deletions.
diff --git a/routes/Instance/Archives.js b/routes/Instance/Archives.js
@@ -29,6 +29,10 @@ router.get("/instance/:id/archives", async (req, res) => {
             return res.redirect('/instances');
         }
 
+        if(instance.suspended === true) {
+            return res.redirect('../../instances?err=SUSPENDED');
+       }
+
         const isAuthorized = await isUserAuthorizedForContainer(req.user.userId, instance.Id);
         if (!isAuthorized) {
             return res.status(403).send('Unauthorized access to this instance.');
@@ -109,10 +113,9 @@ router.post('/instance/:id/archives/create', async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
-
     const RequestData = {
         method: 'post',
        // url: `http://${instance.Node.address}:${instance.Node.port}/archive/${instance.ContainerId}/archives`,
@@ -160,10 +163,9 @@ router.post('/instance/:id/archives/delete/:archivename', async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
-
     const RequestData = {
         method: 'post',
        // url: `http://${instance.Node.address}:${instance.Node.port}/archive/${instance.ContainerId}/archives`,
@@ -214,7 +216,7 @@ router.post('/instance/:id/archives/rollback/:archivename', async (req, res) =>
     }
 
     if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
+         return res.redirect('../../instances?err=SUSPENDED');
     }
 
     const RequestData = {

diff --git a/routes/Instance/CreateFile.js b/routes/Instance/CreateFile.js
@@ -28,10 +28,9 @@ router.post("/instance/:id/files/create/:filename", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
-
     if (!instance.Node || !instance.Node.address || !instance.Node.port) {
         return res.status(500).send('Invalid instance node configuration');
     }
@@ -73,10 +72,9 @@ router.get("/instance/:id/files/create", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
-
     if (!instance || !instance.VolumeId) {
         return res.redirect('../instances');
     }

diff --git a/routes/Instance/CreateFolder.js b/routes/Instance/CreateFolder.js
@@ -34,8 +34,8 @@ router.get("/instance/:id/files/folder/create", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+  if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
 
     if (!instance || !instance.VolumeId) {
@@ -77,8 +77,8 @@ router.post("/instance/:id/files/folder/create/:foldername", async (req, res) =>
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+  if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
 
     if (!instance.Node || !instance.Node.address || !instance.Node.port) {

diff --git a/routes/Instance/DeleteFile.js b/routes/Instance/DeleteFile.js
@@ -24,8 +24,8 @@ router.get("/instance/:id/files/delete/:filename", async (req, res) => {
     }
 
     if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
-    }
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     if (!instance.Node || !instance.Node.address || !instance.Node.port) {
         return res.status(500).send('Invalid instance node configuration');

diff --git a/routes/Instance/EditFile.js b/routes/Instance/EditFile.js
@@ -25,8 +25,8 @@ router.post("/instance/:id/files/edit/:filename", async (req, res) => {
     }
 
     if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
-    }
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     if (!instance.Node || !instance.Node.address || !instance.Node.port) {
         return res.status(500).send('Invalid instance node configuration');

diff --git a/routes/Instance/FileUnzip.js b/routes/Instance/FileUnzip.js
@@ -32,10 +32,9 @@ router.get('/instance/:id/files/unzip/:file', async (req, res) => {
             db.set(id + '_instance', instance);
         }
 
-        if (instance.suspended === true) {
-            console.log(`Instance ${id} is suspended, redirecting to suspended page`);  // Log suspension
-            return res.redirect('../../instance/' + id + '/suspended');
-        }
+        if(instance.suspended === true) {
+            return res.redirect('../../instances?err=SUSPENDED');
+       }
 
         if (!instance || !instance.VolumeId) {
             console.error(`Instance ${id} missing VolumeId, redirecting to instances page`);  // Log missing VolumeId

diff --git a/routes/Instance/Files.js b/routes/Instance/Files.js
@@ -28,10 +28,9 @@ router.get("/instance/:id/files", async (req, res) => {
     }
 
 
-    if(!instance.suspended) {
-        instance.suspended = false;
-        db.set(id + '_instance', instance);
-    }
+    if(instance.suspended === true) {
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     if(instance.suspended === true) {
                 return res.redirect('../../instance/' + id + '/suspended');

diff --git a/routes/Instance/ImageFeatures.js b/routes/Instance/ImageFeatures.js
@@ -27,8 +27,8 @@ router.post("/instance/:id/imagefeatures/eula", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
         createFile(instance, 'eula.txt', 'eula=true');
 
@@ -59,8 +59,8 @@ router.get("/instance/:id/imagefeatures/cracked", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
     const serverport = instance.Ports.split(':')[1];
     const now = new Date();

diff --git a/routes/Instance/Instance.js b/routes/Instance/Instance.js
@@ -65,8 +65,8 @@ router.get("/instance/:id", async (req, res) => {
         return res.redirect('../../instance/' + id + '/installing')
     }
     if(instance.suspended === true) {
-        return res.redirect('../../instance/' + id + '/suspended');
-    }
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     const config = require('../../config.json');
     const { port, domain } = config;
@@ -99,6 +99,7 @@ router.get("/instance/:id/installing", async (req,res) => {
    if (!isAuthorized) {
        return res.status(403).send('Unauthorized access to this instance.');
    }
+   await checkState(id);
    res.render('instance/installing', {
     req,
     instance,
@@ -123,13 +124,64 @@ router.get("/instance/:id/installing/status", async (req, res) => {
        return res.status(403).send('Unauthorized access to this instance.');
    }
 
-    const getStateUrl = `http://${instance.Node.address}:${instance.Node.port}/instances/${instance.Id}/states/get`;
-    const getStateResponse = await axios.get(getStateUrl, {
-           auth: {
-             username: "Skyport",
-             password: instance.Node.apiKey,
-          },
-      });
-     res.status(200).json({ state: getStateResponse.data.state })
+    await checkState(id);
+
+     res.status(200).json({ state: instance.State })
 });
+
+async function checkState(instanceId) {
+    try {
+      // Get the specific instance from the "instances" database
+      const instance = await db.get(`${instanceId}_instance`);
+
+      if (!instance) {
+        return ("Instance not found.");
+      }
+
+      try {
+        // Fetch the current state from the remote server
+        const getStateUrl = `http://${instance.Node.address}:${instance.Node.port}/instances/${instance.Id}/states/get`;
+        const getStateResponse = await axios.get(getStateUrl, {
+          auth: {
+            username: "Skyport",
+            password: instance.Node.apiKey,
+          },
+        });
+
+        const newState = getStateResponse.data.state;
+
+        // Update the state on the remote server
+        const setStateUrl = `http://${instance.Node.address}:${instance.Node.port}/instances/${instance.Id}/states/set/${newState}`;
+        await axios.get(setStateUrl, {
+          auth: {
+            username: "Skyport",
+            password: instance.Node.apiKey,
+          },
+        });
+
+        // Update the instance state locally
+        instance.State = newState;
+
+        // Get the instance-specific database and ensure it has the "State" property
+        const instanceDbKey = `${instanceId}_instance`; // Define the key for instance-specific database
+        let instanceDb = await db.get(instanceDbKey);
+
+        if (!instanceDb) {
+          instanceDb = {};
+        }
+
+        instanceDb.State = newState;
+
+        // Save the updated instance-specific database
+        await db.set(instanceDbKey, instanceDb);
+
+      } catch (instanceError) {
+        console.error(`Error processing instance ${instance.Id}:`, instanceError.message);
+      }
+    } catch (error) {
+      console.error("Error processing instances:", error.message);
+    }
+  }
+
+
 module.exports = router;
diff --git a/routes/Instance/InstanceDB.js b/routes/Instance/InstanceDB.js
@@ -39,8 +39,8 @@ router.get("/instance/:id/db", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
 
     if (instance.Node && instance.Node.address && instance.Node.port) {
@@ -104,8 +104,8 @@ router.post("/instance/:id/db/create/:name", async (req, res) => {
         db.set(id + '_instance', instance);
     }
 
-    if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
+      if(instance.suspended === true) {
+         return res.redirect('../../instances?err=SUSPENDED');
     }
 
     if (instance.Node && instance.Node.address && instance.Node.port) {

diff --git a/routes/Instance/InstanceFTP.js b/routes/Instance/InstanceFTP.js
@@ -34,10 +34,9 @@ router.get("/instance/:id/ftp", async (req, res) => {
     }
 
 
-    if(!instance.suspended) {
-        instance.suspended = false;
-        db.set(id + '_instance', instance);
-    }
+    if(instance.suspended === true) {
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     if(instance.suspended === true) {
         return res.redirect('../../instance/' + id + '/suspended');

diff --git a/routes/Instance/InstanceReinstall.js b/routes/Instance/InstanceReinstall.js
@@ -37,9 +37,8 @@ router.post('/instance/reinstall/:id', async (req, res) => {
         }
 
         if(instance.suspended === true) {
-            return res.redirect('../../instance/' + id + '/suspended');
-        }
-
+            return res.redirect('../../instances?err=SUSPENDED');
+       }
         const { Node: node, imageData, Memory: memory, Cpu: cpu, Ports: ports, Name: name, User: user, Primary: primary, ContainerId: containerId, Env } = instance;
         const nodeId = node.id;
 

diff --git a/routes/Instance/InstanceSettings.js b/routes/Instance/InstanceSettings.js
@@ -39,8 +39,8 @@ router.get("/instance/:id/settings", async (req, res) => {
     }
 
     if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
-    }
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
 
     const allPluginData = Object.values(plugins).map(plugin => plugin.config);
     res.render('instance/settings', {

diff --git a/routes/Instance/InstanceSupended.js b/routes/Instance/InstanceSupended.js
diff --git a/routes/Instance/Network.js b/routes/Instance/Network.js
@@ -31,11 +31,9 @@ router.get("/instance/:id/network", async (req, res) => {
         instance.suspended = false;
         db.set(id + '_instance', instance);
     }
-
     if(instance.suspended === true) {
-                return res.redirect('../../instance/' + id + '/suspended');
-    }
-
+        return res.redirect('../../instances?err=SUSPENDED');
+   }
     const allPluginData = Object.values(plugins).map(plugin => plugin.config);
     const ports = processPorts(instance.Ports, instance);