rustplus 5.6.14__tar.gz → 5.6.16__tar.gz

{rustplus-5.6.14/rustplus.egg-info → rustplus-5.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustplus
-Version: 5.6.14
+Version: 5.6.16
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b6
+Requires-Dist: shlex
 
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/__init__.py

@@ -22,5 +22,5 @@ from .utils import *
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "5.6.14"
+__version__ = "5.6.16"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/api/base_rust_api.py

@@ -38,6 +38,7 @@ class BaseRustSocket:
         use_test_server: bool = False,
         event_loop: asyncio.AbstractEventLoop = None,
         rate_limiter: RateLimiter = None,
+        debug: bool = False,
     ) -> None:
         if ip is None:
             raise ValueError("Ip cannot be None")
@@ -46,6 +47,16 @@ class BaseRustSocket:
         if player_token is None:
             raise ValueError("PlayerToken cannot be None")
 
+        try:
+            steam_id = int(steam_id)
+        except ValueError:
+            raise ValueError("SteamID must be an integer")
+
+        try:
+            player_token = int(player_token)
+        except ValueError:
+            raise ValueError("PlayerToken must be an integer")
+
         self.server_id = ServerID(ip, port, steam_id, player_token)
         self.seq = 1
         self.command_options = command_options
@@ -65,6 +76,7 @@ class BaseRustSocket:
             api=self,
             use_test_server=use_test_server,
             rate_limiter=rate_limiter,
+            debug=debug,
         )
 
         if heartbeat is None:

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/api/remote/rust_remote_interface.py

@@ -32,6 +32,7 @@ class RustRemote:
         api=None,
         use_test_server: bool = False,
         rate_limiter: RateLimiter = None,
+        debug: bool = False,
     ) -> None:
         self.server_id = server_id
         self.api = api
@@ -65,6 +66,7 @@ class RustRemote:
         self.use_test_server = use_test_server
         self.pending_entity_subscriptions = []
         self.camera_manager: Union[CameraManager, None] = None
+        self.debug = debug
 
     async def connect(
         self,
@@ -86,6 +88,7 @@ class RustRemote:
             delay=delay,
             on_success_args_kwargs=on_success_args_kwargs,
             on_failure_args_kwargs=on_failure_args_kwargs,
+            debug=self.debug,
         )
         await self.ws.connect(retries=retries)
 
@@ -112,6 +115,11 @@ class RustRemote:
         if self.ws is None:
             raise ClientNotConnectedError("No Current Websocket Connection")
 
+        if self.debug:
+            self.logger.info(
+                f"[RustPlus.py] Sending Message with seq {request.seq}: {request}"
+            )
+
         self.pending_response_events[request.seq] = YieldingEvent()
         await self.ws.send_message(request)
 

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/api/remote/rustws.py

@@ -36,6 +36,7 @@ class RustWebsocket:
         delay,
         on_success_args_kwargs,
         on_failure_args_kwargs,
+        debug: bool = False,
     ):
         self.connection: Union[WebSocketClientProtocol, None] = None
         self.task: Union[Task, None] = None
@@ -53,6 +54,7 @@ class RustWebsocket:
         self.delay = delay
         self.on_success_args_kwargs = on_success_args_kwargs
         self.on_failure_args_kwargs = on_failure_args_kwargs
+        self.debug = debug
 
     async def connect(
         self, retries=float("inf"), ignore_open_value: bool = False
@@ -83,6 +85,10 @@ class RustWebsocket:
                         )
                     )
                     address += f"?v={str(self.magic_value)}"
+
+                    if self.debug:
+                        self.logger.info(f"[RustPlus.py] Connecting to {address}")
+
                     self.connection = await connect(
                         address,
                         close_timeout=0,
@@ -108,8 +114,9 @@ class RustWebsocket:
                     break
 
                 except Exception as exception:
-                    print_error = True
+                    self.logger.info(f"[RustPlus.py] {exception}")
 
+                    print_error = True
                     if not isinstance(exception, KeyboardInterrupt):
                         # Run the failure callback
                         if self.on_failure is not None:
@@ -154,6 +161,9 @@ class RustWebsocket:
         self.task = None
         self.connection_status = CLOSED
 
+        if self.debug:
+            self.logger.info(f"[RustPlus.py] Connection Closed")
+
     async def send_message(self, message: AppRequest) -> None:
         """
         Send the Protobuf to the server
@@ -214,6 +224,11 @@ class RustWebsocket:
                 )
 
     async def handle_message(self, app_message: AppMessage) -> None:
+        if self.debug:
+            self.logger.info(
+                f"[RustPlus.py] Received Message with seq {app_message.response.seq}: {app_message}"
+            )
+
         if app_message.response.seq in self.remote.ignored_responses:
             self.remote.ignored_responses.remove(app_message.response.seq)
             return
@@ -225,12 +240,20 @@ class RustWebsocket:
         if prefix is not None:
             # This means it is a command
 
+            if self.debug:
+                self.logger.info(
+                    f"[RustPlus.py] Attempting to run Command: {app_message}"
+                )
+
             message = RustChatMessage(app_message.broadcast.team_message.message)
             await self.remote.command_handler.run_command(message, prefix)
 
         if self.is_entity_broadcast(app_message):
             # This means that an entity has changed state
 
+            if self.debug:
+                self.logger.info(f"[RustPlus.py] Running Entity Event: {app_message}")
+
             await EventHandler.run_entity_event(
                 app_message.broadcast.entity_changed.entity_id,
                 app_message,
@@ -238,18 +261,27 @@ class RustWebsocket:
             )
 
         elif self.is_camera_broadcast(app_message):
+            if self.debug:
+                self.logger.info(f"[RustPlus.py] Running Camera Event: {app_message}")
+
             if self.remote.camera_manager is not None:
                 await self.remote.camera_manager.add_packet(
                     RayPacket(app_message.broadcast.camera_rays)
                 )
 
         elif self.is_team_broadcast(app_message):
+            if self.debug:
+                self.logger.info(f"[RustPlus.py] Running Team Event: {app_message}")
+
             # This means that the team of the current player has changed
             await EventHandler.run_team_event(app_message, self.server_id)
 
         elif self.is_message(app_message):
             # This means that a message has been sent to the team chat
 
+            if self.debug:
+                self.logger.info(f"[RustPlus.py] Running Chat Event: {app_message}")
+
             steam_id = int(app_message.broadcast.team_message.message.steam_id)
             message = str(app_message.broadcast.team_message.message.message)
 
@@ -278,16 +310,22 @@ class RustWebsocket:
                 else:
                     self.outgoing_conversation_messages.remove(message)
 
-                # Conversation API end
+            # Conversation API end
 
             await EventHandler.run_chat_event(app_message, self.server_id)
 
         else:
             # This means that it wasn't sent by the server and is a message from the server in response to an action
-            event: YieldingEvent = self.remote.pending_response_events[
-                app_message.response.seq
-            ]
-            event.set_with_value(app_message)
+            event: YieldingEvent = self.remote.pending_response_events.get(
+                app_message.response.seq, None
+            )
+            if event is not None:
+                if self.debug:
+                    self.logger.info(
+                        f"[RustPlus.py] Running Response Event: {app_message}"
+                    )
+
+                event.set_with_value(app_message)
 
     def get_prefix(self, message: str) -> Optional[str]:
         if self.remote.use_commands:

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/api/rust_api.py

@@ -54,6 +54,7 @@ class RustSocket(BaseRustSocket):
         use_test_server: bool = False,
         event_loop: asyncio.AbstractEventLoop = None,
         rate_limiter: RateLimiter = None,
+        debug: bool = False,
     ) -> None:
         super().__init__(
             ip=ip,
@@ -69,6 +70,7 @@ class RustSocket(BaseRustSocket):
             use_test_server=use_test_server,
             event_loop=event_loop,
             rate_limiter=rate_limiter,
+            debug=debug,
         )
 
     async def get_time(self) -> RustTime:

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/api/structures/rust_marker.py

@@ -185,3 +185,6 @@ class RustMarker(Serializable):
                 self._out_of_stock,
             )
         )
+
+    def __hash__(self) -> int:
+        return hash((self._id, self._type))

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus/commands/command_handler.py

@@ -1,4 +1,5 @@
 import asyncio
+import shlex
 from datetime import datetime
 
 from . import Command, CommandTime
@@ -22,7 +23,7 @@ class CommandHandler:
 
     async def run_command(self, message: RustChatMessage, prefix) -> None:
         if prefix == self.command_options.prefix:
-            command = message.message.split(" ")[0][len(prefix) :]
+            command = shlex.split(message.message)[0][len(prefix) :]
         else:
             command = prefix
 
@@ -35,7 +36,7 @@ class CommandHandler:
                     message.steam_id,
                     CommandTime(datetime.utcfromtimestamp(message.time), message.time),
                     command,
-                    message.message.split(" ")[1:],
+                    shlex.split(message.message)[1:],
                 )
             )
         else:
@@ -52,7 +53,7 @@ class CommandHandler:
                                 datetime.utcfromtimestamp(message.time), message.time
                             ),
                             command,
-                            message.message.split(" ")[1:],
+                            shlex.split(message.message)[1:],
                         ),
                     )
                     break

{rustplus-5.6.14 → rustplus-5.6.16/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustplus
-Version: 5.6.14
+Version: 5.6.16
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b6
+Requires-Dist: shlex
 
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">

{rustplus-5.6.14 → rustplus-5.6.16}/rustplus.egg-info/requires.txt

@@ -7,3 +7,4 @@ requests
 numpy
 scipy
 betterproto==2.0.0b6
+shlex