mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
121 lines
3.2 KiB
Swift
121 lines
3.2 KiB
Swift
import Combine
|
|
import CoreData
|
|
import OSLog
|
|
import SwiftUI
|
|
|
|
@MainActor
|
|
class Router: ObservableObject {
|
|
|
|
@Published
|
|
var navigationState: NavigationState
|
|
|
|
private var cancellables: Set<AnyCancellable> = []
|
|
|
|
init(
|
|
navigationState: NavigationState = NavigationState(
|
|
selectedTab: .connect
|
|
)
|
|
) {
|
|
self.navigationState = navigationState
|
|
|
|
$navigationState.sink { destination in
|
|
Logger.services.info("🛣 [App] Routed to \(destination.selectedTab.rawValue, privacy: .public)")
|
|
}.store(in: &cancellables)
|
|
}
|
|
|
|
func route(url: URL) {
|
|
guard url.scheme == "meshtastic" else {
|
|
Logger.services.error("🛣 [App] Received routing URL \(url, privacy: .public) with invalid scheme. Ignoring route.")
|
|
return
|
|
}
|
|
guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false) else {
|
|
Logger.services.error("🛣 [App] Received routing URL \(url, privacy: .public) with invalid host path. Ignoring route.")
|
|
return
|
|
}
|
|
|
|
if components.path == "/messages" {
|
|
routeMessages(components)
|
|
} else if components.path == "/connect" {
|
|
navigationState.selectedTab = .connect
|
|
} else if components.path == "/nodes" {
|
|
routeNodes(components)
|
|
} else if components.path == "/map" {
|
|
routeMap(components)
|
|
} else if components.path.hasPrefix("/settings") {
|
|
routeSettings(components)
|
|
} else {
|
|
Logger.services.warning("🛣 [App] Failed to route url: \(url, privacy: .public)")
|
|
}
|
|
}
|
|
|
|
// MARK: Routing Helpers
|
|
|
|
private func routeMessages(
|
|
_ components: URLComponents
|
|
) {
|
|
let channelId = components.queryItems?
|
|
.first(where: { $0.name == "channelId" })?
|
|
.value
|
|
.flatMap(Int32.init)
|
|
let userNum = components.queryItems?
|
|
.first(where: { $0.name == "userNum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
let messageId = components.queryItems?
|
|
.first(where: { $0.name == "messageId" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
let state: MessagesNavigationState? = if let channelId {
|
|
.channels(channelId: channelId, messageId: messageId)
|
|
} else if let userNum {
|
|
.directMessages(userNum: userNum, messageId: messageId)
|
|
} else {
|
|
nil
|
|
}
|
|
navigationState.selectedTab = .messages
|
|
navigationState.messages = state
|
|
}
|
|
|
|
private func routeNodes(_ components: URLComponents) {
|
|
let nodeId = components.queryItems?
|
|
.first(where: { $0.name == "nodenum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
navigationState.selectedTab = .nodes
|
|
navigationState.nodeListSelectedNodeNum = nodeId
|
|
}
|
|
|
|
private func routeMap(_ components: URLComponents) {
|
|
let nodeId = components.queryItems?
|
|
.first(where: { $0.name == "nodenum" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
let waypointId = components.queryItems?
|
|
.first(where: { $0.name == "waypointId" })?
|
|
.value
|
|
.flatMap(Int64.init)
|
|
|
|
navigationState.selectedTab = .map
|
|
navigationState.map = if let nodeId {
|
|
.selectedNode(nodeId)
|
|
} else if let waypointId {
|
|
.waypoint(waypointId)
|
|
} else {
|
|
nil
|
|
}
|
|
}
|
|
|
|
private func routeSettings(_ components: URLComponents) {
|
|
let settingFromPath = components.path
|
|
.split(separator: "/")
|
|
.dropFirst()
|
|
.first
|
|
.flatMap(String.init)
|
|
.flatMap(SettingsNavigationState.init(rawValue:))
|
|
|
|
navigationState.selectedTab = .settings
|
|
navigationState.settings = settingFromPath
|
|
}
|
|
}
|