KeyisBClient-mmbp 0.0.0.1.13__py3-none-any.whl → 0.0.0.1.15__py3-none-any.whl

KeyisBClient_mmbp/Client.py

@@ -8,7 +8,7 @@ import os
 import sys
 import httpx
 from KeyisBLogging import logging
-from KeyisBClient import Exceptions
+from KeyisBClient import Exceptions, Url
 from KeyisBClient.models import Request, Response
 
 def resource_path(relative_path):
@@ -46,6 +46,8 @@ class Client:
             logging.debug("No DNS record found")
             raise Exceptions.DNS.InvalidDNSError()
         
+        request_url = Url(str(request.url))
+        
         request.url.hostname = request.dnsObject.host() # type: ignore
         request.url.scheme = request.dnsObject.protocolInfo()['connection_protocol']
 
@@ -69,6 +71,13 @@ class Client:
                 json = response.json()
             except:
                 json = None
+
+            response_url = Url(str(response.url))
+            if response_url.hostname == request.dnsObject.host():
+                response_url.hostname = request_url.hostname
+            if response_url.hostname == request.dnsObject.protocolInfo()['connection_protocol']:
+                response_url.scheme = request_url.scheme
+
             return Response(
                     status_code=response.status_code,
                     headers=response.headers,
@@ -79,13 +88,16 @@ class Client:
                     request=request,
                     extensions=response.extensions,
                     history=None,
-                    default_encoding=response.encoding or "utf-8"
+                    default_encoding=response.encoding or "utf-8",
+                    url=response_url
                 )
         except httpx.TimeoutException:
             logging.debug("HTTPS request timed out")
             raise Exceptions.ServerTimeoutError()
-        except httpx.ConnectError:
+        except httpx.ConnectError as e:
             logging.debug("Failed to connect to server")
+            if '[SSL: CERTIFICATE_VERIFY_FAILED]' in str(e):
+                raise Exceptions.CertificateVerifyFailed()
             raise Exceptions.ErrorConnection()
         except httpx.HTTPStatusError as e:
             logging.debug(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
@@ -99,6 +111,8 @@ class Client:
             logging.debug("No DNS record found")
             raise Exceptions.DNS.InvalidDNSError()
         
+        request_url = Url(str(request.url))
+        
         request.url.hostname = request.dnsObject.host() # type: ignore
         request.url.scheme = request.dnsObject.protocolInfo()['connection_protocol']
 
@@ -123,6 +137,14 @@ class Client:
                 json = response.json()
             except:
                 json = None
+
+                
+            response_url = Url(str(response.url))
+            if response_url.hostname == request.dnsObject.host():
+                response_url.hostname = request_url.hostname
+            if response_url.hostname == request.dnsObject.protocolInfo()['connection_protocol']:
+                response_url.scheme = request_url.scheme
+
             return Response(
                 status_code=response.status_code,
                 headers=response.headers,
@@ -133,7 +155,8 @@ class Client:
                 request=request,
                 extensions=response.extensions,
                 history=None,
-                default_encoding=response.encoding or "utf-8"
+                default_encoding=response.encoding or "utf-8",
+                url=response_url
             )
         except httpx.TimeoutException:
             logging.debug("HTTPS request timed out")

{KeyisBClient_mmbp-0.0.0.1.13.dist-info → KeyisBClient_mmbp-0.0.0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: KeyisBClient_mmbp
-Version: 0.0.0.1.13
+Version: 0.0.0.1.15
 Summary: KeyisBClient_mmbp
 Home-page: https://github.com/KeyisB/libs/tree/main/KeyisBClient_mmbp
 Author: KeyisB

KeyisBClient_mmbp-0.0.0.1.15.dist-info/RECORD

@@ -0,0 +1,9 @@
+KeyisBClient_mmbp/Client.py,sha256=BqIzEQ_RrAltvpq-RyEMnu5cH6_XZ6LBU_Jrx9JnFME,7008
+KeyisBClient_mmbp/__init__.py,sha256=y8gLgE6Z2VvJFPnXGVeO7P_OYRoRZufvurQrR5RG1jg,1562
+KeyisBClient_mmbp/gw_certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+KeyisBClient_mmbp/gw_certs/v0.0.1.crt,sha256=4SZKPldOi2FXuOl1Lv9JgjojA8-RL2dzn_mh4XVeuZs,1342
+KeyisBClient_mmbp-0.0.0.1.15.dist-info/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
+KeyisBClient_mmbp-0.0.0.1.15.dist-info/METADATA,sha256=koL-3NszFzcFMN60ANv7y-ZnKf2KeU4V_BUAYLqEIEA,513
+KeyisBClient_mmbp-0.0.0.1.15.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+KeyisBClient_mmbp-0.0.0.1.15.dist-info/top_level.txt,sha256=h6s4YlLhQ13xiqaDqhXJamhuez9D23BmPTwQvMr54FA,18
+KeyisBClient_mmbp-0.0.0.1.15.dist-info/RECORD,,

KeyisBClient_mmbp-0.0.0.1.13.dist-info/RECORD

@@ -1,9 +0,0 @@
-KeyisBClient_mmbp/Client.py,sha256=Dp_fyLz_AwR8_vsug9D2KGcVIV-MlQVivmv8XOkb1Vg,5994
-KeyisBClient_mmbp/__init__.py,sha256=y8gLgE6Z2VvJFPnXGVeO7P_OYRoRZufvurQrR5RG1jg,1562
-KeyisBClient_mmbp/gw_certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-KeyisBClient_mmbp/gw_certs/v0.0.1.crt,sha256=4SZKPldOi2FXuOl1Lv9JgjojA8-RL2dzn_mh4XVeuZs,1342
-KeyisBClient_mmbp-0.0.0.1.13.dist-info/LICENSE,sha256=WH_t7dKZyWJ5Ld07eYIkUG4Tv6zZWXtAdsUqYAUesn0,1084
-KeyisBClient_mmbp-0.0.0.1.13.dist-info/METADATA,sha256=hi-vZVIYCSNDtLLZPMv6yZsO5f5BI2kY-N3rlKwHWDY,513
-KeyisBClient_mmbp-0.0.0.1.13.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-KeyisBClient_mmbp-0.0.0.1.13.dist-info/top_level.txt,sha256=h6s4YlLhQ13xiqaDqhXJamhuez9D23BmPTwQvMr54FA,18
-KeyisBClient_mmbp-0.0.0.1.13.dist-info/RECORD,,