stephen/StikDebug
1
0
Fork 0
mirror of https://github.com/StikDebug/StikDebug.git synced 2026-10-16 04:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Fix cryptic error for pairing files missing required fields"

Browse source
This commit is contained in:
James 2026-07-14 07:31:14 -07:00 • committed by GitHub
parent 2b56d47fed
commit dad59fab0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
StikDebug/Device/JITEnableContext.swift
View file

@ -126,8 +126,7 @@ final class JITEnableContext {
}
if let ffiError {
let readError = error(from: ffiError, fallback: "Failed to read pairing file!")
throw Self.isMalformedPairingFile(readError) ? malformedPairingFileError(readError) : readError
throw error(from: ffiError, fallback: "Failed to read pairing file!")
}
guard let pairingFile else {
@ -137,24 +136,6 @@ final class JITEnableContext {
return pairingFile
}
/// `rp_pairing_file_read` only parses the local plist on disk — no network
/// involved — so a Serde/plist error here always means the file's contents
/// are the wrong shape (e.g. an older pairing file missing `public_key`),
/// not a transient failure a retry would fix. Reclassifying it to the same
/// code as an invalid pairing file routes it to the "select a new file"
/// prompt instead of the generic connection-error/retry flow.
private static func isMalformedPairingFile(_ error: NSError) -> Bool {
let message = error.localizedDescription.lowercased()
return message.contains("missing field") || message.contains("serde(") || message.contains("plist(error")
}
private func malformedPairingFileError(_ underlying: NSError) -> NSError {
makeError(
"The pairing file is missing data StikDebug needs (\(underlying.localizedDescription)). It's likely the wrong format or an incomplete export — select a new pairing file.",
code: -9
)
}
private func createTunnel(hostname: String) throws -> TunnelHandles {
let pairingFile = try getPairingFile()
defer { rp_pairing_file_free(pairingFile) }