Merge pull request #80 from torlando-tech/pr2-app-services

Dual-backend 2/3 — app services + BLE bridge

Author: torlando-tech

Sources/ColumbaApp/App/ColumbaApp.swift

@@ -7,6 +7,7 @@
 //
 
 import LXSTSwift
+import RNSAPI
 
 /// Display information for a telephony profile.
 struct CodecProfileInfo: Identifiable {

Sources/ColumbaApp/Models/CodecProfileInfo.swift

@@ -0,0 +1,30 @@
+//
+//  DiscoveredDevice.swift
+//  ColumbaApp
+//
+//  A discovered BLE peripheral with metadata. Shared by the RNode wizard's
+//  device-discovery step (COLUMBA_RNODE_ENABLED) and the BLE device picker
+//  (COLUMBA_BLE_ENABLED). Lives here (ungated) so neither feature flag owns
+//  the type — extracted from BLEDevicePickerSheet.swift, which used to define
+//  it under COLUMBA_BLE_ENABLED only.
+//
+
+import Foundation
+
+/// A discovered BLE peripheral with metadata.
+struct DiscoveredDevice: Identifiable {
+    /// Unique identifier for SwiftUI list deduplication.
+    let id = UUID()
+
+    /// Peripheral identifier (used for deduplication).
+    let peripheralId: UUID
+
+    /// Peripheral name.
+    let name: String
+
+    /// Received signal strength indicator (dBm).
+    var rssi: Int
+
+    /// Last discovery timestamp.
+    var lastSeen: Date
+}

Sources/ColumbaApp/Models/DiscoveredDevice.swift

@@ -8,6 +8,7 @@
 //
 
 import Foundation
+import RNSAPI
 
 // MARK: - Regional Parameters
 

Sources/ColumbaApp/Models/LoRaPresets.swift

@@ -1,4 +1,6 @@
+#if COLUMBA_NOMADNET_ENABLED
 import SwiftUI
+import RNSAPI
 
 // MARK: - Document
 
@@ -159,3 +161,4 @@ extension MicronTextStyle {
         )
     }
 }
+#endif

Sources/ColumbaApp/Models/MicronDocument.swift

@@ -1,4 +1,6 @@
+#if COLUMBA_NOMADNET_ENABLED
 import Foundation
+import RNSAPI
 
 /// Parses micron markup text into a structured MicronDocument.
 public struct MicronParser {
@@ -550,3 +552,4 @@ public struct MicronParser {
         return .samePage(path: trimmed)
     }
 }
+#endif

Sources/ColumbaApp/Models/MicronParser.swift

@@ -1,3 +1,4 @@
+#if COLUMBA_MIGRATION_ENABLED
 //
 //  MigrationData.swift
 //  ColumbaApp
@@ -7,6 +8,7 @@
 //
 
 import Foundation
+import RNSAPI
 
 /// Top-level migration bundle matching Android's MigrationBundle format.
 ///
@@ -251,3 +253,4 @@ struct ImportResult {
     let interfacesImported: Int
     let settingsImported: Int
 }
+#endif

Sources/ColumbaApp/Models/MigrationData.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import RNSAPI
 
 /// A public Reticulum TCP transport node.
 struct TcpCommunityServer: Identifiable {

Sources/ColumbaApp/Models/TcpCommunityServer.swift

@@ -0,0 +1,26 @@
+import Foundation
+import RNSAPI
+
+/// An `lxmf.delivery` announce surfaced from Python RNS to Swift.
+///
+/// Produced by `PythonBridge.Event.announce` after `rns_bridge._LXMFAnnounceHandler`
+/// receives one from the Python-side `RNS.Transport`. The original `app_data` from
+/// the announce packet has already been msgpack-decoded to `displayName`.
+///
+/// Named `PyAnnounce` (not `Announce`) so it doesn't collide with the old
+/// `ReticulumSwift.Announce` type during the Phase 1 transition.
+public struct PyAnnounce: Identifiable, Equatable, Sendable {
+    public let destHash: String
+    public var displayName: String
+    public var firstSeen: Date
+    public var lastSeen: Date
+
+    public var id: String { destHash }
+
+    public init(destHash: String, displayName: String, firstSeen: Date, lastSeen: Date) {
+        self.destHash = destHash
+        self.displayName = displayName
+        self.firstSeen = firstSeen
+        self.lastSeen = lastSeen
+    }
+}

Sources/ColumbaApp/Python/Models/PyAnnounce.swift

@@ -0,0 +1,38 @@
+import Foundation
+import RNSAPI
+
+/// A conversation-list row backed by the Python-owned SQLite store.
+///
+/// In Phase 2 this is what `MessageRepository` (the new Python-backed
+/// implementation) returns to ChatsView for the conversation list. The schema is
+/// owned in Python (`app/columba_store.py`) and read by Swift via GRDB-read or
+/// stdlib SQLite — see the migration plan for the columns.
+public struct PyConversation: Identifiable, Equatable, Sendable {
+    public let destHash: String
+    public var displayName: String
+    public var lastMessage: String?
+    public var lastMessageAt: Date?
+    public var unreadCount: Int
+    public var isFavorite: Bool
+    public var isPinned: Bool
+
+    public var id: String { destHash }
+
+    public init(
+        destHash: String,
+        displayName: String,
+        lastMessage: String? = nil,
+        lastMessageAt: Date? = nil,
+        unreadCount: Int = 0,
+        isFavorite: Bool = false,
+        isPinned: Bool = false
+    ) {
+        self.destHash = destHash
+        self.displayName = displayName
+        self.lastMessage = lastMessage
+        self.lastMessageAt = lastMessageAt
+        self.unreadCount = unreadCount
+        self.isFavorite = isFavorite
+        self.isPinned = isPinned
+    }
+}