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>
125 lines
4.1 KiB
Swift
125 lines
4.1 KiB
Swift
//
|
|
// SerialTransport.swift
|
|
// Meshtastic
|
|
//
|
|
// Created by Jake Bordens on 7/22/25.
|
|
//
|
|
|
|
#if targetEnvironment(macCatalyst)
|
|
|
|
import Foundation
|
|
import OSLog
|
|
import IOKit.serial
|
|
import SwiftUI
|
|
|
|
class SerialTransport: Transport {
|
|
|
|
let type: TransportType = .serial
|
|
var status: TransportStatus = .uninitialized
|
|
|
|
// Transport Properties
|
|
let requiresPeriodicHeartbeat = true
|
|
let supportsManualConnection = false
|
|
|
|
var portsAlreadyNotified = [String]()
|
|
var discoveryTask: Task<Void, Never>?
|
|
|
|
func discoverDevices() -> AsyncStream<DiscoveryEvent> {
|
|
AsyncStream { cont in
|
|
self.status = .discovering
|
|
self.discoveryTask = Task {
|
|
while !Task.isCancelled {
|
|
let ports = self.getSerialPorts()
|
|
for port in ports {
|
|
let id = port.toUUIDFormatHash() ?? UUID()
|
|
if !portsAlreadyNotified.contains(port) {
|
|
Logger.transport.info("🔱 [Serial] Port \(port, privacy: .public) found.")
|
|
let newDevice = Device(id: id,
|
|
name: port.components(separatedBy: "/").last ?? port,
|
|
transportType: .serial,
|
|
identifier: port)
|
|
cont.yield(.deviceFound(newDevice))
|
|
portsAlreadyNotified.append(port)
|
|
}
|
|
}
|
|
for knownPort in portsAlreadyNotified where !ports.contains(knownPort) {
|
|
// Previosuly seen port is no longer available
|
|
Logger.transport.info("🔱 [Serial] Port \(knownPort, privacy: .public) is no longer connected.")
|
|
if let uuid = knownPort.toUUIDFormatHash() {
|
|
cont.yield(.deviceLost(uuid))
|
|
}
|
|
portsAlreadyNotified.removeAll(where: {$0 == knownPort})
|
|
}
|
|
try? await Task.sleep(for: .seconds(5))
|
|
}
|
|
}
|
|
cont.onTermination = { _ in
|
|
self.discoveryTask?.cancel()
|
|
self.discoveryTask = nil
|
|
self.portsAlreadyNotified.removeAll()
|
|
self.status = .ready
|
|
}
|
|
}
|
|
}
|
|
|
|
// DEPRICATED: old approach is just matching filenames
|
|
// private func getSerialPorts() -> [String] {
|
|
// do {
|
|
// let dev = "/dev"
|
|
// let contents = try FileManager.default.contentsOfDirectory(atPath: dev)
|
|
// return contents.filter { $0.hasPrefix("cu.") || $0.hasPrefix("tty.") }.map { dev + "/" + $0 }
|
|
// } catch {
|
|
// Logger.transport.error("[Serial] Error listing /dev: \(error, privacy: .public)")
|
|
// return []
|
|
// }
|
|
// }
|
|
|
|
// New approach, return only specific USB serial devices
|
|
private func getSerialPorts() -> [String] {
|
|
var serialPortIterator: io_iterator_t = 0
|
|
var paths: [String] = []
|
|
|
|
// Create a matching dictionary for all serial BSD services
|
|
guard let matchingDict = IOServiceMatching(kIOSerialBSDServiceValue) as? [String: Any] else {
|
|
return []
|
|
}
|
|
_ = matchingDict.merging([kIOSerialBSDTypeKey: kIOSerialBSDAllTypes]) { _, new in new }
|
|
|
|
// Get the iterator for matching services
|
|
let result = IOServiceGetMatchingServices(kIOMainPortDefault, matchingDict as CFDictionary, &serialPortIterator)
|
|
if result != KERN_SUCCESS {
|
|
return []
|
|
}
|
|
defer { IOObjectRelease(serialPortIterator) }
|
|
|
|
// Iterate through services and extract callout paths (/dev/cu.xxx) only if they have a USB Serial Number property
|
|
var serialService: io_object_t = 0
|
|
let usbSerialKey = "USB Serial Number" as CFString
|
|
let searchOptions: IOOptionBits = UInt32(kIORegistryIterateRecursively | kIORegistryIterateParents)
|
|
|
|
repeat {
|
|
serialService = IOIteratorNext(serialPortIterator)
|
|
if serialService != 0 {
|
|
// Check for USB Serial Number in the service or its parents
|
|
if IORegistryEntrySearchCFProperty(serialService, kIOServicePlane, usbSerialKey, kCFAllocatorDefault, searchOptions) != nil {
|
|
// Property exists, so this is a USB serial device; get the path
|
|
if let path = IORegistryEntryCreateCFProperty(serialService, kIOCalloutDeviceKey as CFString, kCFAllocatorDefault, 0).takeRetainedValue() as? String {
|
|
paths.append(path)
|
|
}
|
|
}
|
|
IOObjectRelease(serialService)
|
|
}
|
|
} while serialService != 0
|
|
|
|
return paths.sorted() // Sort for consistent UX
|
|
}
|
|
|
|
func connect(to device: Device) async throws -> any Connection {
|
|
return SerialConnection(path: device.identifier)
|
|
}
|
|
|
|
func manuallyConnect(withConnectionString: String) async throws {
|
|
Logger.transport.error("🔱 [USB] This transport does not support manual connections")
|
|
}
|
|
}
|
|
#endif
|