Merge branch 'main' into avoid-recreating-session

Reuse an existing session instead of recreating
2026-07-25 14:25:20 +00:00 · 2025-10-15 01:04:51 +02:00 · 2025-10-14 23:45:03 +01:00
1 changed files with 15 additions and 14 deletions
@@ -60,23 +60,24 @@ final class NoiseSessionManager {
                throw NoiseSessionError.alreadyEstablished
            }
            
-            // Remove any existing non-established session
-            if let existingSession = sessions[peerID], !existingSession.isEstablished() {
-                _ = sessions.removeValue(forKey: peerID)
-            }
+            let session: NoiseSession
            
+            if let existingSession = sessions[peerID] {
+                session = existingSession
+                session.reset()
+            } else {
                // Create new initiator session
-            let session = SecureNoiseSession(
+                session = SecureNoiseSession(
                    peerID: peerID,
                    role: .initiator,
                    keychain: keychain,
                    localStaticKey: localStaticKey
                )
                sessions[peerID] = session
+            }
            
            do {
-                let handshakeData = try session.startHandshake()
-                return handshakeData
+                return try session.startHandshake()
            } catch {
                // Clean up failed session
                _ = sessions.removeValue(forKey: peerID)
Author	SHA1	Message	Date
jackandGitHub	7d487e5bdb	Merge branch 'main' into avoid-recreating-session	2025-10-15 01:04:51 +02:00
islam	4acb2cf540	Reuse an existing session instead of recreating	2025-10-14 23:45:03 +01:00