jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XEP-0198: Enable SM even if we failed resuming the session

Browse Source 
And trigger session_end only after we fail the resuming.
This commit is contained in:
mathieui 2021-01-28 18:20:44 +01:00
parent 3642e2c7f4
commit fc7d7b4eb7
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
slixmpp/plugins/xep_0198/stream_management.py
View File

@ -198,20 +198,7 @@ class XEP_0198(BasePlugin):
# We've already negotiated stream management, # We've already negotiated stream management,
# so no need to do it again. # so no need to do it again.
return False return False
if not self.sm_id: if self.sm_id and self.allow_resume and 'bind' not in self.xmpp.features:
if 'bind' in self.xmpp.features:
enable = stanza.Enable(self.xmpp)
enable['resume'] = self.allow_resume
enable.send()
log.debug("enabling SM")
waiter = Waiter('enabled_or_failed',
MatchMany([
MatchXPath(stanza.Enabled.tag_name()),
MatchXPath(stanza.Failed.tag_name())]))
self.xmpp.register_handler(waiter)
result = await waiter.wait()
elif self.sm_id and self.allow_resume and 'bind' not in self.xmpp.features:
resume = stanza.Resume(self.xmpp) resume = stanza.Resume(self.xmpp)
resume['h'] = self.handled resume['h'] = self.handled
resume['previd'] = self.sm_id resume['previd'] = self.sm_id
@ -229,6 +216,19 @@ class XEP_0198(BasePlugin):
result = await waiter.wait() result = await waiter.wait()
if result is not None and result.name == 'resumed': if result is not None and result.name == 'resumed':
return True return True
self.xmpp.event("session_end")
if 'bind' in self.xmpp.features:
enable = stanza.Enable(self.xmpp)
enable['resume'] = self.allow_resume
enable.send()
log.debug("enabling SM")
waiter = Waiter('enabled_or_failed',
MatchMany([
MatchXPath(stanza.Enabled.tag_name()),
MatchXPath(stanza.Failed.tag_name())]))
self.xmpp.register_handler(waiter)
result = await waiter.wait()
return False return False
def _handle_enabled(self, stanza): def _handle_enabled(self, stanza):