Async/await refactoring

Author: SubvertDev

ForPDA.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@ import RouteComposer
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     @Injected(\.settingsService) private var settingsService
+    @Injected(\.cookiesService) private var cookiesService
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
@@ -27,13 +28,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         return true
     }
-
-    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
-    }
-
-    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) { }
-
 }
 
 // MARK: - Configuration
@@ -68,28 +62,7 @@ extension AppDelegate {
 
     // MARK: Cookies
 
-    func configureCookies() {
-        // We need 3 cookies to authorize: anonymous, member_id, pass_hash
-        // There's also __fixmid cookie, but it lasts for a second and then removed
-        if let cookies = HTTPCookieStorage.shared.cookies, cookies.count < 3 {
-            // Getting saved cookies if present
-            if let cookiesData = settingsService.getCookiesAsData() {
-                // Decoding custom Cookie class since HTTPCookie doesn't support Codable
-                if let cookies = try? JSONDecoder().decode([Cookie].self, from: cookiesData) {
-                    // Force-casting Cookie to HTTPCookie and setting them for 4pda.to domain
-                    let mappedCookies = cookies.map { $0.httpCookie! }
-                    HTTPCookieStorage.shared.setCookies(mappedCookies, for: URL.fourpda, mainDocumentURL: nil)
-                    // WKWebView cookies are added in SceneDelegate
-                } else {
-                    // Deleting saved cookies in defaults if we can't decode them and logout
-                    settingsService.removeCookies()
-                    settingsService.removeUser()
-                }
-            } else {
-                // Deleting all cookies in case we don't have them saved to prevent different sources of truth and logout
-                settingsService.removeCookies()
-                settingsService.removeUser()
-            }
-        }
+    private func configureCookies() {
+        cookiesService.configureCookies()
     }
 }

ForPDA/Sources/Application/AppDelegate.swift

@@ -13,33 +13,49 @@ import WebKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     @Injected(\.settingsService) private var settingsService
+    @Injected(\.cookiesService) private var cookiesService
 
     var window: UIWindow?
 
-    var webView: WKWebView!
+    var webView: WKWebView = {
+        let config = WKWebViewConfiguration()
+        let webView = WKWebView(frame: .zero, configuration: config)
+        webView.tag = 666
+        return webView
+    }()
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         self.window = UIWindow(windowScene: windowScene)
 
         window?.rootViewController = UIViewController()
+        window?.addSubview(webView)
         window?.makeKeyAndVisible()
 
         overrideApplicationThemeStyle(with: settingsService.getAppTheme())
-        configureWKWebView()
-        
-        if let url = connectionOptions.urlContexts.first?.url {
+        cookiesService.syncCookies()
+        handleNavigation(to: connectionOptions.urlContexts.first?.url)
+    }
+}
+
+extension SceneDelegate {
+    
+    // MARK: - Navigation
+    
+    private func handleNavigation(to url: URL?) {
+        if let url {
             // Cold start deeplink
             handleDeeplinkUrl(url)
         } else {
+            // Handle 'try?' later (todo)
+//            handleDeeplinkUrl(URL(string: "forpda://article/2023/10/21/419630/")!)
             try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
         }
     }
 
     private func handleDeeplinkUrl(_ url: URL) {
         if url.absoluteString == "forpda://article//" {
-            // Если share в браузере не сработал, то открываем новости
-            // todo обработать нормально
+            // If share didn't work in browser, fallback to news (also bug with share inside app) (todo)
             try? DefaultRouter().navigate(to: RouteMap.newsScreen, with: nil)
         } else {
             settingsService.setIsDeeplinking(to: true)
@@ -50,36 +66,15 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         }
     }
 
-    private func configureWKWebView() {
-        let config = WKWebViewConfiguration()
-        webView = WKWebView(frame: .zero, configuration: config)
-        webView.tag = 666
-        window?.addSubview(webView)
-        
-        for cookie in HTTPCookieStorage.shared.cookies ?? [] {
-            WKWebsiteDataStore.default().httpCookieStore.setCookie(cookie)
-        }
-    }
-    
     // Opens on existing scene
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
         if let url = URLContexts.first?.url {
             handleDeeplinkUrl(url)
         }
     }
 
-    func sceneDidDisconnect(_ scene: UIScene) { }
-
-    func sceneDidBecomeActive(_ scene: UIScene) { }
-
-    func sceneWillResignActive(_ scene: UIScene) { }
-
-    func sceneWillEnterForeground(_ scene: UIScene) { }
-
-    func sceneDidEnterBackground(_ scene: UIScene) { }
-}
-
-extension SceneDelegate {
+    // MARK: - Themes
+    
     func overrideApplicationThemeStyle(with theme: AppTheme) {
        window?.overrideUserInterfaceStyle = UIUserInterfaceStyle(rawValue: theme.ordinal())!
     }

ForPDA/Sources/Application/SceneDelegate.swift

@@ -0,0 +1,24 @@
+//
+//  UIApplication+Ext.swift
+//  ForPDA
+//
+//  Created by Ilia Lubianoi on 20.10.2023.
+//
+
+import UIKit
+
+extension UIApplication {
+    
+    var keyWindow: UIWindow? {
+        // Get connected scenes
+        return self.connectedScenes
+            // Keep only active scenes, onscreen and visible to the user
+            .filter { $0.activationState == .foregroundActive }
+            // Keep only the first `UIWindowScene`
+            .first(where: { $0 is UIWindowScene })
+            // Get its associated windows
+            .flatMap({ $0 as? UIWindowScene })?.windows
+            // Finally, keep only the key window
+            .first(where: \.isKeyWindow)
+    }
+}

ForPDA/Sources/Extensions/UIApplication+Ext.swift

@@ -7,12 +7,14 @@
 
 import Foundation
 
+// Refactor this struct (todo)
+
 struct MultipartFormDataRequest {
     private let boundary: String = UUID().uuidString
     private var httpBody = NSMutableData()
-    let url: URL
+    let url: URL?
 
-    init(url: URL) {
+    init(url: URL? = nil) {
         self.url = url
     }
 
@@ -51,7 +53,7 @@ struct MultipartFormDataRequest {
     }
 
     func asURLRequest() -> URLRequest {
-        var request = URLRequest(url: url)
+        var request = URLRequest(url: url!)
 
         request.httpMethod = "POST"
         request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
@@ -60,6 +62,16 @@ struct MultipartFormDataRequest {
         request.httpBody = httpBody as Data
         return request
     }
+    
+    func modifyRequest(_ request: inout URLRequest, with multipart: [String: String]) {
+        for (key, value) in multipart {
+            addTextField(named: key, value: value)
+        }
+        
+        request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")
+        httpBody.append("--\(boundary)--")
+        request.httpBody = httpBody as Data
+    }
 }
 
 extension NSMutableData {

ForPDA/Sources/Models/MultipartFormDataRequest.swift

@@ -7,9 +7,7 @@
 
 import Foundation
 
-protocol UserDefaultsSerializable: Codable {}
-
-struct User: UserDefaultsSerializable {
+struct User: Codable {
     let id: String
     let avatarUrl: String
     let nickname: String

ForPDA/Sources/Models/User.swift

@@ -172,7 +172,8 @@ final class ArticleBuilder {
         button.backgroundColor = .systemBlue
         button.layer.cornerRadius = 10
         button.clipsToBounds = true
-        button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
+        // Remake with configuration (todo)
+        // button.contentEdgeInsets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
 
         let container = UIView()
         container.addSubview(button)

ForPDA/Sources/Modules/Article/ArticleBuilder.swift

@@ -11,56 +11,58 @@ import Factory
 protocol ArticlePresenterProtocol {
     var article: Article { get }
 
-    func loadArticle()
+    func loadArticle() async
+    func updateComments() async
 }
 
 final class ArticlePresenter: ArticlePresenterProtocol {
 
     // MARK: - Properties
 
-    @Injected(\.networkService) private var networkService
+    @Injected(\.newsService) private var newsService
     @Injected(\.parsingService) private var parsingService
 
     weak var view: ArticleVCProtocol?
 
     var article: Article
+    private var path: [String] = []
 
     // MARK: - Init
 
     init(article: Article) {
         self.article = article
+        self.path = URL(string: article.url)?.pathComponents ?? []
     }
 
-    // MARK: - Functions
+    // MARK: - Public Functions
 
-    func loadArticle() {
-        guard let path = URL(string: article.url)?.pathComponents else {
+    @MainActor
+    func loadArticle() async {
+        do {
+            let response = try await newsService.article(path: path)
+            
+            // Deeplink case
+            if article.info == nil {
+                let articleInfo = parsingService.parseArticleInfo(from: response)
+                article.info = articleInfo
+                view?.reconfigureHeader()
+            }
+            
+            let elements = parsingService.parseArticle(from: response)
+            view?.configureArticle(with: elements)
+            view?.makeComments(from: response)
+        } catch {
             view?.showError()
-            return
         }
-        
-        networkService.getArticle(path: path) { [weak self] result in
-            guard let self else { return }
-            switch result {
-            case .success(let response):
-                // Deeplink case
-                if article.info == nil {
-                    let articleInfo = parsingService.parseArticleInfo(from: response)
-                    article.info = articleInfo
-                    DispatchQueue.main.async {
-                        self.view?.reconfigureHeader()
-                    }
-                }
-                
-                let elements = parsingService.parseArticle(from: response)
-                DispatchQueue.main.async {
-                    self.view?.configureArticle(with: elements)
-                    self.view?.makeComments(from: response)
-                }
-                
-            case .failure:
-                view?.showError()
-            }
+    }
+    
+    @MainActor
+    func updateComments() async {
+        do {
+            let response = try await newsService.article(path: path)
+            view?.updateComments(with: response)
+        } catch {
+            view?.showError()
         }
     }
 }

ForPDA/Sources/Modules/Article/ArticlePresenter.swift

@@ -16,6 +16,7 @@ protocol ArticleVCProtocol: AnyObject {
     func configureArticle(with elements: [ArticleElement])
     func reconfigureHeader()
     func makeComments(from page: String)
+    func updateComments(with document: String)
     func showError()
 }
 
@@ -45,8 +46,11 @@ final class ArticleVC: PDAViewController<ArticleView> {
         configureView()
         myView.delegate = self
 
+        // What's this if/else for? (todo)
         if presenter.article.url.contains("to/20") {
-            presenter.loadArticle()
+            Task {
+                await presenter.loadArticle()
+            }
         } else {
             myView.removeComments()
             let elements = ArticleBuilder.makeDefaultArticle(
@@ -198,27 +202,26 @@ extension ArticleVC: ArticleVCProtocol {
         alert.addAction(UIAlertAction(title: R.string.localizable.ok(), style: .default))
         present(alert, animated: true)
     }
+    
+    func updateComments(with document: String) {
+        commentsVC?.updateComments(with: document)
+    }
 }
 
 // MARK: - ArticleViewDelegate
 
 extension ArticleVC: ArticleViewDelegate {
+    
     func updateCommentsButtonTapped() {
-        commentsVC?.updateAll()
+        Task {
+            await presenter.updateComments()
+        }
     }
 }
 
 // MARK: - CommentsVCProtocol
 
 extension ArticleVC: CommentsVCProtocol {
-    func updateStarted() {
-        let image = UIImage(
-            systemSymbol: .arrowTriangle2Circlepath,
-            withConfiguration: UIImage.SymbolConfiguration(weight: .bold)
-        )
-        myView.updateCommentsButton.setImage(image, for: .normal)
-        myView.updateCommentsButton.rotate360Degrees(duration: 1, repeatCount: .infinity)
-    }
 
     func updateFinished(_ state: Bool) {
         let image = UIImage(
@@ -233,6 +236,7 @@ extension ArticleVC: CommentsVCProtocol {
 // MARK: - PDAResizingTextViewDelegate
 
 extension ArticleVC: PDAResizingTextViewDelegate {
+    
     func willOpenURL(_ url: URL) {
         analyticsService.clickLinkInArticle(currentUrl: presenter.article.url, targetUrl: url.absoluteString)
     }