Bugfixes, simplifications

Implementation/Peered/NoteEditor/NoteEditingSessionServer.swift

@@ -4,8 +4,6 @@ import Combine
 
 struct OwnPeer {
 	let peer: MCPeerID
-	
-	static var fallback: Self { Self(peer: .init(displayName: "fallback_user")) }
 }
 
 struct Peer: Identifiable {
@@ -25,15 +23,15 @@ struct Peer: Identifiable {
 final class NoteEditingSessionServer: NSObject {
 	private let session: MCSession
 	private let browser: MCNearbyServiceBrowser
-	private let ownPeer: OwnPeer
+	private(set) var ownPeer: OwnPeer
 	
 	var visiblePeers: [Peer] = []
-	let noteChangesEmitter = PassthroughSubject<String, Never>()
+	let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
 	
 	init(peer: OwnPeer) {
 		ownPeer = peer
 		browser = .init(peer: peer.peer, serviceType: "peered")
-		session = .init(peer: peer.peer)
+		session = .init(peer: peer.peer, securityIdentity: nil, encryptionPreference: .required)
 		super.init()
 		browser.delegate = self
 		session.delegate = self
@@ -56,26 +54,34 @@ final class NoteEditingSessionServer: NSObject {
 			withContext: try! JSONEncoder().encode(note),
 			timeout: 5
 		)
-		
-		let idxToUpdate = visiblePeers.firstIndex(where: { $0.mcPeer == peer.mcPeer })!
+		guard let idxToUpdate = visiblePeers.firstIndex(where: { $0.mcPeer == peer.mcPeer }) else { return }
 		visiblePeers[idxToUpdate].state = .invitationPending
 	}
+	
+	func send(note: String, to peers: [MCPeerID]) {
+		let message = NoteMessage(senderID: ownPeer.peer.displayName, content: note)
+		guard !peers.isEmpty, let data = try? JSONEncoder().encode(message) else { return }
+		try? session.send(data, toPeers: peers, with: .reliable)
+	}
 }
 
 extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
 	func browser(
 		_ browser: MCNearbyServiceBrowser,
 		foundPeer peerID: MCPeerID,
-		withDiscoveryInfo info: [String : String]?
+		withDiscoveryInfo info: [String: String]?
 	) {
 		guard !visiblePeers.contains(where: { $0.mcPeer == peerID }) && peerID.displayName != ownPeer.peer.displayName else { return }
-		let newPeer = Peer(mcPeer: peerID, state: .available)
-		visiblePeers.append(newPeer)
+		DispatchQueue.main.async {
+			self.visiblePeers.append(Peer(mcPeer: peerID, state: .available))
+		}
 	}
 	
 	func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
-		guard let peerIdx = visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
-		visiblePeers.remove(at: peerIdx)
+		DispatchQueue.main.async {
+			guard let peerIdx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
+			self.visiblePeers.remove(at: peerIdx)
+		}
 	}
 }
 
@@ -85,39 +91,37 @@ extension NoteEditingSessionServer: MCSessionDelegate {
 		peer peerID: MCPeerID,
 		didChange state: MCSessionState
 	) {
-		
-	}
-	
-	func session(
-		_ session: MCSession,
-		didReceive stream: InputStream,
-		withName streamName: String,
-		fromPeer peerID: MCPeerID
-	) {
-		
-	}
-	
-	func session(
-		_ session: MCSession,
-		didStartReceivingResourceWithName resourceName: String,
-		fromPeer peerID: MCPeerID,
-		with progress: Progress
-	) {
-		
-	}
-	
-	func session(
-		_ session: MCSession,
-		didFinishReceivingResourceWithName resourceName: String,
-		fromPeer peerID: MCPeerID,
-		at localURL: URL?,
-		withError error: (any Error)?
-	) {
-		
+		DispatchQueue.main.async {
+			guard let idx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
+			switch state {
+			case .connected:
+				self.visiblePeers[idx].state = .joined
+			case .notConnected:
+				let currentState = self.visiblePeers[idx].state
+				if currentState == .invitationPending || currentState == .joined {
+					self.visiblePeers[idx].state = .rejected
+				}
+			default:
+				break
+			}
+		}
 	}
 	
 	func session(_ session: MCSession, didReceive data: Data, fromPeer peerID: MCPeerID) {
-		guard let note = String(data: data, encoding: .utf8) else { fatalError() }
-		noteChangesEmitter.send(note)
+		guard let message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
+		
+		// Broadcast to all other connected peers, preserving the original senderID
+		let otherPeers = session.connectedPeers.filter { $0 != peerID }
+		if !otherPeers.isEmpty {
+			try? session.send(data, toPeers: otherPeers, with: .reliable)
+		}
+		
+		DispatchQueue.main.async {
+			self.noteChangesEmitter.send(message)
+		}
 	}
+	
+	func session(_ session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID) {}
+	func session(_ session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, with progress: Progress) {}
+	func session(_ session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL?, withError error: (any Error)?) {}
 }