From b0e0fb9a577cde7768328d472d360cdbd6de06f0 Mon Sep 17 00:00:00 2001
From: zarazaex69 <zarazaex@tuta.io>
Date: Fri, 5 Jun 2026 19:32:23 +0300
Subject: [PATCH] fix(jitsi): timeout MUC rejoin during reconnect

---
 internal/engine/jitsi/jitsi.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/engine/jitsi/jitsi.go b/internal/engine/jitsi/jitsi.go
index df33f91..8195120 100644
--- a/internal/engine/jitsi/jitsi.go
+++ b/internal/engine/jitsi/jitsi.go
@@ -63,6 +63,7 @@ const (
 	// periodic XMPP ping IQ resets that idle timer end-to-end and works for
 	// the WebSocket transport too.
 	xmppKeepaliveInterval = 25 * time.Second
+	reconnectJoinTimeout  = 30 * time.Second
 )
 
 // bridgeMagic tags every EndpointMessage produced by this engine. JVB broadcasts
@@ -1544,12 +1545,14 @@ func (s *Session) reconnect(ctx context.Context) error {
 	}
 
 	logger.Infof("jitsi: rejoin %s/%s (non-blocking) ...", s.host, s.room)
-	jSess, err := j.JoinMUC(ctx, j.Config{
+	joinCtx, joinCancel := context.WithTimeout(ctx, reconnectJoinTimeout)
+	jSess, err := j.JoinMUC(joinCtx, j.Config{
 		Host:  s.host,
 		Room:  s.room,
 		Nick:  s.name,
 		Debug: logger.IsVerbose(),
 	})
+	joinCancel()
 	if err != nil {
 		logger.Warnf("jitsi: rejoin failed: %v - full reconnect", err)
 		return s.reconnectFull(ctx)
@@ -1665,12 +1668,14 @@ func (s *Session) reconnectFull(ctx context.Context) error {
 
 	// First: join the MUC (non-blocking, does not wait for session-initiate).
 	// If this fails, it's a real connectivity problem.
-	jSess, err := j.JoinMUC(ctx, j.Config{
+	joinCtx, joinCancel := context.WithTimeout(ctx, reconnectJoinTimeout)
+	jSess, err := j.JoinMUC(joinCtx, j.Config{
 		Host:  s.host,
 		Room:  s.room,
 		Nick:  s.name,
 		Debug: logger.IsVerbose(),
 	})
+	joinCancel()
 	if err != nil {
 		return fmt.Errorf("jitsi join: %w", err)
 	}
@@ -1683,9 +1688,8 @@ func (s *Session) reconnectFull(ctx context.Context) error {
 	if err != nil {
 		// Park the session so waitForJingle can pick up later.
 		s.jSess.Store(jSess)
-		s.wg.Add(2)
+		s.wg.Add(1)
 		go s.waitForJingle()
-		go s.xmppKeepalive()
 		return errNoPeer
 	}