Merge pull request #5 from abhimuktheeswarar/develop

Fix duplicate action emission

Flywheel.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'Flywheel'
-    spec.version                  = '1.1.3-RC'
+    spec.version                  = '1.1.4-RC'
     spec.homepage                 = 'https://github.com/abhimuktheeswarar/Flywheel'
     spec.source                   = { :git => "https://github.com/abhimuktheeswarar/Flywheel.git", :tag => "v#{spec.version}" }
     spec.authors                  = 'Abhi Muktheeswarar'

README.md

@@ -29,7 +29,7 @@ kotlin {
   sourceSets {
       val commonMain by getting {
           dependencies {
-              implementation("com.msabhi:flywheel:1.1.3-RC")
+              implementation("com.msabhi:flywheel:1.1.4-RC")
           }
       }
   }
@@ -41,7 +41,7 @@ kotlin {
 ```Kotlin
 dependencies {
 
-    implementation("com.msabhi:flywheel-android:1.1.3-RC")
+    implementation("com.msabhi:flywheel-android:1.1.4-RC")
 }
 ```
 
@@ -56,7 +56,7 @@ use_frameworks!
 
 target 'MyApp' do
 
-    pod 'Flywheel', '~> 1.1.3-RC'
+    pod 'Flywheel', '~> 1.1.4-RC'
 
 end
 ```
@@ -70,7 +70,7 @@ import PackageDescription
 let package = Package(
     name: "YOUR_PROJECT_NAME",
     dependencies: [
-        .package(url: "https://github.com/abhimuktheeswarar/Flywheel.git", from: "1.1.3-RC"),
+        .package(url: "https://github.com/abhimuktheeswarar/Flywheel.git", from: "1.1.4-RC"),
     ]
 )
 ```

androidApp/src/main/java/com/msabhi/androidApp/counter/domain/sideeffects/CounterSideEffect.kt

@@ -24,16 +24,24 @@ import com.msabhi.flywheel.ActionState
 import com.msabhi.flywheel.StateReserve
 import com.msabhi.flywheel.attachments.DispatcherProvider
 import com.msabhi.flywheel.attachments.SideEffect
+import kotlinx.coroutines.CoroutineStart
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 class CounterSideEffect(stateReserve: StateReserve<CounterState>, dispatchers: DispatcherProvider) :
     SideEffect<CounterState>(stateReserve, dispatchers) {
 
     init {
+        //Used start = CoroutineStart.UNDISPATCHED to ensure the actions are collected, especially, the very first actions
+        scope.launch(start = CoroutineStart.UNDISPATCHED) { actions.collect(::handle) }
         actionStates.onEach(::handle).launchIn(scope)
     }
 
+    private fun handle(action: Action) {
+    }
+
     private fun handle(actionState: ActionState<Action, CounterState>) {
         when (actionState.action) {
 

buildSrc/src/main/kotlin/Dependencies.kt

@@ -26,7 +26,7 @@ object Versions {
         const val minSdk = 21
         const val targetSdk = 29
         const val buildTools = "30.0.3"
-        const val androidGradlePlugin = "7.0.2"
+        const val androidGradlePlugin = "7.0.3"
 
         const val appCompat = "1.3.0"
         const val core = "1.6.0"

flywheel/src/commonMain/kotlin/com/msabhi/flywheel/Flywheel.kt

@@ -20,10 +20,7 @@ import com.msabhi.flywheel.utilities.MutableStateChecker
 import com.msabhi.flywheel.utilities.assertStateValues
 import com.msabhi.flywheel.utilities.name
 import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.ReceiveChannel
-import kotlinx.coroutines.channels.SendChannel
+import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.selects.select
 
@@ -304,6 +301,9 @@ class StateReserve<S : State>(
     middlewares: List<Middleware<S>>?,
 ) {
 
+    private val actionsChannel: Channel<Action> =
+        Channel(capacity = Channel.UNLIMITED, onBufferOverflow = BufferOverflow.SUSPEND)
+
     private val inputActionsChannel: Channel<Action> =
         Channel(capacity = Channel.UNLIMITED, onBufferOverflow = BufferOverflow.SUSPEND)
 
@@ -338,6 +338,11 @@ class StateReserve<S : State>(
      */
     val states: Flow<S> = setStates
 
+    /**
+     * Returns a [Flow] of actions that are passed through reducer.
+     */
+    val actionStates: Flow<ActionState.Always<Action, S>> = transitionsMutable.filterIsInstance()
+
     /**
      * Returns a [Flow] of actions that are passed through middleware and before reaching reducer.
      * This also captures actions modified by middlewares.
@@ -346,11 +351,6 @@ class StateReserve<S : State>(
     val actions: Flow<Action> =
         mutableActions.distinctUntilChanged().filterNot { it is ForceDistinctAction }
 
-    /**
-     * Returns a [Flow] of actions that are passed through reducer.
-     */
-    val actionStates: Flow<ActionState.Always<Action, S>> = transitionsMutable.filterIsInstance()
-
     /**
      * Enable `enhancedStateMachine` config to listen for `transitions`.
      * Use this along with provided extension functions to collect state transitions to get a StateMachine like behaviour.
@@ -367,6 +367,16 @@ class StateReserve<S : State>(
     }
 
     init {
+
+        config.scope.launch {
+            actionsChannel.consumeEach { action ->
+                if (isActive) {
+                    mutableActions.tryEmit(action)
+                    this@StateReserve.middlewares?.invoke(action) ?: dispatcher(action)
+                }
+            }
+        }
+
         config.scope.stateMachine(
             initialState = initialState,
             inputActions = inputActionsChannel,
@@ -378,8 +388,6 @@ class StateReserve<S : State>(
             ignoreDuplicateState = config.ignoreDuplicateState,
             enhancedStateMachine = config.enhancedStateMachine
         )
-
-        initialState.deferredState?.invokeOnCompletion { }
     }
 
     private fun dispatcher(action: Action) {
@@ -395,8 +403,7 @@ class StateReserve<S : State>(
      * It is the entry point for actions to update the StateReserve's state.
      */
     fun dispatch(action: Action) {
-        mutableActions.tryEmit(action)
-        middlewares?.invoke(action) ?: dispatcher(action)
+        actionsChannel.trySend(action)
     }
 
     /**

gradle.properties

@@ -6,7 +6,7 @@ kotlin.native.enableDependencyPropagation=false
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xmx2560m
 GROUP=com.msabhi
-VERSION_NAME=1.1.3-RC
+VERSION_NAME=1.1.4-RC
 POM_NAME=Flywheel
 POM_DESCRIPTION=Kotlin-Multiplatform state management library
 POM_URL=https://github.com/abhimuktheeswarar/Flywheel