improved cache system

BuildTheEarth · Sep 19, 2023 · 8483f6d · 8483f6d
1 parent 1e09c8c
commit 8483f6d
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 97 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -72,10 +72,10 @@ router.use(express.json());
 router.use(cors());
 router.use(helmet());
 
-// A timer that runs every 10 minutes
+// A timer that runs every 1 minute
 setInterval(() => {
   network.updateCache();
-}, 10 * 60 * 1000);
+}, 1 * 60 * 1000);
 
 app.use("/", router);
 

diff --git a/src/routes/plotsystem/teams/cities/GET.ts b/src/routes/plotsystem/teams/cities/GET.ts
@@ -2,21 +2,22 @@ import { Router } from "express";
 import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
-    app.get('/api/plotsystem/teams/:apikey/cities', function (req, res) {
+    app.get('/api/plotsystem/teams/:apikey/cities', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);
+        const buildTeam = await network.getBuildTeam(req.params.apikey);
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });
             return;
         }
 
+        const cities = await buildTeam.getPSCities();
         res.setHeader('Content-Type', 'application/json');
-        res.send(JSON.stringify(buildTeam.getPSCities()))
+        res.send(JSON.stringify(cities))
     })
 
 }
diff --git a/src/routes/plotsystem/teams/countries/GET.ts b/src/routes/plotsystem/teams/countries/GET.ts
@@ -3,20 +3,20 @@ import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
-    app.get('/api/plotsystem/teams/:apikey/countries', function (req, res) {
+    app.get('/api/plotsystem/teams/:apikey/countries', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);
+        const buildTeam = await network.getBuildTeam(req.params.apikey);
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });
             return;
         }
 
-        const map = buildTeam.getPSCountries();
+        const map = await buildTeam.getPSCountries();
 
         res.setHeader('Content-Type', 'application/json');
         res.send(Object.fromEntries(map))

diff --git a/src/routes/plotsystem/teams/plots/GET.ts b/src/routes/plotsystem/teams/plots/GET.ts
@@ -3,14 +3,14 @@ import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
-    app.get('/api/plotsystem/teams/:apikey/plots', function (req, res) {
+    app.get('/api/plotsystem/teams/:apikey/plots', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);
+        const buildTeam = await network.getBuildTeam(req.params.apikey);
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });

diff --git a/src/routes/plotsystem/teams/plots/POST.ts b/src/routes/plotsystem/teams/plots/POST.ts
@@ -3,13 +3,13 @@ import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
-    app.post('/api/plotsystem/teams/:apikey/plots', function (req, res) {
+    app.post('/api/plotsystem/teams/:apikey/plots', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);    
+        const buildTeam = await network.getBuildTeam(req.params.apikey);    
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });
@@ -52,7 +52,8 @@ export async function initRoutes(app: Router, joi: any, network: Network) {
 
 
             // Validate that the city exists
-            if(!buildTeam.getPSCities().some(city => city.id == city_project_id))
+            const cities = await buildTeam.getPSCities();
+            if(!cities.some(city => city.id == city_project_id))
                 res.status(400).send({success: false, error: 'The city does not exist'});
 
 

diff --git a/src/routes/plotsystem/teams/plots/PUT.ts b/src/routes/plotsystem/teams/plots/PUT.ts
@@ -4,7 +4,7 @@ import Network from "../../../../struct/core/network.js";
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
     // A put request to change plot settings of a build team
-    app.put('/api/plotsystem/teams/:apikey/plots', function (req, res) {
+    app.put('/api/plotsystem/teams/:apikey/plots', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
@@ -17,7 +17,7 @@ export async function initRoutes(app: Router, joi: any, network: Network) {
             return;
         }
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);  
+        const buildTeam = await network.getBuildTeam(req.params.apikey);  
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });

diff --git a/src/routes/plotsystem/teams/reviews/GET.ts b/src/routes/plotsystem/teams/reviews/GET.ts
@@ -3,24 +3,23 @@ import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
-    app.get('/api/plotsystem/teams/:apikey/reviews', function (req, res) {
+    app.get('/api/plotsystem/teams/:apikey/reviews', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);
+        const buildTeam = await network.getBuildTeam(req.params.apikey);
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });
             return;
         }
 
-        buildTeam.getPSReviews().then((reviews) => {
-            res.setHeader('Content-Type', 'application/json');
-            res.send(JSON.stringify(reviews))
-        })
+        const reviews = await buildTeam.getPSReviews()
+        res.setHeader('Content-Type', 'application/json');
+        res.send(JSON.stringify(reviews));
     })
 
 }
diff --git a/src/routes/plotsystem/teams/servers/GET.ts b/src/routes/plotsystem/teams/servers/GET.ts
@@ -3,21 +3,21 @@ import Network from "../../../../struct/core/network.js";
 
 export async function initRoutes(app: Router, joi: any, network: Network) {
 
-    app.get('/api/plotsystem/teams/:apikey/servers', function (req, res) {
+    app.get('/api/plotsystem/teams/:apikey/servers', async function (req, res) {
 
         // Validate that the API key is a valid GUID
         if(!network.validateAPIKey(req, res))
             return;
 
 
-        const buildTeam = network.getBuildTeam(req.params.apikey);
+        const buildTeam = await network.getBuildTeam(req.params.apikey);
 
         if(buildTeam == null) {
             res.status(400).send({ error: 'Build Team not found' });
             return;
         }
 
-        const map = buildTeam.getPSServers();
+        const map = await buildTeam.getPSServers();
 
         res.setHeader('Content-Type', 'application/json');
         res.send(Object.fromEntries(map))