rustplus 5.6.10__tar.gz → 5.6.13__tar.gz

{rustplus-5.6.10 → rustplus-5.6.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustplus
-Version: 5.6.10
+Version: 5.6.13
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -9,6 +9,15 @@ Project-URL: Issue tracker, https://github.com/olijeffers0n/rustplus/issues
 Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: websockets
+Requires-Dist: Pillow
+Requires-Dist: asyncio
+Requires-Dist: rustPlusPushReceiver==0.4.1
+Requires-Dist: http-ece
+Requires-Dist: requests
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: betterproto==2.0.0b6
 
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">
@@ -59,3 +68,9 @@ You can also join me on my discord server:
 GitHub ⭐'s are always welcome :)
 
 Have Fun! 
+
+## Special Thanks:
+Thanks to [JetBrains](https://www.jetbrains.com/?from=rustplus) for providing me with a free Open Source License for 
+PyCharm Professional, which is what I use to develop this project.
+
+<a href="https://jb.gg/OpenSourceSupport"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" width="150"></a>

rustplus-5.6.10/rustplus.egg-info/PKG-INFO → rustplus-5.6.13/README.md

@@ -1,15 +1,3 @@
-Metadata-Version: 2.1
-Name: rustplus
-Version: 5.6.10
-Summary: A python wrapper for the Rust Plus API
-Home-page: https://github.com/olijeffers0n/rustplus
-Author: olijeffers0n
-License: MIT
-Project-URL: Issue tracker, https://github.com/olijeffers0n/rustplus/issues
-Requires-Python: >=3.8.0
-Description-Content-Type: text/markdown
-License-File: LICENSE
-
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">
 	<img src = "https://static.pepy.tech/personalized-badge/rustplus?period=total&units=international_system&left_color=black&right_color=orange&left_text=Downloads">
@@ -59,3 +47,9 @@ You can also join me on my discord server:
 GitHub ⭐'s are always welcome :)
 
 Have Fun! 
+
+## Special Thanks:
+Thanks to [JetBrains](https://www.jetbrains.com/?from=rustplus) for providing me with a free Open Source License for 
+PyCharm Professional, which is what I use to develop this project.
+
+<a href="https://jb.gg/OpenSourceSupport"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" width="150"></a>

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/__init__.py

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

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/base_rust_api.py

@@ -1,5 +1,5 @@
 import asyncio
-from typing import List, Callable, Union
+from typing import List, Union, Coroutine, Callable, Dict, Tuple
 from PIL import Image
 
 from .remote.events.event_loop_manager import EventLoopManager
@@ -113,8 +113,10 @@ class BaseRustSocket:
         self,
         retries: int = float("inf"),
         delay: int = 20,
-        on_failure=None,
-        on_success=None,
+        on_failure: Union[Coroutine, Callable[[], None], None] = None,
+        on_success: Union[Coroutine, Callable[[], None], None] = None,
+        on_success_args_kwargs: Tuple[List, Dict] = ([], {}),
+        on_failure_args_kwargs: Tuple[List, Dict] = ([], {}),
     ) -> None:
         """
         Attempts to open a connection to the rust game server specified in the constructor
@@ -123,7 +125,10 @@ class BaseRustSocket:
         :param delay: The delay (in seconds) between reconnection attempts.
         :param on_failure: Optional function to be called when connecting fails.
         :param on_success: Optional function to be called when connecting succeeds.
-
+        :param on_success_args_kwargs: Optional tuple holding keyword and regular arguments
+            for on_success in this format (args, kwargs)
+        :param on_failure_args_kwargs: Optional tuple holding keyword and regular arguments
+            for on_failure in this format (args, kwargs)
 
         :return: None
         """
@@ -151,6 +156,8 @@ class BaseRustSocket:
                     delay=delay,
                     on_failure=on_failure,
                     on_success=on_success,
+                    on_success_args_kwargs=on_success_args_kwargs,
+                    on_failure_args_kwargs=on_failure_args_kwargs,
                 )
                 await self.heartbeat.start_beat()
         except ConnectionRefusedError:

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/remote/rust_remote_interface.py

@@ -66,7 +66,15 @@ class RustRemote:
         self.pending_entity_subscriptions = []
         self.camera_manager: Union[CameraManager, None] = None
 
-    async def connect(self, retries, delay, on_failure=None, on_success=None) -> None:
+    async def connect(
+        self,
+        retries,
+        delay,
+        on_failure,
+        on_success,
+        on_success_args_kwargs,
+        on_failure_args_kwargs,
+    ) -> None:
         self.ws = RustWebsocket(
             server_id=self.server_id,
             remote=self,
@@ -76,6 +84,8 @@ class RustRemote:
             on_failure=on_failure,
             on_success=on_success,
             delay=delay,
+            on_success_args_kwargs=on_success_args_kwargs,
+            on_failure_args_kwargs=on_failure_args_kwargs,
         )
         await self.ws.connect(retries=retries)
 

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/remote/rustplus_proto/rustplus.py

@@ -352,6 +352,9 @@ class AppTeamInfoNote(betterproto.Message):
     type: int = betterproto.int32_field(2)
     x: float = betterproto.float_field(3)
     y: float = betterproto.float_field(4)
+    icon: int = betterproto.int32_field(5)
+    colour_index: int = betterproto.int32_field(6)
+    label: str = betterproto.string_field(7)
 
 
 @dataclass

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/remote/rustws.py

@@ -34,6 +34,8 @@ class RustWebsocket:
         on_failure,
         on_success,
         delay,
+        on_success_args_kwargs,
+        on_failure_args_kwargs,
     ):
         self.connection: Union[WebSocketClientProtocol, None] = None
         self.task: Union[Task, None] = None
@@ -49,6 +51,8 @@ class RustWebsocket:
         self.on_failure = on_failure
         self.on_success = on_success
         self.delay = delay
+        self.on_success_args_kwargs = on_success_args_kwargs
+        self.on_failure_args_kwargs = on_failure_args_kwargs
 
     async def connect(
         self, retries=float("inf"), ignore_open_value: bool = False
@@ -80,16 +84,25 @@ class RustWebsocket:
                     )
                     address += f"?v={str(self.magic_value)}"
                     self.connection = await connect(
-                        address, close_timeout=0, ping_interval=None, max_size=1_000_000_000
+                        address,
+                        close_timeout=0,
+                        ping_interval=None,
+                        max_size=1_000_000_000,
                     )
                     self.connected_time = time.time()
 
                     if self.on_success is not None:
                         try:
                             if asyncio.iscoroutinefunction(self.on_success):
-                                await self.on_success()
+                                await self.on_success(
+                                    *self.on_success_args_kwargs[0],
+                                    **self.on_success_args_kwargs[1],
+                                )
                             else:
-                                self.on_success()
+                                self.on_success(
+                                    *self.on_success_args_kwargs[0],
+                                    **self.on_success_args_kwargs[1],
+                                )
                         except Exception as e:
                             self.logger.warning(e)
                     break
@@ -102,9 +115,15 @@ class RustWebsocket:
                         if self.on_failure is not None:
                             try:
                                 if asyncio.iscoroutinefunction(self.on_failure):
-                                    val = await self.on_failure()
+                                    val = await self.on_failure(
+                                        *self.on_failure_args_kwargs[0],
+                                        **self.on_failure_args_kwargs[1],
+                                    )
                                 else:
-                                    val = self.on_failure()
+                                    val = self.on_failure(
+                                        *self.on_failure_args_kwargs[0],
+                                        **self.on_failure_args_kwargs[1],
+                                    )
 
                                 if val is not None:
                                     print_error = val

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_chat_message.py

@@ -1,7 +1,8 @@
 from ..remote.rustplus_proto import AppTeamMessage
+from .serialization import Serializable
 
 
-class RustChatMessage:
+class RustChatMessage(Serializable):
     def __init__(self, data: AppTeamMessage):
         self._steam_id: int = data.steam_id
         self._name: str = data.name

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_contents.py

@@ -1,10 +1,10 @@
 from datetime import timedelta
 from typing import List
-
+from .serialization import Serializable
 from .rust_item import RustItem
 
 
-class RustContents:
+class RustContents(Serializable):
     def __init__(self, protection_time, has_protection, contents) -> None:
         self._protection_time: timedelta = protection_time
         self._has_protection: bool = has_protection

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_entity_info.py

@@ -1,9 +1,9 @@
 from typing import List
-
+from .serialization import Serializable
 from ..remote import AppEntityInfo, AppEntityPayloadItem
 
 
-class RustEntityInfoItem:
+class RustEntityInfoItem(Serializable):
     def __init__(self, data: AppEntityPayloadItem) -> None:
         self._item_id: int = data.item_id
         self._quantity: int = data.quantity
@@ -29,7 +29,7 @@ class RustEntityInfoItem:
         )
 
 
-class RustEntityInfo:
+class RustEntityInfo(Serializable):
     def __init__(self, data: AppEntityInfo) -> None:
         self._type: int = data.type
         self._value: bool = data.payload.value

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_info.py

@@ -1,7 +1,8 @@
 from ..remote.rustplus_proto import AppInfo
+from .serialization import Serializable
 
 
-class RustInfo:
+class RustInfo(Serializable):
     def __init__(self, data: AppInfo) -> None:
         self._name: str = data.name
         self._url: str = data.url

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_item.py

@@ -1,7 +1,8 @@
 from typing import Union
+from .serialization import Serializable
 
 
-class RustItem:
+class RustItem(Serializable):
     def __init__(
         self, name: str, item_id: Union[str, int], quantity: int, is_blueprint: bool
     ) -> None:

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_map.py

@@ -1,9 +1,9 @@
 from typing import List
-
+from .serialization import Serializable
 from ..remote.rustplus_proto import AppMap
 
 
-class RustMonument:
+class RustMonument(Serializable):
     def __init__(self, token, x, y) -> None:
         self._token: str = token
         self._x: float = x
@@ -27,7 +27,7 @@ class RustMonument:
         )
 
 
-class RustMap:
+class RustMap(Serializable):
     def __init__(self, data: AppMap) -> None:
         self._width: int = data.width
         self._height: int = data.height

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_marker.py

@@ -1,9 +1,9 @@
 from typing import List
-
+from .serialization import Serializable
 from ..remote.rustplus_proto import Vector4, AppMarkerSellOrder, AppMarker
 
 
-class RustColour:
+class RustColour(Serializable):
     def __init__(self, data: Vector4) -> None:
         self._x: float = data.x
         self._y: float = data.y
@@ -32,7 +32,7 @@ class RustColour:
         )
 
 
-class RustSellOrder:
+class RustSellOrder(Serializable):
     def __init__(self, data: AppMarkerSellOrder) -> None:
         self._item_id: int = data.item_id
         self._quantity: int = data.quantity
@@ -84,7 +84,7 @@ class RustSellOrder:
         )
 
 
-class RustMarker:
+class RustMarker(Serializable):
     PlayerMarker = 1
     ExplosionMarker = 2
     VendingMachineMarker = 3

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_team_info.py

@@ -1,9 +1,9 @@
 from typing import List
-
+from .serialization import Serializable
 from ..remote.rustplus_proto import AppTeamInfoMember, AppTeamInfoNote, AppTeamInfo
 
 
-class RustTeamMember:
+class RustTeamMember(Serializable):
     def __init__(self, data: AppTeamInfoMember) -> None:
         self._steam_id: int = data.steam_id
         self._name: str = data.name
@@ -59,11 +59,14 @@ class RustTeamMember:
         )
 
 
-class RustTeamNote:
+class RustTeamNote(Serializable):
     def __init__(self, data: AppTeamInfoNote) -> None:
         self._type: int = data.type
         self._x: float = data.x
         self._y: float = data.y
+        self._icon: int = data.icon
+        self._colour_index: int = data.colour_index
+        self._label: str = data.label
 
     @property
     def type(self) -> int:
@@ -77,11 +80,25 @@ class RustTeamNote:
     def y(self) -> float:
         return self._y
 
+    @property
+    def icon(self) -> int:
+        return self._icon
+
+    @property
+    def colour_index(self) -> int:
+        return self._colour_index
+
+    @property
+    def label(self) -> str:
+        return self._label
+
     def __str__(self) -> str:
-        return "RustTeamNote[type={}, x={}, y={}]".format(self._type, self._x, self._y)
+        return "RustTeamNote[type={}, x={}, y={}, icon={}, colour_index={}, label={}]".format(
+            self._type, self._x, self._y, self._icon, self._colour_index, self._label
+        )
 
 
-class RustTeamInfo:
+class RustTeamInfo(Serializable):
     def __init__(self, data: AppTeamInfo) -> None:
         self._leader_steam_id: int = data.leader_steam_id
         self._members = [RustTeamMember(member) for member in data.members]

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus/api/structures/rust_time.py

@@ -1,4 +1,7 @@
-class RustTime:
+from .serialization import Serializable
+
+
+class RustTime(Serializable):
     def __init__(self, day_length, sunrise, sunset, time, raw_time, time_scale) -> None:
         self._day_length: float = day_length
         self._sunrise: str = sunrise

rustplus-5.6.13/rustplus/api/structures/serialization.py

@@ -0,0 +1,17 @@
+from collections.abc import Sequence
+
+
+class Serializable:
+
+    def serialize(self):
+        data = {}
+        for k, v in self.__dict__.items():
+            key = k if k[0] != "_" else k[1:]
+            if isinstance(v, Serializable):
+                data[key] = v.serialize()
+            elif isinstance(v, Sequence) and all(isinstance(element, Serializable) for element in v):
+                data[key] = [e.serialize() for e in v]
+            else:
+                data[key] = str(v)
+
+        return data

rustplus-5.6.10/README.md → rustplus-5.6.13/rustplus.egg-info/PKG-INFO

@@ -1,3 +1,24 @@
+Metadata-Version: 2.1
+Name: rustplus
+Version: 5.6.13
+Summary: A python wrapper for the Rust Plus API
+Home-page: https://github.com/olijeffers0n/rustplus
+Author: olijeffers0n
+License: MIT
+Project-URL: Issue tracker, https://github.com/olijeffers0n/rustplus/issues
+Requires-Python: >=3.8.0
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: websockets
+Requires-Dist: Pillow
+Requires-Dist: asyncio
+Requires-Dist: rustPlusPushReceiver==0.4.1
+Requires-Dist: http-ece
+Requires-Dist: requests
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: betterproto==2.0.0b6
+
 ![Rust+.py](https://raw.githubusercontent.com/olijeffers0n/rustplus/master/icon.png)
 <div align = "center">
 	<img src = "https://static.pepy.tech/personalized-badge/rustplus?period=total&units=international_system&left_color=black&right_color=orange&left_text=Downloads">
@@ -47,3 +68,9 @@ You can also join me on my discord server:
 GitHub ⭐'s are always welcome :)
 
 Have Fun! 
+
+## Special Thanks:
+Thanks to [JetBrains](https://www.jetbrains.com/?from=rustplus) for providing me with a free Open Source License for 
+PyCharm Professional, which is what I use to develop this project.
+
+<a href="https://jb.gg/OpenSourceSupport"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg" width="150"></a>

{rustplus-5.6.10 → rustplus-5.6.13}/rustplus.egg-info/SOURCES.txt

@@ -82,6 +82,7 @@ rustplus/api/structures/rust_map.py
 rustplus/api/structures/rust_marker.py
 rustplus/api/structures/rust_team_info.py
 rustplus/api/structures/rust_time.py
+rustplus/api/structures/serialization.py
 rustplus/api/structures/util.py
 rustplus/commands/__init__.py
 rustplus/commands/command.py