har2tree 1.36.3__py3-none-any.whl → 1.36.4__py3-none-any.whl

har2tree/har2tree.py

@@ -250,7 +250,7 @@ class HarFile():
     @property
     def root_url(self) -> str:
         """First URL of the capture"""
-        return self.entries[0]['request']['url']
+        return self.entries[0]['request']['url'].strip()
 
     def __find_header_value(self, har_entry: dict[str, Any], header_name: str) -> str | None:
         """Get the value of a specific header"""

har2tree/nodes.py

@@ -25,7 +25,7 @@ import json_stream  # type: ignore
 
 from bs4 import BeautifulSoup
 from ete3 import TreeNode  # type: ignore
-from pyfaup import Url, Hostname
+from pyfaup import Url, Host
 from requests_toolbelt.multipart import decoder  # type: ignore
 from w3lib.html import strip_html5_whitespace
 from w3lib.url import canonicalize_url, safe_url_string
@@ -711,12 +711,18 @@ class HostNode(HarTreeNode):
         if hasattr(self, 'hostname_is_ip') or hasattr(self, 'file_on_disk'):
             return None
         try:
-            faup_hostname = Hostname(self.name)
+            faup_host = Host(self.name)
+            if not faup_host.is_hostname():
+                return None
+            faup_hostname = faup_host.try_into_hostname()
             if faup_hostname.domain:
                 return str(faup_hostname.domain)
 
             self.logger.warning(f'No domain: "{self.name}"')
             return None
+        except ValueError as e:
+            self.logger.warning(f'Not a Host "{self.name}": {e}')
+            return None
         except Exception as e:
             self.logger.warning(f'Unable to parse Hostname "{self.name}": {e}')
             return None
@@ -726,12 +732,18 @@ class HostNode(HarTreeNode):
         if hasattr(self, 'hostname_is_ip') or hasattr(self, 'file_on_disk'):
             return None
         try:
-            faup_hostname = Hostname(self.name)
+            faup_host = Host(self.name)
+            if not faup_host.is_hostname():
+                return None
+            faup_hostname = faup_host.try_into_hostname()
             if faup_hostname.suffix:
                 return str(faup_hostname.suffix)
 
             self.logger.warning(f'No domain: "{self.name}"')
             return None
+        except ValueError as e:
+            self.logger.warning(f'Not a Host "{self.name}": {e}')
+            return None
         except Exception as e:
             self.logger.warning(f'Unable to parse Hostname "{self.name}": {e}')
             return None

{har2tree-1.36.3.dist-info → har2tree-1.36.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: har2tree
-Version: 1.36.3
+Version: 1.36.4
 Summary: HTTP Archive (HAR) to ETE Toolkit generator
 License-Expression: BSD-3-Clause
 License-File: LICENSE
@@ -29,7 +29,7 @@ Requires-Dist: multipart (>=1.3.0,<2.0.0)
 Requires-Dist: numpy (>=2.2,<2.3) ; python_version < "3.11"
 Requires-Dist: numpy (>=2.4.2) ; python_version >= "3.11" and python_version < "4.0"
 Requires-Dist: pure-magic-rs (>=0.3.1,<0.4.0)
-Requires-Dist: pyfaup-rs (>=0.2.1,<0.3.0)
+Requires-Dist: pyfaup-rs (>=0.3,<0.4.0)
 Requires-Dist: requests-toolbelt (>=1.0.0,<2.0.0)
 Requires-Dist: six (>=1.17.0) ; extra == "docs"
 Requires-Dist: tinycss2 (>=1.5.1)

har2tree-1.36.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+har2tree/__init__.py,sha256=Na3mxHkUBq3rzYbxiLNJF37DxH5mcghSorjzXw5Teug,422
+har2tree/har2tree.py,sha256=NgmI1aPus_IY-7KgTF2Ju80h6Giwq7lTLquItzrkSu8,54298
+har2tree/helper.py,sha256=3_KatDaP7pqglD1MAmPTYGARxubi3x3y4Ia2FpbX9sw,20731
+har2tree/nodes.py,sha256=ft2NimyTkVm-aP9F9ZipXnlOH9dC_mw8uo5VOzYBCNc,39978
+har2tree/parser.py,sha256=4yej1OcVYAIiLfzYZsO9WCw3WyM_ykDTuvpW7UO1ROE,3645
+har2tree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+har2tree-1.36.4.dist-info/METADATA,sha256=4O4K-3l-kXyozixHkAICVSWylm2_JzgOnfCRjbg_QQw,2240
+har2tree-1.36.4.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+har2tree-1.36.4.dist-info/licenses/LICENSE,sha256=Xa4EVROgJsEo10CW-ISCRiw0TtqdKz1JuM3BBLBM55c,1803
+har2tree-1.36.4.dist-info/RECORD,,

har2tree-1.36.3.dist-info/RECORD

@@ -1,10 +0,0 @@
-har2tree/__init__.py,sha256=Na3mxHkUBq3rzYbxiLNJF37DxH5mcghSorjzXw5Teug,422
-har2tree/har2tree.py,sha256=TVC122tJ6PmNV8Rim0j__vmPo3a1ikCL-PmYfy0WlRo,54290
-har2tree/helper.py,sha256=3_KatDaP7pqglD1MAmPTYGARxubi3x3y4Ia2FpbX9sw,20731
-har2tree/nodes.py,sha256=hkcEwyu_5aydla0aQbix795hHx9MOaSSQ0VcPNKFsKE,39494
-har2tree/parser.py,sha256=4yej1OcVYAIiLfzYZsO9WCw3WyM_ykDTuvpW7UO1ROE,3645
-har2tree/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-har2tree-1.36.3.dist-info/METADATA,sha256=mEm0GRhHcbKmrcw-AkbZLG1H67WoOthlFwG1K8puUC0,2242
-har2tree-1.36.3.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
-har2tree-1.36.3.dist-info/licenses/LICENSE,sha256=Xa4EVROgJsEo10CW-ISCRiw0TtqdKz1JuM3BBLBM55c,1803
-har2tree-1.36.3.dist-info/RECORD,,