Better roomsUploaded catching

screepers · Mar 20, 2024 · e744d98 · e744d98
1 parent 0d693a2
commit e744d98
Show file tree

Hide file tree

Showing 5 changed files with 9,716 additions and 18 deletions.
diff --git a/src/data/converter/manage/ownedRoom.js b/src/data/converter/manage/ownedRoom.js
@@ -182,13 +182,6 @@ export default async function handleObjects(data, opts) {
 
     // #region Controller
     if (controller) {
-      actions.push(
-        ActionProcessor.CreateAction(
-          `controller.upgrader`,
-          controller._upgraded,
-          ActionProcessor.ActionType.FirstTickOnly
-        )
-      );
       actions.push(
         ActionProcessor.CreateAction(
           `controller.level`,

diff --git a/src/process/index.js b/src/process/index.js
@@ -9,7 +9,7 @@ function shouldFail(opts) {
   const data = validData[key]
   if (!data) return false;
 
-  if (data.tick + 1000 > opts.tick) return false
+  if (data.tick + 500 > opts.tick) return false
   delete validData[key]
   return true;
 }
@@ -42,7 +42,7 @@ export default async function processData(opts, proxyIndex) {
           status: "No user",
         }
       }
-      validData[`${opts.shard}-${opts.room}`] = { data: opts.data, tick: opts.tick }
+      validData[`${opts.shard}-${opts.room}`] = opts;
     }
     return {
       status: "Success",
@@ -55,7 +55,7 @@ export default async function processData(opts, proxyIndex) {
       };
     }
 
-    opts.data = validData[`${opts.shard}-${opts.room}`] || {};
+    opts.data = validData[`${opts.shard}-${opts.room}`];
     return {
       status: "Success",
     };

diff --git a/src/requests/index.js b/src/requests/index.js
@@ -75,14 +75,16 @@ export default class Requests {
       }
       const roomsUploaded = {};
       for (let u = 0; u < status.processed.length; u += 1) {
-        const { shard, room } = status.processed[u];
-        roomsUploaded[shard] = roomsUploaded[shard] || {};
-        roomsUploaded[shard][room] = 1;
+        const { shard, room, username } = status.processed[u];
+        roomsUploaded[username] = roomsUploaded[username] || {};
+        roomsUploaded[username][shard] = roomsUploaded[username][shard] || {};
+        roomsUploaded[username][shard][room] = 1;
       }
       for (let u = 0; u < status.failed.length; u += 1) {
-        const { shard, room } = status.failed[u];
-        roomsUploaded[shard] = roomsUploaded[shard] || {};
-        roomsUploaded[shard][room] = 1;
+        const { shard, room, username } = status.failed[u];
+        roomsUploaded[username] = roomsUploaded[username] || {};
+        roomsUploaded[username][shard] = roomsUploaded[username][shard] || {};
+        roomsUploaded[username][shard][room] = 0;
       }
       await UploadStatus({
         cycleDetails:

diff --git a/tests/helper/dataFiles/data.json b/tests/helper/dataFiles/data.json
diff --git a/tests/helper/dataFiles/index.js b/tests/helper/dataFiles/index.js
@@ -11,7 +11,7 @@ const opts = {
 }
 // set id each change in data.json
 ProcessDataBroker.usernamesById = {
-  "58519b0bee6ae29347627228": "username"
+  "61a475b5048fffe95d98bbcf": "username"
 };
 const stats = await ProcessDataBroker.single({ roomData, opts });
 console.log(stats);