refactor

hoc081098 · hoc081098 · commit 2f90fda66b56 · 2023-03-18T19:12:55.000+07:00
diff --git a/iosApp/iosApp/AppError+readableErrorMessage.swift b/iosApp/iosApp/AppError+readableErrorMessage.swift
@@ -2,7 +2,7 @@
 //  AppError+readableErrorMessage.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/15/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/15/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/DIContainer+get.swift b/iosApp/iosApp/DIContainer+get.swift
@@ -2,7 +2,7 @@
 //  DIContainer+get.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/15/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/15/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/ErrorMessageAndButton.swift b/iosApp/iosApp/ErrorMessageAndButton.swift
@@ -2,7 +2,7 @@
 //  ErrorMessageAndButton.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubEmptySearch.swift b/iosApp/iosApp/GithubEmptySearch.swift
@@ -2,7 +2,7 @@
 //  GithubEmptySearch.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemRow.swift b/iosApp/iosApp/GithubRepoItemRow.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemRow.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemsFirstPage.swift b/iosApp/iosApp/GithubRepoItemsFirstPage.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemsFirstPage.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/GithubRepoItemsList.swift b/iosApp/iosApp/GithubRepoItemsList.swift
@@ -2,7 +2,7 @@
 //  GithubRepoItemsList.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/16/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/16/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/IOSGithubSearchViewModel.swift b/iosApp/iosApp/IOSGithubSearchViewModel.swift
@@ -2,7 +2,7 @@
 //  IOSGithubSearchViewModel.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/18/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/18/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/Color+init.swift b/iosApp/iosApp/Utils/Color+init.swift
@@ -2,7 +2,7 @@
 //  Color+init.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/25/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/25/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/LazyView.swift b/iosApp/iosApp/Utils/LazyView.swift
@@ -2,7 +2,7 @@
 //  LazyView.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/18/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/18/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/Napier.swift b/iosApp/iosApp/Utils/Napier.swift
@@ -2,7 +2,7 @@
 //  Napier.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
@@ -128,7 +128,7 @@ extension Napier {
     function: String
   ) {
     let message = items.map { "\($0)" }.joined(separator: separator)
-    
+
     let throwable: KotlinThrowable?
     if let error = error {
       throwable = NSErrorKt.asThrowable(error)
diff --git a/iosApp/iosApp/Utils/Once.swift b/iosApp/iosApp/Utils/Once.swift
@@ -2,7 +2,7 @@
 //  Once.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/UIColor+init.swift b/iosApp/iosApp/Utils/UIColor+init.swift
@@ -2,7 +2,7 @@
 //  UIColor+init.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/17/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/17/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
diff --git a/iosApp/iosApp/Utils/kotlinxCoroutinesFlowExtensions.swift b/iosApp/iosApp/Utils/kotlinxCoroutinesFlowExtensions.swift
@@ -2,7 +2,7 @@
 //  flows.swift
 //  iosApp
 //
-//  Created by Hoc Nguyen T. on 7/14/22.
+//  Created by Petrus Nguyen Thai Hoc on 7/14/22.
 //  Copyright © 2022 orgName. All rights reserved.
 //
 
@@ -11,40 +11,64 @@ import shared
 import Combine
 
 private let emptyOnComplete = { }
-private let defaultOnError = { (error: KotlinThrowable) in
-  Napier.e(error: error.asError(), "Unhandled error")
+private let defaultOnError = { (error: Error) in
+  Napier.e(error: error, "Unhandled error")
   fatalError("Unhandled error = \(error)")
 }
 
 extension StateFlow {
-  func typedValue<T>(_ type: T.Type = T.self) -> T {
-    value as! T
-  }
+  func typedValue<T>(_ type: T.Type = T.self) -> T { value as! T }
 }
 
 extension Flow {
+  // MARK: Flow<T>
   @discardableResult
   func subscribeNonNullFlow<T: AnyObject>(
     _ type: T.Type = T.self,
     scope: CoroutineScope,
     onValue: @escaping (T) -> Void,
-    onError: ((KotlinThrowable) -> Void)? = nil,
+    onError: ((Error) -> Void)? = nil,
     onComplete: (() -> Void)? = nil
-  ) -> Closeable {
+  ) -> JoinableAndCloseable {
     NonNullFlowWrapper<T>(flow: self).subscribe(
       scope: scope,
       onValue: onValue,
-      onError: onError ?? defaultOnError,
+      onError: { throwable in
+        (onError ?? defaultOnError)(throwable.asNSError())
+      },
       onComplete: onComplete ?? emptyOnComplete
     )
   }
 
   func asNonNullPublisher<T: AnyObject>(_ type: T.Type = T.self) -> AnyPublisher<T, Error> {
     NonNullFlowPublisher(flow: self).eraseToAnyPublisher()
   }
-}
 
+  // MARK: - Flow<T?>
+  @discardableResult
+  func subscribeNullableFlow<T: AnyObject>(
+    _ type: T.Type = T.self,
+    scope: CoroutineScope,
+    onValue: @escaping (T?) -> Void,
+    onError: ((Error) -> Void)? = nil,
+    onComplete: (() -> Void)? = nil
+  ) -> JoinableAndCloseable {
+    NullableFlowWrapper<T>(flow: self).subscribe(
+      scope: scope,
+      onValue: onValue,
+      onError: { throwable in
+        (onError ?? defaultOnError)(throwable.asNSError())
+      },
+      onComplete: onComplete ?? emptyOnComplete
+    )
+  }
 
+  func asNullablePublisher<T: AnyObject>(_ type: T.Type = T.self) -> AnyPublisher<T?, Error> {
+    NullableFlowPublisher(flow: self).eraseToAnyPublisher()
+  }
+}
+
+// MARK: - NonNullFlowPublisher
 private struct NonNullFlowPublisher<T: AnyObject>: Publisher {
   typealias Output = T
   typealias Failure = Error
@@ -75,19 +99,78 @@ private class NonNullFlowSubscription<T: AnyObject, S: Subscriber>: Subscription
   ) {
     self.subscriber = subscriber
 
-    let scope = DIContainer.shared
-      .get(
-        for: AppCoroutineScope.self,
-        qualifier: AppModuleKt.MainAppCoroutineScope
-      )
+    let dispatcher = DIContainer.shared
+      .get(for: AppCoroutineDispatchers.self)
+      .unconfined
+    let scope = CoroutineScopeKt.CoroutineScope(context: dispatcher)
+
+    self.closable = flow.subscribeNonNullFlow(
+      scope: scope,
+      onValue: {
+        _ = subscriber.receive($0)
+      },
+      onError: {
+        subscriber.receive(completion: .failure($0))
+      },
+      onComplete: {
+        subscriber.receive(completion: .finished)
+      }
+    )
+  }
+
+  func request(_ demand: Subscribers.Demand) { }
+
+  func cancel() {
+    self.subscriber = nil
+
+    self.closable?.close()
+    self.closable = nil
+  }
+}
+
+// MARK: - NullableFlowPublisher
+private struct NullableFlowPublisher<T: AnyObject>: Publisher {
+  typealias Output = T?
+  typealias Failure = Error
+
+  private let flow: Flow
+
+  init(flow: Flow) {
+    self.flow = flow
+  }
+
+  func receive<S>(subscriber: S) where S: Subscriber, Error == S.Failure, T? == S.Input {
+    let subscription = NullableFlowSubscription(
+      flow: flow,
+      subscriber: subscriber
+    )
+    subscriber.receive(subscription: subscription)
+  }
+}
+
+private class NullableFlowSubscription<T: AnyObject, S: Subscriber>: Subscription where S.Input == T?, S.Failure == Error {
+
+  private var subscriber: S?
+  private var closable: Closeable?
+
+  init(
+    flow: Flow,
+    subscriber: S
+  ) {
+    self.subscriber = subscriber
+
+    let dispatcher = DIContainer.shared
+      .get(for: AppCoroutineDispatchers.self)
+      .unconfined
+    let scope = CoroutineScopeKt.CoroutineScope(context: dispatcher)
 
     self.closable = flow.subscribeNonNullFlow(
       scope: scope,
       onValue: {
         _ = subscriber.receive($0)
       },
       onError: {
-        subscriber.receive(completion: .failure($0.asError()))
+        subscriber.receive(completion: .failure($0))
       },
       onComplete: {
         subscriber.receive(completion: .finished)
