Return when no data

.env.example

@@ -2,7 +2,6 @@ DEBUG=FALSE
 SCREEPS_TOKEN=""
 CHECK_FOR_NEW_ACTIONS=TRUE
 API_SETTINGS='{}'
-ROOM_NAME='E0N0'
 
 # Postgres
 POSTGRES_ENABLED='TRUE'

src/adminUtils.js

@@ -0,0 +1,48 @@
+import { ScreepsAPI } from "screeps-api"
+import axios from "axios"
+import { CronJob } from "cron";
+import { UploadAdminUtils } from "./data/upload.js";
+
+async function adminUtilsHandler() {
+  try {
+    const url = `${process.env.PRIVATE_SERVER_PROTOCOL}://${process.env.PRIVATE_SERVER_HOST}:${process.env.PRIVATE_SERVER_PORT}`
+    const { data } = await axios.get(`${url}/stats`);
+
+    const users = {}
+    data.users.forEach(user => {
+      users[user.username] = user;
+    });
+    data.users = users;
+
+    UploadAdminUtils(data);
+  } catch (error) {
+
+  }
+}
+
+if (process.env.PRIVATE_SERVER_USERNAME) {
+  const api = new ScreepsAPI({
+    token: process.env.SCREEPS_TOKEN,
+    protocol: process.env.PRIVATE_SERVER_PROTOCOL || "https",
+    hostname: process.env.PRIVATE_SERVER_HOST || "screeps.com",
+    port: process.env.PRIVATE_SERVER_PORT || 443,
+  });
+  await api.auth(
+    process.env.PRIVATE_SERVER_USERNAME,
+    process.env.PRIVATE_SERVER_PASSWORD
+  );
+
+  api.socket.connect()
+  api.socket.on('connected', () => {
+    console.log('Connected to socket')
+  })
+
+  new CronJob(
+    "* * * * *",
+    adminUtilsHandler,
+    null,
+    true,
+    "Europe/Amsterdam",
+  );
+  adminUtilsHandler()
+}

src/index.js

@@ -1,5 +1,5 @@
 import "dotenv/config";
 import Requests from "./requests/index.js";
-import "./socket/console.js";
+import "./adminUtils.js";
 
 Requests.executeCycle();

src/process/index.js

@@ -9,7 +9,7 @@ function shouldFail(opts) {
   const data = validData[key]
   if (!data) return false;
 
-  if (data.tick + 500 > opts.tick) return false
+  if (data.tick + 2500 > opts.tick) return false
   delete validData[key]
   return true;
 }
@@ -32,35 +32,34 @@ export default async function processData(opts, proxyIndex) {
   }
 
   const dataResult = await GetRoomHistory(proxy, opts.shard, opts.room, opts.tick);
-  if (dataResult.status === "Success") {
-    const { data } = dataResult;
-    if (opts.username) {
-      opts.timestamp = data.timestamp;
-      opts.data = await ProcessDataBroker.single({ roomData: data, opts });
-      if (!opts.data) {
-        return {
-          status: "No user",
+  switch (dataResult.status) {
+    case "Success": {
+      const { data } = dataResult;
+      if (opts.username) {
+        opts.timestamp = data.timestamp;
+        opts.data = await ProcessDataBroker.single({ roomData: data, opts });
+        if (!opts.data) {
+          return {
+            status: "No user",
+          }
         }
+        validData[`${opts.shard}-${opts.room}`] = opts;
       }
-      validData[`${opts.shard}-${opts.room}`] = opts;
-    }
-    return {
-      status: "Success",
-    }
-  }
-  if (opts.failed) {
-    if (shouldFail(opts)) {
       return {
-        status: "Failed",
-      };
+        status: "Success",
+      }
     }
+    default: {
+      if (shouldFail(opts)) {
+        return {
+          status: "Failed",
+        };
+      }
 
-    opts.data = validData[`${opts.shard}-${opts.room}`];
-    return {
-      status: "Success",
-    };
+      opts.data = validData[`${opts.shard}-${opts.room}`];
+      return {
+        status: "Success"
+      }
+    }
   }
-
-  opts.failed = true;
-  return processData(opts, proxyIndex);
 }