Merge pull request #443 from dojoengine/fix/recs-get-eventmessages

fix: recs getEventMessages

Author: MartianGreed

.changeset/afraid-berries-go.md

@@ -0,0 +1,15 @@
+---
+"@dojoengine/predeployed-connector": patch
+"@dojoengine/state": patch
+"@dojoengine/core": patch
+"@dojoengine/create-burner": patch
+"@dojoengine/create-dojo": patch
+"@dojoengine/react": patch
+"@dojoengine/sdk": patch
+"@dojoengine/torii-client": patch
+"@dojoengine/torii-wasm": patch
+"@dojoengine/utils": patch
+"@dojoengine/utils-wasm": patch
+---
+
+fix: recs getEventMessages looping

packages/predeployed-connector/package.json

@@ -64,6 +64,10 @@
         "node": ">=18.0.0"
     },
     "dependencies": {
-        "@starknet-io/types-js": "^0.7.10"
+        "@starknet-io/types-js": "^0.7.10",
+        "@starknet-react/core": "catalog:",
+        "react": "catalog:",
+        "react-dom": "catalog:",
+        "starknet": "catalog:"
     }
 }

packages/state/src/recs/index.ts

@@ -238,10 +238,16 @@ export const getEvents = async <S extends Schema>(
         if (logging) console.log("entities", entities.items);
 
         setEntities(entities.items, components, logging);
+        if (entities.items.length < limit && !entities.next_cursor) {
+            continueFetching = false;
+            continue;
+        }
 
         if (Object.keys(entities.items).length === 0) {
+            console.error("STOP FETCHING");
             continueFetching = false;
         } else {
+            console.error("NEXT_CURSOR", entities.next_cursor);
             cursor = entities.next_cursor;
         }
     }
@@ -282,27 +288,34 @@ export const getEntitiesQuery = async <S extends Schema>(
     let cursor = undefined;
     let continueFetching = true;
 
-    const fetchedEntities = await client.getEntities({
-        pagination: {
-            limit,
-            cursor,
-            direction: "Forward",
-            order_by: orderBy,
-        },
-        clause: entityKeyClause,
-        no_hashed_keys: false,
-        models: entityModels,
-        historical,
-    });
-
     while (continueFetching) {
+        const fetchedEntities = await client.getEntities({
+            pagination: {
+                limit,
+                cursor,
+                direction: "Forward",
+                order_by: orderBy,
+            },
+            clause: entityKeyClause,
+            no_hashed_keys: false,
+            models: entityModels,
+            historical,
+        });
         if (logging)
             console.log(
                 `Fetched ${Object.keys(fetchedEntities.items).length} entities ${fetchedEntities.next_cursor}`
             );
 
         setEntities(fetchedEntities.items, components, logging);
 
+        if (
+            fetchedEntities.items.length < limit &&
+            !fetchedEntities.next_cursor
+        ) {
+            continueFetching = false;
+            continue;
+        }
+
         if (Object.keys(fetchedEntities.items).length < limit) {
             continueFetching = false;
         } else {