feat: add runSuspendCatchingWithContext

core/auth/build.gradle.kts

@@ -6,12 +6,11 @@ plugins {
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  implementation(projects.core.util)
+  api(projects.core.util)
   implementation(projects.di)
 
   implementation(libs.androidx.datastore.prefs.core)
   implementation(libs.dagger)
-  api(libs.thirdparty.kotlin.result)
 
   testImplementation(libs.testing.kotlin)
   testImplementation(libs.testing.kotlin.coroutines)

core/auth/src/main/kotlin/dev/skrilltrax/baka/core/auth/AuthManager.kt

@@ -5,24 +5,24 @@ import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.github.michaelbull.result.Result
 import dev.skrilltrax.baka.core.util.extension.runSuspendCatching
+import dev.skrilltrax.baka.core.util.extension.runSuspendCatchingWithContext
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 
 @Singleton
 public class AuthManager @Inject constructor(@Named("InternalFilesDirPath") filesDir: String) {
   private val authDataStore by preferencesDataStore(filesDir, DATASTORE_NAME)
 
-  public suspend fun getAuthToken(): Result<String, Throwable> {
-    return runSuspendCatching {
+  public suspend fun getAuthToken(): Result<String, Throwable> = runSuspendCatchingWithContext(Dispatchers.IO) {
       val authTokenKey = stringPreferencesKey(AUTH_TOKEN_KEY)
       val authToken = authDataStore.data.map { store -> store[authTokenKey] }
 
-      return@runSuspendCatching authToken.firstOrNull() ?: throw AuthTokenNotFoundException()
+      authToken.firstOrNull() ?: throw AuthTokenNotFoundException()
     }
-  }
 
   public suspend fun saveAuthToken(authToken: String): Result<String, Throwable> {
     return runSuspendCatching {

core/network/src/main/kotlin/dev/skrilltrax/baka/di/NetworkModule.kt

@@ -39,7 +39,6 @@ public object NetworkModule {
   }
 
   @Provides
-  @Singleton
   public fun provideOkHttpClient(loggingInterceptor: HttpLoggingInterceptor): OkHttpClient {
     return OkHttpClient.Builder().addInterceptor(loggingInterceptor).build()
   }
@@ -59,7 +58,6 @@ public object NetworkModule {
   }
 
   @Provides
-  @Singleton
   public fun provideMemoryCacheFactory(
     @MemoryCacheSizeLimit maxSizeBytes: Int,
     @MemoryCacheExpireTime expireAfterMillis: Long

core/util/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins { id("dev.skrilltrax.baka.kotlin-library") }
 
 dependencies {
+  api(libs.thirdparty.kotlin.result)
   implementation(libs.androidx.datastore.prefs.core)
-  implementation(libs.thirdparty.kotlin.result)
 }

core/util/src/main/kotlin/dev/skrilltrax/baka/core/util/extension/RunCatchingExtension.kt

@@ -9,15 +9,18 @@ import com.github.michaelbull.result.Result
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
+import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.withContext
 
 /**
  * Calls the specified function [block] with [this] value as its receiver and returns its
  * encapsulated result if invocation was successful, catching any [Throwable] except
  * [CancellationException] that was thrown from the [block] function execution and encapsulating it
  * as a failure.
  */
-public suspend inline fun <V> runSuspendCatching(block: () -> V): Result<V, Throwable> {
+@Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
+public suspend inline fun <V> runSuspendCatching(block: suspend () -> V): Result<V, Throwable> {
   contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) }
 
   return try {
@@ -46,3 +49,12 @@ public suspend inline infix fun <T, V> T.runSuspendCatching(
     Err(e)
   }
 }
+
+public suspend inline fun <V> runSuspendCatchingWithContext(
+  context: CoroutineContext,
+  crossinline block: suspend () -> V
+): Result<V, Throwable> =
+  withContext(context) {
+    return@withContext runSuspendCatching(block)
+  }
+