atomicshop 2.16.45__py3-none-any.whl → 2.16.46__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.16.45'
+__version__ = '2.16.46'

atomicshop/mitm/connection_thread_worker.py

@@ -127,13 +127,7 @@ def thread_worker_main(
                     network_logger.info(f'Protocol upgraded to Websocket')
 
     def parse_websocket(raw_bytes):
-        is_deflated = websocket_parse.is_frame_deflated(raw_bytes)
-        request_decoded = websocket_frame_parser.parse_frame_bytes(raw_bytes)
-
-        return {
-            'is_deflated': is_deflated,
-            'frame': request_decoded
-        }
+        return websocket_frame_parser.parse_frame_bytes(raw_bytes)
 
     def finish_thread():
         # At this stage there could be several times that the same socket was used to the service server - we need to

atomicshop/websocket_parse.py

@@ -129,15 +129,15 @@ class WebsocketFrameParser:
         def process_frame(current_frame):
             if current_frame.opcode == Opcode.TEXT:
                 message = current_frame.data.decode('utf-8', errors='replace')
-                return message
+                return message, 'TEXT'
             elif current_frame.opcode == Opcode.BINARY:
-                return current_frame.data
+                return current_frame.data, 'BINARY'
             elif current_frame.opcode == Opcode.CLOSE:
-                print("Received close frame")
+                return None, 'CLOSE'
             elif current_frame.opcode == Opcode.PING:
-                print("Received ping")
+                return None, 'PING'
             elif current_frame.opcode == Opcode.PONG:
-                print("Received pong")
+                return None, 'PONG'
             else:
                 raise WebsocketParseWrongOpcode("Received unknown frame with opcode:", current_frame.opcode)
 
@@ -152,12 +152,19 @@ class WebsocketFrameParser:
 
         # Parse and process frames
         frame = parse_frame(masked, deflated)
-        result = process_frame(frame)
+        parsed_frame, frame_opcode = process_frame(frame)
 
         # This is basically not needed since we restart the 'reader = StreamReader()' each function execution.
         # # After processing, reset the reader's buffer
         # reader.buffer = b''
 
+        result: dict = {
+            'is_deflated': deflated,
+            'is_masked': masked,
+            'frame': parsed_frame,
+            'opcode': frame_opcode
+        }
+
         return result
 
 

{atomicshop-2.16.45.dist-info → atomicshop-2.16.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.16.45
+Version: 2.16.46
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.16.45.dist-info → atomicshop-2.16.46.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=fBF5eT1cIzArZVWu2launQIsr0jJhGhMkV0tYXx0zf4,124
+atomicshop/__init__.py,sha256=lwyRrx1298W0LP5WyV3pYJw7KJMlCtYSIh5JN2AhC58,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -45,7 +45,7 @@ atomicshop/urls.py,sha256=aJ0NGS9qqaKeqjkkWBs80jaBBg6MYBiPuLIyPGxscVc,1557
 atomicshop/uuids.py,sha256=JSQdm3ZTJiwPQ1gYe6kU0TKS_7suwVrHc8JZDGYlydM,2214
 atomicshop/virtualization.py,sha256=LPP4vjE0Vr10R6DA4lqhfX_WaNdDGRAZUW0Am6VeGco,494
 atomicshop/web.py,sha256=GLdTXgMxg1_0UQaXC4bOvARVyuFg7SPIeJdsCHV8rNE,11662
-atomicshop/websocket_parse.py,sha256=chqR3NSuW5Ndtclzj-46jCuQbyTh6umm1PBKvSkDzXw,16456
+atomicshop/websocket_parse.py,sha256=bkOwiXCNw5bQg1J4KOG7es5kUGysyX2NdfFFVBceSzg,16662
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
 atomicshop/a_installs/ubuntu/elastic_search_and_kibana.py,sha256=yRB-l1zBxdiN6av-FwNkhcBlaeu4zrDPjQ0uPGgpK2I,244
@@ -126,7 +126,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=ROAtbibSWSsF3BraUbhu-QO3MPIFqYY5KUKgsQbiSkk,7813
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=J2fYJZS1IuibvvNmeIsm4hkJMxokQFbBk9xwMGjT7YE,19958
+atomicshop/mitm/connection_thread_worker.py,sha256=ZIlGoi-uN8YxT_-f6xYO9w2IbOAg0qBa7m4T87Uu58I,19769
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=VyJE8QnzlgD3QbX5inz5o6rC3zQ3is9CeTL7-B10g1w,8292
 atomicshop/mitm/message.py,sha256=URR5JKSuAT8XmGIkyprEjlPW2GW4ef_gfUz_GgcFseE,2184
@@ -315,8 +315,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=SDYI1cN0oaapvPeLxSXiJrelTy6xbZl-bopR0jAjVGE,3149
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=zZQfps-CdODQaTUADbHAwKHr5RUg7BLafnKWBbKaLN4,8728
-atomicshop-2.16.45.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.45.dist-info/METADATA,sha256=E-QukR4G1Pts-0XCHJeKddzx3V2jaC6C5eLog6UU0Kw,10500
-atomicshop-2.16.45.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.45.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.45.dist-info/RECORD,,
+atomicshop-2.16.46.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.46.dist-info/METADATA,sha256=omUbYa_iNUdkQVw-R3HI2c0QglteZBXwvixzYRx2jD4,10500
+atomicshop-2.16.46.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.46.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.46.dist-info/RECORD,,