rustplus 6.0.10__tar.gz → 6.0.11__tar.gz

{rustplus-6.0.10/rustplus.egg-info → rustplus-6.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.10
+Version: 6.0.11
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n

{rustplus-6.0.10 → rustplus-6.0.11}/rustplus/__init__.py

@@ -14,5 +14,5 @@ from .structs import RustError, RustMarker, Vector
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.0.10"
+__version__ = "6.0.11"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-6.0.10 → rustplus-6.0.11}/rustplus/remote/ratelimiter/__init__.py

@@ -1,6 +1,6 @@
 import math
 import time
-import asyncio
+import threading
 from typing import Dict
 
 from ...exceptions.exceptions import RateLimitError
@@ -34,6 +34,8 @@ class TokenBucket:
 
 
 class RateLimiter:
+    SOCKET_LIMIT = 25
+    SOCKET_REFRESH_AMOUNT = 3
     SERVER_LIMIT = 50
     SERVER_REFRESH_AMOUNT = 15
 
@@ -47,7 +49,7 @@ class RateLimiter:
     def __init__(self) -> None:
         self.socket_buckets: Dict[ServerDetails, TokenBucket] = {}
         self.server_buckets: Dict[str, TokenBucket] = {}
-        self.lock = asyncio.Lock()
+        self.lock = threading.Lock()
 
     def add_socket(
         self,
@@ -57,19 +59,21 @@ class RateLimiter:
         refresh_rate: float,
         refresh_amount: float,
     ) -> None:
-        self.socket_buckets[server_details] = TokenBucket(
-            current, maximum, refresh_rate, refresh_amount
-        )
-        if server_details.get_server_string() not in self.server_buckets:
-            self.server_buckets[server_details.get_server_string()] = TokenBucket(
-                self.SERVER_LIMIT, self.SERVER_LIMIT, 1, self.SERVER_REFRESH_AMOUNT
-            )
+        with self.lock:
+            if server_details not in self.socket_buckets:
+                self.socket_buckets[server_details] = TokenBucket(
+                    current, maximum, refresh_rate, refresh_amount
+                )
+            if server_details.get_server_string() not in self.server_buckets:
+                self.server_buckets[server_details.get_server_string()] = TokenBucket(
+                    self.SERVER_LIMIT, self.SERVER_LIMIT, 1, self.SERVER_REFRESH_AMOUNT
+                )
 
     async def can_consume(self, server_details: ServerDetails, amount: int = 1) -> bool:
         """
         Returns whether the user can consume the amount of tokens provided
         """
-        async with self.lock:
+        with self.lock:
             for bucket in [
                 self.socket_buckets.get(server_details),
                 self.server_buckets.get(server_details.get_server_string()),
@@ -83,7 +87,7 @@ class RateLimiter:
         """
         Consumes an amount of tokens from the bucket. You should first check to see whether it is possible with can_consume
         """
-        async with self.lock:
+        with self.lock:
             for bucket in [
                 self.socket_buckets.get(server_details),
                 self.server_buckets.get(server_details.get_server_string()),
@@ -103,12 +107,14 @@ class RateLimiter:
         """
         Returns how long until the amount of tokens needed will be available
         """
-        async with self.lock:
+
+        with self.lock:
             delay = 0
             for bucket in [
                 self.socket_buckets.get(server_details),
                 self.server_buckets.get(server_details.get_server_string()),
             ]:
+                bucket.refresh()
                 val = (
                     math.ceil(
                         (
@@ -127,5 +133,10 @@ class RateLimiter:
         """
         Removes the limiter
         """
-        async with self.lock:
+        with self.lock:
             del self.socket_buckets[server_details]
+            server_str = server_details.get_server_string()
+            if not any(
+                d.get_server_string() == server_str for d in self.socket_buckets
+            ):
+                del self.server_buckets[server_str]

{rustplus-6.0.10 → rustplus-6.0.11}/rustplus/rust_api.py

@@ -85,10 +85,10 @@ class RustSocket:
 
         self.ratelimiter.add_socket(
             self.server_details,
-            RateLimiter.SERVER_LIMIT,
-            RateLimiter.SERVER_LIMIT,
+            RateLimiter.SOCKET_LIMIT,
+            RateLimiter.SOCKET_LIMIT,
             1,
-            RateLimiter.SERVER_REFRESH_AMOUNT,
+            RateLimiter.SOCKET_REFRESH_AMOUNT,
         )
 
     async def _handle_ratelimit(self, tokens) -> None:

{rustplus-6.0.10 → rustplus-6.0.11/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.0.10
+Version: 6.0.11
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n