add userInfo

Sources/MultipeerKit/Public API/Models/Peer.swift

@@ -3,7 +3,7 @@ import MultipeerConnectivity.MCPeerID
 import CommonCrypto
 
 /// Represents a remote peer.
-public struct Peer: Hashable, Identifiable {
+public struct Peer: Identifiable {
 
     let underlyingPeer: MCPeerID
 
@@ -19,9 +19,7 @@ public struct Peer: Hashable, Identifiable {
     /// `true` if we are currently connected to this peer.
     public internal(set) var isConnected: Bool
 
-}
-
-extension Peer {
+    public var userInfo: [String: Any]
 
     init(peer: MCPeerID, discoveryInfo: [String: String]?) throws {
         /**
@@ -36,10 +34,34 @@ extension Peer {
         self.name = peer.displayName
         self.discoveryInfo = discoveryInfo
         self.isConnected = false
+        self.userInfo = [:]
     }
 
 }
 
+extension Peer: Equatable {
+
+    public static func == (lhs: Peer, rhs: Peer) -> Bool {
+        lhs.underlyingPeer == rhs.underlyingPeer &&
+        lhs.id == rhs.id &&
+        lhs.name == rhs.name &&
+        lhs.discoveryInfo == rhs.discoveryInfo &&
+        lhs.isConnected == rhs.isConnected
+    }
+
+}
+
+extension Peer: Hashable {
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(underlyingPeer)
+        hasher.combine(id)
+        hasher.combine(name)
+        hasher.combine(discoveryInfo)
+        hasher.combine(isConnected)
+    }
+}
+
 fileprivate extension Data {
 
     var idHash: String {

Sources/MultipeerKit/Public API/MultipeerTransceiver.swift

@@ -196,11 +196,9 @@ public final class MultipeerTransceiver {
     }
 
     private func setConnected(_ connected: Bool, on peer: Peer) {
-        guard let idx = availablePeers.firstIndex(where: { $0.underlyingPeer == peer.underlyingPeer }) else { return }
+        guard let peer = availablePeers.first(where: { $0.underlyingPeer == peer.underlyingPeer }) else { return }
 
-        var mutablePeer = availablePeers[idx]
-        mutablePeer.isConnected = connected
-        availablePeers[idx] = mutablePeer
+        peer.isConnected = connected
     }
 
 }

example/MultipeerKitExample/MultipeerKitExample.xcodeproj/project.pbxproj

@@ -15,20 +15,22 @@
 		DDADA0A2240A83B400842749 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DDADA0A0240A83B400842749 /* LaunchScreen.storyboard */; };
 		DDADA0AC240A83FF00842749 /* MultipeerKit in Frameworks */ = {isa = PBXBuildFile; productRef = DDADA0AB240A83FF00842749 /* MultipeerKit */; };
 		DDADA0AE240A844B00842749 /* ExamplePayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDADA0AD240A844B00842749 /* ExamplePayload.swift */; };
+		DE13AA3F2842BD50008C3C54 /* Peer+History.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE13AA3E2842BD50008C3C54 /* Peer+History.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		DD2DAF67240B04DF003D7A4D /* MultipeerKitExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MultipeerKitExample.entitlements; sourceTree = "<group>"; };
 		DDADA092240A83B300842749 /* MultipeerKitExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MultipeerKitExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DDADA095240A83B300842749 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		DDADA097240A83B300842749 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
-		DDADA099240A83B300842749 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		DDADA099240A83B300842749 /* ContentView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
 		DDADA09B240A83B400842749 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		DDADA09E240A83B400842749 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		DDADA0A1240A83B400842749 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		DDADA0A3240A83B400842749 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DDADA0A9240A83F800842749 /* MultipeerKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = MultipeerKit; path = ../..; sourceTree = "<group>"; };
 		DDADA0AD240A844B00842749 /* ExamplePayload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExamplePayload.swift; sourceTree = "<group>"; };
+		DE13AA3E2842BD50008C3C54 /* Peer+History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Peer+History.swift"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,6 +71,7 @@
 				DDADA095240A83B300842749 /* AppDelegate.swift */,
 				DDADA097240A83B300842749 /* SceneDelegate.swift */,
 				DDADA099240A83B300842749 /* ContentView.swift */,
+				DE13AA3E2842BD50008C3C54 /* Peer+History.swift */,
 				DDADA09B240A83B400842749 /* Assets.xcassets */,
 				DDADA0A0240A83B400842749 /* LaunchScreen.storyboard */,
 				DDADA0A3240A83B400842749 /* Info.plist */,
@@ -166,6 +169,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DE13AA3F2842BD50008C3C54 /* Peer+History.swift in Sources */,
 				DDADA096240A83B300842749 /* AppDelegate.swift in Sources */,
 				DDADA0AE240A844B00842749 /* ExamplePayload.swift in Sources */,
 				DDADA098240A83B300842749 /* SceneDelegate.swift in Sources */,

example/MultipeerKitExample/MultipeerKitExample/ContentView.swift

@@ -37,6 +37,9 @@ struct ContentView: View {
                 Button(action: { self.sendToSelectedPeers(self.viewModel.message) }) {
                     Text("SEND")
                 }
+
+                Text("\(dataSource.availablePeers.reduce(0, { $0 + $1.history.count })) message(s) sent")
+                    .foregroundColor(.secondary)
             }
 
             VStack(alignment: .leading) {
@@ -73,7 +76,11 @@ struct ContentView: View {
             return
         }
 
-        let payload = ExamplePayload(message: self.viewModel.message)
+        let payload = ExamplePayload(message: message)
+        viewModel.selectedPeers = viewModel.selectedPeers.map { peer in
+            peer.history.append(message)
+            return peer
+        }
         dataSource.transceiver.send(payload, to: viewModel.selectedPeers)
     }
 }

example/MultipeerKitExample/MultipeerKitExample/Peer+History.swift

@@ -0,0 +1,24 @@
+//
+//  Peer+History.swift
+//  MultipeerKitExample
+//
+//  Created by Oliver Michalak on 28.05.22.
+//  Copyright © 2022 Guilherme Rambo. All rights reserved.
+//
+
+import Foundation
+import MultipeerKit
+
+
+extension Peer {
+
+	var history: [String] {
+		get {
+			userInfo["history"] as? [String] ?? []
+		}
+		set {
+			userInfo["history"] = newValue
+		}
+	}
+
+}