Lightweight containerized prosody tooling + moved auth scripts + xmpp reconnect/auth stabilization
This commit is contained in:
@@ -135,6 +135,9 @@ class XMPPComponent(ComponentXMPP):
|
||||
def __init__(self, ur, jid, secret, server, port):
|
||||
self.ur = ur
|
||||
self._upload_config_warned = False
|
||||
self._reconnect_task = None
|
||||
self._reconnect_delay_seconds = 1.0
|
||||
self._reconnect_delay_max_seconds = 30.0
|
||||
|
||||
self.log = logs.get_logger("XMPP")
|
||||
|
||||
@@ -821,14 +824,49 @@ class XMPPComponent(ComponentXMPP):
|
||||
|
||||
async def session_start(self, *args):
|
||||
self.log.info("XMPP session started")
|
||||
self._reconnect_delay_seconds = 1.0
|
||||
if self._reconnect_task and not self._reconnect_task.done():
|
||||
self._reconnect_task.cancel()
|
||||
self._reconnect_task = None
|
||||
await self.enable_carbons()
|
||||
|
||||
async def _reconnect_loop(self):
|
||||
try:
|
||||
while True:
|
||||
delay = float(self._reconnect_delay_seconds)
|
||||
await asyncio.sleep(delay)
|
||||
try:
|
||||
self.log.info("XMPP reconnect attempt delay_s=%.1f", delay)
|
||||
connected = self.connect()
|
||||
if connected is False:
|
||||
raise RuntimeError("connect returned false")
|
||||
self.process(forever=False)
|
||||
return
|
||||
except Exception as exc:
|
||||
self.log.warning("XMPP reconnect attempt failed: %s", exc)
|
||||
self._reconnect_delay_seconds = min(
|
||||
self._reconnect_delay_max_seconds,
|
||||
max(1.0, float(self._reconnect_delay_seconds) * 2.0),
|
||||
)
|
||||
except asyncio.CancelledError:
|
||||
return
|
||||
finally:
|
||||
self._reconnect_task = None
|
||||
|
||||
def _schedule_reconnect(self):
|
||||
if self._reconnect_task and not self._reconnect_task.done():
|
||||
return
|
||||
self._reconnect_task = self.loop.create_task(self._reconnect_loop())
|
||||
|
||||
def on_disconnected(self, *args):
|
||||
"""
|
||||
Handles XMPP disconnection and triggers a reconnect loop.
|
||||
"""
|
||||
self.log.warning("XMPP disconnected, attempting to reconnect...")
|
||||
self.connect()
|
||||
self.log.warning(
|
||||
"XMPP disconnected, scheduling reconnect attempt in %.1fs",
|
||||
float(self._reconnect_delay_seconds),
|
||||
)
|
||||
self._schedule_reconnect()
|
||||
|
||||
async def request_upload_slot(self, recipient, filename, content_type, size):
|
||||
"""
|
||||
@@ -1716,7 +1754,7 @@ class XMPPClient(ClientBase):
|
||||
self.client.loop = self.loop
|
||||
|
||||
self.client.connect()
|
||||
# self.client.process()
|
||||
self.client.process(forever=False)
|
||||
|
||||
async def start_typing_for_person(self, user, person_identifier):
|
||||
await self.client.send_typing_for_person(user, person_identifier, True)
|
||||
|
||||
Reference in New Issue
Block a user