mirror of
https://github.com/SideStore/SideStore.git
synced 2026-02-09 06:43:25 +01:00
* [Shared] Revises ALTLocalizedError protocol * Refactors errors to conform to revised ALTLocalizedError protocol * [Missing Commit] Remaining changes for ALTLocalizedError * [AltServer] Refactors errors to conform to revised ALTLocalizedError protocol * [Missing Commit] Declares ALTLocalizedTitleErrorKey + ALTLocalizedDescriptionKey * Updates Objective-C errors to match revised ALTLocalizedError * [Missing Commit] Unnecessary ALTLocalizedDescription logic * [Shared] Refactors NSError.withLocalizedFailure to properly support ALTLocalizedError * [Shared] Supports adding localized titles to errors via NSError.withLocalizedTitle() * Revises ErrorResponse logic to support arbitrary errors and user info values * [Missed Commit] Renames CodableServerError to CodableError * Merges ConnectionError into OperationError * [Missed Commit] Doesn’t check ALTWrappedError’s userInfo for localizedDescription * [Missed] Fixes incorrect errorDomain for ALTErrorEnums * [Missed] Removes nonexistent ALTWrappedError.h * Includes source file and line number in OperationError.unknown failureReason * Adds localizedTitle to AppManager operation errors * Fixes adding localizedTitle + localizedFailure to ALTWrappedError * Updates ToastView to use error’s localizedTitle as title * [Shared] Adds NSError.formattedDetailedDescription(with:) Returns formatted NSAttributedString containing all user info values intended for displaying to the user. * [Shared] Updates Error.localizedErrorCode to say “code” instead of “error” * Conforms ALTLocalizedError to CustomStringConvertible * Adds “View More Details” option to Error Log context menu to view detailed error description * [Shared] Fixes NSError.formattedDetailedDescription appearing black in dark mode * [AltServer] Updates error alert to match revised error logic Uses error’s localizedTitle as alert title. * [AltServer] Adds “View More Details” button to error alert to view detailed error info * [AltServer] Renames InstallError to OperationError and conforms to ALTErrorEnum * [Shared] Removes CodableError support for Date user info values Not currently used, and we don’t want to accidentally parse a non-Date as a Date in the meantime. * [Shared] Includes dynamic UserInfoValueProvider values in NSError.formattedDetailedDescription() * [Shared] Includes source file + line in NSError.formattedDetailedDescription() Automatically captures source file + line when throwing ALTErrorEnums. * [Shared] Captures source file + line for unknown errors * Removes sourceFunction from OperationError * Adds localizedTitle to AuthenticationViewController errors * [Shared] Moves nested ALTWrappedError logic to ALTWrappedError initializer * [AltServer] Removes now-redundant localized failure from JIT errors All JIT errors now have a localizedTitle which effectively says the same thing. * Makes OperationError.Code start at 1000 “Connection errors” subsection starts at 1200. * [Shared] Updates Error domains to revised [Source].[ErrorType] format * Updates ALTWrappedError.localizedDescription to prioritize using wrapped NSLocalizedDescription as failure reason * Makes ALTAppleAPIError codes start at 3000 * [AltServer] Adds relevant localizedFailures to ALTDeviceManager.installApplication() errors * Revises OperationError failureReasons and recovery suggestions All failure reasons now read correctly when preceded by a failure reason and “because”. * Revises ALTServerError error messages All failure reasons now read correctly when preceded by a failure reason and “because”. * Most failure reasons now read correctly when preceded by a failure reason and “because”. * ALTServerErrorUnderlyingError forwards all user info provider calls to underlying error. * Revises error messages for ALTAppleAPIErrorIncorrectCredentials * [Missed] Removes NSError+AltStore.swift from AltStore target * [Shared] Updates AltServerErrorDomain to revised [Source].[ErrorType] format * [Shared] Removes “code” from Error.localizedErrorCode * [Shared] Makes ALTServerError codes (appear to) start at 2000 We can’t change the actual error codes without breaking backwards compatibility, so instead we just add 2000 whenever we display ALTServerError codes to the user. * Moves VerificationError.errorFailure to VerifyAppOperation * Supports custom failure reason for OperationError.unknown * [Shared] Changes AltServerErrorDomain to “AltServer.ServerError” * [Shared] Converts ALTWrappedError to Objective-C class NSError subclasses must be written in ObjC for Swift.Error <-> NSError bridging to work correctly. * Fixes decoding CodableError nested user info values
251 lines
9.7 KiB
Swift
251 lines
9.7 KiB
Swift
//
|
|
// NSError+AltStore.swift
|
|
// AltStore
|
|
//
|
|
// Created by Riley Testut on 3/11/20.
|
|
// Copyright © 2020 Riley Testut. All rights reserved.
|
|
//
|
|
|
|
import Foundation
|
|
|
|
#if canImport(UIKit)
|
|
import UIKit
|
|
public typealias ALTFont = UIFont
|
|
#elseif canImport(AppKit)
|
|
import AppKit
|
|
public typealias ALTFont = NSFont
|
|
#endif
|
|
|
|
import AltSign
|
|
|
|
public extension NSError
|
|
{
|
|
@objc(alt_localizedFailure)
|
|
var localizedFailure: String? {
|
|
let localizedFailure = (self.userInfo[NSLocalizedFailureErrorKey] as? String) ?? (NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSLocalizedFailureErrorKey) as? String)
|
|
return localizedFailure
|
|
}
|
|
|
|
@objc(alt_localizedDebugDescription)
|
|
var localizedDebugDescription: String? {
|
|
let debugDescription = (self.userInfo[NSDebugDescriptionErrorKey] as? String) ?? (NSError.userInfoValueProvider(forDomain: self.domain)?(self, NSDebugDescriptionErrorKey) as? String)
|
|
return debugDescription
|
|
}
|
|
|
|
@objc(alt_localizedTitle)
|
|
var localizedTitle: String? {
|
|
return self.userInfo[ALTLocalizedTitleErrorKey] as? String
|
|
}
|
|
|
|
@objc(alt_errorWithLocalizedFailure:)
|
|
func withLocalizedFailure(_ failure: String) -> NSError
|
|
{
|
|
switch self
|
|
{
|
|
case var error as any ALTLocalizedError:
|
|
error.errorFailure = failure
|
|
return error as NSError
|
|
|
|
default:
|
|
var userInfo = self.userInfo
|
|
userInfo[NSLocalizedFailureReasonErrorKey] = failure
|
|
|
|
return ALTWrappedError(error: self, userInfo: userInfo)
|
|
}
|
|
}
|
|
@objc(alt_errorWithLocalizedTitle:)
|
|
func withLocalizedTitle(_ title: String) -> NSError {
|
|
switch self
|
|
{
|
|
case var error as any ALTLocalizedError:
|
|
error.errorTitle = title
|
|
return error as NSError
|
|
|
|
default:
|
|
var userInfo = self.userInfo
|
|
userInfo[ALTLocalizedTitleErrorKey] = title
|
|
return ALTWrappedError(error: self, userInfo: userInfo)
|
|
|
|
}
|
|
}
|
|
|
|
func sanitizedForSerialization() -> NSError
|
|
{
|
|
var userInfo = self.userInfo
|
|
userInfo[NSLocalizedDescriptionKey] = self.localizedDescription
|
|
userInfo[NSLocalizedFailureErrorKey] = self.localizedFailure
|
|
userInfo[NSLocalizedFailureReasonErrorKey] = self.localizedFailureReason
|
|
userInfo[NSLocalizedRecoverySuggestionErrorKey] = self.localizedRecoverySuggestion
|
|
userInfo[NSDebugDescriptionErrorKey] = self.localizedDebugDescription
|
|
// Remove userInfo values that don't conform to NSSecureEncoding.
|
|
userInfo = userInfo.filter { (key, value) in
|
|
return (value as AnyObject) is NSSecureCoding
|
|
}
|
|
|
|
// Sanitize underlying errors.
|
|
if let underlyingError = userInfo[NSUnderlyingErrorKey] as? Error
|
|
{
|
|
let sanitizedError = (underlyingError as NSError).sanitizedForSerialization()
|
|
userInfo[NSUnderlyingErrorKey] = sanitizedError
|
|
}
|
|
|
|
if #available(iOS 14.5, macOS 11.3, *), let underlyingErrors = userInfo[NSMultipleUnderlyingErrorsKey] as? [Error]
|
|
{
|
|
let sanitizedErrors = underlyingErrors.map { ($0 as NSError).sanitizedForSerialization() }
|
|
userInfo[NSMultipleUnderlyingErrorsKey] = sanitizedErrors
|
|
}
|
|
|
|
let error = NSError(domain: self.domain, code: self.code, userInfo: userInfo)
|
|
return error
|
|
}
|
|
func formattedDetailedDescription(with font: ALTFont) -> NSAttributedString {
|
|
#if canImport(UIKit)
|
|
let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.traitBold) ?? font.fontDescriptor
|
|
#else
|
|
let boldFontDescriptor = font.fontDescriptor.withSymbolicTraits(.bold)
|
|
#endif
|
|
let boldFont = ALTFont(descriptor: boldFontDescriptor, size: font.pointSize) ?? font
|
|
|
|
var preferredKeyOrder = [
|
|
NSDebugDescriptionErrorKey,
|
|
NSLocalizedDescriptionKey,
|
|
NSLocalizedFailureErrorKey,
|
|
NSLocalizedFailureReasonErrorKey,
|
|
NSLocalizedRecoverySuggestionErrorKey,
|
|
ALTLocalizedTitleErrorKey,
|
|
// ALTSourceFileErrorKey,
|
|
// ALTSourceLineErrorKey,
|
|
NSUnderlyingErrorKey
|
|
]
|
|
|
|
if #available(iOS 14.5, macOS 11.3, *) {
|
|
preferredKeyOrder.append(NSMultipleUnderlyingErrorsKey)
|
|
}
|
|
|
|
var userInfo = self.userInfo
|
|
userInfo[NSDebugDescriptionErrorKey] = self.localizedDebugDescription
|
|
userInfo[NSLocalizedDescriptionKey] = self.localizedDescription
|
|
userInfo[NSLocalizedFailureErrorKey] = self.localizedFailure
|
|
userInfo[NSLocalizedFailureReasonErrorKey] = self.localizedFailureReason
|
|
userInfo[NSLocalizedRecoverySuggestionErrorKey] = self.localizedRecoverySuggestion
|
|
|
|
let sortedUserInfo = userInfo.sorted { a, b in
|
|
let indexA = preferredKeyOrder.firstIndex(of: a.key)
|
|
let indexB = preferredKeyOrder.firstIndex(of: b.key)
|
|
switch (indexA, indexB) {
|
|
case (let indexA?, let indexB?): return indexA < indexB
|
|
case (_?, nil): return true // indexA exists, indexB is nil, indexA should come first
|
|
case (nil, _?): return false // indexB exists, indexB is nil, indexB should come first
|
|
case (nil, nil): return a.key < b.key // both nil, so sort alphabetically
|
|
}
|
|
}
|
|
|
|
let detailedDescription = NSMutableAttributedString()
|
|
|
|
for (key, value) in sortedUserInfo
|
|
{
|
|
let keyName: String
|
|
switch key
|
|
{
|
|
case NSDebugDescriptionErrorKey: keyName = NSLocalizedString("Debug Description", comment: "")
|
|
case NSLocalizedDescriptionKey: keyName = NSLocalizedString("Error Description", comment: "")
|
|
case NSLocalizedFailureErrorKey: keyName = NSLocalizedString("Failure", comment: "")
|
|
case NSLocalizedFailureReasonErrorKey: keyName = NSLocalizedString("Failure Reason", comment: "")
|
|
case NSLocalizedRecoverySuggestionErrorKey: keyName = NSLocalizedString("Recovery Suggestion", comment: "")
|
|
case ALTLocalizedTitleErrorKey: keyName = NSLocalizedString("Title", comment: "")
|
|
// case ALTSourceFileErrorKey: keyName = NSLocalizedString("Source File", comment: "")
|
|
// case ALTSourceLineErrorKey: keyName = NSLocalizedString("Source Line", comment: "")
|
|
case NSUnderlyingErrorKey: keyName = NSLocalizedString("Underlying Error", comment: "")
|
|
default:
|
|
if #available(iOS 14.5, macOS 11.3, *), key == NSMultipleUnderlyingErrorsKey
|
|
{
|
|
keyName = NSLocalizedString("Underlying Errors", comment: "")
|
|
}
|
|
else
|
|
{
|
|
keyName = key
|
|
}
|
|
}
|
|
|
|
let attributedKey = NSAttributedString(string: keyName, attributes: [.font: boldFont])
|
|
let attributedValue = NSAttributedString(string: String(describing: value), attributes: [.font: font])
|
|
|
|
let attributedString = NSMutableAttributedString(attributedString: attributedKey)
|
|
attributedString.mutableString.append("\n")
|
|
attributedString.append(attributedValue)
|
|
|
|
if !detailedDescription.string.isEmpty
|
|
{
|
|
detailedDescription.mutableString.append("\n\n")
|
|
}
|
|
|
|
detailedDescription.append(attributedString)
|
|
}
|
|
|
|
// Support dark mode
|
|
#if canImport(UIKit)
|
|
if #available(iOS 13, *)
|
|
{
|
|
detailedDescription.addAttribute(.foregroundColor, value: UIColor.label, range: NSMakeRange(0, detailedDescription.length))
|
|
}
|
|
#else
|
|
detailedDescription.addAttribute(.foregroundColor, value: NSColor.labelColor, range: NSMakeRange(0, detailedDescription.length))
|
|
#endif
|
|
|
|
return detailedDescription
|
|
}
|
|
}
|
|
|
|
public extension NSError
|
|
{
|
|
typealias UserInfoProvider = (Error, String) -> Any?
|
|
|
|
@objc
|
|
class func alt_setUserInfoValueProvider(forDomain domain: String, provider: UserInfoProvider?) {
|
|
NSError.setUserInfoValueProvider(forDomain: domain) { error, key in
|
|
let nsError = error as NSError
|
|
|
|
switch key{
|
|
case NSLocalizedDescriptionKey:
|
|
if nsError.localizedFailure != nil {
|
|
// Error has localizedFailure, so return nil to construct localizedDescription from it + localizedFailureReason
|
|
return nil
|
|
} else if let localizedDescription = provider?(error, NSLocalizedDescriptionKey) as? String {
|
|
// Only call provider() if there is no localizedFailure
|
|
return localizedDescription
|
|
}
|
|
|
|
/* Otherwise return failureReason for localizedDescription to avoid system prepending "Operation Failed" message
|
|
Do NOT return provider(NSLocalizedFailureReason) which might be unexpectedly nil if unrecognized error code. */
|
|
|
|
return nsError.localizedFailureReason
|
|
|
|
default:
|
|
return provider?(error, key)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public extension Error
|
|
{
|
|
var underlyingError: Error? {
|
|
return (self as NSError).userInfo[NSUnderlyingErrorKey] as? Error
|
|
}
|
|
|
|
var localizedErrorCode: String {
|
|
return String(format: NSLocalizedString("%@ %@", comment: ""), (self as NSError).domain, self.displayCode as NSNumber)
|
|
}
|
|
|
|
var displayCode: Int {
|
|
guard let serverError = self as? ALTServerError else {
|
|
return (self as NSError).code
|
|
}
|
|
|
|
/* We want AltServerError codes to start at 2000, but we can't change them without breaking AltServer compatibility.
|
|
Instead we just add 2000 when displaying code to the user to make it appear as if the codes start at 2000 anyway.
|
|
*/
|
|
return 2000 + serverError.code.rawValue
|
|
}
|
|
}
|