seb/RippleChat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Friends and their log-sequence Numbers now get listed when receiving WANT-Vector

Browse Source
This commit is contained in:
severin.memmishofer 2023-07-15 16:18:16 +02:00
parent 653c2068e7
commit 1582f57eab
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RippleChat/BTPeripheral.swift
View File

@ -11,6 +11,7 @@ import CoreBluetooth
class BluetoothPeripheral: NSObject, ObservableObject { class BluetoothPeripheral: NSObject, ObservableObject {
@Published var incomingMsg: String = "" @Published var incomingMsg: String = ""
@Published var wantVector: WantMessage = WantMessage()
private var peripheralManager: CBPeripheralManager? private var peripheralManager: CBPeripheralManager?
let BLE_SERVICE_UUID = CBUUID(string: "6e400001-7646-4b5b-9a50-71becce51558") let BLE_SERVICE_UUID = CBUUID(string: "6e400001-7646-4b5b-9a50-71becce51558")
@ -98,6 +99,7 @@ extension BluetoothPeripheral: CBPeripheralManagerDelegate {
// Use the received object to update your app state as needed // Use the received object to update your app state as needed
print("Received Write") print("Received Write")
self.incomingMsg = receivedObject.printMsg() self.incomingMsg = receivedObject.printMsg()
self.wantVector = receivedObject
print(receivedObject.printMsg()) print(receivedObject.printMsg())
} catch { } catch {
print("Failed to decode JSON: \(error)") print("Failed to decode JSON: \(error)")

4
RippleChat/BluetoothController.swift
View File

@ -55,6 +55,10 @@ extension BluetoothController: CBCentralManagerDelegate, CBPeripheralDelegate {
} }
} }
func peripheral(_ peripheral: CBPeripheral, didModifyServices invalidatedServices: [CBService]) {
// Not implemented yet
}
// func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) { // func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
// print("Discovering services...") // print("Discovering services...")
// peripheral.discoverCharacteristics(BLE_CHARACTERISTIC_UUID_RX) // peripheral.discoverCharacteristics(BLE_CHARACTERISTIC_UUID_RX)

8
RippleChat/Views/PeeringView.swift
View File

@ -19,6 +19,12 @@ struct PeeringView: View {
} }
.navigationTitle("Peering") .navigationTitle("Peering")
.navigationViewStyle(StackNavigationViewStyle()) .navigationViewStyle(StackNavigationViewStyle())
List {
ForEach(btPeripheral.wantVector.friends.keys.sorted(), id: \.self) { friend in
Text("Feed: \(friend.description), SEQ: \(btPeripheral.wantVector.friends[friend] ?? -1)")
// Send new log Entries...
}
}
Text("Incoming msg: \(btPeripheral.incomingMsg)") Text("Incoming msg: \(btPeripheral.incomingMsg)")
Button(action: { Button(action: {
do { do {
@ -51,6 +57,6 @@ struct WantMessage: Codable {
var friends = [String:Int]() var friends = [String:Int]()
func printMsg() -> String { func printMsg() -> String {
return ("\(command) : \(friends.description)") return ("{\(command) : \(friends.description)}")
} }
} }