resumable upload support

Author: lohanidamodar

README.md

@@ -39,7 +39,7 @@ repositories {
 Next, add the dependency to your project's `build.gradle(.kts)` file:
 
 ```groovy
-implementation("io.appwrite:sdk-for-kotlin:0.3.0")
+implementation("io.appwrite:sdk-for-kotlin:0.4.0")
 ```
 
 ### Maven
@@ -50,7 +50,7 @@ Add this to your project's `pom.xml` file:
     <dependency>
         <groupId>io.appwrite</groupId>
         <artifactId>sdk-for-kotlin</artifactId>
-        <version>0.3.0</version>
+        <version>0.4.0</version>
     </dependency>
 </dependencies>
 ```

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version '1.5.31'
+    id "org.jetbrains.kotlin.jvm" version '1.6.10'
     id "java-library"
     id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
 }
@@ -29,12 +29,12 @@ repositories {
 }
 
 dependencies {
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
-    api(platform("com.squareup.okhttp3:okhttp-bom:4.9.0"))
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+    api(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
     api("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:okhttp-urlconnection")
     implementation("com.squareup.okhttp3:logging-interceptor")
-    implementation("com.google.code.gson:gson:2.8.7")
+    implementation("com.google.code.gson:gson:2.9.0")
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/io/appwrite/Client.kt

@@ -20,6 +20,7 @@ import okhttp3.logging.HttpLoggingInterceptor
 import java.io.BufferedInputStream
 import java.io.BufferedReader
 import java.io.File
+import java.io.RandomAccessFile
 import java.io.IOException
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
@@ -219,7 +220,7 @@ class Client @JvmOverloads constructor(
         headers:  Map<String, String> = mapOf(),
         params: Map<String, Any?> = mapOf(),
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T)? = null
+        converter: ((Map<String, Any,>) -> T)? = null
     ): T {
         val filteredParams = params.filterValues { it != null }
 
@@ -255,7 +256,7 @@ class Client @JvmOverloads constructor(
                 .get()
                 .build()
 
-            return awaitResponse(request, responseType, convert)
+            return awaitResponse(request, responseType, converter)
         }
 
         val body = if (MultipartBody.FORM.toString() == headers["content-type"]) {
@@ -292,7 +293,7 @@ class Client @JvmOverloads constructor(
             .method(method, body)
             .build()
 
-        return awaitResponse(request, responseType, convert)
+        return awaitResponse(request, responseType, converter)
     }
 
     /**
@@ -310,8 +311,9 @@ class Client @JvmOverloads constructor(
         headers:  MutableMap<String, String>,
         params: MutableMap<String, Any?>,
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T),
+        converter: ((Map<String, Any,>) -> T),
         paramName: String,
+        idParamName: String? = null,
         onProgress: ((UploadProgress) -> Unit)? = null,
     ): T {
         val file = params[paramName] as File
@@ -324,74 +326,84 @@ class Client @JvmOverloads constructor(
                 file.asRequestBody()
             )
             return call(
-                "POST",
+                method = "POST",
                 path,
                 headers,
                 params,
                 responseType,
-                convert
+                converter
             )
         }
 
-        val input = file.inputStream().buffered()
+        val input = RandomAccessFile(file, "r")
         val buffer = ByteArray(CHUNK_SIZE)
         var offset = 0L
         var result: Map<*, *>? = null
 
-        generateSequence {
-            val readBytes = input.read(buffer)
-            if (readBytes >= 0) {
-                buffer.copyOf(readBytes)
-            } else {
-                input.close()
-                null
-            }
-        }.forEach {
+        if (idParamName?.isNotEmpty() == true && params[idParamName] != "unique()") {
+            // Make a request to check if a file already exists
+            val current = call(
+                method = "GET",
+                path = "$path/${params[idParamName]}",
+                headers = headers,
+                params = emptyMap(),
+                responseType = Map::class.java,
+            )
+            val chunksUploaded = current["chunksUploaded"] as Long
+            offset = (chunksUploaded * CHUNK_SIZE).coerceAtMost(size)
+        }
+
+        while (offset < size) {
+            input.seek(offset)
+            input.read(buffer)
+
             params[paramName] = MultipartBody.Part.createFormData(
                 paramName,
                 file.name,
-                it.toRequestBody()
+                buffer.toRequestBody()
             )
 
             headers["Content-Range"] =
                 "bytes $offset-${((offset + CHUNK_SIZE) - 1).coerceAtMost(size)}/$size"
 
             result = call(
-                "POST",
+                method = "POST",
                 path,
                 headers,
                 params,
-                Map::class.java
+                responseType = Map::class.java
             )
 
             offset += CHUNK_SIZE
             headers["x-appwrite-id"] = result!!["\$id"].toString()
-            onProgress?.invoke(UploadProgress(
-                id = result!!["\$id"].toString(),
-                progress = offset.coerceAtMost(size).toDouble()/size * 100,
-                sizeUploaded = offset.coerceAtMost(size),
-                chunksTotal = result!!["chunkTotal"].toString().toInt(),
-                chunksUploaded = result!!["chunkUploaded"].toString().toInt(),
-            ))
+            onProgress?.invoke(
+                UploadProgress(
+                    id = result!!["\$id"].toString(),
+                    progress = offset.coerceAtMost(size).toDouble() / size * 100,
+                    sizeUploaded = offset.coerceAtMost(size),
+                    chunksTotal = result!!["chunksTotal"].toString().toInt(),
+                    chunksUploaded = result!!["chunksUploaded"].toString().toInt(),
+                )
+            )
         }
 
-        return convert(result as Map<String, Any>)
+        return converter(result as Map<String, Any>)
     }
 
     /**
      * Await Response
      *
      * @param request
      * @param responseType
-     * @param convert
+     * @param converter
      *
      * @return [T]
      */
     @Throws(AppwriteException::class)
     private suspend fun <T> awaitResponse(
         request: Request,
         responseType: Class<T>,
-        convert: ((Map<String, Any,>) -> T)? = null
+        converter: ((Map<String, Any,>) -> T)? = null
     ) = suspendCancellableCoroutine<T> {
         http.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
@@ -457,7 +469,7 @@ class Client @JvmOverloads constructor(
                     object : TypeToken<Map<String, Any>>(){}.type
                 )
                 it.resume(
-                    convert?.invoke(map) ?: map as T
+                    converter?.invoke(map) ?: map as T
                 )
             }
         })