mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Bump version * update the translations (#1540) update the translations * Don't alert (with sound: .default) when updating Live Activity (#1536) * Fix adding channels (#1532) * Full translation into Spanish (#1529) * tapback with any emoji (#1538) * Call clearStaleNodes at start of sendWantConfig (#1535) * NFC Tag contact (#1537) * Accessorymanager background discovery (#1542) * Don't add new BLE devices to the device list in the backgournd * Bump version * Update Meshtastic/MeshtasticApp.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/MeshtasticApp.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert "Full translation into Spanish (#1529)" (#1543) This reverts commitf25fdfb89f. * Revert "update the translations (#1540)" (#1544) This reverts commitcb2fd8cc15. * Revert "NFC Tag contact (#1537)" (#1545) This reverts commit5c22b8b6e0. * Update Meshtastic/Views/Messages/TapbackInputView.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Meshtastic/Helpers/EmojiOnlyTextField.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Revert "Accessorymanager background discovery (#1542)" (#1553) This reverts commit487f24b99a. * Update protobufs * Remove UI Kit code, clean up waypoint form emoji picker * Remove redundant nested Task in tapback emoji handler (#1552) * Initial plan * Remove nested Task block in tapback handler Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> * Delete empty file * Handle nil for emoji keyboard type extension * Remove UI kit method from waypoint form emoji picker * Remove UI kit emoji picker from tapback * Add Exchange User Info (#1550) * Emoji keyboard (#1559) * Add file missing from project, must have merged badly * Remove ui kit emoji keyboard * Discovery background fixes (#1561) * Make BLE Transport an actor to fix background discovery crashes * Protobufs * Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Throw too many retries error again, remove return --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Increase connection timeout * Update protobufs * Revert "Fix adding channels (#1532)" (#1562) This reverts commitbff8ca018b. --------- Co-authored-by: MGJ <62177301+MGJ520@users.noreply.github.com> Co-authored-by: Mike Robbins <mrobbins@alum.mit.edu> Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com> Co-authored-by: Alvaro Samudio <alvarosamudio@protonmail.com> Co-authored-by: Mathew Kamkar <578302+matkam@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com> Co-authored-by: Brian Hardie <777730+bhardie@users.noreply.github.com>
395 lines
14 KiB
Swift
395 lines
14 KiB
Swift
//
|
|
// AccessoryManager+Connect.swift
|
|
// Meshtastic
|
|
//
|
|
// Created by Jake Bordens on 7/24/25.
|
|
//
|
|
|
|
import Foundation
|
|
import OSLog
|
|
import MeshtasticProtobufs
|
|
import CoreBluetooth
|
|
|
|
private let maxRetries = 1
|
|
private let retryDelay: Duration = .seconds(2)
|
|
|
|
extension AccessoryManager {
|
|
func connect(to device: Device, withConnection: Connection? = nil, wantConfig: Bool = true, wantDatabase: Bool = true, versionCheck: Bool = true) async throws {
|
|
Logger.transport.info("AccessoryManager.connect(to: \(device.name, privacy: .public), withConnection: \(withConnection != nil), wantConfig: \(wantConfig), wantDatabase: \(wantDatabase), versionCheck: \(versionCheck))")
|
|
// Prevent new connection if one is active
|
|
if activeConnection != nil {
|
|
throw AccessoryError.connectionFailed("Already connected to a device")
|
|
}
|
|
|
|
guard let transport = transportForType(device.transportType) else {
|
|
throw AccessoryError.connectionFailed("No transport for type")
|
|
}
|
|
|
|
// Clear any errors from last time
|
|
lastConnectionError = nil
|
|
packetsSent = 0
|
|
packetsReceived = 0
|
|
expectedNodeDBSize = nil
|
|
|
|
// Prepare to connect
|
|
self.connectionStepper = SequentialSteps(maxRetries: maxRetries, retryDelay: retryDelay) {
|
|
|
|
// Step 0
|
|
Step { @MainActor retryAttempt in
|
|
Logger.transport.info("🔗👟 [Connect] Starting connection to \(device.id, privacy: .public)")
|
|
if retryAttempt > 0 {
|
|
try await self.closeConnection() // clean-up before retries.
|
|
self.updateState(.retrying(attempt: retryAttempt + 1))
|
|
self.allowDisconnect = true
|
|
} else {
|
|
self.updateState(.connecting)
|
|
}
|
|
self.updateDevice(deviceId: device.id, key: \.connectionState, value: .connecting)
|
|
}
|
|
|
|
// Step 1: Setup the connection
|
|
Step(timeout: .seconds(5)) { @MainActor _ in
|
|
Logger.transport.info("🔗👟[Connect] Step 1: connection to \(device.id, privacy: .public)")
|
|
do {
|
|
let connection: Connection
|
|
if let providedConnection = withConnection {
|
|
connection = providedConnection
|
|
} else {
|
|
connection = try await transport.connect(to: device)
|
|
}
|
|
let eventStream = try await connection.connect()
|
|
self.updateState(.communicating)
|
|
self.connectionEventTask = Task {
|
|
for await event in eventStream {
|
|
self.didReceive(event)
|
|
}
|
|
Logger.transport.info("[Accessory] Event stream closed")
|
|
}
|
|
self.activeConnection = (device: device, connection: connection)
|
|
} catch let error as CBError where error.code == .peerRemovedPairingInformation {
|
|
await self.connectionStepper?.cancelCurrentlyExecutingStep(withError: AccessoryError.coreBluetoothError(error), cancelFullProcess: true)
|
|
}
|
|
}
|
|
|
|
// Step 2: Send Heartbeat before wantConfig (config)
|
|
Step { @MainActor _ in
|
|
guard wantConfig else {
|
|
Logger.transport.info("👟 [Connect] Step 2: wantConfig = false, skipping heartbeat")
|
|
return
|
|
}
|
|
Logger.transport.info("💓👟 [Connect] Step 2: Send heartbeat")
|
|
try await self.sendHeartbeat()
|
|
}
|
|
|
|
// Step 3: Send WantConfig (config)
|
|
Step(timeout: .seconds(30)) { @MainActor _ in
|
|
guard wantConfig else {
|
|
Logger.transport.info("👟 [Connect] Step 4: wantConfig = false, skipping wantConfig")
|
|
return
|
|
}
|
|
Logger.transport.info("🔗👟 [Connect] Step 3: Send wantConfig (config)")
|
|
try await self.sendWantConfig()
|
|
}
|
|
|
|
// Step 4: Send Heartbeat before wantConfig (database)
|
|
Step { @MainActor _ in
|
|
guard wantDatabase else {
|
|
Logger.transport.info("👟 [Connect] Step 4: wantDatabase = false, skipping heartbeat")
|
|
return
|
|
}
|
|
Logger.transport.info("💓 [Connect] Step 4: Send heartbeat")
|
|
try await self.sendHeartbeat()
|
|
}
|
|
|
|
// Step 5: Send WantConfig (database)
|
|
Step(timeout: .seconds(3.0), onFailure: .retryStep(attempts: 3)) { @MainActor _ in
|
|
guard wantDatabase else {
|
|
Logger.transport.info("👟 [Connect] Step 5: wantDatabase = false, skipping wantDatabase")
|
|
return
|
|
}
|
|
Logger.transport.info("🔗👟 [Connect] Step 5: Send wantConfig (database)")
|
|
self.updateState(.retrievingDatabase(nodeCount: 0))
|
|
self.allowDisconnect = true
|
|
|
|
Logger.transport.info("🔗 Saving preferredPeripheralId: \(device.id.uuidString)")
|
|
UserDefaults.preferredPeripheralId = device.id.uuidString
|
|
|
|
try await self.sendWantDatabase()
|
|
}
|
|
|
|
// Step 5a: Wait for end of WantConfig (database)
|
|
Step { @MainActor _ in
|
|
guard wantDatabase else {
|
|
Logger.transport.info("👟 [Connect] Step 4: wantDatabase = false, skipping waitForWantDatabase")
|
|
return
|
|
}
|
|
Logger.transport.info("🔗👟 [Connect] Step 5a: Wait for the final database")
|
|
try await self.waitForWantDatabaseResponse()
|
|
}
|
|
|
|
// Step 6: Version check
|
|
Step { @MainActor _ in
|
|
guard versionCheck else {
|
|
Logger.transport.info("👟 [Connect] Step 6: versionCheck = false, skipping version check")
|
|
return
|
|
}
|
|
Logger.transport.info("🔗👟 [Connect] Step 6: Version check")
|
|
|
|
guard let firmwareVersion = self.activeConnection?.device.firmwareVersion else {
|
|
Logger.transport.error("🔗 [Connect] Firmware version not available for device \(device.name, privacy: .public)")
|
|
throw AccessoryError.connectionFailed("Firmware version not available")
|
|
}
|
|
|
|
let lastDotIndex = firmwareVersion.lastIndex(of: ".")
|
|
if lastDotIndex == nil {
|
|
throw AccessoryError.versionMismatch("🚨" + "Update Your Firmware".localized)
|
|
}
|
|
|
|
let version = firmwareVersion[...(lastDotIndex ?? String.Index(utf16Offset: 6, in: firmwareVersion))].dropLast()
|
|
|
|
// TODO: do we really need to store the firmware version in the UserDefaults?
|
|
UserDefaults.firmwareVersion = String(version)
|
|
|
|
let supportedVersion = self.checkIsVersionSupported(forVersion: self.minimumVersion)
|
|
if !supportedVersion {
|
|
throw AccessoryError.connectionFailed("🚨" + "Update Your Firmware".localized)
|
|
}
|
|
}
|
|
|
|
// Step 7: Update UI and status to connected
|
|
Step { @MainActor _ in
|
|
Logger.transport.info("🔗👟 [Connect] Step 7: Update Time, UI and status")
|
|
// Send time to device
|
|
try? await self.sendTime()
|
|
|
|
// Allow disconnect here too
|
|
self.allowDisconnect = true
|
|
|
|
// We have an active connection
|
|
self.updateDevice(deviceId: device.id, key: \.connectionState, value: .connected)
|
|
self.updateState(.subscribed)
|
|
|
|
// If we successfully connected to a manual connection, then save it to the list
|
|
// Remember, Device is a value type (struct) so don't use use `device` here, thats
|
|
// The value at the instantiation of the connect process. We want the currently
|
|
// updated device object in `activeConnection` with its additonal metadata from
|
|
// NodeInfo packets.
|
|
if let activeDevice = self.activeConnection?.device, activeDevice.isManualConnection {
|
|
ManualConnectionList.shared.insert(device: activeDevice)
|
|
}
|
|
}
|
|
|
|
// Step 8: Update UI and status to connected
|
|
Step { @MainActor _ in
|
|
Logger.transport.debug("🔗👟 [Connect] Step 8: Initialize MQTT and Location Provider")
|
|
self.stopDiscovery()
|
|
await self.initializeMqtt()
|
|
self.initializeLocationProvider()
|
|
if transport.requiresPeriodicHeartbeat {
|
|
await self.setupPeriodicHeartbeat()
|
|
}
|
|
|
|
if let device = self.activeConnection?.device {
|
|
var version: String?
|
|
if let firmwareVersion = device.firmwareVersion {
|
|
if let lastDotIndex = firmwareVersion.lastIndex(of: ".") {
|
|
version = String(firmwareVersion[...(lastDotIndex)].dropLast())
|
|
} else {
|
|
version = firmwareVersion
|
|
}
|
|
}
|
|
|
|
let connectionWasRestored = (withConnection != nil)
|
|
Logger.datadog.action(.connect(firmwareVersion: version,
|
|
transportType: device.transportType.rawValue,
|
|
hardwareModel: device.hardwareModel,
|
|
nodes: self.expectedNodeDBSize,
|
|
connectionRestored: connectionWasRestored))
|
|
}
|
|
}
|
|
}
|
|
|
|
// Run the connection process
|
|
do {
|
|
try await connectionStepper?.run()
|
|
Logger.transport.debug("🔗 [Connect] ConnectionStepper completed.")
|
|
} catch {
|
|
Logger.transport.error("🔗 [Connect] Error returned by connectionStepper: \(error)")
|
|
try await self.closeConnection()
|
|
updateState(.discovering)
|
|
self.lastConnectionError = error
|
|
}
|
|
|
|
// All done, one way or another, clean up
|
|
self.connectionStepper = nil
|
|
}
|
|
}
|
|
|
|
// Sequentially stepped tasks
|
|
typealias Step = SequentialSteps.Step
|
|
actor SequentialSteps {
|
|
|
|
typealias StepClosure = @Sendable (_ retryAttempt: Int) async throws -> Void
|
|
|
|
enum FailureBehavior {
|
|
case fail
|
|
case retryStep(attempts: Int)
|
|
case retryAll
|
|
}
|
|
|
|
struct Step {
|
|
let timeout: Duration?
|
|
let failureBehavior: FailureBehavior
|
|
let operation: StepClosure
|
|
|
|
init(timeout: Duration? = nil, onFailure: FailureBehavior = .retryAll, operation: @escaping StepClosure) {
|
|
self.timeout = timeout
|
|
self.failureBehavior = onFailure
|
|
self.operation = operation
|
|
}
|
|
}
|
|
|
|
private enum SequentialStepError: Error, LocalizedError {
|
|
case timeout(stepNumber: Int, afterWaiting: Duration)
|
|
|
|
var errorDescription: String? {
|
|
switch self {
|
|
case .timeout(let stepNumber, let afterWaiting):
|
|
return "Timeout after \(afterWaiting) waiting for step \(stepNumber)."
|
|
}
|
|
}
|
|
}
|
|
let steps: [Step]
|
|
var currentlyExecutingStep: Task<Void, any Error>?
|
|
var cancelled = false
|
|
var maxRetries: Int
|
|
var retryDelay: Duration
|
|
var isRunning: Bool = false
|
|
var externalError: Error?
|
|
|
|
init(maxRetries: Int = 3, retryDelay: Duration = .seconds(3), @StepsBuilder _ builder: () -> [Step]) {
|
|
self.maxRetries = maxRetries
|
|
self.retryDelay = retryDelay
|
|
self.steps = builder()
|
|
}
|
|
|
|
func run() async throws {
|
|
self.isRunning = true
|
|
retryLoop: for attempt in 0..<maxRetries {
|
|
for stepNumber in 0..<steps.count {
|
|
if cancelled {
|
|
throw externalError ?? CancellationError()
|
|
}
|
|
let currentStep = steps[stepNumber]
|
|
let isRetry = (attempt > 0)
|
|
if isRetry {
|
|
try await Task.sleep(for: retryDelay)
|
|
}
|
|
do {
|
|
let stepRetries = if case let .retryStep(attempts) = currentStep.failureBehavior, attempts > 0 { attempts } else { 1 }
|
|
stepRetryLoop: for stepRetryAttempt in 0..<stepRetries {
|
|
if stepRetryAttempt > 0 {
|
|
Logger.transport.info("[Retry Step Loop] Retrying step \(stepNumber + 1) for the \(stepRetryAttempt + 1) time.")
|
|
try await Task.sleep(for: retryDelay)
|
|
}
|
|
do {
|
|
// Starting a new attempt for this step.
|
|
if let duration = currentStep.timeout {
|
|
// Execute this task with a timeout
|
|
self.currentlyExecutingStep = executeWithTimeout(stepNumber: stepNumber, timeout: duration) {
|
|
try await currentStep.operation(attempt)
|
|
}
|
|
try await self.currentlyExecutingStep!.value
|
|
} else {
|
|
// Execute this task without a timeout
|
|
self.currentlyExecutingStep = Task {
|
|
try await currentStep.operation(attempt)
|
|
}
|
|
try await self.currentlyExecutingStep!.value
|
|
}
|
|
break stepRetryLoop // Exit retry loop if successful
|
|
} catch {
|
|
if stepRetryAttempt == stepRetries - 1 {
|
|
// If this is the last retry attempt, we throw the error to the outer loop
|
|
throw error
|
|
} else {
|
|
switch error {
|
|
case let SequentialStepError.timeout(stepNumber, afterWaiting):
|
|
Logger.transport.info("[Inner Retry Step Loop] Sequential process timed out on step \(stepNumber) of \(stepRetries) after waiting \(afterWaiting)")
|
|
case is CancellationError:
|
|
if let externalError {
|
|
// Something from the outside had an error which caused the cancellation of this step
|
|
let errorToThrow = externalError
|
|
self.externalError = nil
|
|
throw errorToThrow
|
|
}
|
|
break stepRetryLoop
|
|
default:
|
|
Logger.transport.error("[Inner Retry Step Loop] Sequential process failed on step \(stepNumber) with error: \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} catch {
|
|
switch error {
|
|
case let SequentialStepError.timeout(stepNumber, afterWaiting):
|
|
Logger.transport.info("[Outer Step Retry Loop] Sequential process timed out on step \(stepNumber) after waiting \(afterWaiting)")
|
|
default:
|
|
Logger.transport.error("[Outer Step Retry Loop] Sequential process failed on step \(stepNumber) with error: \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
switch currentStep.failureBehavior {
|
|
case .retryAll, .retryStep:
|
|
// TODO: we could have a .retryStepAndFail and a .retryStepAndContinue instead of just .retryStep to clarify the behavior here
|
|
continue retryLoop
|
|
case .fail:
|
|
isRunning = false
|
|
throw error
|
|
}
|
|
}
|
|
}
|
|
// We have finished all steps
|
|
isRunning = false
|
|
return
|
|
}
|
|
isRunning = false
|
|
throw AccessoryError.tooManyRetries
|
|
}
|
|
|
|
func cancel() {
|
|
cancelled = true
|
|
self.currentlyExecutingStep?.cancel()
|
|
}
|
|
|
|
func cancelCurrentlyExecutingStep(withError: Error?, cancelFullProcess: Bool = false) {
|
|
self.externalError = withError
|
|
if cancelFullProcess {
|
|
cancel()
|
|
} else {
|
|
self.currentlyExecutingStep?.cancel()
|
|
}
|
|
}
|
|
|
|
func executeWithTimeout<ReturnType>(stepNumber: Int, timeout: Duration, operation: @escaping @Sendable () async throws -> ReturnType) -> Task<ReturnType, Error> {
|
|
return Task {
|
|
try await withThrowingTaskGroup(of: ReturnType.self) { group -> ReturnType in
|
|
group.addTask(operation: operation)
|
|
group.addTask {
|
|
try await _Concurrency.Task.sleep(for: timeout)
|
|
throw SequentialStepError.timeout(stepNumber: stepNumber, afterWaiting: timeout)
|
|
}
|
|
guard let success = try await group.next() else {
|
|
throw SequentialStepError.timeout(stepNumber: stepNumber, afterWaiting: timeout)
|
|
}
|
|
group.cancelAll()
|
|
return success
|
|
}
|
|
}
|
|
}
|
|
|
|
@resultBuilder
|
|
struct StepsBuilder {
|
|
static func buildBlock(_ components: Step...) -> [Step] {
|
|
return components
|
|
}
|
|
}
|
|
}
|