Migrate ISStoreAccount from Grand Central Dispatch to PromiseKit.

Partial #562

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>

.swiftformat

@@ -11,6 +11,7 @@
 --disable blankLinesAroundMark
 --disable consecutiveSpaces
 --disable hoistPatternLet
+--disable hoistTry
 --disable indent
 --disable trailingCommas
 

Sources/MasKit/AppStore/ISStoreAccount.swift

@@ -7,85 +7,81 @@
 //
 
 import CommerceKit
+import PromiseKit
 import StoreFoundation
 
 extension ISStoreAccount: StoreAccount {
-    static var primaryAccount: ISStoreAccount? {
+    static var primaryAccount: Promise<ISStoreAccount> {
         if #available(macOS 10.13, *) {
-            let group = DispatchGroup()
+            return race(
-            group.enter()
+                Promise<ISStoreAccount> { seal in
-
+                    ISServiceProxy.genericShared().accountService.primaryAccount { storeAccount in
-            var account: ISStoreAccount?
+                        seal.fulfill(storeAccount)
-            ISServiceProxy.genericShared().accountService.primaryAccount { storeAccount in
+                    }
-                account = storeAccount
+                },
-                group.leave()
+                after(seconds: 30).then {
-            }
+                    Promise(error: MASError.notSignedIn)
-
+                }
-            _ = group.wait(timeout: .now() + 30)
+            )
-
-            return account
         } else {
-            return CKAccountStore.shared().primaryAccount
+            return .value(CKAccountStore.shared().primaryAccount)
         }
     }
 
-    static func signIn(username: String, password: String, systemDialog: Bool = false) throws -> ISStoreAccount {
+    static func signIn(username: String, password: String, systemDialog: Bool) -> Promise<ISStoreAccount> {
         if #available(macOS 10.13, *) {
             // Signing in is no longer possible as of High Sierra.
             // https://github.com/mas-cli/mas/issues/164
-            throw MASError.notSupported
+            return Promise(error: MASError.notSupported)
         } else {
-            if let account = primaryAccount, account.isSignedIn {
+            return
-                throw MASError.alreadySignedIn(asAccountId: account.identifier)
+                primaryAccount
-            }
+                .then { account -> Promise<ISStoreAccount> in
+                    if account.isSignedIn {
+                        return Promise(error: MASError.alreadySignedIn(asAccountId: account.identifier))
+                    }
 
-            let password =
+                    let password =
-                password.isEmpty && !systemDialog
+                        password.isEmpty && !systemDialog
-                ? String(validatingUTF8: getpass("Password: "))!
+                        ? String(validatingUTF8: getpass("Password: "))!
-                : password
+                        : password
 
-            guard !password.isEmpty || systemDialog else {
+                    guard !password.isEmpty || systemDialog else {
-                throw MASError.noPasswordProvided
+                        return Promise(error: MASError.noPasswordProvided)
-            }
+                    }
 
-            let accountService = ISServiceProxy.genericShared().accountService
+                    let context = ISAuthenticationContext(accountID: 0)
-            accountService.setStoreClient(ISStoreClient(storeClientType: 0))
+                    context.appleIDOverride = username
 
-            let context = ISAuthenticationContext(accountID: 0)
+                    let signInPromise =
-            context.appleIDOverride = username
+                        Promise<ISStoreAccount> { seal in
-            if !systemDialog {
+                            let accountService = ISServiceProxy.genericShared().accountService
-                context.demoMode = true
+                            accountService.setStoreClient(ISStoreClient(storeClientType: 0))
-                context.demoAccountName = username
+                            accountService.signIn(with: context) { success, storeAccount, error in
-                context.demoAccountPassword = password
+                                if success, let storeAccount {
-                context.demoAutologinMode = true
+                                    seal.fulfill(storeAccount)
-            }
+                                } else {
+                                    seal.reject(MASError.signInFailed(error: error as NSError?))
+                                }
+                            }
+                        }
 
-            let group = DispatchGroup()
+                    if systemDialog {
-            group.enter()
+                        return signInPromise
+                    } else {
+                        context.demoMode = true
+                        context.demoAccountName = username
+                        context.demoAccountPassword = password
+                        context.demoAutologinMode = true
 
-            var storeAccount: ISStoreAccount?
+                        return race(
-            var maserror: MASError?
+                            signInPromise,
-            // Only works on macOS Sierra and below
+                            after(seconds: 30).then {
-            accountService.signIn(with: context) { success, account, error in
+                                Promise(error: MASError.signInFailed(error: nil))
-                if success, let account {
+                            }
-                    storeAccount = account
+                        )
-                } else {
+                    }
-                    maserror = .signInFailed(error: error as NSError?)
                 }
-                group.leave()
-            }
-
-            if systemDialog {
-                group.wait()
-            } else {
-                _ = group.wait(timeout: .now() + 30)
-            }
-
-            if let storeAccount {
-                return storeAccount
-            }
-
-            throw maserror ?? MASError.signInFailed(error: nil)
         }
     }
 }

Sources/MasKit/AppStore/SSPurchase.swift

@@ -45,7 +45,7 @@ extension SSPurchase {
             // Monterey obscures the user's App Store account information, but allows
             // redownloads without passing the account to SSPurchase.
             // https://github.com/mas-cli/mas/issues/417
-            if let storeAccount = ISStoreAccount.primaryAccount {
+            if let storeAccount = try? ISStoreAccount.primaryAccount.wait() {
                 accountIdentifier = storeAccount.dsID
                 appleID = storeAccount.identifier
             }

Sources/MasKit/Commands/Account.swift

@@ -24,11 +24,11 @@ public struct AccountCommand: CommandProtocol {
             return .failure(.notSupported)
         }
 
-        if let account = ISStoreAccount.primaryAccount {
+        do {
-            print(account.identifier)
+            print(try ISStoreAccount.primaryAccount.wait().identifier)
-        } else {
+            return .success(())
-            return .failure(.notSignedIn)
+        } catch {
+            return .failure(error as? MASError ?? .failed(error: error as NSError))
         }
-        return .success(())
     }
 }

Sources/MasKit/Commands/SignIn.swift

@@ -25,6 +25,7 @@ public struct SignInCommand: CommandProtocol {
                 password: options.password,
                 systemDialog: options.dialog
             )
+            .wait()
             return .success(())
         } catch {
             return .failure(error as? MASError ?? .signInFailed(error: error as NSError))

Sources/MasKit/Errors/MASError.swift

@@ -11,6 +11,8 @@ import Foundation
 public enum MASError: Error, Equatable {
     case notSupported
 
+    case failed(error: NSError?)
+
     case notSignedIn
     case noPasswordProvided
     case signInFailed(error: NSError?)
@@ -46,6 +48,12 @@ extension MASError: CustomStringConvertible {
                 For more information see: \
                 https://github.com/mas-cli/mas#%EF%B8%8F-known-issues
                 """
+        case .failed(let error):
+            if let error {
+                return "Failed: \(error.localizedDescription)"
+            } else {
+                return "Failed"
+            }
         case .signInFailed(let error):
             if let error {
                 return "Sign in failed: \(error.localizedDescription)"