-
-
- ![ADR Logo]({require("./style/themes/7cav/logo-m.png")} "Return to the main website")
-
+ return (
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
)
-}
+}
export default MilpacRequest
diff --git a/server/controllers/cRequest b/server/controllers/cRequest
deleted file mode 100644
index 43e8c7c..0000000
--- a/server/controllers/cRequest
+++ /dev/null
@@ -1,21 +0,0 @@
-const express = require("express");
-const axios = require("axios");
-const Token = require("../credentials/token")
-
-
-let getCombatRoster = async () => {
-let response = await axios('https://api.7cav.us/api/v1/roster/1', {
- headers: {
- Accept: 'application/json',
- 'Content-Type': 'application/json',
- Authorization: 'Bearer ' + Token
- },
-})
-return response.data
-}
-//controller function getCombatRoster
-
-module.exports = async (req, res) => {
-let responseCombat = await getCombatRoster();
-res.send(responseCombat);
-};
diff --git a/server/controllers/cRequest.js b/server/controllers/cRequest.js
new file mode 100644
index 0000000..90979a8
--- /dev/null
+++ b/server/controllers/cRequest.js
@@ -0,0 +1,11 @@
+const cacheManager = require('../controllers/cacheManager');
+
+module.exports = async (req, res) => {
+ const cachedCombatRoster = cacheManager.getCachedCombatRoster();
+
+ if (cachedCombatRoster) {
+ res.send(cachedCombatRoster);
+ } else {
+ res.status(503).send("Cache is empty");
+ }
+};
diff --git a/server/controllers/cacheManager.js b/server/controllers/cacheManager.js
new file mode 100644
index 0000000..a8f7ce5
--- /dev/null
+++ b/server/controllers/cacheManager.js
@@ -0,0 +1,67 @@
+const axios = require("axios");
+const Token = require("../credentials/token");
+
+let cachedCombatRoster;
+let cachedReserveRoster;
+let cacheTime = {};
+
+const updateCombatRosterCache = async () => {
+ try {
+ const response = await axios('https://api.7cav.us/api/v1/roster/1', {
+ headers: {
+ Accept: 'application/json',
+ 'Content-Type': 'application/json',
+ Authorization: 'Bearer ' + Token
+ },
+ });
+ cachedCombatRoster = response.data;
+ cacheTime['combat'] = Date.now();
+ } catch (error) {
+ console.error("Failed to update combat cache:", error);
+ }
+};
+
+const updateReserveRosterCache = async () => {
+ try {
+ const response = await axios('https://api.7cav.us/api/v1/roster/2', {
+ headers: {
+ Accept: 'application/json',
+ 'Content-Type': 'application/json',
+ Authorization: 'Bearer ' + Token
+ },
+ });
+ cachedReserveRoster = response.data;
+ cacheTime['reserve'] = Date.now();
+ } catch (error) {
+ console.error("Failed to update reserve cache:", error);
+ }
+};
+
+const scheduleCacheUpdate = (updateFunction, key) => {
+ const now = new Date();
+ const delay = (60 - now.getMinutes()) * 60 * 1000 + (60 - now.getSeconds()) * 1000;
+
+ setTimeout(() => {
+ updateFunction();
+ setInterval(updateFunction, 3660 * 1000); // Update every 3660 seconds (1 hour and 1 minute)
+ }, delay);
+};
+
+// Initialize the cache and schedule the updates
+updateCombatRosterCache();
+scheduleCacheUpdate(updateCombatRosterCache, 'combat');
+updateReserveRosterCache();
+scheduleCacheUpdate(updateReserveRosterCache, 'reserve');
+
+const getCachedCombatRoster = () => {
+ return cachedCombatRoster;
+};
+
+const getCachedReserveRoster = () => {
+ return cachedReserveRoster;
+};
+
+module.exports = {
+ getCachedCombatRoster,
+ getCachedReserveRoster
+};
\ No newline at end of file
diff --git a/server/controllers/rRequest b/server/controllers/rRequest
deleted file mode 100644
index cd5de4f..0000000
--- a/server/controllers/rRequest
+++ /dev/null
@@ -1,20 +0,0 @@
-const express = require("express");
-const axios = require("axios");
-const Token = require("../credentials/token")
-
-let getReserveRoster = async () => {
-let response = await axios('https://api.7cav.us/api/v1/roster/2', {
- headers: {
- Accept: 'application/json',
- 'Content-Type': 'application/json',
- Authorization: 'Bearer ' + Token
- },
-})
-return response.data
-}
-//controller function getReserveRoster
-
-module.exports = async (req, res) => {
-let responseReserves = await getReserveRoster();
-res.send(responseReserves);
-};
diff --git a/server/controllers/rRequest.js b/server/controllers/rRequest.js
new file mode 100644
index 0000000..8ad0445
--- /dev/null
+++ b/server/controllers/rRequest.js
@@ -0,0 +1,11 @@
+const cacheManager = require('../controllers/cacheManager');
+
+module.exports = async (req, res) => {
+ const cachedReserveRoster = cacheManager.getCachedReserveRoster();
+
+ if (cachedReserveRoster) {
+ res.send(cachedReserveRoster);
+ } else {
+ res.status(503).send("Cache is empty");
+ }
+};
\ No newline at end of file
diff --git a/server/routes/index.js b/server/routes/index.js
index d3ae033..052e238 100644
--- a/server/routes/index.js
+++ b/server/routes/index.js
@@ -5,7 +5,7 @@ const cRequest = require("../controllers/cRequest");
const rRequest = require("../controllers/rRequest");
const app = express();
-app.use (cors({
+app.use(cors({
origin: '*',
}));
diff --git a/server/server.js b/server/server.js
index 3576a4b..386d0f2 100644
--- a/server/server.js
+++ b/server/server.js
@@ -9,11 +9,9 @@ app.use(cors({
}));
app.use("/roster", middleware);
app.get("/", (req, res) => {
-res.send("Ayy Lmao! Successful response! Any issues? Submit a ticket to S6!");
+ res.send("Ayy Lmao! Successful response! Any issues? Submit a ticket to S6!");
});
app.listen(port, () => {
- console.log(`Roster Server listening on ${port}`)
+ console.log(`Roster Server listening on ${port}`)
})
-
-