-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Surface specific XPC & login item errors (#819)
Task/Issue URL: https://app.asana.com/0/72649045549333/1207013105069620/f iOS PR:duckduckgo/iOS#2872 macOS PR: duckduckgo/macos-browser#2773
- Loading branch information
1 parent
03e6b71
commit 79fe0c9
Showing
10 changed files
with
304 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // | ||
| // KnownFailure.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public protocol SilentErrorConvertible: Error { | ||
| var asSilentError: KnownFailure.SilentError? { get } | ||
| } | ||
|
|
||
| @objc | ||
| final public class KnownFailure: NSObject, Codable { | ||
| public typealias SilentErrorCode = Int | ||
|
|
||
| public enum SilentError: SilentErrorCode { | ||
| case operationNotPermitted | ||
| case loginItemVersionMismatched | ||
| case registeredServerFetchingFailed | ||
| } | ||
|
|
||
| public let error: SilentErrorCode | ||
|
|
||
| public init?(_ error: Error?) { | ||
| if let nsError = error as? NSError, nsError.domain == "SMAppServiceErrorDomain", nsError.code == 1 { | ||
| self.error = SilentError.operationNotPermitted.rawValue | ||
| return | ||
| } | ||
|
|
||
| if let error = error as? SilentErrorConvertible, let silentError = error.asSilentError { | ||
| self.error = silentError.rawValue | ||
| return | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
| } |
26 changes: 26 additions & 0 deletions
26
Sources/NetworkProtection/Status/KnownFailureObserver/KnownFailureObserver.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // | ||
| // KnownFailureObserver.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Combine | ||
| import Foundation | ||
| import NetworkExtension | ||
|
|
||
| public protocol KnownFailureObserver { | ||
| var publisher: AnyPublisher<KnownFailure?, Never> { get } | ||
| var recentValue: KnownFailure? { get } | ||
| } |
60 changes: 60 additions & 0 deletions
60
...ion/Status/KnownFailureObserver/KnownFailureObserverThroughDistributedNotifications.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // | ||
| // KnownFailureObserverThroughDistributedNotifications.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| #if os(macOS) | ||
|
|
||
| import Combine | ||
| import Foundation | ||
| import NetworkExtension | ||
| import NotificationCenter | ||
|
|
||
| public class KnownFailureObserverThroughDistributedNotifications: KnownFailureObserver { | ||
| public lazy var publisher = subject.eraseToAnyPublisher() | ||
| public var recentValue: KnownFailure? { | ||
| subject.value | ||
| } | ||
|
|
||
| private let subject = CurrentValueSubject<KnownFailure?, Never>(nil) | ||
|
|
||
| private let distributedNotificationCenter: DistributedNotificationCenter | ||
| private var cancellable: AnyCancellable? | ||
|
|
||
| public init(distributedNotificationCenter: DistributedNotificationCenter = .default()) { | ||
| self.distributedNotificationCenter = distributedNotificationCenter | ||
|
|
||
| start() | ||
| } | ||
|
|
||
| private func start() { | ||
| cancellable = distributedNotificationCenter.publisher(for: .knownFailureUpdated).sink { [weak self] notification in | ||
| self?.handleKnownFailureUpdated(notification) | ||
| } | ||
| } | ||
|
|
||
| private func handleKnownFailureUpdated(_ notification: Notification) { | ||
| if let object = notification.object as? String, | ||
| let data = object.data(using: .utf8), | ||
| let failure = try? JSONDecoder().decode(KnownFailure.self, from: data) { | ||
| subject.send(failure) | ||
| } else { | ||
| subject.send(nil) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
Sources/NetworkProtection/Storage/NetworkProtectionKnownFailureStore.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // | ||
| // NetworkProtectionKnownFailureStore.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Common | ||
|
|
||
| final public class NetworkProtectionKnownFailureStore { | ||
| private static let lastKnownFailureKey = "com.duckduckgo.NetworkProtectionKnownFailureStore.knownFailure" | ||
| private let userDefaults: UserDefaults | ||
|
|
||
| #if os(macOS) | ||
| private let distributedNotificationCenter: DistributedNotificationCenter | ||
|
|
||
| public init(userDefaults: UserDefaults = .standard, | ||
| distributedNotificationCenter: DistributedNotificationCenter = .default()) { | ||
| self.userDefaults = userDefaults | ||
| self.distributedNotificationCenter = distributedNotificationCenter | ||
| } | ||
| #else | ||
| public init(userDefaults: UserDefaults = .standard) { | ||
| self.userDefaults = userDefaults | ||
| } | ||
| #endif | ||
|
|
||
| public var lastKnownFailure: KnownFailure? { | ||
| get { | ||
| guard let data = userDefaults.data(forKey: Self.lastKnownFailureKey) else { return nil } | ||
| return try? JSONDecoder().decode(KnownFailure.self, from: data) | ||
| } | ||
|
|
||
| set { | ||
| if let newValue, let data = try? JSONEncoder().encode(newValue) { | ||
| userDefaults.set(data, forKey: Self.lastKnownFailureKey) | ||
| #if os(macOS) | ||
| postKnownFailureUpdatedNotification(data: data) | ||
| #endif | ||
| } else { | ||
| userDefaults.removeObject(forKey: Self.lastKnownFailureKey) | ||
| #if os(macOS) | ||
| postKnownFailureUpdatedNotification() | ||
| #endif | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public func reset() { | ||
| lastKnownFailure = nil | ||
| } | ||
|
|
||
| // MARK: - Posting Notifications | ||
|
|
||
| #if os(macOS) | ||
| private func postKnownFailureUpdatedNotification(data: Data? = nil) { | ||
| let object: String? = { | ||
| guard let data else { return nil } | ||
| return String(data: data, encoding: .utf8) | ||
| }() | ||
| distributedNotificationCenter.post(.knownFailureUpdated, object: object) | ||
| } | ||
| #endif | ||
| } |
30 changes: 30 additions & 0 deletions
30
Sources/NetworkProtectionTestUtils/Status/MockKnownFailureObserver.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // | ||
| // MockKnownFailureObserver.swift | ||
| // | ||
| // Copyright © 2024 DuckDuckGo. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import Combine | ||
| import Foundation | ||
| import NetworkProtection | ||
|
|
||
| public final class MockKnownFailureObserver: KnownFailureObserver { | ||
| public init() {} | ||
| public let subject = CurrentValueSubject<KnownFailure?, Never>(nil) | ||
| public lazy var publisher = subject.eraseToAnyPublisher() | ||
| public var recentValue: KnownFailure? { | ||
| subject.value | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.