feat: Improve protocol availability

Author: chadsec1

logic/background_worker.py

@@ -18,7 +18,7 @@
 from core.trad_crypto import (
         decrypt_xchacha20poly1305
 )
-from base64 import urlsafe_b64encode
+from base64 import b64decode, urlsafe_b64encode
 import copy
 import logging
 
@@ -67,17 +67,43 @@ def parse_blobs(blobs: list[bytes]) -> dict:
     return parsed_messages
 
 def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
-    # Incase we received a SMP question request last time and user did not answer it.
-    # NOTE: this is not needed anymore, as we have implemented acknowlegements
-    # smp_unanswered_questions(user_data, user_data_lock, ui_queue)
 
     # Acknowledgements
     acks = {}
 
     while not stop_flag.is_set():
+
         with user_data_lock:
             server_url = user_data["server_url"]
             auth_token = user_data["token"]
+            session_headers  = user_data["tmp"]["session_headers"]
+
+            user_data_copied = copy.deepcopy(user_data)
+
+
+        for i, v in user_data_copied["contacts"].items():
+            for msg_payload in v["staged_messages"]:
+                try:
+                    http_request(f"{server_url}/data/send", "POST", metadata = {
+                            "recipient": i
+                        }, 
+                        blob = b64decode(msg_payload),
+                        headers = session_headers, 
+                        auth_token = auth_token
+                    )
+                    logger.info("Successfuly recovered and sent the message to contact (%s)", i)
+
+                    with user_data_lock:
+                        user_data["contacts"][i]["staged_messages"].pop(0)
+                        
+                        if not user_data["contacts"][i]["staged_messages"]:
+                            user_data["contacts"][i]["locked"] = False
+
+                except Exception as e:
+                    logger.error("Failed to send recovered message to contact (%s), error: %s", i, str(e))
+                    break
+
+
 
         try:
             # Random longpoll number to help obfsucate traffic against analysis
@@ -109,20 +135,28 @@ def background_worker(user_data, user_data_lock, ui_queue, stop_flag):
             sender = message["sender"]
             blob   = message["blob"]
 
-            ack_id = urlsafe_b64encode(message["ack_id"]).decode().rstrip("=")
-            if "acks" not in acks:
-                acks["acks"] = [ack_id]
-            else:
-                acks["acks"].append(ack_id)
-
             with user_data_lock:
                 try:
-                    user_data["contacts"][sender]["locked"] = True
+
+                    if user_data["contacts"][sender]["locked"] is False:
+                        user_data["contacts"][sender]["locked"] = True
+                    else:
+                        logger.info("Skipping data message from contact (%s) as contact is locked.", contact_id)
+                        continue
+
                 except Exception:
                     pass
 
                 user_data_copied = copy.deepcopy(user_data)
 
+
+
+            ack_id = urlsafe_b64encode(message["ack_id"]).decode().rstrip("=")
+            if "acks" not in acks:
+                acks["acks"] = [ack_id]
+            else:
+                acks["acks"].append(ack_id)
+
             # Everything from here is not validated by server
 
             blob_plaintext = None

logic/contacts.py

@@ -97,6 +97,7 @@ def save_contact(user_data: dict, user_data_lock, contact_id: str) -> None:
 
                     }
                 },
+                "staged_messages": [],
                 "our_next_strand_key": None,
                 "contact_next_strand_key": None,
                 "our_next_strand_nonce": None,

logic/message.py

@@ -40,6 +40,7 @@
     XCHACHA20POLY1305_NONCE_LEN
 
 )
+from base64 import b64encode
 import secrets
 import logging
 
@@ -145,6 +146,8 @@ def send_message_processor(user_data, user_data_lock, contact_id: str, message:
 
         if user_data["contacts"][contact_id]["locked"]:
             return
+        else:
+            user_data["contacts"][contact_id]["locked"] = True
 
 
     if contact_kyber_public_key is None or contact_mceliece_public_key is None:
@@ -216,20 +219,24 @@ def send_message_processor(user_data, user_data_lock, contact_id: str, message:
         )
 
     try:
-        http_request(f"{server_url}/data/send", "POST", metadata = {
+        http_request(f"{server_url}/data/sendd", "POST", metadata = {
                 "recipient": contact_id
             }, 
             blob = ciphertext_blob, 
             headers = session_headers, 
             auth_token = auth_token
         )
-    except Exception:
-        ui_queue.put({"type": "showerror", "title": "Error", "message": "Failed to send our message to the server"})
-        return False
-
+        logger.info("Successfuly sent the message to contact (%s)", contact_id)
+        with user_data_lock:
+            user_data["contacts"][contact_id]["locked"] = False
+    except Exception as e:
+        logger.error("Could not send new message to contact (%s), server gave us error: %s", contact_id, str(e))
+        ui_queue.put({"type": "showerror", "title": "Error", "message": "Failed to send our message to the server. You do NOT need to resent it, we will resent it automatically once you regain internet connectivity."})
 
-    logger.info("Successfuly sent the message to contact (%s)", contact_id)
+        with user_data_lock:
+            user_data["contacts"][contact_id]["staged_messages"].append(b64encode(ciphertext_blob).decode())
 
+        save_account_data(user_data, user_data_lock)
 
     return True