Merge branch 'master' into firestore-document

Author: nbransby

firebase-database/src/androidMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -44,7 +44,7 @@ suspend fun <T> Task<T>.awaitWhileOnline(): T = coroutineScope {
 
     select<T> {
         asDeferred().onAwait { it.also { notConnected.cancel() } }
-        notConnected.onReceive { throw DatabaseException("Database not connected") }
+        notConnected.onReceive { throw DatabaseException("Database not connected", null) }
     }
 }
 

firebase-database/src/commonMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -86,7 +86,7 @@ object ServerValue {
     val TIMESTAMP = Double.POSITIVE_INFINITY
 }
 
-expect class DatabaseException : RuntimeException
+expect class DatabaseException(message: String?, cause: Throwable?) : RuntimeException
 
 expect class OnDisconnect {
     suspend fun removeValue()

firebase-database/src/iosMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -107,7 +107,7 @@ actual open class Query internal constructor(
             withBlock = { snapShot ->
                 safeOffer(DataSnapshot(snapShot!!))
             }
-        ) { close(DatabaseException(it.toString())) }
+        ) { close(DatabaseException(it.toString(), null)) }
         awaitClose { ios.removeObserverWithHandle(handle) }
     }
 
@@ -118,7 +118,7 @@ actual open class Query internal constructor(
                 andPreviousSiblingKeyWithBlock = { snapShot, key ->
                     safeOffer(ChildEvent(DataSnapshot(snapShot!!), type, key))
                 }
-            ) { close(DatabaseException(it.toString())) }
+            ) { close(DatabaseException(it.toString(), null)) }
         }
         awaitClose {
             handles.forEach { ios.removeObserverWithHandle(it) }
@@ -201,15 +201,15 @@ actual class OnDisconnect internal constructor(
     }
 }
 
-actual class DatabaseException(message: String) : RuntimeException(message)
+actual class DatabaseException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause)
 
 private suspend inline fun <T, reified R> T.awaitResult(whileOnline: Boolean, function: T.(callback: (NSError?, R?) -> Unit) -> Unit): R {
     val job = CompletableDeferred<R?>()
     function { error, result ->
         if(error == null) {
             job.complete(result)
         } else {
-            job.completeExceptionally(DatabaseException(error.toString()))
+            job.completeExceptionally(DatabaseException(error.toString(), null))
         }
     }
     return job.run { if(whileOnline) awaitWhileOnline() else await() } as R
@@ -221,7 +221,7 @@ suspend inline fun <T> T.await(whileOnline: Boolean, function: T.(callback: (NSE
         if(error == null) {
             job.complete(Unit)
         } else {
-            job.completeExceptionally(DatabaseException(error.toString()))
+            job.completeExceptionally(DatabaseException(error.toString(), null))
         }
     }
     job.run { if(whileOnline) awaitWhileOnline() else await() }
@@ -238,6 +238,6 @@ suspend fun <T> CompletableDeferred<T>.awaitWhileOnline(): T = coroutineScope {
 
     select<T> {
         onAwait { it.also { notConnected.cancel() } }
-        notConnected.onReceive { throw DatabaseException("Database not connected") }
+        notConnected.onReceive { throw DatabaseException("Database not connected", null) }
     }
 }

firebase-database/src/jsMain/kotlin/dev/gitlive/firebase/database/database.kt

@@ -164,8 +164,9 @@ actual class OnDisconnect internal constructor(val js: firebase.database.OnDisco
         rethrow { js.set(encode(strategy, value, encodeDefaults)).awaitWhileOnline() }
 }
 
-actual class DatabaseException(error: dynamic) :
-    RuntimeException("${error.code ?: "UNKNOWN"}: ${error.message}", error.unsafeCast<Throwable>())
+actual class DatabaseException actual constructor(message: String?, cause: Throwable?) : RuntimeException(message, cause) {
+    constructor(error: dynamic) : this("${error.code ?: "UNKNOWN"}: ${error.message}", error.unsafeCast<Throwable>())
+}
 
 inline fun <T, R> T.rethrow(function: T.() -> R): R = dev.gitlive.firebase.database.rethrow { function() }
 
@@ -189,7 +190,7 @@ suspend fun <T> Promise<T>.awaitWhileOnline(): T = coroutineScope {
 
     select<T> {
         this@awaitWhileOnline.asDeferred().onAwait { it.also { notConnected.cancel() } }
-        notConnected.onReceive { throw DatabaseException("Database not connected") }
+        notConnected.onReceive { throw DatabaseException("Database not connected", null) }
     }
 
 }