long time ago it was a crawler ;)

MaRcR11 · Nov 11, 2023 · a080c0d · a080c0d
1 parent bd7105e
commit a080c0d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 31 deletions.
diff --git a/server/src/crawler/crawler.js → ...rc/campusDualFetcher/campusDualFetcher.js b/server/src/crawler/crawler.js → ...rc/campusDualFetcher/campusDualFetcher.js
@@ -1,7 +1,7 @@
 const https = require("https");
 const fs = require("fs");
 
-const crawler = async (userID, userHash) => {
+const campusDualFetcher = async (userID, userHash) => {
   const OPTIONS = {
     host: "selfservice.campus-dual.de",
     path: `/room/json?userid=${userID ? userID : 5002080}&hash=${
@@ -31,4 +31,4 @@ const crawler = async (userID, userHash) => {
   }
 };
 
-module.exports = crawler;
+module.exports = campusDualFetcher;
diff --git a/server/src/crawler/campusdual-cert-chain.pem → ...mpusDualFetcher/campusdual-cert-chain.pem b/server/src/crawler/campusdual-cert-chain.pem → ...mpusDualFetcher/campusdual-cert-chain.pem
diff --git a/server/src/helpers/checkUserExistence.helper.js b/server/src/helpers/checkUserExistence.helper.js
@@ -8,7 +8,7 @@ const checkUserExistence = (userID, userHash) => {
   const OPTIONS = {
     host: "selfservice.campus-dual.de",
     path: `/dash/getcp?user=${encodeURIComponent(userID)}&hash=${encodeURIComponent(userHash)}`,
-    ca: fs.readFileSync(path.join(__dirname, "..", "crawler", "campusdual-cert-chain.pem")),
+    ca: fs.readFileSync(path.join(__dirname, "..", "campusDualFetcher", "campusdual-cert-chain.pem")),
     json: true,
   };
 

diff --git a/server/src/helpers/crawlScheduleData.helper.js b/server/src/helpers/crawlScheduleData.helper.js
diff --git a/server/src/helpers/createNewCronJob.helper.js b/server/src/helpers/createNewCronJob.helper.js
@@ -1,5 +1,5 @@
 const cron = require("node-cron");
-const crawlScheduleData = require("./crawlScheduleData.helper");
+const crawlScheduleData = require("./getScheduleData.helper");
 
 const createNewCronJobHelper = async (userID, userHash, data) => {
   data[userID] = await crawlScheduleData(userID, userHash);

diff --git a/server/src/helpers/getScheduleData.helper.js b/server/src/helpers/getScheduleData.helper.js
@@ -0,0 +1,22 @@
+const campusDualFetcher = require("../campusDualFetcher/campusDualFetcher");
+
+let crawlTriedCounter = 0;
+let data;
+const getScheduleData = async (userID, userHash = null) => {
+  try {
+    console.log(`getting data (${userID ? userID : "general"})...`);
+    data = await campusDualFetcher(userID, userHash);
+    crawlTriedCounter = 0;
+    return data;
+  } catch (error) {
+    console.log(error);
+    if (crawlTriedCounter < 3) {
+      getScheduleData(userID);
+      crawlTriedCounter++;
+    } else {
+      crawlTriedCounter = 0;
+    }
+  }
+};
+
+module.exports = getScheduleData;
diff --git a/server/src/helpers/index.js b/server/src/helpers/index.js
@@ -6,7 +6,7 @@ module.exports = {
   checkUserRegistered: require("../helpers/checkUserRegistered.helper"),
   createNewCronJob: require("../helpers/createNewCronJob.helper"),
   getEndTime: require("../helpers/endTime.helper"),
-  crawlScheduleData: require("../helpers/crawlScheduleData.helper"),
+  getScheduleData: require("./getScheduleData.helper"),
   updateUserToken: require("../helpers/updateUserToken.helper"),
   verifyToken: require("../helpers/verifyToken.helper"),
 };
diff --git a/server/src/services/schedule.service.js b/server/src/services/schedule.service.js
@@ -1,6 +1,5 @@
 const cron = require("node-cron");
 const { connectDB } = require("./db.service");
-const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
 const {
   createNewCronJob,
@@ -10,7 +9,7 @@ const {
   checkUserExistence,
   checkPwd,
   getEndTime,
-  crawlScheduleData,
+  getScheduleData,
   updateUserToken,
   verifyToken,
 } = require("../helpers");
@@ -22,7 +21,7 @@ const isJobRunning = {};
 
 (async () => {
   await connectDB();
-  data = { general: await crawlScheduleData(null) };
+  data = { general: await getScheduleData(null) };
 })();
 
 async function getData(req) {
@@ -129,7 +128,7 @@ async function getEndTimeOfCurrentDay() {
 }
 
 cron.schedule("*/5 * * * *", async () => {
-  data.general = await crawlScheduleData(null);
+  data.general = await getScheduleData(null);
 });
 
 module.exports = {