From 5689d95ab09d63709fc434ee58899a074030692a Mon Sep 17 00:00:00 2001
From: Ivan-267 <61947090+Ivan-267@users.noreply.github.com>
Date: Sun, 16 Jul 2023 13:19:03 +0200
Subject: [PATCH] rebase

Provides a possible implementation for refactoring the method.
---
 godot_rl/core/godot_env.py | 41 ++++++++++++++++++++++++++------------
 godot_rl_agents_plugin     |  2 +-
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/godot_rl/core/godot_env.py b/godot_rl/core/godot_env.py
index 1c888215..b0901848 100644
--- a/godot_rl/core/godot_env.py
+++ b/godot_rl/core/godot_env.py
@@ -156,7 +156,7 @@ def step(self, action, order_ij=False):
         """
         self.step_send(action, order_ij=order_ij)
         return self.step_recv()
-        
+
 
     def step_send(self, action, order_ij=False):
         """
@@ -172,7 +172,7 @@ def step_send(self, action, order_ij=False):
             "action": self.from_numpy(action, order_ij=order_ij),
         }
         self._send_as_json(message)
-    
+
     def step_recv(self):
         """
         Receive the step response from the Godot environment.
@@ -190,8 +190,8 @@ def step_recv(self):
             np.array(response["done"]).tolist(),  # TODO update API to term, trunc
             [{}] * len(response["done"]),
         )
-        
-        
+
+
 
     def _process_obs(self, response_obs: dict):
         """
@@ -387,19 +387,34 @@ def _clear_socket(self):
 
     def _get_data(self):
         try:
-            data = self.connection.recv(4)
-            if not data:
-                time.sleep(0.000001)
-                return self._get_data()
-            length = int.from_bytes(data, "little")
-            string = ""
-            while len(string) != length:  # TODO: refactor as string concatenation could be slow
-                string += self.connection.recv(length).decode()
+            # Receive the size (in bytes) of the remaining data to receive
+            string_size_bytes: bytearray = bytearray()
+            received_length: int = 0
+
+            # The first 4 bytes contain the length of the remaining data
+            length: int = 4
+
+            while received_length < length:
+                data = self.connection.recv(length - received_length)
+                received_length += len(data)
+                string_size_bytes.extend(data)
+
+            length = int.from_bytes(string_size_bytes, "little")
+
+            # Receive the rest of the data
+            string_bytes: bytearray = bytearray()
+            received_length = 0
+
+            while received_length < length:
+                data = self.connection.recv(length - received_length)
+                received_length += len(data)
+                string_bytes.extend(data)
+
+            string: str = string_bytes.decode()
 
             return string
         except socket.timeout as e:
             print("env timed out", e)
-
         return None
 
     def _send_string(self, string):
diff --git a/godot_rl_agents_plugin b/godot_rl_agents_plugin
index 5b09dc90..3984fd12 160000
--- a/godot_rl_agents_plugin
+++ b/godot_rl_agents_plugin
@@ -1 +1 @@
-Subproject commit 5b09dc906eae1e037c4f8b0b09a1ffe11340802f
+Subproject commit 3984fd124a2b941a446f4614bb0eacd09a2468f5