add delete() and getDownloadUrl() for StorageReference

Author: michaelprichardson

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

@@ -8,6 +8,7 @@ package dev.gitlive.firebase.storage
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
+import kotlinx.coroutines.tasks.await
 
 actual val Firebase.storage get() =
     FirebaseStorage(com.google.firebase.storage.FirebaseStorage.getInstance())
@@ -44,6 +45,8 @@ actual class StorageReference(val android: com.google.firebase.storage.StorageRe
     actual val storage: FirebaseStorage get() = FirebaseStorage(android.storage)
 
     actual fun child(path: String): StorageReference = StorageReference(android.child(path))
+    actual suspend fun delete() = android.delete().await().run { Unit }
+    actual suspend fun getDownloadUrl(): String = android.downloadUrl.await().toString()
 }
 
 actual open class StorageException(message: String) : FirebaseException(message)

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

@@ -26,26 +26,10 @@ expect class StorageReference {
     val parent: StorageReference?
     val root: StorageReference
     val storage: FirebaseStorage
+
     fun child(path: String): StorageReference
-//    fun delete(): Task<Unit>
-//    fun downloadUrl(): Task<Uri>
-//    fun getBytes(maxDownloadSizeBytes: Long): Task<ByteArray>
-//    fun getMetadata(): Task<StorageMetadata>
-//    fun list(options: ListOptions? = definedExternally): Task<ListResult>
-//    fun listAll(): Task<ListResult>
-//    fun putBytes(bytes: ByteArray, metadata: StorageMetadata? = definedExternally): UploadTask
-//    fun putFile(file: Uri, metadata: StorageMetadata? = definedExternally): UploadTask
-//    fun putFile(file: Uri, metadata: StorageMetadata? = definedExternally, existingUploadUri: Uri? = definedExternally): UploadTask
-//    fun putFile(file: Uri, metadata: StorageMetadata? = definedExternally, existingUploadUri: Uri? = definedExternally, existingUploadHeaders: Map<String, String>? = definedExternally): UploadTask
-//    fun putStream(stream: InputStream, metadata: StorageMetadata? = definedExternally): UploadTask
-//    fun updateMetadata(metadata: StorageMetadata): Task<StorageMetadata>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.StreamProcessor): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.StreamProcessor, cancellationFlow: Flow<Unit>): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.StreamProcessor, cancellationFlow: Flow<Unit>, executor: Executor): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.StreamProcessor, cancellationFlow: Flow<Unit>, executor: Executor, bufferSize: Int): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.StreamProcessor, cancellationFlow: Flow<Unit>, executor: Executor, bufferSize: Int, chunkSize: Int): Flow<ByteReadPacket>
-//    fun getStream(maxDownloadSizeBytes: Long = definedExternally, progressListener: StreamDownloadTask.Stream
+    suspend fun delete()
+    suspend fun getDownloadUrl(): String
 }
 
 expect open class StorageException : FirebaseException

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

@@ -9,6 +9,9 @@ import cocoapods.FirebaseStorage.FIRStorageReference
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
+import kotlinx.coroutines.CompletableDeferred
+import platform.Foundation.NSError
+import platform.Foundation.NSURL
 
 
 actual val Firebase.storage get() =
@@ -47,6 +50,35 @@ actual class StorageReference(val ios: FIRStorageReference) {
     actual val storage: FirebaseStorage get() = FirebaseStorage(ios.storage())
 
     actual fun child(path: String): StorageReference = StorageReference(ios.child(path))
+    actual suspend fun delete() = await { ios.deleteWithCompletion(it) }
+    actual suspend fun getDownloadUrl(): String = awaitResult<NSURL?> { ios.downloadURLWithCompletion(it) }?.absoluteString!!
 }
 
 actual open class StorageException(message: String) : FirebaseException(message)
+
+suspend inline fun <reified T> awaitResult(function: (callback: (T?, NSError?) -> Unit) -> Unit): T {
+    val job = CompletableDeferred<T?>()
+    function { result, error ->
+        if(error == null) {
+            job.complete(result)
+        } else {
+            job.completeExceptionally(error.toException())
+        }
+    }
+    return job.await() as T
+}
+
+suspend inline fun <T> await(function: (callback: (NSError?) -> Unit) -> T): T {
+    val job = CompletableDeferred<Unit>()
+    val result = function { error ->
+        if(error == null) {
+            job.complete(Unit)
+        } else {
+            job.completeExceptionally(error.toException())
+        }
+    }
+    job.await()
+    return result
+}
+
+fun NSError.toException() = StorageException(description!!) // TODO: Improve error handling

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

@@ -8,6 +8,7 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseApp
 import dev.gitlive.firebase.FirebaseException
 import dev.gitlive.firebase.firebase
+import kotlinx.coroutines.await
 
 
 actual val Firebase.storage get() =
@@ -45,6 +46,8 @@ actual class StorageReference(val js: firebase.storage.Reference) {
     actual val storage: FirebaseStorage get() = FirebaseStorage(js.storage)
 
     actual fun child(path: String): StorageReference = StorageReference(js.child(path))
+    actual suspend fun delete() = rethrow { js.delete().await() }
+    actual suspend fun getDownloadUrl(): String = rethrow { js.getDownloadURL().await().toString() }
 }
 
 inline fun <T, R> T.rethrow(function: T.() -> R): R = dev.gitlive.firebase.storage.rethrow { function() }