feat: Turbowarp cloud debug message compliance

.gitignore

@@ -14,4 +14,13 @@ identifier.sqlite
 obfuscated.sb3
 .pytest_cache
 .ruff_cache
+
+.coverage
+certfile.pem
+coverage.xml
+keyfile.pem
+.test/test.py
+.test/teststststs.py
+.test/ws_client_test.py
+tests/test_tw_cloud_debug_compliance.py
 .vscode

.test/server.py

@@ -0,0 +1,57 @@
+import scratchattach as sa
+
+from rich.traceback import install
+
+from scratchattach.cloud.cloud import CustomCloud
+
+install(show_locals=True)
+
+server_ip = '127.0.0.1'
+ws_server_port = 8080
+wss_server_port = 8765
+project_id=["108566337"]
+
+ws_server = sa.init_cloud_server(server_ip,
+                              ws_server_port,
+                              length_limit=65536,
+                              allow_non_numeric=True,
+                              whitelisted_projects=project_id,
+                              allow_nonscratch_names=True,
+                              blocked_ips=None,
+                              sync_players=True,
+                              log_var_sets=True
+)
+
+wss_server = sa.init_ssl_cloud_server(server_ip,
+                              wss_server_port,
+                              length_limit=65536,
+                              allow_non_numeric=True,
+                              whitelisted_projects=project_id,
+                              allow_nonscratch_names=True,
+                              blocked_ips=None,
+                              sync_players=True,
+                              log_var_sets=True,
+                              certfile="certfile.pem",
+                              keyfile="keyfile.pem"
+)
+
+
+
+ws_server.start()
+
+wss_server.start()
+
+cloud = CustomCloud(project_id=project_id[0],
+                    cloud_host=f"wss://{server_ip}:{wss_server_port}",
+                    username = "Boss_1s",
+                    length_limit = None,
+                    allow_non_numeric = True,
+                    _session = None,
+                    header = None,
+                    cookie = None,
+                    origin = None,
+                    print_connect_messages = True)
+
+events = cloud.events()
+
+events.start()

scratchattach/__init__.py

@@ -1,15 +1,33 @@
-from .cloud.cloud import CustomCloud, ScratchCloud, TwCloud, get_cloud, get_scratch_cloud, get_tw_cloud
+from .cloud.cloud import (
+    CustomCloud,
+    ScratchCloud,
+    TwCloud,
+    get_cloud,
+    get_scratch_cloud,
+    get_tw_cloud,
+)
 from .cloud._base import BaseCloud, AnyCloud
 
-from .eventhandlers.cloud_server import init_cloud_server
-from .eventhandlers._base import BaseEventHandler
+from .eventhandlers.cloud_server import (
+    init_cloud_server,
+    init_ssl_cloud_server,
+    TwCloudSocket,
+    TwCloudServer,
+    TwSSLCloudServer,
+)
+from .eventhandlers._base import BaseEventHandler, BaseCloudServer
 from .eventhandlers.filterbot import Filterbot, HardFilter, SoftFilter, SpamFilter
 from .eventhandlers.cloud_storage import Database
 from .eventhandlers.combine import MultiEventHandler
 
 from .other.other_apis import *
-
-# from .other.project_json_capabilities import ProjectBody, get_empty_project_pb, get_pb_from_dict, read_sb3_file, download_asset
+# from .other.project_json_capabilities import (
+#     ProjectBody,
+#     get_empty_project_pb,
+#     get_pb_from_dict,
+#     read_sb3_file,
+#     download_asset,
+# )
 from .utils.encoder import Encoding
 from .utils.enums import Languages, TTSVoices
 from .utils.exceptions import (
@@ -27,11 +45,29 @@
 from .site.cloud_activity import CloudActivity
 from .site.forum import ForumPost, ForumTopic, get_topic, get_topic_list, youtube_link_to_scratch
 from .site.project import Project, get_project, search_projects, explore_projects
-from .site.session import Session, login, login_by_id, login_by_session_string, login_by_io, login_by_file, login_from_browser
+from .site.session import (
+    Session,
+    login,
+    login_by_id,
+    login_by_session_string,
+    login_by_io,
+    login_by_file,
+    login_from_browser,
+)
 from .site.studio import Studio, get_studio, search_studios, explore_studios
 from .site.classroom import Classroom, get_classroom
 from .site.user import User, get_user, Rank
 from .site._base import BaseSiteComponent
-from .site.browser_cookies import Browser, ANY, FIREFOX, CHROME, CHROMIUM, VIVALDI, EDGE, EDGE_DEV, SAFARI
+from .site.browser_cookies import (
+    Browser,
+    ANY,
+    FIREFOX,
+    CHROME,
+    CHROMIUM,
+    VIVALDI,
+    EDGE,
+    EDGE_DEV,
+    SAFARI,
+)
 
 from . import editor

scratchattach/cloud/_base.py

@@ -9,6 +9,7 @@
 from abc import ABC, abstractmethod, ABCMeta
 from threading import Lock
 from collections.abc import Iterator
+from rich import print
 
 from scratchattach.cloud import cloud as cloud_module
 
@@ -199,7 +200,7 @@ def __init__(self, cloud: BaseCloud):
         except exceptions.CloudConnectionError:
             warnings.warn("Initial cloud connection attempt failed, retrying...", exceptions.UnexpectedWebsocketEventWarning)
         self.packets_left = []
-    
+
     def wait_before_reconnect(self):
         if time.time() - self.most_recent_reconnection_time > self.RECENT_RECONNECT_TIME_DELTA:
             self.recent_reconnect_count = 0
@@ -254,10 +255,12 @@ def read(self, amount: int = -1) -> Iterator[dict[str, Any]]:
                         i += 1
                         yield json.loads(self.packets_left.pop(0))
                     done = True
-                except json.JSONDecodeError as e:
+                except json.JSONDecodeError:
                     # this could happen e.g. when the scratchattach server sends the message
                     # "This server uses @TimMcCool's scratchattach 2.0.0"
-                    warnings.warn(f"Invalid JSON sent from server: {e}")
+                    # print(f"[yellow]Warning: Cloud events handler received invalid JSON.[/]")
+                    # print(f"    [b]Data received:[/] \"{self.packets_left}\"")
+                    warnings.warn(f"Cloud events handler received invalid JSON. Data received: {self.packets_left}")
                 except (websocket.WebSocketConnectionClosedException, ssl.SSLWantReadError):
                     self.wait_before_reconnect()
                     self.source_cloud.reconnect()