Ensure MVR-xchange protocol data compliance

Author: vanous

mvrxchange/mvrx_message.py

@@ -93,7 +93,9 @@ def craft_packet(message=None, length=None, buffer=None, msg_type=0):
     request_message = {
         "Type": "MVR_REQUEST",
         "FileUUID": "",
+        "StationUUID": "",
         "FromStationUUID": [],
+        "FromStationsUUID": [],
     }
 
     request_message_ret = {"Type": "MVR_REQUEST_RET", "OK": False, "Message": ""}
@@ -110,6 +112,7 @@ def craft_packet(message=None, length=None, buffer=None, msg_type=0):
 
     leave_message = {
         "Type": "MVR_LEAVE",
+        "StationUUID": "",
         "FromStationUUID": "",
     }
 
@@ -127,7 +130,7 @@ def craft_packet(message=None, length=None, buffer=None, msg_type=0):
 
     @staticmethod
     def create_message(
-        message, commits=None, uuid=None, file_uuid=None, ok=None, nok_reason=None
+        message, commits=None, uuid=None, file_uuid=None, ok=None, nok_reason=None, app_uuid = None,
     ):
         if message == "MVR_JOIN_RET":
             response = mvrx_message.join_message_ret.copy()
@@ -158,10 +161,15 @@ def create_message(
         elif message == "MVR_REQUEST":
             response = mvrx_message.request_message.copy()
             response["FileUUID"] = file_uuid
+            response["StationUUID"] = app_uuid
             response[
                 "FromStationUUID"
             ] = []  # the response seems to stay in memory, reset it
             response["FromStationUUID"].append(uuid)
+            response[
+                "FromStationsUUID"
+            ] = []  # the response seems to stay in memory, reset it
+            response["FromStationsUUID"].append(uuid)
             return response
         elif message == "MVR_JOIN":
             response = mvrx_message.join_message.copy()
@@ -172,6 +180,7 @@ def create_message(
             return response
         elif message == "MVR_LEAVE":
             response = mvrx_message.leave_message.copy()
+            response["StationUUID"] = uuid
             response["FromStationUUID"] = uuid
             return response
         elif message == "MVR_REQUEST_RET":

mvrxchange/mvrx_tcp_client.py

@@ -100,7 +100,7 @@ def request_file(self, commit, path):
         self.send(
             mvrx_message.craft_packet(
                 mvrx_message.create_message(
-                    "MVR_REQUEST", uuid=commit.station_uuid, file_uuid=commit_uuid
+                    "MVR_REQUEST", uuid=commit.station_uuid, file_uuid=commit_uuid, app_uuid = self.application_uuid
                 )
             )
         )

mvrxchange/mvrx_tcp_server.py

@@ -180,7 +180,9 @@ def process_json_message(self, json_data, data):
                     mvrx_message.create_message("MVR_LEAVE_RET", uuid=self.uuid)
                 )
             )
-            dmx.toggle_join_MVR_Client(json_data["FromStationUUID"], False)
+            station_uuid = json_data.get("StationUUID") or json_data.get("FromStationUUID")
+            if station_uuid:
+                dmx.toggle_join_MVR_Client(station_uuid, False)
             # NOTE: this is sending the JOIN/LEAVE 2x, because the subscribe
             # event will trigger client side sending
 

mvrxchange/mvrx_ws_client.py

@@ -141,7 +141,7 @@ def request_file(self, commit, path):
         commit_uuid = commit.commit_uuid
         self.send(
             mvrx_message.create_message(
-                "MVR_REQUEST", uuid=commit.station_uuid, file_uuid=commit_uuid
+                "MVR_REQUEST", uuid=commit.station_uuid, file_uuid=commit_uuid, app_uuid=self.application_uuid
             )
         )