When no tick, wait until tick is known

screepers · Feb 2, 2024 · 20a2bb1 · 20a2bb1
1 parent 73f82f2
commit 20a2bb1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM node:16.7.0
+FROM node:18.18.0
 ENV NODE_ENV=production
 
 WORKDIR /usr/app

diff --git a/src/data/broker/processData.js b/src/data/broker/processData.js
@@ -114,7 +114,7 @@ export default class ProcessDataBroker {
       if (process.env.CHECK_FOR_NEW_ACTIONS === "TRUE")
         ActionProcessor.FindNewDefaultActions(actionsArray, opts.type);
 
-      return { data: ActionProcessor.getStats(actionsArray) };
+      return ActionProcessor.getStats(actionsArray);
     } catch (e) {
       console.error(e);
       throw e;

diff --git a/src/data/combineResults.js b/src/data/combineResults.js
@@ -101,5 +101,7 @@ export default function handleCombinedRoomStats(shardsData, userData) {
   if (process.env.ONLY_COMBINED_DATA_UPLOAD === "true")
     delete userStats.shards;
 
+  userStats.userData = userData;
+
   return { stats: userStats }
 }
diff --git a/src/helper/requests.js b/src/helper/requests.js
@@ -21,9 +21,13 @@ export function getSyncedTick(shard) {
   }
   if (!syncedTicks[shard]) {
     // eslint-disable-next-line no-nested-ternary
-    let tick = process.env.MIN_TICK !== undefined
-      ? Number.parseInt(process.env.MIN_TICK || "-1", 10)
-      : lastLiveTicks[shard] ? lastLiveTicks[shard] - 1000 : 0;
+    let tick;
+
+    if (process.env.MIN_TICK !== undefined) tick = Number.parseInt(process.env.MIN_TICK || "-1", 10)
+    else if (lastLiveTicks[shard]) tick = lastLiveTicks[shard] - 1000;
+    else {
+      return undefined;
+    }
     tick = Math.round(tick / 100) * 100
 
     syncedTicks[shard] = tick;