Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Register the helper again once macOS accepts it
Țugui Dragoș345589a0ab1e
diff --git a/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift b/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swiftindex f2657cdc..29c08a5b 100644--- a/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift+++ b/Packages/PeelCore/Sources/PeelCore/Removal/PrivilegedHelper.swift@@ -56,8 +56,30 @@ public enum PrivilegedHelper {status}- public static func register() throws {- try service.register()+ @concurrent+ public static func register() async throws {+ try await register(service.register, status: { status }, pause: { try await Task.sleep(for: .seconds(4)) })+ }++ static let registrationAttempts = 4++ /// macOS refuses (`EPERM`) to register a service it has just unregistered until Background Task Management has+ /// saved the change, a few seconds after the last one, and a refusal counts as a change. So a refusal is tried+ /// again after a longer pause, while the helper reads as not registered; one turned off in Login Items waits.+ static func register(+ _ attempt: () throws -> Void,+ status: () -> Status,+ pause: () async throws -> Void+ ) async throws {+ for remaining in (0..<registrationAttempts).reversed() {+ do {+ return try attempt()+ } catch let error as NSError+ where remaining > 0 && error.domain == SMAppServiceErrorDomain && error.code == Int(EPERM)+ && status() == .notRegistered {+ try await pause()+ }+ }}public static func unregister() async throws {@@ -74,7 +96,7 @@ public enum PrivilegedHelper {unregistering = error}do {- try service.register()+ try await register()} catch {throw repairFailure(registering: error, afterUnregistering: unregistering)}diff --git a/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swiftindex a0366126..8cd04e8b 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HelperRepairTests.swift@@ -7,6 +7,8 @@ struct HelperRepairTests {private let alreadyRegistered = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorAlreadyRegistered))private let notAuthorized = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorAuthorizationFailure))private let notFound = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorJobNotFound))+ private let refused = NSError(domain: SMAppServiceErrorDomain, code: Int(EPERM))+ private let denied = NSError(domain: SMAppServiceErrorDomain, code: Int(kSMErrorLaunchDeniedByUser))/// A helper that could not be unregistered is still registered, so registering it again only says so: the reason/// the repair failed is what unregistering answered.@@ -21,4 +23,64 @@ struct HelperRepairTests {let alone = PrivilegedHelper.repairFailure(registering: alreadyRegistered, afterUnregistering: nil)#expect((alone as NSError).code == Int(kSMErrorAlreadyRegistered))}++ @Test func aRefusalRightAfterUnregisteringIsTriedAgainAfterAPause() async throws {+ let registering = Registering(failures: [refused, refused])+ try await PrivilegedHelper.register(registering.attempt, status: { .notRegistered }, pause: registering.pause)+ #expect(registering.attempts == 3)+ #expect(registering.pauses == 2)+ }++ @Test func aRefusalThatLastsIsReportedAfterTheLastAttempt() async {+ let registering = Registering(failures: Array(repeating: refused, count: 10))+ await #expect(throws: refused) {+ try await PrivilegedHelper.register(+ registering.attempt, status: { .notRegistered }, pause: registering.pause+ )+ }+ #expect(registering.attempts == PrivilegedHelper.registrationAttempts)+ #expect(registering.pauses == PrivilegedHelper.registrationAttempts - 1)+ }++ @Test func anyOtherFailureIsReportedAtOnce() async {+ let registering = Registering(failures: [denied])+ await #expect(throws: denied) {+ try await PrivilegedHelper.register(+ registering.attempt, status: { .notRegistered }, pause: registering.pause+ )+ }+ #expect(registering.attempts == 1)+ #expect(registering.pauses == 0)+ }++ @Test func aRefusalOnceTheHelperWaitsForApprovalIsReportedAtOnce() async {+ let registering = Registering(failures: [refused])+ await #expect(throws: refused) {+ try await PrivilegedHelper.register(+ registering.attempt, status: { .requiresApproval }, pause: registering.pause+ )+ }+ #expect(registering.attempts == 1)+ }+}++private final class Registering: @unchecked Sendable {+ private var failures: [NSError]+ private(set) var attempts = 0+ private(set) var pauses = 0++ init(failures: [NSError]) {+ self.failures = failures+ }++ func attempt() throws {+ attempts += 1+ if !failures.isEmpty {+ throw failures.removeFirst()+ }+ }++ func pause() async throws {+ pauses += 1+ }}diff --git a/Peel/Model/HelperModel.swift b/Peel/Model/HelperModel.swiftindex 0a4ea90e..5cb4223c 100644--- a/Peel/Model/HelperModel.swift+++ b/Peel/Model/HelperModel.swift@@ -62,9 +62,12 @@ final class HelperModel {/// Registers the helper, and opens Login Items settings when it needs the user's approval. Per/// `SMAppService.h`, registering a service that is already registered, or not approved by the user,/// throws an error. Neither is reported as a failure, since the status says what happened.- func install() {+ func install() async {+ guard !isChanging else { return }+ isChanging = true+ defer { isChanging = false }do {- try PrivilegedHelper.register()+ try await PrivilegedHelper.register()} catch {refresh()if status != .requiresApproval, status != .enabled {@@ -78,6 +81,7 @@ final class HelperModel {}func repair() async {+ guard !isChanging else { return }isChanging = truedefer { isChanging = false }do {diff --git a/Peel/Views/Home/HomePermissionsView.swift b/Peel/Views/Home/HomePermissionsView.swiftindex a42dc3a5..537535da 100644--- a/Peel/Views/Home/HomePermissionsView.swift+++ b/Peel/Views/Home/HomePermissionsView.swift@@ -290,8 +290,10 @@ struct HomePermissionsContent: View {await home.refresh(helper: helper)}} else {- helper.install()- Task { await home.refresh(helper: helper) }+ Task {+ await helper.install()+ await home.refresh(helper: helper)+ }}case .notifications: Task { await home.requestNotifications() }case .fullDiskAccess, .appManagement, .finderExtension, .openAtLogin: reveal(permission)diff --git a/Peel/Views/Settings/SettingsView.swift b/Peel/Views/Settings/SettingsView.swiftindex 59253502..4077e051 100644--- a/Peel/Views/Settings/SettingsView.swift+++ b/Peel/Views/Settings/SettingsView.swift@@ -632,8 +632,9 @@ private struct HelperSettingsView: View {switch helper.standing {case .notInstalled:Button("Install Helper", systemImage: "lock.shield") {- helper.install()+ Task { await helper.install() }}+ .disabled(helper.isChanging).centeredInRow()case .waitingForApproval:Text("Allow Peel in System Settings under Login Items & Extensions.")