Fix auto poll initial config load from cache (#34)

* Fix initial config load when auto poll enabled with results from cache

* Format

* Update Constants.kt

Author: z4kn4fein

gradle.properties

@@ -1,5 +1,5 @@
 group=com.configcat
-version=3.1.0
+version=3.1.1
 
 ktorVersion=2.3.10
 kotlinxSerializationVersion=1.6.3

src/commonMain/kotlin/com/configcat/ConfigService.kt

@@ -65,29 +65,30 @@ internal class ConfigService(
     }
 
     suspend fun getSettings(): SettingResult {
-        return when (mode) {
-            is LazyLoadMode -> {
-                val result =
+        val result =
+            when (mode) {
+                is LazyLoadMode -> {
                     fetchIfOlder(
                         DateTime.now()
                             .add(0, -mode.configuration.cacheRefreshInterval.inWholeMilliseconds.toDouble()),
                     )
-                if (result.first.isEmpty()) {
-                    SettingResult.empty
-                } else {
-                    SettingResult(result.first.config.settings ?: emptyMap(), result.first.fetchTime)
                 }
-            }
-
-            else -> {
-                // If we are initialized, we prefer the cached results
-                val result = fetchIfOlder(Constants.distantPast, preferCached = initialized.value)
-                if (result.first.isEmpty()) {
-                    SettingResult.empty
-                } else {
-                    SettingResult(result.first.config.settings ?: emptyMap(), result.first.fetchTime)
+                else -> {
+                    // If we are initialized, we prefer the cached results
+                    val threshold =
+                        if (!initialized.value && mode is AutoPollMode) {
+                            DateTime.now()
+                                .add(0, -mode.configuration.pollingInterval.inWholeMilliseconds.toDouble())
+                        } else {
+                            Constants.distantPast
+                        }
+                    fetchIfOlder(threshold, preferCached = initialized.value)
                 }
             }
+        return if (result.first.isEmpty()) {
+            SettingResult.empty
+        } else {
+            SettingResult(result.first.config.settings ?: emptyMap(), result.first.fetchTime)
         }
     }
 

src/commonMain/kotlin/com/configcat/Constants.kt

@@ -23,7 +23,7 @@ internal interface Closeable {
 }
 
 internal object Constants {
-    const val VERSION: String = "3.1.0"
+    const val VERSION: String = "3.1.1"
     const val CONFIG_FILE_NAME: String = "config_v6.json"
     const val SERIALIZATION_FORMAT_VERSION: String = "v2"
     const val GLOBAL_CDN_URL = "https://cdn-global.configcat.com"

src/commonTest/kotlin/com/configcat/ConfigServiceTests.kt

@@ -312,6 +312,25 @@ class ConfigServiceTests {
             }
         }
 
+    @Test
+    fun testPollsWhenCacheExpired() =
+        runTest {
+            val mockEngine =
+                MockEngine.create {
+                    this.addHandler {
+                        respond(content = Data.formatJsonBodyWithString("test1"), status = HttpStatusCode.OK)
+                    }
+                } as MockEngine
+
+            val cache = SingleValueCache(Data.formatCacheEntryWithDate("test", DateTime.now().add(0, -5000.0)))
+            val service = Services.createConfigService(mockEngine, autoPoll { pollingInterval = 1.seconds }, cache)
+
+            val setting = service.getSettings().settings["fakeKey"]
+            assertEquals("test1", setting?.settingValue?.stringValue)
+
+            assertEquals(1, mockEngine.requestHistory.size)
+        }
+
     @Test
     fun testAutoPollOnlineOffline() =
         runTest {