oschly/praca_inzynierska
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format code

Browse Source
This commit is contained in:
Oskar Chybowski
2026-05-24 20:40:56 +02:00
parent 2346ca1b49
commit 40e840ee50
12 changed files with 526 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Implementation/Peered/NoteEditor/ManageMembersScreen.swift
+18 -18
View File
@@ -7,22 +7,22 @@
import SwiftUI
struct ManageMembersScreen: View {
@Bindable var noteAdvertiser: NoteEditingSessionServer
let noteTitle: String
@Binding var noteContent: String
var body: some View {
List(noteAdvertiser.visiblePeers) { peer in
HStack {
Text(peer.id)
Spacer()
PeerStateButton(peerState: peer.state) {
noteAdvertiser.invite(peer: peer, to: .init(title: noteTitle, noteSnapshot: noteContent))
}
}
}
.navigationTitle("Visible users")
}
@Bindable var noteAdvertiser: NoteEditingSessionServer
let noteTitle: String
@Binding var noteContent: String
var body: some View {
List(noteAdvertiser.visiblePeers) { peer in
HStack {
Text(peer.id)
Spacer()
PeerStateButton(peerState: peer.state) {
noteAdvertiser.invite(peer: peer, to: .init(title: noteTitle, noteSnapshot: noteContent))
}
}
}
.navigationTitle("Visible users")
}
}
Implementation/Peered/NoteEditor/NoteEditingSessionServer.swift
+125 -109
View File
@@ -1,126 +1,142 @@
import MultipeerConnectivity
import Foundation
import Combine
import Foundation
import MultipeerConnectivity
struct OwnPeer {
let peer: MCPeerID
let peer: MCPeerID
}
struct Peer: Identifiable {
enum ConnectionState {
case available
case joined
case rejected
case invitationPending
}
var id: String { mcPeer.displayName }
let mcPeer: MCPeerID
var state: ConnectionState
enum ConnectionState {
case available
case joined
case rejected
case invitationPending
}
var id: String { mcPeer.displayName }
let mcPeer: MCPeerID
var state: ConnectionState
}
@Observable
final class NoteEditingSessionServer: NSObject {
private let session: MCSession
private let browser: MCNearbyServiceBrowser
private(set) var ownPeer: OwnPeer
var visiblePeers: [Peer] = []
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
init(peer: OwnPeer) {
ownPeer = peer
browser = .init(peer: peer.peer, serviceType: "peered")
session = .init(peer: peer.peer, securityIdentity: nil, encryptionPreference: .required)
super.init()
browser.delegate = self
session.delegate = self
}
func startServer() {
browser.startBrowsingForPeers()
}
func stopServer() {
browser.stopBrowsingForPeers()
session.disconnect()
}
func invite(peer: Peer, to note: NoteInvitation.NoteContent) {
guard peer.state == .available, let note = try? JSONEncoder().encode(note) else { return }
browser.invitePeer(
peer.mcPeer,
to: session,
withContext: note,
timeout: 600
)
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)
}
private let session: MCSession
private let browser: MCNearbyServiceBrowser
private(set) var ownPeer: OwnPeer
var visiblePeers: [Peer] = []
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
init(peer: OwnPeer) {
ownPeer = peer
browser = .init(peer: peer.peer, serviceType: "peered")
session = .init(peer: peer.peer, securityIdentity: nil, encryptionPreference: .required)
super.init()
browser.delegate = self
session.delegate = self
}
func startServer() {
browser.startBrowsingForPeers()
}
func stopServer() {
browser.stopBrowsingForPeers()
session.disconnect()
}
func invite(peer: Peer, to note: NoteInvitation.NoteContent) {
guard peer.state == .available, let note = try? JSONEncoder().encode(note) else { return }
browser.invitePeer(
peer.mcPeer,
to: session,
withContext: note,
timeout: 600
)
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]?
) {
guard !visiblePeers.contains(where: { $0.mcPeer == peerID }) && peerID.displayName != ownPeer.peer.displayName else { return }
DispatchQueue.main.async {
self.visiblePeers.append(Peer(mcPeer: peerID, state: .available))
}
}
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
DispatchQueue.main.async {
guard let peerIdx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
self.visiblePeers.remove(at: peerIdx)
}
}
func browser(
_ browser: MCNearbyServiceBrowser,
foundPeer peerID: MCPeerID,
withDiscoveryInfo info: [String: String]?
) {
guard
!visiblePeers.contains(where: { $0.mcPeer == peerID })
&& peerID.displayName != ownPeer.peer.displayName
else { return }
DispatchQueue.main.async {
self.visiblePeers.append(Peer(mcPeer: peerID, state: .available))
}
}
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
DispatchQueue.main.async {
guard let peerIdx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else {
return
}
self.visiblePeers.remove(at: peerIdx)
}
}
}
extension NoteEditingSessionServer: MCSessionDelegate {
func session(
_ session: MCSession,
peer peerID: MCPeerID,
didChange state: MCSessionState
) {
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 message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
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)?) {}
func session(
_ session: MCSession,
peer peerID: MCPeerID,
didChange state: MCSessionState
) {
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 message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
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)?
) {}
}
Implementation/Peered/NoteEditor/NoteEditorScreen.swift
+59 -59
View File
@@ -5,69 +5,69 @@
// Created by Oskar Chybowski on 25/09/2025.
//
import SwiftUI
import MultipeerConnectivity
import SwiftUI
struct NoteEditorScreen: View {
let note: Note
@State private var noteAdvertiser: NoteEditingSessionServer
@State private var noteContent: String = ""
@State private var remoteNoteContent: String? = nil
@State private var timer = Timer.publish(every: 5, on: .current, in: .common)
.autoconnect()
@State private var showManageMembers = false
let note: Note
@State private var noteAdvertiser: NoteEditingSessionServer
@State private var noteContent: String = ""
@State private var remoteNoteContent: String? = nil
@State private var timer = Timer.publish(every: 5, on: .current, in: .common)
.autoconnect()
@State private var showManageMembers = false
init(note: Note, peer: OwnPeer) {
self.note = note
self._noteAdvertiser = .init(initialValue: .init(peer: peer))
}
init(note: Note, peer: OwnPeer) {
self.note = note
self._noteAdvertiser = .init(initialValue: .init(peer: peer))
}
var body: some View {
NoteTextEditor(text: $noteContent, remoteText: remoteNoteContent)
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button("Manage members") {
showManageMembers = true
}
}
}
.sheet(isPresented: $showManageMembers) {
NavigationStack {
ManageMembersScreen(
noteAdvertiser: noteAdvertiser,
noteTitle: note.name,
noteContent: $noteContent
)
}
}
.onReceive(noteAdvertiser.noteChangesEmitter) { message in
guard message.senderID != noteAdvertiser.ownPeer.peer.displayName else { return }
remoteNoteContent = message.content
}
.task(id: noteContent) {
if noteContent == remoteNoteContent { return }
let connectedPeers = noteAdvertiser.visiblePeers
.filter { $0.state == .joined }
.map(\.mcPeer)
guard !connectedPeers.isEmpty else { return }
try? await Task.sleep(nanoseconds: 500_000_000)
guard !Task.isCancelled else { return }
noteAdvertiser.send(note: noteContent, to: connectedPeers)
}
.onAppear {
noteContent = (try? String(contentsOf: note.path, encoding: .utf8)) ?? ""
noteAdvertiser.startServer()
}
.onDisappear {
noteAdvertiser.stopServer()
saveNote()
}
.onReceive(timer) { _ in
saveNote()
}
}
var body: some View {
NoteTextEditor(text: $noteContent, remoteText: remoteNoteContent)
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button("Manage members") {
showManageMembers = true
}
}
}
.sheet(isPresented: $showManageMembers) {
NavigationStack {
ManageMembersScreen(
noteAdvertiser: noteAdvertiser,
noteTitle: note.name,
noteContent: $noteContent
)
}
}
.onReceive(noteAdvertiser.noteChangesEmitter) { message in
guard message.senderID != noteAdvertiser.ownPeer.peer.displayName else { return }
remoteNoteContent = message.content
}
.task(id: noteContent) {
if noteContent == remoteNoteContent { return }
let connectedPeers = noteAdvertiser.visiblePeers
.filter { $0.state == .joined }
.map(\.mcPeer)
guard !connectedPeers.isEmpty else { return }
try? await Task.sleep(nanoseconds: 500_000_000)
guard !Task.isCancelled else { return }
noteAdvertiser.send(note: noteContent, to: connectedPeers)
}
.onAppear {
noteContent = (try? String(contentsOf: note.path, encoding: .utf8)) ?? ""
noteAdvertiser.startServer()
}
.onDisappear {
noteAdvertiser.stopServer()
saveNote()
}
.onReceive(timer) { _ in
saveNote()
}
}
func saveNote() {
try? noteContent.write(to: note.path, atomically: true, encoding: .utf8)
}
func saveNote() {
try? noteContent.write(to: note.path, atomically: true, encoding: .utf8)
}
}
Implementation/Peered/NoteEditor/NoteTextEditor.swift
+12 -12
View File
@@ -1,16 +1,16 @@
import SwiftUI
struct NoteTextEditor: View {
@Binding var text: String
let remoteText: String?
@State private var selection: TextSelection? = nil
var body: some View {
TextEditor(text: $text, selection: $selection)
.onChange(of: remoteText) { oldValue, newValue in
guard let newValue, newValue != text else { return }
// Apply remote text first
text = newValue
}
}
@Binding var text: String
let remoteText: String?
@State private var selection: TextSelection? = nil
var body: some View {
TextEditor(text: $text, selection: $selection)
.onChange(of: remoteText) { oldValue, newValue in
guard let newValue, newValue != text else { return }
// Apply remote text first
text = newValue
}
}
}
Implementation/Peered/NoteEditor/PeerStateButton.swift
+15 -15
View File
@@ -8,19 +8,19 @@
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")
}
}
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")
}
}
}
Implementation/Peered/NoteEditor/SharedNoteEditor.swift
+35 -35
View File
@@ -7,41 +7,41 @@
import SwiftUI
struct SharedNoteEditor: View {
@State var note: String?
@State var remoteNote: String? = nil
@State var invitation: NoteInvitation
@Bindable var noteClient: NoteEditingSessionClient
@State var note: String?
@State var remoteNote: String? = nil
@State var invitation: NoteInvitation
@Bindable var noteClient: NoteEditingSessionClient
init(
invitation: NoteInvitation,
noteClient: NoteEditingSessionClient
) {
self._invitation = .init(initialValue: invitation)
self._noteClient = .init(noteClient)
}
init(
invitation: NoteInvitation,
noteClient: NoteEditingSessionClient
) {
self._invitation = .init(initialValue: invitation)
self._noteClient = .init(noteClient)
}
var body: some View {
ZStack {
if let note = Binding($note) {
NoteTextEditor(text: note, remoteText: remoteNote)
} else {
ProgressView {
Text("Fetching note...")
}
}
}
.onReceive(noteClient.noteChangesEmitter) { message in
guard message.senderID != noteClient.ownPeer.displayName else { return }
remoteNote = message.content
}
.task(id: note) {
try? await Task.sleep(nanoseconds: 500_000_000)
guard !Task.isCancelled, let note else { return }
noteClient.send(note: note, to: invitation.invitatorID)
}
.onAppear {
invitation.accept()
note = invitation.note.noteSnapshot
}
}
var body: some View {
ZStack {
if let note = Binding($note) {
NoteTextEditor(text: note, remoteText: remoteNote)
} else {
ProgressView {
Text("Fetching note...")
}
}
}
.onReceive(noteClient.noteChangesEmitter) { message in
guard message.senderID != noteClient.ownPeer.displayName else { return }
remoteNote = message.content
}
.task(id: note) {
try? await Task.sleep(nanoseconds: 500_000_000)
guard !Task.isCancelled, let note else { return }
noteClient.send(note: note, to: invitation.invitatorID)
}
.onAppear {
invitation.accept()
note = invitation.note.noteSnapshot
}
}
}