migrate to gradle

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/data/repository/HistoryDatesRepository.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.PsychomatrixBase.data.repository
 
-import kotlinx.coroutines.experimental.Deferred
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 
 interface HistoryDatesRepository {

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/data/repository/realisations/HistoryDatesRepositoryImpl.kt

@@ -2,21 +2,21 @@ package com.github.insanusmokrassar.PsychomatrixBase.data.repository.realisation
 
 import com.github.insanusmokrassar.PsychomatrixBase.data.repository.HistoryDatesRepository
 import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.CalculatePsychomatrixByDateUseCase
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_EXTRA_SMALL
 import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.subscribe
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.BroadcastChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 
 abstract class HistoryDatesRepositoryImpl(
     calculatePsychomatrixByDateUseCase: CalculatePsychomatrixByDateUseCase
 ) : HistoryDatesRepository {
-    private val dateAddedBroadcast = BroadcastChannel<DateTime>(SUBSCRIPTIONS_EXTRA_SMALL)
-    private val dateRemovedBroadcast = BroadcastChannel<DateTime>(SUBSCRIPTIONS_EXTRA_SMALL)
+    private val scope = CoroutineScope(Dispatchers.Default)
+    private val dateAddedBroadcast = BroadcastChannel<DateTime>(8)
+    private val dateRemovedBroadcast = BroadcastChannel<DateTime>(8)
 
     init {
-        launch {
+        scope.launch {
             calculatePsychomatrixByDateUseCase.openPsychomatrixCreatedSubscription().subscribe {
                 it.date.also {
                     date ->
@@ -41,7 +41,7 @@ abstract class HistoryDatesRepositoryImpl(
     protected abstract fun onDateCalculated(dateTime: DateTime)
 
     override suspend fun removeDate(date: DateTime): Deferred<Boolean> {
-        return async {
+        return scope.async {
             internalRemoveDate(date).also {
                 if (it) {
                     dateRemovedBroadcast.send(date)

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/UseCases/CalculatePsychomatrixByDateUseCase.kt

@@ -1,8 +1,8 @@
 package com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
-import kotlinx.coroutines.experimental.Deferred
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 import java.util.*
 

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/UseCases/CeilDescriptionUseCase.kt

@@ -2,7 +2,7 @@ package com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilInfo
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilState
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 typealias CeilDescriptionReady = Pair<CeilState, CeilInfo>
 

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/UseCases/ModifyPsychomatrixUseCase.kt

@@ -3,7 +3,7 @@ package com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.MutablePsychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.operations.Operation
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 typealias PsychomatrixOperationIsConvert = Pair<MutablePsychomatrix, Pair<Operation, Boolean>>
 

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/interactors/CalculatePsychomatrixByDateUseCaseInteractor.kt

@@ -2,23 +2,22 @@ package com.github.insanusmokrassar.PsychomatrixBase.domain.interactors
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.CalculatePsychomatrixByDateUseCase
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_MEDIUM
-import kotlinx.coroutines.experimental.Deferred
-import kotlinx.coroutines.experimental.async
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.BroadcastChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 import java.util.*
 
 class CalculatePsychomatrixByDateUseCaseInteractor : CalculatePsychomatrixByDateUseCase {
-    private val psychomatrixCreatedBroadcast = BroadcastChannel<Psychomatrix>(SUBSCRIPTIONS_MEDIUM)
+    private val scope = CoroutineScope(Dispatchers.Default)
+    private val psychomatrixCreatedBroadcast = BroadcastChannel<Psychomatrix>(16)
 
     override suspend fun calculate(date: Long): Deferred<Psychomatrix> {
         return calculate(DateTime(date))
     }
 
     override suspend fun calculate(date: DateTime): Deferred<Psychomatrix> {
-        return async {
+        return scope.async {
             Psychomatrix(date).also {
                 psychomatrixCreatedBroadcast.send(it)
             }

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/interactors/CeilDescriptionInteractor.kt

@@ -4,18 +4,17 @@ import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.CeilDescript
 import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.CeilDescriptionUseCase
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilInfo
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilState
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_EXTRA_SMALL
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_SMALL
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.BroadcastChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 class CeilDescriptionInteractor : CeilDescriptionUseCase {
+    private val scope = CoroutineScope(Dispatchers.Default)
     private val ceilDescriptionReadyBroadcastChannel = BroadcastChannel<CeilDescriptionReady>(
-        SUBSCRIPTIONS_SMALL
+        16
     )
     private val ceilDescriptionRequestedBroadcastChannel = BroadcastChannel<CeilState>(
-        SUBSCRIPTIONS_EXTRA_SMALL
+        8
     )
 
     override fun openCeilDescriptionReadySubscription(): ReceiveChannel<CeilDescriptionReady> {
@@ -27,13 +26,13 @@ class CeilDescriptionInteractor : CeilDescriptionUseCase {
     }
 
     override fun descriptionReady(ceilState: CeilState, ceilInfo: CeilInfo) {
-        launch {
+        scope.launch {
             ceilDescriptionReadyBroadcastChannel.send(ceilState to ceilInfo)
         }
     }
 
     override fun requestDescription(ceilState: CeilState) {
-        launch {
+        scope.launch {
             ceilDescriptionRequestedBroadcastChannel.send(
                 ceilState
             )

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/domain/interactors/ModifyPsychomatrixUseCaseInteractor.kt

@@ -5,15 +5,15 @@ import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.MutablePsychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.operations.Operation
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_MEDIUM
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.BroadcastChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 class ModifyPsychomatrixUseCaseInteractor : ModifyPsychomatrixUseCase {
+    private val scope = CoroutineScope(Dispatchers.Default)
     private val currentPsychomatrixes: MutableList<MutablePsychomatrix> = ArrayList()
 
-    private val psychomatrixChangedBroadcastChannel = BroadcastChannel<PsychomatrixOperationIsConvert>(SUBSCRIPTIONS_MEDIUM)
+    private val psychomatrixChangedBroadcastChannel = BroadcastChannel<PsychomatrixOperationIsConvert>(16)
 
     override fun openPsychomatrixChangedSubscription(): ReceiveChannel<PsychomatrixOperationIsConvert> {
         return psychomatrixChangedBroadcastChannel.openSubscription()
@@ -22,7 +22,7 @@ class ModifyPsychomatrixUseCaseInteractor : ModifyPsychomatrixUseCase {
     override fun makeConvert(psychomatrix: MutablePsychomatrix, operation: Operation): Boolean {
         return asMutablePsychomatrix(psychomatrix).applyConvert(operation).also {
             if (it) {
-                launch {
+                scope.launch {
                     psychomatrixChangedBroadcastChannel.send(psychomatrix to (operation to true))
                 }
             }
@@ -31,7 +31,7 @@ class ModifyPsychomatrixUseCaseInteractor : ModifyPsychomatrixUseCase {
 
     override fun makeInvert(psychomatrix: MutablePsychomatrix, operation: Operation): Boolean {
         return asMutablePsychomatrix(psychomatrix).applyInvert(operation).also {
-            launch {
+            scope.launch {
                 psychomatrixChangedBroadcastChannel.send(psychomatrix to (operation to false))
             }
         }

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/CeilDescriptionPresenter.kt

@@ -2,7 +2,7 @@ package com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilInfo
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilState
-import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.Deferred
 
 interface CeilDescriptionPresenter {
     fun onUserChooseCeil(ceilState: CeilState): Deferred<CeilInfo>

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/DatePickerPresenter.kt

@@ -1,7 +1,7 @@
 package com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 
 interface DatePickerPresenter {

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/DefaultRealisations/CeilDescriptionPresenterImpl.kt

@@ -6,13 +6,15 @@ import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilState
 import com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters.CeilDescriptionPresenter
 import com.github.insanusmokrassar.PsychomatrixBase.utils.Container
 import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.subscribeChecking
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.*
 
 class CeilDescriptionPresenterImpl(
     private val ceilDescriptionUseCase: CeilDescriptionUseCase
 ) : CeilDescriptionPresenter {
+    private val scope = CoroutineScope(Dispatchers.Default)
+
     override fun onUserChooseCeil(ceilState: CeilState): Deferred<CeilInfo> {
-        return async {
+        return scope.async {
             val container = Container<CeilInfo>()
             val subscription = ceilDescriptionUseCase.openCeilDescriptionReadySubscription().subscribeChecking(
                 {

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/DefaultRealisations/DatePickerPresenterImpl.kt

@@ -3,16 +3,17 @@ package com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters.Def
 import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.CalculatePsychomatrixByDateUseCase
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters.DatePickerPresenter
-import com.github.insanusmokrassar.PsychomatrixBase.utils.extensions.SUBSCRIPTIONS_MEDIUM
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.BroadcastChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 import org.joda.time.DateTime
 
 class DatePickerPresenterImpl(
-    private val CalculatePsychomatrixByDateUseCase: CalculatePsychomatrixByDateUseCase
+    private val CalculatePsychomatrixByDateUseCase: CalculatePsychomatrixByDateUseCase,
+    broadcastChannelCapacity: Int = 4
 ) : DatePickerPresenter {
-    private val psychomatrixCreateBroadcastChannel = BroadcastChannel<Psychomatrix>(SUBSCRIPTIONS_MEDIUM)
+    private val scope = CoroutineScope(Dispatchers.Default)
+    private val psychomatrixCreateBroadcastChannel = BroadcastChannel<Psychomatrix>(broadcastChannelCapacity)
 
     override suspend fun openPsychomatrixCreatedSubscription(): ReceiveChannel<Psychomatrix> {
         return psychomatrixCreateBroadcastChannel.openSubscription()
@@ -23,7 +24,7 @@ class DatePickerPresenterImpl(
     }
 
     override fun userPickDate(date: DateTime) {
-        launch {
+        scope.launch {
             CalculatePsychomatrixByDateUseCase.calculate(date).await().also {
                 psychomatrixCreateBroadcastChannel.send(it)
             }

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/DefaultRealisations/ModifyPsychomatrixPresenterImpl.kt

@@ -6,7 +6,7 @@ import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.MutablePsych
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.operations.Operation
 import com.github.insanusmokrassar.PsychomatrixBase.presentation.presenters.ModifyPsychomatrixPresenter
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 class ModifyPsychomatrixPresenterImpl(
     private val modifyPsychomatrixUseCase: ModifyPsychomatrixUseCase

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/presentation/presenters/ModifyPsychomatrixPresenter.kt

@@ -4,7 +4,7 @@ import com.github.insanusmokrassar.PsychomatrixBase.domain.UseCases.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.MutablePsychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.Psychomatrix
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.operations.Operation
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.channels.ReceiveChannel
 
 interface ModifyPsychomatrixPresenter {
 

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/utils/CeilDescriptions/CeilInfoResolver.kt

@@ -2,14 +2,11 @@ package com.github.insanusmokrassar.PsychomatrixBase.utils.CeilDescriptions
 
 import com.github.insanusmokrassar.PsychomatrixBase.utils.CeilDescriptions.models.CeilsInfosRoot
 import com.github.insanusmokrassar.PsychomatrixBase.utils.FilesLoader.load
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
+import kotlinx.serialization.json.Json
 import java.io.InputStreamReader
 
 const val characteristicsFolder = "characteristics"
 
-private val gson: Gson = GsonBuilder().create()
-
 val availableTranslations = listOf(
     "en_US",
     "ru_RU"
@@ -30,6 +27,6 @@ private fun findSubTranslation(language: String): String {
 
 fun resolveCeilsDescriptionsByLanguage(language: String = "en_US"): CeilsInfosRoot {
     return load("$characteristicsFolder/${findSubTranslation(language)}.json").let {
-        gson.fromJson(InputStreamReader(it), CeilsInfosRoot::class.java)
+        Json.nonstrict.parse(CeilsInfosRoot.serializer(), InputStreamReader(it).readText())
     }
 }

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/utils/CeilDescriptions/models/CeilInfoConfig.kt

@@ -1,7 +1,9 @@
 package com.github.insanusmokrassar.PsychomatrixBase.utils.CeilDescriptions.models
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilInfo
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class CeilInfoConfig(
     val title: String = "",
     val description: String = "",

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/utils/CeilDescriptions/models/CeilsInfosRoot.kt

@@ -2,7 +2,9 @@ package com.github.insanusmokrassar.PsychomatrixBase.utils.CeilDescriptions.mode
 
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilInfo
 import com.github.insanusmokrassar.PsychomatrixBase.domain.entities.CeilState
+import kotlinx.serialization.Serializable
 
+@Serializable
 data class CeilsInfosRoot(
     val language: String? = "en_US",
     private val descriptionsList: List<List<CeilInfoConfig>> = emptyList()

src/main/kotlin/com/github/insanusmokrassar/PsychomatrixBase/utils/extensions/ReceiveChannel.kt

@@ -1,44 +1,128 @@
 package com.github.insanusmokrassar.PsychomatrixBase.utils.extensions
 
-import kotlinx.coroutines.experimental.*
-import kotlinx.coroutines.experimental.channels.BroadcastChannel
-import kotlinx.coroutines.experimental.channels.ReceiveChannel
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.*
 import java.util.concurrent.TimeUnit
 
-const val SUBSCRIPTIONS_LARGE = 256
-const val SUBSCRIPTIONS_MEDIUM = 128
-const val SUBSCRIPTIONS_SMALL = 64
-const val SUBSCRIPTIONS_EXTRA_SMALL = 32
-const val SUBSCRIPTIONS_SINGLE = 1
+private sealed class DebounceAction<T> {
+    abstract val value: T
+}
+
+private data class AddValue<T>(override val value: T) : DebounceAction<T>()
+private data class RemoveJob<T>(override val value: T, val job: Job) : DebounceAction<T>()
+
+fun <T> ReceiveChannel<T>.debounceByValue(
+    delayMillis: Long,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    resultBroadcastChannelCapacity: Int = 32
+): ReceiveChannel<T> {
+    val outChannel = Channel<T>(resultBroadcastChannelCapacity)
+    val values = HashMap<T, Job>()
+
+    val channel = Channel<DebounceAction<T>>(Channel.UNLIMITED)
+    scope.launch {
+        for (action in channel) {
+            when (action) {
+                is AddValue -> {
+                    val msg = action.value
+                    values[msg] ?.cancel()
+                    lateinit var job: Job
+                    job = launch {
+                        delay(delayMillis)
+
+                        outChannel.send(msg)
+                        channel.send(RemoveJob(msg, job))
+                    }
+                    values[msg] = job
+                }
+                is RemoveJob -> if (values[action.value] == action.job) {
+                    values.remove(action.value)
+                }
+            }
+
+        }
+    }
+
+    scope.launch {
+        for (msg in this@debounceByValue) {
+            channel.send(AddValue(msg))
+        }
+    }
+
+    return outChannel
+}
+
+typealias AccumulatedValues<K, V> = Pair<K, List<V>>
+
+fun <K, V> ReceiveChannel<Pair<K, V>>.accumulateByKey(
+    delayMillis: Long,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    resultBroadcastChannelCapacity: Int = 32
+): ReceiveChannel<AccumulatedValues<K, V>> {
+    val outChannel = Channel<AccumulatedValues<K, V>>(resultBroadcastChannelCapacity)
+    val values = HashMap<K, MutableList<V>>()
+    val jobs = HashMap<K, Job>()
+
+    val channel = Channel<DebounceAction<Pair<K, V>>>(Channel.UNLIMITED)
+    scope.launch {
+        for (action in channel) {
+            val (key, value) = action.value
+            when (action) {
+                is AddValue -> {
+                    jobs[key] ?.cancel()
+                    (values[key] ?: mutableListOf<V>().also { values[key] = it }).add(value)
+                    lateinit var job: Job
+                    job = launch {
+                        delay(delayMillis)
+
+                        values[key] ?.let {
+                            outChannel.send(key to it)
+                            channel.send(RemoveJob(key to value, job))
+                        }
+                    }
+                    jobs[key] = job
+                }
+                is RemoveJob -> if (values[key] == action.job) {
+                    values.remove(key)
+                    jobs.remove(key)
+                }
+            }
+
+        }
+    }
+
+    scope.launch {
+        for (msg in this@accumulateByKey) {
+            channel.send(AddValue(msg))
+        }
+    }
+
+    return outChannel
+}
 
 fun <T> ReceiveChannel<T>.subscribeChecking(
     throwableHandler: (Throwable) -> Boolean = {
         it.printStackTrace()
         true
     },
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     by: suspend (T) -> Boolean
 ): Job {
-    return launch {
-        while (isActive && !isClosedForReceive) {
-            try {
-                val received = receive()
-
-                launch {
-                    try {
-                        if (!by(received)) {
-                            cancel()
-                        }
-                    } catch (e: Throwable) {
-                        if (!throwableHandler(e)) {
-                            cancel()
-                        }
+    val channel = this
+    return scope.launch {
+        for (data in channel) {
+            launch {
+                try {
+                    if (!by(data)) {
+                        channel.cancel()
+                    }
+                } catch (e: Throwable) {
+                    if (!throwableHandler(e)) {
+                        channel.cancel()
                     }
                 }
-            } catch (e: CancellationException) {
-                break
             }
         }
-        cancel()
     }
 }
 
@@ -47,45 +131,30 @@ fun <T> ReceiveChannel<T>.subscribe(
         it.printStackTrace()
         true
     },
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
     by: suspend (T) -> Unit
 ): Job {
-    return subscribeChecking(throwableHandler) {
+    return subscribeChecking(throwableHandler, scope) {
         by(it)
         true
     }
 }
 
-fun <T> ReceiveChannel<T>.debounce(delayMs: Long, awaitedSubscriptions: Int = 256): BroadcastChannel<T> {
-    val channel = BroadcastChannel<T>(awaitedSubscriptions)
-    var lastReceived: Pair<Long, T>? = null
-    var job: Job? = null
-    launch {
-        while (isActive && !isClosedForReceive) {
-            val received = receive()
+fun <T> ReceiveChannel<T>.debounce(
+    delay: Long,
+    timeUnit: TimeUnit = TimeUnit.MILLISECONDS,
+    scope: CoroutineScope = CoroutineScope(Dispatchers.Default),
+    resultBroadcastChannelCapacity: Int = 1
+): BroadcastChannel<T> {
+    return BroadcastChannel<T>(resultBroadcastChannelCapacity).also { outBroadcast ->
+        var lastReceived: Job? = null
+        subscribe(scope = scope) {
+            lastReceived ?.cancel()
+            lastReceived = scope.launch {
+                delay(timeUnit.toMillis(delay))
 
-            lastReceived = Pair(System.currentTimeMillis() + delayMs, received)
-
-            job ?:let {
-                job = launch {
-                    try {
-                        var now = System.currentTimeMillis()
-                        while (isActive && lastReceived?.first ?: now >= now) {
-                            delay((lastReceived ?.first ?: now) - now, TimeUnit.MILLISECONDS)
-                            now = System.currentTimeMillis()
-                        }
-
-                        lastReceived?.second?.also {
-                            channel.send(it)
-                        }
-                    } catch (e: Exception) {
-                        e.printStackTrace()
-                    } finally {
-                        job = null
-                    }
-                }
+                outBroadcast.send(it)
             }
         }
-        cancel()
     }
-    return channel
 }