Mercurial > libervia-backend

diff libervia/backend/plugins/plugin_xep_0234.py @ 4240:79c8a70e1813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backend, frontend: prepare remote control: This is a series of changes necessary to prepare the implementation of remote control feature: - XEP-0166: add a `priority` attribute to `ApplicationData`: this is needed when several applications are working in a same session, to know which one must be handled first. Will be used to make Remote Control have precedence over Call content. - XEP-0166: `_call_plugins` is now async and is not used with `DeferredList` anymore: the benefit to have methods called in parallels is very low, and it cause a lot of trouble as we can't predict order. Methods are now called sequentially so workflow can be predicted. - XEP-0167: fix `senders` XMPP attribute <=> SDP mapping - XEP-0234: preflight acceptance key is now `pre-accepted` instead of `file-accepted`, so the same key can be used with other jingle applications. - XEP-0167, XEP-0343: move some method to XEP-0167 - XEP-0353: use new `priority` feature to call preflight methods of applications according to it. - frontend (webrtc): refactor the sources/sink handling with a more flexible mechanism based on Pydantic models. It is now possible to have has many Data Channel as necessary, to have them in addition to A/V streams, to specify manually GStreamer sources and sinks, etc. - frontend (webrtc): rework of the pipeline to reduce latency. - frontend: new `portal_desktop` method. Screenshare portal handling has been moved there, and RemoteDesktop portal has been added. - frontend (webrtc): fix `extract_ufrag_pwd` method. rel 436
author Goffi <goffi@goffi.org>
date Sat, 11 May 2024 13:52:41 +0200
parents e11b13418ba6
children 0d7bb4df2343
line wrap: on
line diff
--- a/libervia/backend/plugins/plugin_xep_0234.py	Sat May 11 13:25:45 2024 +0200
+++ b/libervia/backend/plugins/plugin_xep_0234.py	Sat May 11 13:52:41 2024 +0200
@@ -548,9 +548,6 @@
         """
         session_id = session["id"]
         peer_jid = session["peer_jid"]
-        # FIXME: has been moved from XEP-0353, but it doesn't handle correctly file
-        #   transfer (metadata are not used). We must check with other clients what is
-        #   actually send, and if XEP-0353 is used, and do a better integration.
 
         try:
             file_elt = next(description_elt.elements(NS_JINGLE_FT, "file"))
@@ -564,10 +561,8 @@
         )
         if is_in_roster:
             action_type = C.META_TYPE_CONFIRM
-            action_subtype = C.META_TYPE_FILE
         else:
             action_type = C.META_TYPE_NOT_IN_ROSTER_LEAK
-            action_subtype = None
 
         action_extra = {
             "type": action_type,
@@ -575,8 +570,7 @@
             "from_jid": peer_jid.full(),
             "file_data": file_data
         }
-        if action_subtype is not None:
-            action_extra["subtype"] = action_subtype
+        action_extra["subtype"] = C.META_TYPE_FILE
         accepted = await xml_tools.defer_confirm(
             self.host,
             confirm_msg,
@@ -585,7 +579,7 @@
             action_extra=action_extra
         )
         if accepted:
-            session["file_accepted"] = True
+            session["pre_accepted"] = True
         return accepted
 
     async def jingle_preflight_info(
@@ -752,7 +746,7 @@
         transport_data = content_data["transport_data"]
         webrtc = transport_data.get("webrtc", False)
         # file may have been already accepted in preflight
-        file_accepted = session.get("file_accepted", False)
+        pre_accepted = session.get("pre_accepted", False)
         file_data = await self.parse_file_element(client, file_elt, file_data, given=True)
         # FIXME: looks redundant with code done in self.parse_file_element
         try:
@@ -773,7 +767,7 @@
             )
             action_extra = {
                 "webrtc": webrtc,
-                "file_accepted": file_accepted,
+                "pre_accepted": pre_accepted,
                 "type": C.META_TYPE_FILE,
                 "session_id": session["id"],
                 "from_jid": peer_jid.full(),