Add showing visible members that aren't us
based on very flaky display name checking for now
This commit is contained in:
@@ -7,18 +7,28 @@
|
|||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
|
extension EnvironmentValues {
|
||||||
|
@Entry var ownPeer: OwnPeer = .fallback
|
||||||
|
}
|
||||||
|
|
||||||
struct ContentView: View {
|
struct ContentView: View {
|
||||||
@AppStorage("peered_username") private var username: String = ""
|
@AppStorage("peered_username") private var username: String = ""
|
||||||
@State private var notes = [Note]()
|
@State private var notes = [Note]()
|
||||||
@State private var notesClient: NoteEditingSessionClient?
|
@State private var notesClient: NoteEditingSessionClient?
|
||||||
|
@State private var ownPeer: OwnPeer?
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationView {
|
NavigationStack {
|
||||||
List(notes) { note in
|
List(notes) { note in
|
||||||
NavigationLink(note.name) {
|
NavigationLink(note.name) {
|
||||||
NoteEditorScreen(note: note, username: username)
|
let peer = ownPeer ?? .init(peer: .init(displayName: username))
|
||||||
|
if ownPeer == nil {
|
||||||
|
ownPeer = peer
|
||||||
|
}
|
||||||
|
return NoteEditorScreen(note: note, peer: peer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.environment(\.ownPeer, ownPeer ?? .fallback)
|
||||||
.navigationTitle("Peered")
|
.navigationTitle("Peered")
|
||||||
.toolbar {
|
.toolbar {
|
||||||
Button("Create note") {
|
Button("Create note") {
|
||||||
@@ -30,7 +40,7 @@ struct ContentView: View {
|
|||||||
.onAppear {
|
.onAppear {
|
||||||
notes = NotesStorage().loadNotes()
|
notes = NotesStorage().loadNotes()
|
||||||
if notesClient == nil {
|
if notesClient == nil {
|
||||||
notesClient = .init(id: username)
|
notesClient = .init(peer: .init(displayName: username))
|
||||||
}
|
}
|
||||||
notesClient?.startBrowsingForNotes()
|
notesClient?.startBrowsingForNotes()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
//
|
||||||
|
// ManageMembersView.swift
|
||||||
|
// Peered
|
||||||
|
//
|
||||||
|
// Created by Oskar Chybowski on 06/10/2025.
|
||||||
|
//
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct ManageMembersView: View {
|
||||||
|
@Bindable var noteAdvertiser: NoteEditingSessionServer
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
List(noteAdvertiser.visiblePeers) { peer in
|
||||||
|
HStack {
|
||||||
|
Text(peer.id)
|
||||||
|
|
||||||
|
Spacer()
|
||||||
|
|
||||||
|
PeerStateButton(peerState: peer.state) {
|
||||||
|
noteAdvertiser.invite(peer: peer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.navigationTitle("Visible users")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,15 +1,39 @@
|
|||||||
import MultipeerConnectivity
|
import MultipeerConnectivity
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
|
struct OwnPeer {
|
||||||
|
let peer: MCPeerID
|
||||||
|
|
||||||
|
static var fallback: Self { Self(peer: .init(displayName: "fallback_user")) }
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Peer: Identifiable {
|
||||||
|
enum ConnectionState {
|
||||||
|
case available
|
||||||
|
case joined
|
||||||
|
case rejected
|
||||||
|
case invitationPending
|
||||||
|
}
|
||||||
|
|
||||||
|
var id: String {
|
||||||
|
mcPeer.displayName
|
||||||
|
}
|
||||||
|
let mcPeer: MCPeerID
|
||||||
|
var state: ConnectionState
|
||||||
|
}
|
||||||
|
|
||||||
@Observable
|
@Observable
|
||||||
final class NoteEditingSessionServer: NSObject {
|
final class NoteEditingSessionServer: NSObject {
|
||||||
private let session: MCSession
|
private let session: MCSession
|
||||||
private let browser: MCNearbyServiceBrowser
|
private let browser: MCNearbyServiceBrowser
|
||||||
|
private let ownPeer: OwnPeer
|
||||||
|
|
||||||
init(username: String) {
|
var visiblePeers: [Peer] = []
|
||||||
let peer = MCPeerID(displayName: username)
|
|
||||||
browser = .init(peer: peer, serviceType: "peered")
|
init(peer: OwnPeer) {
|
||||||
session = .init(peer: peer)
|
ownPeer = peer
|
||||||
|
browser = .init(peer: peer.peer, serviceType: "peered")
|
||||||
|
session = .init(peer: peer.peer)
|
||||||
super.init()
|
super.init()
|
||||||
browser.delegate = self
|
browser.delegate = self
|
||||||
}
|
}
|
||||||
@@ -21,6 +45,16 @@ final class NoteEditingSessionServer: NSObject {
|
|||||||
func stopServer() {
|
func stopServer() {
|
||||||
browser.stopBrowsingForPeers()
|
browser.stopBrowsingForPeers()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func invite(peer: Peer) {
|
||||||
|
guard peer.state == .available else { return }
|
||||||
|
browser.invitePeer(
|
||||||
|
peer.mcPeer,
|
||||||
|
to: session,
|
||||||
|
withContext: nil, // FIXME: put note here?
|
||||||
|
timeout: 5
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
||||||
@@ -29,9 +63,13 @@ extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
|||||||
foundPeer peerID: MCPeerID,
|
foundPeer peerID: MCPeerID,
|
||||||
withDiscoveryInfo info: [String : String]?
|
withDiscoveryInfo info: [String : String]?
|
||||||
) {
|
) {
|
||||||
browser.invitePeer(peerID, to: session, withContext: nil, timeout: 30)
|
guard !visiblePeers.contains(where: { $0.mcPeer == peerID }) && peerID.displayName != ownPeer.peer.displayName else { return }
|
||||||
print("seeing peer \(peerID.displayName)")
|
let newPeer = Peer(mcPeer: peerID, state: .available)
|
||||||
|
visiblePeers.append(newPeer)
|
||||||
}
|
}
|
||||||
|
|
||||||
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {}
|
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
|
||||||
|
guard let peerIdx = visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
|
||||||
|
visiblePeers.remove(at: peerIdx)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
import MultipeerConnectivity
|
||||||
|
|
||||||
struct NoteEditorScreen: View {
|
struct NoteEditorScreen: View {
|
||||||
let note: Note
|
let note: Note
|
||||||
@@ -13,14 +14,27 @@ struct NoteEditorScreen: View {
|
|||||||
@State private var noteContent: String = ""
|
@State private var noteContent: String = ""
|
||||||
@State private var timer = Timer.publish(every: 5, on: .current, in: .common)
|
@State private var timer = Timer.publish(every: 5, on: .current, in: .common)
|
||||||
.autoconnect()
|
.autoconnect()
|
||||||
|
@State private var showManageMembers = false
|
||||||
|
|
||||||
init(note: Note, username: String) {
|
init(note: Note, peer: OwnPeer) {
|
||||||
self.note = note
|
self.note = note
|
||||||
self._noteAdvertiser = .init(wrappedValue: .init(username: username))
|
self._noteAdvertiser = .init(initialValue: .init(peer: peer))
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
TextEditor(text: $noteContent)
|
TextEditor(text: $noteContent)
|
||||||
|
.toolbar {
|
||||||
|
ToolbarItem(placement: .primaryAction) {
|
||||||
|
Button("Manage members") {
|
||||||
|
showManageMembers = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.sheet(isPresented: $showManageMembers) {
|
||||||
|
NavigationStack {
|
||||||
|
ManageMembersView(noteAdvertiser: noteAdvertiser)
|
||||||
|
}
|
||||||
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
noteContent = try! String(contentsOf: note.path, encoding: .utf8)
|
noteContent = try! String(contentsOf: note.path, encoding: .utf8)
|
||||||
noteAdvertiser.startServer()
|
noteAdvertiser.startServer()
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
//
|
||||||
|
// PeerStateButton.swift
|
||||||
|
// Peered
|
||||||
|
//
|
||||||
|
// Created by Oskar Chybowski on 06/10/2025.
|
||||||
|
//
|
||||||
|
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
|
struct PeerStateButton: View {
|
||||||
|
let peerState: Peer.ConnectionState
|
||||||
|
let onTap: () -> Void
|
||||||
|
|
||||||
|
var body: some View {
|
||||||
|
switch peerState {
|
||||||
|
case .available:
|
||||||
|
Button("Invite", action: onTap)
|
||||||
|
case .joined:
|
||||||
|
Text("Joined")
|
||||||
|
case .rejected:
|
||||||
|
Text("Rejected")
|
||||||
|
case .invitationPending:
|
||||||
|
Text("Invitation pending")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,16 +13,17 @@ import Foundation
|
|||||||
final class NoteEditingSessionClient: NSObject {
|
final class NoteEditingSessionClient: NSObject {
|
||||||
private let session: MCSession
|
private let session: MCSession
|
||||||
private let advertiser: MCNearbyServiceAdvertiser
|
private let advertiser: MCNearbyServiceAdvertiser
|
||||||
|
private let ownPeer: MCPeerID
|
||||||
|
|
||||||
init(id: String) {
|
init(peer: MCPeerID) {
|
||||||
let id = MCPeerID(displayName: id)
|
ownPeer = peer
|
||||||
session = MCSession(
|
session = MCSession(
|
||||||
peer: id,
|
peer: peer,
|
||||||
securityIdentity: nil,
|
securityIdentity: nil,
|
||||||
encryptionPreference: .required
|
encryptionPreference: .required
|
||||||
)
|
)
|
||||||
advertiser = MCNearbyServiceAdvertiser(
|
advertiser = MCNearbyServiceAdvertiser(
|
||||||
peer: id,
|
peer: peer,
|
||||||
discoveryInfo: [:],
|
discoveryInfo: [:],
|
||||||
serviceType: "peered"
|
serviceType: "peered"
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user