format code
This commit is contained in:
@@ -8,70 +8,70 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct AllNotesScreen: View {
|
struct AllNotesScreen: 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?
|
@State private var ownPeer: OwnPeer?
|
||||||
|
|
||||||
var isUsernameValid: Bool {
|
var isUsernameValid: Bool {
|
||||||
!(username.map(\.isEmpty) ?? true)
|
!(username.map(\.isEmpty) ?? true)
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
List {
|
List {
|
||||||
Section("Your notes") {
|
Section("Your notes") {
|
||||||
ForEach(notes) { note in
|
ForEach(notes) { note in
|
||||||
NavigationLink(note.name) {
|
NavigationLink(note.name) {
|
||||||
if let ownPeer {
|
if let ownPeer {
|
||||||
NoteEditorScreen(note: note, peer: ownPeer)
|
NoteEditorScreen(note: note, peer: ownPeer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let notesClient {
|
if let notesClient {
|
||||||
Section("External notes") {
|
Section("External notes") {
|
||||||
ForEach(notesClient.invitations) { invitation in
|
ForEach(notesClient.invitations) { invitation in
|
||||||
NavigationLink(invitation.noteName) {
|
NavigationLink(invitation.noteName) {
|
||||||
SharedNoteEditor(invitation: invitation, noteClient: notesClient)
|
SharedNoteEditor(invitation: invitation, noteClient: notesClient)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Peered")
|
.navigationTitle("Peered")
|
||||||
.toolbar {
|
.toolbar {
|
||||||
Button("Create note") {
|
Button("Create note") {
|
||||||
NotesStorage().createNote(name: "New Note")
|
NotesStorage().createNote(name: "New Note")
|
||||||
notes = NotesStorage().loadNotes()
|
notes = NotesStorage().loadNotes()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
notes = NotesStorage().loadNotes()
|
notes = NotesStorage().loadNotes()
|
||||||
if let username, isUsernameValid {
|
if let username, isUsernameValid {
|
||||||
setupSession(username: username)
|
setupSession(username: username)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onChange(of: username) { _, newUsername in
|
.onChange(of: username) { _, newUsername in
|
||||||
guard let newUsername, isUsernameValid else { return }
|
guard let newUsername, isUsernameValid else { return }
|
||||||
setupSession(username: newUsername)
|
setupSession(username: newUsername)
|
||||||
}
|
}
|
||||||
.sheet(isPresented: .constant(!isUsernameValid)) {
|
.sheet(isPresented: .constant(!isUsernameValid)) {
|
||||||
SetUserNameBottomSheetView(username: $username)
|
SetUserNameBottomSheetView(username: $username)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private func setupSession(username: String) {
|
private func setupSession(username: String) {
|
||||||
notesClient?.stopBrowsingForNotes()
|
notesClient?.stopBrowsingForNotes()
|
||||||
let peer = OwnPeer(peer: .init(displayName: username))
|
let peer = OwnPeer(peer: .init(displayName: username))
|
||||||
ownPeer = peer
|
ownPeer = peer
|
||||||
notesClient = .init(peer: peer.peer)
|
notesClient = .init(peer: peer.peer)
|
||||||
notesClient?.startBrowsingForNotes()
|
notesClient?.startBrowsingForNotes()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#Preview {
|
#Preview {
|
||||||
AllNotesScreen()
|
AllNotesScreen()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,22 +7,22 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct ManageMembersScreen: View {
|
struct ManageMembersScreen: View {
|
||||||
@Bindable var noteAdvertiser: NoteEditingSessionServer
|
@Bindable var noteAdvertiser: NoteEditingSessionServer
|
||||||
let noteTitle: String
|
let noteTitle: String
|
||||||
@Binding var noteContent: String
|
@Binding var noteContent: String
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
List(noteAdvertiser.visiblePeers) { peer in
|
List(noteAdvertiser.visiblePeers) { peer in
|
||||||
HStack {
|
HStack {
|
||||||
Text(peer.id)
|
Text(peer.id)
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
PeerStateButton(peerState: peer.state) {
|
PeerStateButton(peerState: peer.state) {
|
||||||
noteAdvertiser.invite(peer: peer, to: .init(title: noteTitle, noteSnapshot: noteContent))
|
noteAdvertiser.invite(peer: peer, to: .init(title: noteTitle, noteSnapshot: noteContent))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.navigationTitle("Visible users")
|
.navigationTitle("Visible users")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,126 +1,142 @@
|
|||||||
import MultipeerConnectivity
|
|
||||||
import Foundation
|
|
||||||
import Combine
|
import Combine
|
||||||
|
import Foundation
|
||||||
|
import MultipeerConnectivity
|
||||||
|
|
||||||
struct OwnPeer {
|
struct OwnPeer {
|
||||||
let peer: MCPeerID
|
let peer: MCPeerID
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Peer: Identifiable {
|
struct Peer: Identifiable {
|
||||||
enum ConnectionState {
|
enum ConnectionState {
|
||||||
case available
|
case available
|
||||||
case joined
|
case joined
|
||||||
case rejected
|
case rejected
|
||||||
case invitationPending
|
case invitationPending
|
||||||
}
|
}
|
||||||
|
|
||||||
var id: String { mcPeer.displayName }
|
var id: String { mcPeer.displayName }
|
||||||
let mcPeer: MCPeerID
|
let mcPeer: MCPeerID
|
||||||
var state: ConnectionState
|
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(set) var ownPeer: OwnPeer
|
private(set) var ownPeer: OwnPeer
|
||||||
|
|
||||||
var visiblePeers: [Peer] = []
|
var visiblePeers: [Peer] = []
|
||||||
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
|
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
|
||||||
|
|
||||||
init(peer: OwnPeer) {
|
init(peer: OwnPeer) {
|
||||||
ownPeer = peer
|
ownPeer = peer
|
||||||
browser = .init(peer: peer.peer, serviceType: "peered")
|
browser = .init(peer: peer.peer, serviceType: "peered")
|
||||||
session = .init(peer: peer.peer, securityIdentity: nil, encryptionPreference: .required)
|
session = .init(peer: peer.peer, securityIdentity: nil, encryptionPreference: .required)
|
||||||
super.init()
|
super.init()
|
||||||
browser.delegate = self
|
browser.delegate = self
|
||||||
session.delegate = self
|
session.delegate = self
|
||||||
}
|
}
|
||||||
|
|
||||||
func startServer() {
|
func startServer() {
|
||||||
browser.startBrowsingForPeers()
|
browser.startBrowsingForPeers()
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopServer() {
|
func stopServer() {
|
||||||
browser.stopBrowsingForPeers()
|
browser.stopBrowsingForPeers()
|
||||||
session.disconnect()
|
session.disconnect()
|
||||||
}
|
}
|
||||||
|
|
||||||
func invite(peer: Peer, to note: NoteInvitation.NoteContent) {
|
func invite(peer: Peer, to note: NoteInvitation.NoteContent) {
|
||||||
guard peer.state == .available, let note = try? JSONEncoder().encode(note) else { return }
|
guard peer.state == .available, let note = try? JSONEncoder().encode(note) else { return }
|
||||||
browser.invitePeer(
|
browser.invitePeer(
|
||||||
peer.mcPeer,
|
peer.mcPeer,
|
||||||
to: session,
|
to: session,
|
||||||
withContext: note,
|
withContext: note,
|
||||||
timeout: 600
|
timeout: 600
|
||||||
)
|
)
|
||||||
guard let idxToUpdate = visiblePeers.firstIndex(where: { $0.mcPeer == peer.mcPeer }) else { return }
|
guard let idxToUpdate = visiblePeers.firstIndex(where: { $0.mcPeer == peer.mcPeer }) else {
|
||||||
visiblePeers[idxToUpdate].state = .invitationPending
|
return
|
||||||
}
|
}
|
||||||
|
visiblePeers[idxToUpdate].state = .invitationPending
|
||||||
|
}
|
||||||
|
|
||||||
func send(note: String, to peers: [MCPeerID]) {
|
func send(note: String, to peers: [MCPeerID]) {
|
||||||
let message = NoteMessage(senderID: ownPeer.peer.displayName, content: note)
|
let message = NoteMessage(senderID: ownPeer.peer.displayName, content: note)
|
||||||
guard !peers.isEmpty, let data = try? JSONEncoder().encode(message) else { return }
|
guard !peers.isEmpty, let data = try? JSONEncoder().encode(message) else { return }
|
||||||
try? session.send(data, toPeers: peers, with: .reliable)
|
try? session.send(data, toPeers: peers, with: .reliable)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
extension NoteEditingSessionServer: MCNearbyServiceBrowserDelegate {
|
||||||
func browser(
|
func browser(
|
||||||
_ browser: MCNearbyServiceBrowser,
|
_ browser: MCNearbyServiceBrowser,
|
||||||
foundPeer peerID: MCPeerID,
|
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 }
|
guard
|
||||||
DispatchQueue.main.async {
|
!visiblePeers.contains(where: { $0.mcPeer == peerID })
|
||||||
self.visiblePeers.append(Peer(mcPeer: peerID, state: .available))
|
&& 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) {
|
func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let peerIdx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
|
guard let peerIdx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else {
|
||||||
self.visiblePeers.remove(at: peerIdx)
|
return
|
||||||
}
|
}
|
||||||
}
|
self.visiblePeers.remove(at: peerIdx)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension NoteEditingSessionServer: MCSessionDelegate {
|
extension NoteEditingSessionServer: MCSessionDelegate {
|
||||||
func session(
|
func session(
|
||||||
_ session: MCSession,
|
_ session: MCSession,
|
||||||
peer peerID: MCPeerID,
|
peer peerID: MCPeerID,
|
||||||
didChange state: MCSessionState
|
didChange state: MCSessionState
|
||||||
) {
|
) {
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
guard let idx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
|
guard let idx = self.visiblePeers.firstIndex(where: { $0.mcPeer == peerID }) else { return }
|
||||||
switch state {
|
switch state {
|
||||||
case .connected:
|
case .connected:
|
||||||
self.visiblePeers[idx].state = .joined
|
self.visiblePeers[idx].state = .joined
|
||||||
case .notConnected:
|
case .notConnected:
|
||||||
let currentState = self.visiblePeers[idx].state
|
let currentState = self.visiblePeers[idx].state
|
||||||
if currentState == .invitationPending || currentState == .joined {
|
if currentState == .invitationPending || currentState == .joined {
|
||||||
self.visiblePeers[idx].state = .rejected
|
self.visiblePeers[idx].state = .rejected
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func session(_ session: MCSession, didReceive data: Data, fromPeer peerID: MCPeerID) {
|
func session(_ session: MCSession, didReceive data: Data, fromPeer peerID: MCPeerID) {
|
||||||
guard let message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
|
guard let message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
|
||||||
|
|
||||||
let otherPeers = session.connectedPeers.filter { $0 != peerID }
|
let otherPeers = session.connectedPeers.filter { $0 != peerID }
|
||||||
if !otherPeers.isEmpty {
|
if !otherPeers.isEmpty {
|
||||||
try? session.send(data, toPeers: otherPeers, with: .reliable)
|
try? session.send(data, toPeers: otherPeers, with: .reliable)
|
||||||
}
|
}
|
||||||
|
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.noteChangesEmitter.send(message)
|
self.noteChangesEmitter.send(message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func session(_ session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID) {}
|
func session(
|
||||||
func session(_ session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, with progress: Progress) {}
|
_ session: MCSession, didReceive stream: InputStream, withName streamName: String,
|
||||||
func session(_ session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL?, withError error: (any Error)?) {}
|
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)?
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,69 +5,69 @@
|
|||||||
// Created by Oskar Chybowski on 25/09/2025.
|
// Created by Oskar Chybowski on 25/09/2025.
|
||||||
//
|
//
|
||||||
|
|
||||||
import SwiftUI
|
|
||||||
import MultipeerConnectivity
|
import MultipeerConnectivity
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
struct NoteEditorScreen: View {
|
struct NoteEditorScreen: View {
|
||||||
let note: Note
|
let note: Note
|
||||||
@State private var noteAdvertiser: NoteEditingSessionServer
|
@State private var noteAdvertiser: NoteEditingSessionServer
|
||||||
@State private var noteContent: String = ""
|
@State private var noteContent: String = ""
|
||||||
@State private var remoteNoteContent: String? = nil
|
@State private var remoteNoteContent: String? = nil
|
||||||
@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
|
@State private var showManageMembers = false
|
||||||
|
|
||||||
init(note: Note, peer: OwnPeer) {
|
init(note: Note, peer: OwnPeer) {
|
||||||
self.note = note
|
self.note = note
|
||||||
self._noteAdvertiser = .init(initialValue: .init(peer: peer))
|
self._noteAdvertiser = .init(initialValue: .init(peer: peer))
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
NoteTextEditor(text: $noteContent, remoteText: remoteNoteContent)
|
NoteTextEditor(text: $noteContent, remoteText: remoteNoteContent)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItem(placement: .primaryAction) {
|
ToolbarItem(placement: .primaryAction) {
|
||||||
Button("Manage members") {
|
Button("Manage members") {
|
||||||
showManageMembers = true
|
showManageMembers = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.sheet(isPresented: $showManageMembers) {
|
.sheet(isPresented: $showManageMembers) {
|
||||||
NavigationStack {
|
NavigationStack {
|
||||||
ManageMembersScreen(
|
ManageMembersScreen(
|
||||||
noteAdvertiser: noteAdvertiser,
|
noteAdvertiser: noteAdvertiser,
|
||||||
noteTitle: note.name,
|
noteTitle: note.name,
|
||||||
noteContent: $noteContent
|
noteContent: $noteContent
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(noteAdvertiser.noteChangesEmitter) { message in
|
.onReceive(noteAdvertiser.noteChangesEmitter) { message in
|
||||||
guard message.senderID != noteAdvertiser.ownPeer.peer.displayName else { return }
|
guard message.senderID != noteAdvertiser.ownPeer.peer.displayName else { return }
|
||||||
remoteNoteContent = message.content
|
remoteNoteContent = message.content
|
||||||
}
|
}
|
||||||
.task(id: noteContent) {
|
.task(id: noteContent) {
|
||||||
if noteContent == remoteNoteContent { return }
|
if noteContent == remoteNoteContent { return }
|
||||||
let connectedPeers = noteAdvertiser.visiblePeers
|
let connectedPeers = noteAdvertiser.visiblePeers
|
||||||
.filter { $0.state == .joined }
|
.filter { $0.state == .joined }
|
||||||
.map(\.mcPeer)
|
.map(\.mcPeer)
|
||||||
guard !connectedPeers.isEmpty else { return }
|
guard !connectedPeers.isEmpty else { return }
|
||||||
try? await Task.sleep(nanoseconds: 500_000_000)
|
try? await Task.sleep(nanoseconds: 500_000_000)
|
||||||
guard !Task.isCancelled else { return }
|
guard !Task.isCancelled else { return }
|
||||||
noteAdvertiser.send(note: noteContent, to: connectedPeers)
|
noteAdvertiser.send(note: noteContent, to: connectedPeers)
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
noteContent = (try? String(contentsOf: note.path, encoding: .utf8)) ?? ""
|
noteContent = (try? String(contentsOf: note.path, encoding: .utf8)) ?? ""
|
||||||
noteAdvertiser.startServer()
|
noteAdvertiser.startServer()
|
||||||
}
|
}
|
||||||
.onDisappear {
|
.onDisappear {
|
||||||
noteAdvertiser.stopServer()
|
noteAdvertiser.stopServer()
|
||||||
saveNote()
|
saveNote()
|
||||||
}
|
}
|
||||||
.onReceive(timer) { _ in
|
.onReceive(timer) { _ in
|
||||||
saveNote()
|
saveNote()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func saveNote() {
|
func saveNote() {
|
||||||
try? noteContent.write(to: note.path, atomically: true, encoding: .utf8)
|
try? noteContent.write(to: note.path, atomically: true, encoding: .utf8)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct NoteTextEditor: View {
|
struct NoteTextEditor: View {
|
||||||
@Binding var text: String
|
@Binding var text: String
|
||||||
let remoteText: String?
|
let remoteText: String?
|
||||||
@State private var selection: TextSelection? = nil
|
@State private var selection: TextSelection? = nil
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
TextEditor(text: $text, selection: $selection)
|
TextEditor(text: $text, selection: $selection)
|
||||||
.onChange(of: remoteText) { oldValue, newValue in
|
.onChange(of: remoteText) { oldValue, newValue in
|
||||||
guard let newValue, newValue != text else { return }
|
guard let newValue, newValue != text else { return }
|
||||||
// Apply remote text first
|
// Apply remote text first
|
||||||
text = newValue
|
text = newValue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,19 +8,19 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct PeerStateButton: View {
|
struct PeerStateButton: View {
|
||||||
let peerState: Peer.ConnectionState
|
let peerState: Peer.ConnectionState
|
||||||
let onTap: () -> Void
|
let onTap: () -> Void
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
switch peerState {
|
switch peerState {
|
||||||
case .available:
|
case .available:
|
||||||
Button("Invite", action: onTap)
|
Button("Invite", action: onTap)
|
||||||
case .joined:
|
case .joined:
|
||||||
Text("Joined")
|
Text("Joined")
|
||||||
case .rejected:
|
case .rejected:
|
||||||
Text("Rejected")
|
Text("Rejected")
|
||||||
case .invitationPending:
|
case .invitationPending:
|
||||||
Text("Invitation pending")
|
Text("Invitation pending")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,41 +7,41 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct SharedNoteEditor: View {
|
struct SharedNoteEditor: View {
|
||||||
@State var note: String?
|
@State var note: String?
|
||||||
@State var remoteNote: String? = nil
|
@State var remoteNote: String? = nil
|
||||||
@State var invitation: NoteInvitation
|
@State var invitation: NoteInvitation
|
||||||
@Bindable var noteClient: NoteEditingSessionClient
|
@Bindable var noteClient: NoteEditingSessionClient
|
||||||
|
|
||||||
init(
|
init(
|
||||||
invitation: NoteInvitation,
|
invitation: NoteInvitation,
|
||||||
noteClient: NoteEditingSessionClient
|
noteClient: NoteEditingSessionClient
|
||||||
) {
|
) {
|
||||||
self._invitation = .init(initialValue: invitation)
|
self._invitation = .init(initialValue: invitation)
|
||||||
self._noteClient = .init(noteClient)
|
self._noteClient = .init(noteClient)
|
||||||
}
|
}
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
ZStack {
|
ZStack {
|
||||||
if let note = Binding($note) {
|
if let note = Binding($note) {
|
||||||
NoteTextEditor(text: note, remoteText: remoteNote)
|
NoteTextEditor(text: note, remoteText: remoteNote)
|
||||||
} else {
|
} else {
|
||||||
ProgressView {
|
ProgressView {
|
||||||
Text("Fetching note...")
|
Text("Fetching note...")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.onReceive(noteClient.noteChangesEmitter) { message in
|
.onReceive(noteClient.noteChangesEmitter) { message in
|
||||||
guard message.senderID != noteClient.ownPeer.displayName else { return }
|
guard message.senderID != noteClient.ownPeer.displayName else { return }
|
||||||
remoteNote = message.content
|
remoteNote = message.content
|
||||||
}
|
}
|
||||||
.task(id: note) {
|
.task(id: note) {
|
||||||
try? await Task.sleep(nanoseconds: 500_000_000)
|
try? await Task.sleep(nanoseconds: 500_000_000)
|
||||||
guard !Task.isCancelled, let note else { return }
|
guard !Task.isCancelled, let note else { return }
|
||||||
noteClient.send(note: note, to: invitation.invitatorID)
|
noteClient.send(note: note, to: invitation.invitatorID)
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
invitation.accept()
|
invitation.accept()
|
||||||
note = invitation.note.noteSnapshot
|
note = invitation.note.noteSnapshot
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
struct Note: Identifiable {
|
struct Note: Identifiable {
|
||||||
var id: URL { path }
|
var id: URL { path }
|
||||||
|
|
||||||
let name: String
|
let name: String
|
||||||
let path: URL
|
let path: URL
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,131 +1,140 @@
|
|||||||
import MultipeerConnectivity
|
|
||||||
import Foundation
|
|
||||||
import Combine
|
import Combine
|
||||||
|
import Foundation
|
||||||
|
import MultipeerConnectivity
|
||||||
|
|
||||||
struct NoteInvitation: Identifiable {
|
struct NoteInvitation: Identifiable {
|
||||||
struct NoteContent: Codable {
|
struct NoteContent: Codable {
|
||||||
let title: String
|
let title: String
|
||||||
let noteSnapshot: String
|
let noteSnapshot: String
|
||||||
}
|
}
|
||||||
|
|
||||||
var id: MCPeerID { invitatorID }
|
var id: MCPeerID { invitatorID }
|
||||||
var noteName: String { note.title }
|
var noteName: String { note.title }
|
||||||
let invitatorID: MCPeerID
|
let invitatorID: MCPeerID
|
||||||
let note: NoteContent
|
let note: NoteContent
|
||||||
private var invitationHandler: ((Bool) -> Void)?
|
private var invitationHandler: ((Bool) -> Void)?
|
||||||
|
|
||||||
init(
|
init(
|
||||||
invitatorID: MCPeerID,
|
invitatorID: MCPeerID,
|
||||||
note: NoteContent,
|
note: NoteContent,
|
||||||
invitationHandler: ((Bool) -> Void)? = nil
|
invitationHandler: ((Bool) -> Void)? = nil
|
||||||
) {
|
) {
|
||||||
self.invitatorID = invitatorID
|
self.invitatorID = invitatorID
|
||||||
self.note = note
|
self.note = note
|
||||||
self.invitationHandler = invitationHandler
|
self.invitationHandler = invitationHandler
|
||||||
}
|
}
|
||||||
|
|
||||||
mutating func accept() {
|
mutating func accept() {
|
||||||
invitationHandler?(true)
|
invitationHandler?(true)
|
||||||
invitationHandler = nil
|
invitationHandler = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
mutating func decline() {
|
mutating func decline() {
|
||||||
invitationHandler?(false)
|
invitationHandler?(false)
|
||||||
invitationHandler = nil
|
invitationHandler = nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Observable
|
@Observable
|
||||||
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(set) var ownPeer: MCPeerID
|
private(set) var ownPeer: MCPeerID
|
||||||
|
|
||||||
var invitations: [NoteInvitation] = []
|
var invitations: [NoteInvitation] = []
|
||||||
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
|
let noteChangesEmitter = PassthroughSubject<NoteMessage, Never>()
|
||||||
|
|
||||||
init(peer: MCPeerID) {
|
init(peer: MCPeerID) {
|
||||||
ownPeer = peer
|
ownPeer = peer
|
||||||
session = MCSession(
|
session = MCSession(
|
||||||
peer: peer,
|
peer: peer,
|
||||||
securityIdentity: nil,
|
securityIdentity: nil,
|
||||||
encryptionPreference: .required
|
encryptionPreference: .required
|
||||||
)
|
)
|
||||||
advertiser = MCNearbyServiceAdvertiser(
|
advertiser = MCNearbyServiceAdvertiser(
|
||||||
peer: peer,
|
peer: peer,
|
||||||
discoveryInfo: [:],
|
discoveryInfo: [:],
|
||||||
serviceType: "peered"
|
serviceType: "peered"
|
||||||
)
|
)
|
||||||
super.init()
|
super.init()
|
||||||
advertiser.delegate = self
|
advertiser.delegate = self
|
||||||
session.delegate = self
|
session.delegate = self
|
||||||
}
|
}
|
||||||
|
|
||||||
func startBrowsingForNotes() {
|
func startBrowsingForNotes() {
|
||||||
advertiser.startAdvertisingPeer()
|
advertiser.startAdvertisingPeer()
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopBrowsingForNotes() {
|
func stopBrowsingForNotes() {
|
||||||
advertiser.stopAdvertisingPeer()
|
advertiser.stopAdvertisingPeer()
|
||||||
session.disconnect()
|
session.disconnect()
|
||||||
}
|
}
|
||||||
|
|
||||||
func send(note: String, to peer: MCPeerID) {
|
func send(note: String, to peer: MCPeerID) {
|
||||||
let message = NoteMessage(senderID: ownPeer.displayName, content: note)
|
let message = NoteMessage(senderID: ownPeer.displayName, content: note)
|
||||||
guard let data = try? JSONEncoder().encode(message) else { return }
|
guard let data = try? JSONEncoder().encode(message) else { return }
|
||||||
try? session.send(data, toPeers: [peer], with: .reliable)
|
try? session.send(data, toPeers: [peer], with: .reliable)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension NoteEditingSessionClient: MCNearbyServiceAdvertiserDelegate {
|
extension NoteEditingSessionClient: MCNearbyServiceAdvertiserDelegate {
|
||||||
func advertiser(
|
func advertiser(
|
||||||
_ advertiser: MCNearbyServiceAdvertiser,
|
_ advertiser: MCNearbyServiceAdvertiser,
|
||||||
didReceiveInvitationFromPeer peerID: MCPeerID,
|
didReceiveInvitationFromPeer peerID: MCPeerID,
|
||||||
withContext context: Data?,
|
withContext context: Data?,
|
||||||
invitationHandler: @escaping (Bool, MCSession?) -> Void
|
invitationHandler: @escaping (Bool, MCSession?) -> Void
|
||||||
) {
|
) {
|
||||||
guard
|
guard
|
||||||
let context,
|
let context,
|
||||||
let noteContent = try? JSONDecoder().decode(NoteInvitation.NoteContent.self, from: context)
|
let noteContent = try? JSONDecoder().decode(NoteInvitation.NoteContent.self, from: context)
|
||||||
else { return }
|
else { return }
|
||||||
|
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.invitations.append(
|
self.invitations.append(
|
||||||
.init(
|
.init(
|
||||||
invitatorID: peerID,
|
invitatorID: peerID,
|
||||||
note: noteContent,
|
note: noteContent,
|
||||||
invitationHandler: { [weak self, invitationHandler] accepted in
|
invitationHandler: { [weak self, invitationHandler] accepted in
|
||||||
guard let self else { return }
|
guard let self else { return }
|
||||||
invitationHandler(accepted, self.session)
|
invitationHandler(accepted, self.session)
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.invitations.removeAll { $0.id == peerID }
|
self.invitations.removeAll { $0.id == peerID }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extension NoteEditingSessionClient: MCSessionDelegate {
|
extension NoteEditingSessionClient: MCSessionDelegate {
|
||||||
func session(
|
func session(
|
||||||
_ session: MCSession,
|
_ session: MCSession,
|
||||||
peer peerID: MCPeerID,
|
peer peerID: MCPeerID,
|
||||||
didChange state: MCSessionState
|
didChange state: MCSessionState
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
func session(
|
func session(
|
||||||
_ session: MCSession,
|
_ session: MCSession,
|
||||||
didReceive data: Data,
|
didReceive data: Data,
|
||||||
fromPeer peerID: MCPeerID
|
fromPeer peerID: MCPeerID
|
||||||
) {
|
) {
|
||||||
guard let message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
|
guard let message = try? JSONDecoder().decode(NoteMessage.self, from: data) else { return }
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.noteChangesEmitter.send(message)
|
self.noteChangesEmitter.send(message)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func session(_ session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID) {}
|
func session(
|
||||||
func session(_ session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, with progress: Progress) {}
|
_ session: MCSession, didReceive stream: InputStream, withName streamName: String,
|
||||||
func session(_ session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL?, withError error: (any Error)?) {}
|
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)?
|
||||||
|
) {}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct NoteInvitationView: View {
|
struct NoteInvitationView: View {
|
||||||
@Binding var invitation: NoteInvitation
|
@Binding var invitation: NoteInvitation
|
||||||
let joinTapped: () -> Void
|
let joinTapped: () -> Void
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
HStack {
|
HStack {
|
||||||
Text(invitation.noteName)
|
Text(invitation.noteName)
|
||||||
Spacer()
|
Spacer()
|
||||||
Button("Join", action: joinTapped)
|
Button("Join", action: joinTapped)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
struct NoteMessage: Codable {
|
struct NoteMessage: Codable {
|
||||||
let senderID: String
|
let senderID: String
|
||||||
let content: String
|
let content: String
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,72 +8,76 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
protocol StorageProvider {
|
protocol StorageProvider {
|
||||||
func contentsOfDirectory(atPath path: String) throws -> [String]
|
func contentsOfDirectory(atPath path: String) throws -> [String]
|
||||||
|
|
||||||
@discardableResult
|
@discardableResult
|
||||||
func createFile(atPath path: String, contents data: Data?, attributes attr: [FileAttributeKey: Any]?) -> Bool
|
func createFile(
|
||||||
|
atPath path: String, contents data: Data?, attributes attr: [FileAttributeKey: Any]?
|
||||||
|
) -> Bool
|
||||||
}
|
}
|
||||||
|
|
||||||
extension FileManager: StorageProvider {}
|
extension FileManager: StorageProvider {}
|
||||||
|
|
||||||
struct NotesStorage {
|
struct NotesStorage {
|
||||||
let storageProvider: StorageProvider
|
let storageProvider: StorageProvider
|
||||||
let rootDirectory: URL
|
let rootDirectory: URL
|
||||||
|
|
||||||
init(
|
init(
|
||||||
storageProvider: StorageProvider = FileManager.default,
|
storageProvider: StorageProvider = FileManager.default,
|
||||||
rootDirectory: URL = .documentsDirectory
|
rootDirectory: URL = .documentsDirectory
|
||||||
) {
|
) {
|
||||||
self.storageProvider = storageProvider
|
self.storageProvider = storageProvider
|
||||||
self.rootDirectory = rootDirectory
|
self.rootDirectory = rootDirectory
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadNotes() -> [Note] {
|
func loadNotes() -> [Note] {
|
||||||
let files = try! storageProvider
|
let files =
|
||||||
.contentsOfDirectory(atPath: rootDirectory.path)
|
try! storageProvider
|
||||||
var notes = [Note]()
|
.contentsOfDirectory(atPath: rootDirectory.path)
|
||||||
|
var notes = [Note]()
|
||||||
|
|
||||||
for file in files.compactMap({
|
for file in files.compactMap({
|
||||||
URL(
|
URL(
|
||||||
filePath: $0,
|
filePath: $0,
|
||||||
directoryHint: .notDirectory,
|
directoryHint: .notDirectory,
|
||||||
relativeTo: rootDirectory
|
relativeTo: rootDirectory
|
||||||
)
|
)
|
||||||
}) {
|
}) {
|
||||||
let name = file.lastPathComponent
|
let name = file.lastPathComponent
|
||||||
let note = Note(
|
let note = Note(
|
||||||
name: name,
|
name: name,
|
||||||
path: file
|
path: file
|
||||||
)
|
)
|
||||||
notes.append(note)
|
notes.append(note)
|
||||||
}
|
}
|
||||||
|
|
||||||
return notes
|
return notes
|
||||||
}
|
}
|
||||||
|
|
||||||
func createNote(name: String) {
|
func createNote(name: String) {
|
||||||
let currentNotes = loadNotes()
|
let currentNotes = loadNotes()
|
||||||
var index: Int? = nil
|
var index: Int? = nil
|
||||||
var proposedName: String {
|
var proposedName: String {
|
||||||
index.map { name + " \($0)" } ?? name
|
index.map { name + " \($0)" } ?? name
|
||||||
}
|
}
|
||||||
|
|
||||||
while currentNotes.contains(where: { $0.name == proposedName }) {
|
while currentNotes.contains(where: { $0.name == proposedName }) {
|
||||||
if let _index = index {
|
if let _index = index {
|
||||||
index = _index + 1
|
index = _index + 1
|
||||||
} else {
|
} else {
|
||||||
index = 1
|
index = 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let pathToWrite = rootDirectory
|
let pathToWrite =
|
||||||
.appendingPathComponent(proposedName)
|
rootDirectory
|
||||||
.appendingPathExtension(for: .text)
|
.appendingPathComponent(proposedName)
|
||||||
|
.appendingPathExtension(for: .text)
|
||||||
|
|
||||||
storageProvider.createFile(
|
storageProvider.createFile(
|
||||||
atPath: pathToWrite.path,
|
atPath: pathToWrite.path,
|
||||||
contents: Data(),
|
contents: Data(),
|
||||||
attributes: nil
|
attributes: nil
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user