network-core 0.2.0__tar.gz → 0.2.2__tar.gz

{network_core-0.2.0 → network_core-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: network_core
-Version: 0.2.0
+Version: 0.2.2
 Summary: Core networking utilities and data models
 Author: Your Name
 Requires-Python: >=3.9

{network_core-0.2.0 → network_core-0.2.2}/network_core/dataModels.py

@@ -73,8 +73,8 @@ class HttpUnit:
     request_ct: str
     response_status: int
     response_ct: str
-    request_data: str
-    response_data: str
+    request_data: str | dict
+    response_data: str | dict
     request_start: float
     request_end: float
     response_start: float

{network_core-0.2.0 → network_core-0.2.2}/network_core/http/httpExtract/helpers.py

@@ -6,6 +6,7 @@ import brotli
 import json
 import blackboxprotobuf
 import zlib
+import base64
 
 
 def decompress_gzip_resilient(data):
@@ -54,7 +55,7 @@ def get_ft_from_layers(layers: dict):
     )
 
 
-def parse_hex(raw_bytes: bytes, encoding: str, content_type: str) -> dict | bytes | str:
+def parse_hex(raw_bytes: bytes, encoding: str, content_type: str) -> dict | str:
     # 1. Decompress (Existing logic)
     encoding = str(encoding).lower()  # in case I have arrays like ["application/json"]
     content_type = str(content_type).lower()
@@ -75,14 +76,12 @@ def parse_hex(raw_bytes: bytes, encoding: str, content_type: str) -> dict | byte
         print(
             f"Decompression failed: {e}, with encoding {encoding} and content-type {content_type}"
         )
-        print(raw_bytes[:100])
-        print("=" * 100)
         decompressed = raw_bytes
 
     # 2. Handle Binary types
     binary_types = ["image/", "video/", "audio/", "application/octet-stream"]
     if any(bt in content_type for bt in binary_types):
-        return decompressed
+        return base64.b64encode(decompressed).decode("ascii")  # JSON-safe string
 
     # 3. Handle Protobuf explicitly if the content type suggests it
     # Google often uses "application/json+protobuf" or "application/x-protobuf"
@@ -103,39 +102,42 @@ def parse_hex(raw_bytes: bytes, encoding: str, content_type: str) -> dict | byte
             try:
                 # message is a dict, typedef is the guessed structure
                 message, typedef = blackboxprotobuf.decode_message(decompressed)
-                return {
-                    "type": "protobuf_decoded",
-                    "data": message,
-                    "structure": typedef,
-                }
+                return str(message)  # Convert to string for JSON serialization
             except Exception as pb_e:
                 print(f"Protobuf decoding failed: {pb_e}")
 
-        return text_output
+        return str(text_output)
     except:
-        return decompressed
+        return base64.b64encode(decompressed).decode("ascii")  # JSON-safe string
 
 
 def parse_http_unit_data(http_unit: HttpUnit):
     try:
-        raw_bytes = bytes.fromhex(http_unit.response_data)
-        encoding = http_unit.response_headers.get("content-encoding", "").lower()
-        content_type = http_unit.response_headers.get("content-type", "").lower()
+        if isinstance(http_unit.response_data, str):
+            raw_bytes = bytes.fromhex(http_unit.response_data)
+            encoding = http_unit.response_headers.get("content-encoding", "").lower()
+            content_type = http_unit.response_headers.get("content-type", "").lower()
+
+            http_unit.response_data = parse_hex(
+                raw_bytes=raw_bytes, encoding=encoding, content_type=content_type
+            )
+        else:
+            print("Response data is not a string, skipping parsing.")
 
-        http_unit.response_data = parse_hex(  # type: ignore
-            raw_bytes=raw_bytes, encoding=encoding, content_type=content_type
-        )
     except:
         pass
 
     try:
-        raw_bytes = bytes.fromhex(http_unit.request_data)
+        if isinstance(http_unit.request_data, str):
+            raw_bytes = bytes.fromhex(http_unit.request_data)
 
-        encoding = http_unit.request_headers.get("content-encoding", "").lower()
-        content_type = http_unit.request_headers.get("content-type", "").lower()
+            encoding = http_unit.request_headers.get("content-encoding", "").lower()
+            content_type = http_unit.request_headers.get("content-type", "").lower()
 
-        http_unit.request_data = parse_hex(  # type: ignore
-            raw_bytes=raw_bytes, encoding=encoding, content_type=content_type
-        )
+            http_unit.request_data = parse_hex(  # type: ignore
+                raw_bytes=raw_bytes, encoding=encoding, content_type=content_type
+            )
+        else:
+            print("Request data is not a string, skipping parsing.")
     except:
         pass

{network_core-0.2.0 → network_core-0.2.2}/network_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: network_core
-Version: 0.2.0
+Version: 0.2.2
 Summary: Core networking utilities and data models
 Author: Your Name
 Requires-Python: >=3.9

{network_core-0.2.0 → network_core-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "network_core"
-version = "0.2.0"
+version = "0.2.2"
 description = "Core networking utilities and data models"
 authors = [{ name = "Your Name" }]
 readme = "README.md"