Refactor remote config

Author: shepeliev

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals.kt

@@ -40,38 +40,6 @@ external object firebase {
 
     }
 
-    fun remoteConfig(app: App? = definedExternally): remoteConfig.RemoteConfig
-
-    object remoteConfig {
-        interface RemoteConfig {
-            var defaultConfig: Any
-            var fetchTimeMillis: Long
-            var lastFetchStatus: String
-            val settings: Settings
-            fun activate(): Promise<Boolean>
-            fun ensureInitialized(): Promise<Unit>
-            fun fetch(): Promise<Unit>
-            fun fetchAndActivate(): Promise<Boolean>
-            fun getAll(): Json
-            fun getBoolean(key: String): Boolean
-            fun getNumber(key: String): Number
-            fun getString(key: String): String?
-            fun getValue(key: String): Value
-        }
-
-        interface Settings {
-            var fetchTimeoutMillis: Number
-            var minimumFetchIntervalMillis: Number
-        }
-
-        interface Value {
-            fun asBoolean(): Boolean
-            fun asNumber(): Number
-            fun asString(): String?
-            fun getSource(): String
-        }
-    }
-
     fun installations(app: App? = definedExternally): installations.Installations
 
     object installations {

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals/remoteconfig/remoteconfig.kt

@@ -0,0 +1,47 @@
+@file:JsModule("firebase/remote-config")
+@file:JsNonModule
+
+package dev.gitlive.firebase.externals.remoteconfig
+
+import dev.gitlive.firebase.externals.app.FirebaseApp
+import kotlin.js.Json
+import kotlin.js.Promise
+
+external fun activate(remoteConfig: RemoteConfig): Promise<Boolean>
+
+external fun ensureInitialized(remoteConfig: RemoteConfig): Promise<Unit>
+
+external fun fetchAndActivate(remoteConfig: RemoteConfig): Promise<Boolean>
+
+external fun fetchConfig(remoteConfig: RemoteConfig): Promise<Unit>
+
+external fun getAll(remoteConfig: RemoteConfig): Json
+
+external fun getBoolean(remoteConfig: RemoteConfig, key: String): Boolean
+
+external fun getNumber(remoteConfig: RemoteConfig, key: String): Number
+
+external fun getRemoteConfig(app: FirebaseApp? = definedExternally): RemoteConfig
+
+external fun getString(remoteConfig: RemoteConfig, key: String): String?
+
+external fun getValue(remoteConfig: RemoteConfig, key: String): Value
+
+external interface RemoteConfig {
+    var defaultConfig: Any
+    var fetchTimeMillis: Long
+    var lastFetchStatus: String
+    val settings: Settings
+}
+
+external interface Settings {
+    var fetchTimeoutMillis: Number
+    var minimumFetchIntervalMillis: Number
+}
+
+external interface Value {
+    fun asBoolean(): Boolean
+    fun asNumber(): Number
+    fun asString(): String?
+    fun getSource(): String
+}

firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/externals2.kt

@@ -13,10 +13,6 @@ external object functions
 
 external object installations
 
-@JsModule("firebase/compat/remote-config")
-@JsName("default")
-external object remoteConfig
-
 typealias ChangeSnapshotCallback = (data: DataSnapshot, previousChildName: String?) -> Unit
 typealias ValueSnapshotCallback = (data: DataSnapshot) -> Unit
 typealias CancelCallback = (error: Throwable) -> Unit

firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt

@@ -3,44 +3,40 @@ package dev.gitlive.firebase.remoteconfig
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
-import dev.gitlive.firebase.firebase
+import dev.gitlive.firebase.externals.remoteconfig.*
 import kotlinx.coroutines.await
 import kotlin.js.json
 
 actual val Firebase.remoteConfig: FirebaseRemoteConfig
-    get() = rethrow {
-        dev.gitlive.firebase.remoteConfig
-        FirebaseRemoteConfig(firebase.remoteConfig())
-    }
+    get() = rethrow { FirebaseRemoteConfig(getRemoteConfig()) }
 
 actual fun Firebase.remoteConfig(app: FirebaseApp): FirebaseRemoteConfig = rethrow {
-    dev.gitlive.firebase.remoteConfig
-    FirebaseRemoteConfig(firebase.remoteConfig(app.js))
+    FirebaseRemoteConfig(getRemoteConfig(app.js))
 }
 
-actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteConfig.RemoteConfig) {
+actual class FirebaseRemoteConfig internal constructor(val js: RemoteConfig) {
     actual val all: Map<String, FirebaseRemoteConfigValue>
         get() = rethrow { getAllKeys().map { Pair(it, getValue(it)) }.toMap() }
 
     actual val info: FirebaseRemoteConfigInfo
         get() = rethrow {
             FirebaseRemoteConfigInfo(
-                configSettings = js.settings.toSettings(),
+                configSettings = js.settings.toFirebaseRemoteConfigSettings(),
                 fetchTimeMillis = js.fetchTimeMillis,
                 lastFetchStatus = js.lastFetchStatus.toFetchStatus()
             )
         }
 
-    actual suspend fun activate(): Boolean = rethrow { js.activate().await() }
-    actual suspend fun ensureInitialized(): Unit = rethrow { js.activate().await() }
+    actual suspend fun activate(): Boolean = rethrow { activate(js).await() }
+    actual suspend fun ensureInitialized(): Unit = rethrow { ensureInitialized(js).await() }
 
     actual suspend fun fetch(minimumFetchIntervalInSeconds: Long?): Unit =
-        rethrow { js.fetch().await() }
+        rethrow { fetchConfig(js).await() }
 
-    actual suspend fun fetchAndActivate(): Boolean = rethrow { js.fetchAndActivate().await() }
+    actual suspend fun fetchAndActivate(): Boolean = rethrow { fetchAndActivate(js).await() }
 
     actual fun getValue(key: String): FirebaseRemoteConfigValue = rethrow {
-        FirebaseRemoteConfigValue(js.getValue(key))
+        FirebaseRemoteConfigValue(getValue(js, key))
     }
 
     actual fun getKeysByPrefix(prefix: String): Set<String> {
@@ -49,7 +45,7 @@ actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteCo
 
     private fun getAllKeys(): Set<String> {
         val objectKeys = js("Object.keys")
-        return objectKeys(js.getAll()).unsafeCast<Array<String>>().toSet()
+        return objectKeys(getAll(js)).unsafeCast<Array<String>>().toSet()
     }
 
     actual suspend fun reset() {
@@ -68,7 +64,7 @@ actual class FirebaseRemoteConfig internal constructor(val js: firebase.remoteCo
         js.defaultConfig = json(*defaults)
     }
 
-    private fun firebase.remoteConfig.Settings.toSettings(): FirebaseRemoteConfigSettings {
+    private fun Settings.toFirebaseRemoteConfigSettings(): FirebaseRemoteConfigSettings {
         return FirebaseRemoteConfigSettings(
             fetchTimeoutInSeconds = fetchTimeoutMillis.toLong() / 1000,
             minimumFetchIntervalInSeconds = minimumFetchIntervalMillis.toLong() / 1000

firebase-config/src/jsMain/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfigValue.kt

@@ -1,8 +1,8 @@
 package dev.gitlive.firebase.remoteconfig
 
-import dev.gitlive.firebase.firebase
+import dev.gitlive.firebase.externals.remoteconfig.Value
 
-actual class FirebaseRemoteConfigValue(val js: firebase.remoteConfig.Value) {
+actual class FirebaseRemoteConfigValue(val js: Value) {
     actual fun asBoolean(): Boolean = rethrow { js.asBoolean() }
     actual fun asByteArray(): ByteArray = rethrow { js.asString()?.encodeToByteArray() ?: byteArrayOf() }
     actual fun asDouble(): Double = rethrow { js.asNumber().toDouble() }