code simplification and deduplication

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/ImageDownloader.kt

@@ -50,64 +50,54 @@ class ImageDownloader {
      * Stream download and calculate hash for verification without loading entire file into memory.
      * This is memory-efficient for large files (videos, high-res images, etc.)
      */
-    suspend fun waitAndVerifyStream(
+    private suspend fun <T> retryWithDelay(
-        imageUrl: String,
+        maxAttempts: Int = 15,
-        okHttpClient: (url: String) -> OkHttpClient,
+        delayMs: Long = 1000,
-    ): StreamVerification? =
+        operation: suspend () -> T?,
+    ): T? =
         withContext(Dispatchers.IO) {
-            var verification: StreamVerification? = null
+            var result: T? = null
             var tentatives = 0
 
             // Servers are usually not ready, so tries to download it for 15 times/seconds.
-            while (verification == null && tentatives < 15) {
+            while (result == null && tentatives < maxAttempts) {
-                verification =
+                result =
                     try {
-                        tryStreamAndVerify(imageUrl, okHttpClient)
+                        operation()
                     } catch (e: Exception) {
                         if (e is CancellationException) throw e
                         null
                     }
 
-                if (verification == null) {
+                if (result == null) {
                     tentatives++
-                    delay(1000)
+                    delay(delayMs)
                 }
             }
 
-            return@withContext verification
+            return@withContext result
         }
 
+    suspend fun waitAndVerifyStream(
+        imageUrl: String,
+        okHttpClient: (url: String) -> OkHttpClient,
+    ): StreamVerification? = retryWithDelay { tryStreamAndVerify(imageUrl, okHttpClient) }
+
     suspend fun waitAndGetImage(
         imageUrl: String,
         okHttpClient: (url: String) -> OkHttpClient,
-    ): Blob? =
+    ): Blob? = retryWithDelay { tryGetTheImage(imageUrl, okHttpClient) }
-        withContext(Dispatchers.IO) {
-            var imageData: Blob? = null
-            var tentatives = 0
 
-            // Servers are usually not ready, so tries to download it for 15 times/seconds.
+    private data class HttpConnection(
-            while (imageData == null && tentatives < 15) {
+        val connection: HttpURLConnection,
-                imageData =
+        val responseCode: Int,
-                    try {
+        val contentType: String?,
-                        tryGetTheImage(imageUrl, okHttpClient)
+    )
-                    } catch (e: Exception) {
-                        if (e is CancellationException) throw e
-                        null
-                    }
 
-                if (imageData == null) {
+    private suspend fun openHttpConnection(
-                    tentatives++
-                    delay(1000)
-                }
-            }
-
-            return@withContext imageData
-        }
-
-    private suspend fun tryStreamAndVerify(
         imageUrl: String,
         okHttpClient: (url: String) -> OkHttpClient,
-    ): StreamVerification? =
+    ): HttpConnection =
         withContext(Dispatchers.IO) {
             // TODO: Migrate to OkHttp
             HttpURLConnection.setFollowRedirects(true)
@@ -122,6 +112,7 @@ class ImageDownloader {
             huc.instanceFollowRedirects = true
             var responseCode = huc.responseCode
 
+            // Handle redirects
             if (responseCode in 300..400) {
                 val newUrl: String = huc.getHeaderField("Location")
 
@@ -137,24 +128,38 @@ class ImageDownloader {
                 responseCode = huc.responseCode
             }
 
+            return@withContext HttpConnection(
+                connection = huc,
+                responseCode = responseCode,
+                contentType = huc.headerFields.get("Content-Type")?.firstOrNull(),
+            )
+        }
+
+    private suspend fun tryStreamAndVerify(
+        imageUrl: String,
+        okHttpClient: (url: String) -> OkHttpClient,
+    ): StreamVerification? =
+        withContext(Dispatchers.IO) {
+            val httpConn = openHttpConnection(imageUrl, okHttpClient)
+
             return@withContext try {
-                if (responseCode in 200..300) {
+                if (httpConn.responseCode in 200..300) {
                     val (hash, totalBytes) =
-                        huc.inputStream.use {
+                        httpConn.connection.inputStream.use {
                             sha256StreamWithCount(it)
                         }
 
                     StreamVerification(
                         hash = hash.toHexKey(),
                         size = totalBytes,
-                        contentType = huc.headerFields.get("Content-Type")?.firstOrNull(),
+                        contentType = httpConn.contentType,
                     )
                 } else {
                     null
                 }
             } finally {
                 // Always disconnect to release connection resources
-                huc.disconnect()
+                httpConn.connection.disconnect()
             }
         }
 
@@ -163,41 +168,19 @@ class ImageDownloader {
         okHttpClient: (url: String) -> OkHttpClient,
     ): Blob? =
         withContext(Dispatchers.IO) {
-            // TODO: Migrate to OkHttp
+            val httpConn = openHttpConnection(imageUrl, okHttpClient)
-            HttpURLConnection.setFollowRedirects(true)
-            var url = URL(imageUrl)
-            var clientProxy = okHttpClient(imageUrl).proxy
-            var huc =
-                if (clientProxy != null) {
-                    url.openConnection(clientProxy) as HttpURLConnection
-                } else {
-                    url.openConnection() as HttpURLConnection
-                }
-            huc.instanceFollowRedirects = true
-            var responseCode = huc.responseCode
 
-            if (responseCode in 300..400) {
+            return@withContext try {
-                val newUrl: String = huc.getHeaderField("Location")
+                if (httpConn.responseCode in 200..300) {
-
-                // open the new connnection again
-                url = URL(newUrl)
-                clientProxy = okHttpClient(newUrl).proxy
-                huc =
-                    if (clientProxy != null) {
-                        url.openConnection(clientProxy) as HttpURLConnection
-                    } else {
-                        url.openConnection() as HttpURLConnection
-                    }
-                responseCode = huc.responseCode
-            }
-
-            return@withContext if (responseCode in 200..300) {
                     Blob(
-                    huc.inputStream.use { it.readBytes() },
+                        httpConn.connection.inputStream.use { it.readBytes() },
-                    huc.headerFields.get("Content-Type")?.firstOrNull(),
+                        httpConn.contentType,
                     )
                 } else {
                     null
                 }
+            } finally {
+                httpConn.connection.disconnect()
+            }
         }
 }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaUploadResult.kt

@@ -45,4 +45,12 @@ data class MediaUploadResult(
     val ipfs: String? = null,
     // blurhash value for previews
     val blurHash: BlurhashWrapper? = null,
-)
+) {
+    fun mergeLocalMetadata(localMetadata: Pair<BlurhashWrapper?, DimensionTag?>?): MediaUploadResult =
+        localMetadata?.let { (blur, dim) ->
+            copy(
+                dimension = dim ?: dimension,
+                blurHash = blur ?: blurHash,
+            )
+        } ?: this
+}

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/blossom/BlossomUploader.kt

@@ -97,8 +97,8 @@ class BlossomUploader {
         val imageInputStream = contentResolver.openInputStream(uri)
         checkNotNull(imageInputStream) { "Can't open the image input stream" }
 
-        val serverResult =
+        return imageInputStream
-            imageInputStream.use { stream ->
+            .use { stream ->
                 upload(
                     stream,
                     hash,
@@ -112,14 +112,7 @@ class BlossomUploader {
                     httpAuth,
                     context,
                 )
-            }
+            }.mergeLocalMetadata(localMetadata)
-
-        return localMetadata?.let { (blur, dim) ->
-            serverResult.copy(
-                dimension = dim ?: serverResult.dimension,
-                blurHash = blur ?: serverResult.blurHash,
-            )
-        } ?: serverResult
     }
 
     fun encodeAuth(event: BlossomAuthorizationEvent): String {

amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/nip96/Nip96Uploader.kt

@@ -112,8 +112,8 @@ class Nip96Uploader {
 
         checkNotNull(imageInputStream) { "Can't open the image input stream" }
 
-        val serverResult =
+        return imageInputStream
-            imageInputStream.use { stream ->
+            .use { stream ->
                 upload(
                     stream,
                     length,
@@ -126,14 +126,7 @@ class Nip96Uploader {
                     httpAuth,
                     context,
                 )
-            }
+            }.mergeLocalMetadata(localMetadata)
-
-        return localMetadata?.let { (blur, dim) ->
-            serverResult.copy(
-                dimension = dim ?: serverResult.dimension,
-                blurHash = blur ?: serverResult.blurHash,
-            )
-        } ?: serverResult
     }
 
     suspend fun upload(