Merge branch 'master' into add-authDomain-to-FirebaseOptions

nbransby · web-flow · commit ae1c8a8ece8a · 2021-05-13T16:26:32.000+01:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -30,6 +30,12 @@ jobs:
       run: ./gradlew assemble
     - name: Run JS Tests
       run: ./gradlew cleanTest jsTest
+    - name: Upload test artifact
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: "JSTest Report HTML"
+        path: "firebase-firestore/build/reports/tests/jsTest/"
     - name: Run Android Instrumented Tests
       uses: reactivecircus/android-emulator-runner@v2
       with:
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
   <i>Real-time code collaboration inside any IDE</i><br/>
 <br/>
 <br/>
-The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the [Firebase Android SDK Kotlin Extensions](https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/) but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting *iOS*, *Android* or *JS*.
+The Firebase Kotlin SDK is a Kotlin-first SDK for Firebase. It's API is similar to the <a href="https://firebase.github.io/firebase-android-sdk/reference/kotlin/firebase-ktx/">Firebase Android SDK Kotlin Extensions</a> but also supports multiplatform projects, enabling you to use Firebase directly from your common source targeting <strong>iOS</strong>, <strong>Android</strong> or <strong>JS</strong>.
 
 ## Available libraries
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -67,6 +67,16 @@ subprojects {
         onlyIf { !project.gradle.startParameter.taskNames.contains("publishToMavenLocal") }
     }
 
+    tasks.whenTaskAdded {
+        enabled = when(name) {
+            "compileDebugUnitTestKotlinAndroid" -> false
+            "compileReleaseUnitTestKotlinAndroid" -> false
+            "testDebugUnitTest" -> false
+            "testReleaseUnitTest" -> false
+            else -> enabled
+        }
+    }
+
     tasks {
 
         val updateVersion by registering(Exec::class) {
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -77,8 +77,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-common": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -102,8 +102,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -58,8 +58,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-multiplatform-sdk",
   "dependencies": {
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3",
     "kotlinx-serialization-kotlinx-serialization-runtime": "1.1.0"
diff --git a/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt b/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt
@@ -51,7 +51,7 @@ class EncodersTest {
 
     @Test
     fun decodeObjectNullableValue() {
-        val decoded = decode(TestData.serializer(), mapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
+        val decoded = decode(TestData.serializer(), nativeMapOf("map" to mapOf("key" to "value"), "nullableBool" to null))
         assertNull(decoded.nullableBool)
     }
 }
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -78,8 +78,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }
diff --git a/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt
@@ -5,11 +5,15 @@
 package dev.gitlive.firebase.database
 
 import dev.gitlive.firebase.*
-import kotlinx.coroutines.await
+import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.produceIn
+import kotlinx.coroutines.selects.select
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy
+import kotlin.js.Promise
 
 @PublishedApi
 internal inline fun <reified T> encode(value: T, shouldEncodeElementDefault: Boolean) =
@@ -113,16 +117,16 @@ actual class DatabaseReference internal constructor(override val js: firebase.da
     actual fun onDisconnect() = rethrow { OnDisconnect(js.onDisconnect()) }
 
     actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) =
-        rethrow { js.update(encode(update, encodeDefaults)).await() }
+        rethrow { js.update(encode(update, encodeDefaults)).awaitWhileOnline() }
 
-    actual suspend fun removeValue() = rethrow { js.remove().await() }
+    actual suspend fun removeValue() = rethrow { js.remove().awaitWhileOnline() }
 
     actual suspend inline fun <reified T> setValue(value: T?, encodeDefaults: Boolean) = rethrow {
-        js.set(encode(value, encodeDefaults)).await()
+        js.set(encode(value, encodeDefaults)).awaitWhileOnline()
     }
 
     actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(strategy, value, encodeDefaults)).await() }
+        rethrow { js.set(encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 }
 
 actual class DataSnapshot internal constructor(val js: firebase.database.DataSnapshot) {
@@ -147,17 +151,17 @@ actual class DataSnapshot internal constructor(val js: firebase.database.DataSna
 
 actual class OnDisconnect internal constructor(val js: firebase.database.OnDisconnect) {
 
-    actual suspend fun removeValue() = rethrow { js.remove().await() }
-    actual suspend fun cancel() =  rethrow { js.cancel().await() }
+    actual suspend fun removeValue() = rethrow { js.remove().awaitWhileOnline() }
+    actual suspend fun cancel() =  rethrow { js.cancel().awaitWhileOnline() }
 
     actual suspend fun updateChildren(update: Map<String, Any?>, encodeDefaults: Boolean) =
-        rethrow { js.update(encode(update, encodeDefaults)).await() }
+        rethrow { js.update(encode(update, encodeDefaults)).awaitWhileOnline() }
 
     actual suspend inline fun <reified T> setValue(value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(value, encodeDefaults)).await() }
+        rethrow { js.set(encode(value, encodeDefaults)).awaitWhileOnline() }
 
     actual suspend fun <T> setValue(strategy: SerializationStrategy<T>, value: T, encodeDefaults: Boolean) =
-        rethrow { js.set(encode(strategy, value, encodeDefaults)).await() }
+        rethrow { js.set(encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 }
 
 actual class DatabaseException(error: dynamic) :
@@ -174,3 +178,18 @@ inline fun <R> rethrow(function: () -> R): R {
         throw DatabaseException(e)
     }
 }
+
+suspend fun <T> Promise<T>.awaitWhileOnline(): T = coroutineScope {
+
+    val notConnected = Firebase.database
+        .reference(".info/connected")
+        .valueEvents
+        .filter { !it.value<Boolean>() }
+        .produceIn(this)
+
+    select<T> {
+        this@awaitWhileOnline.asDeferred().onAwait { it.also { notConnected.cancel() } }
+        notConnected.onReceive { throw DatabaseException("Database not connected") }
+    }
+
+}
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -80,8 +80,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -39,9 +39,11 @@ class FirebaseFirestoreTest {
     @Test
     fun testStringOrderBy() = runTest {
         setupFirestoreData()
-
-        val resultDocs = Firebase.firestore.collection("FirebaseFirestoreTest")
-            .orderBy("prop1").get().documents
+        val resultDocs = Firebase.firestore
+            .collection("FirebaseFirestoreTest")
+            .orderBy("prop1")
+            .get()
+            .documents
         assertEquals(3, resultDocs.size)
         assertEquals("aaa", resultDocs[0].get("prop1"))
         assertEquals("bbb", resultDocs[1].get("prop1"))
diff --git a/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jsMain/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -471,25 +471,30 @@ inline fun <R> rethrow(function: () -> R): R {
     }
 }
 
-fun errorToException(e: dynamic) = when(e?.code?.toString()?.toLowerCase()) {
-    "cancelled" -> FirebaseFirestoreException(e, FirestoreExceptionCode.CANCELLED)
-    "invalid-argument" -> FirebaseFirestoreException(e, FirestoreExceptionCode.INVALID_ARGUMENT)
-    "deadline-exceeded" -> FirebaseFirestoreException(e, FirestoreExceptionCode.DEADLINE_EXCEEDED)
-    "not-found" -> FirebaseFirestoreException(e, FirestoreExceptionCode.NOT_FOUND)
-    "already-exists" -> FirebaseFirestoreException(e, FirestoreExceptionCode.ALREADY_EXISTS)
-    "permission-denied" -> FirebaseFirestoreException(e, FirestoreExceptionCode.PERMISSION_DENIED)
-    "resource-exhausted" -> FirebaseFirestoreException(e, FirestoreExceptionCode.RESOURCE_EXHAUSTED)
-    "failed-precondition" -> FirebaseFirestoreException(e, FirestoreExceptionCode.FAILED_PRECONDITION)
-    "aborted" -> FirebaseFirestoreException(e, FirestoreExceptionCode.ABORTED)
-    "out-of-range" -> FirebaseFirestoreException(e, FirestoreExceptionCode.OUT_OF_RANGE)
-    "unimplemented" -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNIMPLEMENTED)
-    "internal" -> FirebaseFirestoreException(e, FirestoreExceptionCode.INTERNAL)
-    "unavailable" -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNAVAILABLE)
-    "data-loss" -> FirebaseFirestoreException(e, FirestoreExceptionCode.DATA_LOSS)
-    "unauthenticated" -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNAUTHENTICATED)
-    "unknown" -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNKNOWN)
-    else -> {
-        println("Unknown error code in ${JSON.stringify(e)}")
-        FirebaseFirestoreException(e, FirestoreExceptionCode.UNKNOWN)
-    }
+fun errorToException(e: dynamic) = (e?.code ?: e?.message ?: "")
+    .toString()
+    .toLowerCase()
+    .let {
+        when {
+            "cancelled" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.CANCELLED)
+            "invalid-argument" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.INVALID_ARGUMENT)
+            "deadline-exceeded" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.DEADLINE_EXCEEDED)
+            "not-found" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.NOT_FOUND)
+            "already-exists" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.ALREADY_EXISTS)
+            "permission-denied" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.PERMISSION_DENIED)
+            "resource-exhausted" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.RESOURCE_EXHAUSTED)
+            "failed-precondition" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.FAILED_PRECONDITION)
+            "aborted" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.ABORTED)
+            "out-of-range" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.OUT_OF_RANGE)
+            "unimplemented" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNIMPLEMENTED)
+            "internal" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.INTERNAL)
+            "unavailable" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNAVAILABLE)
+            "data-loss" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.DATA_LOSS)
+            "unauthenticated" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNAUTHENTICATED)
+            "unknown" in it -> FirebaseFirestoreException(e, FirestoreExceptionCode.UNKNOWN)
+            else -> {
+                println("Unknown error code in ${JSON.stringify(e)}")
+                FirebaseFirestoreException(e, FirestoreExceptionCode.UNKNOWN)
+            }
+        }
 }
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -72,8 +72,20 @@ kotlin {
 
     js {
         useCommonJs()
-        nodejs()
-        browser()
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "5s"
+                }
+            }
+        }
     }
 
     sourceSets {
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -24,7 +24,7 @@
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
     "@gitlive/firebase-app": "1.2.0",
-    "firebase": "8.2.10",
+    "firebase": "8.5.0",
     "kotlin": "1.4.31",
     "kotlinx-coroutines-core": "1.4.3"
   }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"@gitlive/firebase-common": "1.2.0",`
`27`		`- "firebase": "8.2.10",`
	`27`	`+ "firebase": "8.5.0",`
`28`	`28`	`"kotlin": "1.4.31",`
`29`	`29`	`"kotlinx-coroutines-core": "1.4.3"`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class EncodersTest {`
`51`	`51`
`52`	`52`	`@Test`
`53`	`53`	`fun decodeObjectNullableValue() {`
`54`		`- val decoded = decode(TestData.serializer(), mapOf("map" to mapOf("key" to "value"), "nullableBool" to null))`
	`54`	`+ val decoded = decode(TestData.serializer(), nativeMapOf("map" to mapOf("key" to "value"), "nullableBool" to null))`
`55`	`55`	`assertNull(decoded.nullableBool)`
`56`	`56`	`}`
`57`	`57`	`}`