core (xmpp): make send a blocking method, fix sendMessageData calls:

original `send` method is blocking, and it is used as such by Wokkel and thus can't be
changed to an async method easily. However, an Async method is necessary to have an async
trigger at the very end of the send workflow for end-to-end encryption. To workaround
that, `send` is an async method which call `a_send`, an async method which actually does
the sending. This way legacy method can still call `send` while `a_send` can be await
otherwise.

Fix calls to `sendMessageData`: the method now being an `async` one, `ensureDeferred` had
to be used in some calls.
This commit is contained in:
Goffi 2022-09-24 16:31:39 +02:00
commit ee5784811e
2 changed files with 14 additions and 5 deletions

View file

@ -155,7 +155,9 @@ class XEP_0033(object):
def send(mess_data, skip_send=False):
d = defer.Deferred()
if not skip_send:
d.addCallback(client.sendMessageData)
d.addCallback(
lambda ret: defer.ensureDeferred(client.sendMessageData(ret))
)
d.addCallback(
lambda ret: defer.ensureDeferred(client.messageAddToHistory(ret))
)

View file

@ -22,6 +22,8 @@ from sat.core.constants import Const as C
from sat.core.i18n import _, D_
from sat.core.log import getLogger
from twisted.internet import defer
log = getLogger(__name__)
from wokkel import disco, iwokkel
@ -104,7 +106,7 @@ class XEP_0297(object):
msg.addChild(forwarded_elt)
client = self.host.getClient(profile_key)
return client.sendMessageData({"xml": msg})
return defer.ensureDeferred(client.sendMessageData({"xml": msg}))
@implementer(iwokkel.IDisco)