]> git.mxchange.org Git - fba.git/blobdiff - fba/network.py
Continued:
[fba.git] / fba / network.py
index 7329979d658b0177afa63afa84bb4fe39b00fafa..18e9437b1c7a9ccaaada26494ab792bd428f6c04 100644 (file)
@@ -19,7 +19,7 @@ import reqto
 import requests
 
 from fba import config
-from fba import csrf
+from fba import fba
 from fba import instances
 
 # HTTP headers for non-API requests
@@ -33,47 +33,147 @@ api_headers = {
     "Content-Type": "application/json",
 }
 
-def post_json_api(domain: str, path: str, parameter: str, extra_headers: dict = {}) -> dict:
-    print(f"DEBUG: domain='{domain}',path='{path}',parameter='{parameter}',extra_headers()={len(extra_headers)} - CALLED!")
+# Exceptions to always catch
+exceptions = (
+    requests.exceptions.ConnectionError,
+    requests.exceptions.Timeout,
+    requests.exceptions.TooManyRedirects,
+    UnicodeEncodeError
+)
+
+def post_json_api(domain: str, path: str, data: str, headers: dict = {}) -> dict:
+    # DEBUG: print(f"DEBUG: domain='{domain}',path='{path}',data='{data}',headers()={len(headers)} - CALLED!")
     if not isinstance(domain, str):
-        raise ValueError(f"Parameter domain[]={type(domain)} is not 'str'")
+        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
         raise ValueError("Parameter 'domain' is empty")
     elif not isinstance(path, str):
-        raise ValueError(f"path[]={type(path)} is not 'str'")
+        raise ValueError(f"path[]='{type(path)}' is not 'str'")
     elif path == "":
         raise ValueError("Parameter 'path' cannot be empty")
-    elif not isinstance(parameter, str):
-        raise ValueError(f"parameter[]={type(parameter)} is not 'str'")
-
-    print(f"DEBUG: Determining if CSRF header needs to be sent for domain='{domain}' ...")
-    headers = csrf.determine(domain, {**api_headers, **extra_headers})
+    elif not isinstance(data, str):
+        raise ValueError(f"data[]='{type(data)}' is not 'str'")
+    elif not isinstance(headers, dict):
+        raise ValueError(f"headers[]='{type(headers)}' is not 'list'")
 
-    data = {}
+    json_reply = {
+        "status_code": 200,
+    }
 
     try:
-        print(f"DEBUG: Sending POST to domain='{domain}',path='{path}',parameter='{parameter}',extra_headers({len(extra_headers)})={extra_headers}")
+        # DEBUG: print(f"DEBUG: Sending POST to domain='{domain}',path='{path}',data='{data}',headers({len(headers)})={headers}")
         response = reqto.post(
             f"https://{domain}{path}",
-            data=parameter,
-            headers=headers,
+            data=data,
+            headers={**api_headers, **headers},
             timeout=(config.get("connection_timeout"), config.get("read_timeout"))
         )
 
-        data = json_from_response(response)
-        print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},data[]='{type(data)}'")
+        json_reply["json"] = json_from_response(response)
+
+        # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
         if not response.ok or response.status_code >= 400:
-            print(f"WARNING: Cannot query JSON API: domain='{domain}',path='{path}',parameter()={len(parameter)},response.status_code='{response.status_code}',data[]='{type(data)}'")
+            print(f"WARNING: Cannot query JSON API: domain='{domain}',path='{path}',data()={len(data)},response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+            json_reply["status_code"]   = response.status_code
+            json_reply["error_message"] = response.reason
+            del json_reply["json"]
             instances.update_last_error(domain, response)
 
-    except BaseException as exception:
-        print(f"WARNING: Some error during post(): domain='{domain}',path='{path}',parameter()={len(parameter)},exception[{type(exception)}]:'{str(exception)}'")
+    except exceptions as exception:
+        # DEBUG: print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+        json_reply["status_code"]   = 999
+        json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
+        json_reply["exception"]     = exception
+        instances.update_last_error(domain, exception)
+        raise exception
 
-    print(f"DEBUG: Returning data({len(data)})=[]:{type(data)}")
-    return data
+    # DEBUG: print(f"DEBUG: Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    return json_reply
+
+def fetch_api_url(url: str, timeout: tuple) -> dict:
+    # DEBUG: print(f"DEBUG: url='{url}',timeout()={len(timeout)} - CALLED!")
+    if not isinstance(url, str):
+        raise ValueError(f"Parameter url[]='{type(url)}' is not 'str'")
+    elif not isinstance(timeout, tuple):
+        raise ValueError(f"timeout[]='{type(timeout)}' is not 'tuple'")
+
+    json_reply = {
+       "status_code": 200,
+    }
+
+    try:
+        # DEBUG: print(f"DEBUG: Fetching url='{url}' ...")
+        response = fba.fetch_url(url, api_headers, timeout)
+
+        json_reply["json"] = json_from_response(response)
+
+        # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
+        if not response.ok or response.status_code >= 400:
+            print(f"WARNING: Cannot query JSON API: url='{url}',response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+            json_reply["status_code"]   = response.status_code
+            json_reply["error_message"] = response.reason
+            del json_reply["json"]
+
+    except exceptions as exception:
+        # DEBUG: print(f"DEBUG: Fetching '{url}' failed. exception[{type(exception)}]='{str(exception)}'")
+        json_reply["status_code"]   = 999
+        json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
+        json_reply["exception"]     = exception
+        raise exception
+
+    # DEBUG: print(f"DEBUG: Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    return json_reply
+
+def get_json_api(domain: str, path: str, headers: dict, timeout: tuple) -> dict:
+    # DEBUG: print(f"DEBUG: domain='{domain}',path='{path}',timeout()={len(timeout)} - CALLED!")
+    if not isinstance(domain, str):
+        raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
+    elif domain == "":
+        raise ValueError("Parameter 'domain' is empty")
+    elif not isinstance(path, str):
+        raise ValueError(f"path[]='{type(path)}' is not 'str'")
+    elif path == "":
+        raise ValueError("Parameter 'path' cannot be empty")
+    elif not isinstance(headers, dict):
+        raise ValueError(f"headers[]='{type(headers)}' is not 'list'")
+    elif not isinstance(timeout, tuple):
+        raise ValueError(f"timeout[]='{type(timeout)}' is not 'tuple'")
+
+    json_reply = {
+        "status_code": 200,
+    }
+
+    try:
+        # DEBUG: print(f"DEBUG: Sending GET to domain='{domain}',path='{path}',timeout({len(timeout)})={timeout}")
+        response = reqto.get(
+            f"https://{domain}{path}",
+            headers={**api_headers, **headers},
+            timeout=timeout
+        )
+
+    except exceptions as exception:
+        # DEBUG: print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+        json_reply["status_code"]   = 999
+        json_reply["error_message"] = f"exception['{type(exception)}']='{str(exception)}'"
+        json_reply["exception"]     = exception
+        instances.update_last_error(domain, exception)
+        raise exception
+
+    json_reply["json"] = json_from_response(response)
+
+    # DEBUG: print(f"DEBUG: response.ok={response.ok},response.status_code={response.status_code},json_reply[]='{type(json_reply)}'")
+    if not response.ok or response.status_code >= 400:
+        print(f"WARNING: Cannot query JSON API: domain='{domain}',path='{path}',response.status_code='{response.status_code}',json_reply[]='{type(json_reply)}'")
+        json_reply["status_code"]   = response.status_code
+        json_reply["error_message"] = response.reason
+        del json_reply["json"]
+        instances.update_last_error(domain, response)
+
+    # DEBUG: print(f"DEBUG: Returning json_reply({len(json_reply)})=[]:{type(json_reply)}")
+    return json_reply
 
 def send_bot_post(domain: str, blocklist: dict):
-    print(f"DEBUG: domain={domain},blocklist()={len(blocklist)} - CALLED!")
+    # DEBUG: print(f"DEBUG: domain={domain},blocklist()={len(blocklist)} - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -88,9 +188,9 @@ def send_bot_post(domain: str, blocklist: dict):
         truncated = True
         blocklist = blocklist[0 : 19]
 
-    print(f"DEBUG: blocklist()={len(blocklist)}")
+    # DEBUG: print(f"DEBUG: blocklist()={len(blocklist)}")
     for block in blocklist:
-        print(f"DEBUG: block['{type(block)}']={block}")
+        # DEBUG: print(f"DEBUG: block['{type(block)}']={block}")
         if block["reason"] is None or block["reason"] == '':
             message = message + block["blocked"] + " with unspecified reason\n"
         else:
@@ -117,8 +217,8 @@ def send_bot_post(domain: str, blocklist: dict):
 
     return True
 
-def fetch_response(domain: str, path: str, headers: dict, timeout: list) -> requests.models.Response:
-    print(f"DEBUG: domain='{domain}',path='{path}',headers()={len(headers)},timeout={timeout} - CALLED!")
+def fetch_response(domain: str, path: str, headers: dict, timeout: tuple) -> requests.models.Response:
+    # DEBUG: print(f"DEBUG: domain='{domain}',path='{path}',headers()={len(headers)},timeout={timeout} - CALLED!")
     if not isinstance(domain, str):
         raise ValueError(f"Parameter domain[]='{type(domain)}' is not 'str'")
     elif domain == "":
@@ -127,38 +227,39 @@ def fetch_response(domain: str, path: str, headers: dict, timeout: list) -> requ
         raise ValueError(f"Parameter path[]='{type(path)}' is not 'str'")
     elif path == "":
         raise ValueError("Parameter 'path' is empty")
-
-    print(f"DEBUG: Determining if CSRF header needs to be sent for domain='{domain}',headers()='{len(headers)}' ...")
-    headers = csrf.determine(domain, headers)
+    elif not isinstance(headers, dict):
+        raise ValueError(f"headers[]='{type(headers)}' is not 'dict'")
+    elif not isinstance(timeout, tuple):
+        raise ValueError(f"timeout[]='{type(timeout)}' is not 'tuple'")
 
     try:
-        print(f"DEBUG: Sending GET request to '{domain}{path}' ...")
+        # DEBUG: print(f"DEBUG: Sending GET request to '{domain}{path}' ...")
         response = reqto.get(
             f"https://{domain}{path}",
             headers=headers,
             timeout=timeout
         )
 
-    except requests.exceptions.ConnectionError as exception:
-        print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
+    except exceptions as exception:
+        # DEBUG: print(f"DEBUG: Fetching '{path}' from '{domain}' failed. exception[{type(exception)}]='{str(exception)}'")
         instances.update_last_error(domain, exception)
         raise exception
 
-    print(f"DEBUG: response[]='{type(response)}' - EXXIT!")
+    # DEBUG: print(f"DEBUG: response[]='{type(response)}' - EXXIT!")
     return response
 
 def json_from_response(response: requests.models.Response) -> list:
-    print(f"DEBUG: response[]={type(response)} - CALLED!")
+    # DEBUG: print(f"DEBUG: response[]='{type(response)}' - CALLED!")
     if not isinstance(response, requests.models.Response):
         raise ValueError(f"Parameter response[]='{type(response)}' is not type of 'Response'")
 
     data = list()
     if response.text.strip() != "":
-        print(f"DEBUG: response.text()={len(response.text)} is not empty, invoking response.json() ...")
+        # DEBUG: print(f"DEBUG: response.text()={len(response.text)} is not empty, invoking response.json() ...")
         try:
             data = response.json()
         except json.decoder.JSONDecodeError:
             pass
 
-    print(f"DEBUG: data[]={type(data)} - EXIT!")
+    # DEBUG: print(f"DEBUG: data[]='{type(data)}' - EXIT!")
     return data