feat: support for 0.13.0

Author: TorstenDittmann

Package.swift

@@ -4,6 +4,12 @@ import PackageDescription
 
 let package = Package(
     name: "Appwrite",
+    platforms: [
+        .iOS("15.0"),
+        .macOS("11.0"),
+        .watchOS("6.0"),
+        .tvOS("13.0"),
+    ],
     products: [
         .library(
             name: "Appwrite",

README.md

@@ -2,12 +2,12 @@
 
 ![Swift Package Manager](https://img.shields.io/github/v/release/appwrite/sdk-for-apple.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-apple.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-0.12.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-0.13.0-blue.svg?style=flat-square)
 [![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
 
-**This SDK is compatible with Appwrite server version 0.12.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-apple/releases).**
+**This SDK is compatible with Appwrite server version 0.13.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-apple/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Apple SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 
@@ -17,13 +17,13 @@ Appwrite is an open-source backend as a service server that abstract and simplif
 
 ### Xcode with Swift Package Manager
 
-The Appwrite Swift SDK is available via multiple package managers, including Swift Package Manager. In order to use the Appwrite Swift SDK from Xcode, select File > Swift Packages > **Add Package Dependency**
+The Appwrite Swift SDK is available via Swift Package Manager. In order to use the Appwrite Swift SDK from Xcode, select File > **Add Packages**
 
-In the dialog that appears, enter the Appwrite Swift SDK [package URL]([email protected]:appwrite/sdk-for-apple.git) and click **Next**.
+In the dialog that appears, enter the Appwrite Swift SDK [package URL]([email protected]:appwrite/sdk-for-apple.git) in the search field. Once found, select `sdk-for-apple`.
 
-Once the repository information is loaded, add your version rules and click **Next** again.
+On the right, select your version rules and ensure your desired target is selected in the **Add to Project** field.
 
-On the final screen, make sure you see `Appwrite` as a product selected for your target:
+Now click add package and you're done!
 
 ### Swift Package Manager
 

Sources/Appwrite/Client.swift

@@ -12,23 +12,28 @@ let CRLF = "\r\n"
 open class Client {
 
     // MARK: Properties
+    public static var chunkSize = 5 * 1024 * 1024 // 5MB
 
     open var endPoint = "https://HOSTNAME/v1"
 
     open var endPointRealtime: String? = nil
 
     open var headers: [String: String] = [
         "content-type": "",
-        "x-sdk-version": "appwrite:swiftclient:0.2.1",        "X-Appwrite-Response-Format": "0.12.0"
+        "x-sdk-version": "appwrite:swiftclient:0.2.1",        "X-Appwrite-Response-Format": "0.13.0"
     ]
 
     open var config: [String: String] = [:]
 
+    open var selfSigned: Bool = false
+
     open var http: HTTPClient
 
     private static let boundaryChars =
         "abcdefghijklmnopqrstuvwxyz1234567890"
 
+    private static let boundary = randomBoundary()
+
     private static var eventLoopGroupProvider =
         HTTPClient.EventLoopGroupProvider.createNew
 
@@ -136,6 +141,7 @@ open class Client {
     /// @return Client
     ///
     open func setSelfSigned(_ status: Bool = true) -> Client {
+        self.selfSigned = status
         try! http.syncShutdown()
         http = Client.createHTTP(selfSigned: status)
         return self
@@ -266,7 +272,9 @@ open class Client {
                 method: .RAW(value: method)
             )
         } catch {
-            completion?(Result.failure(AppwriteError(message: error.localizedDescription)))
+            completion?(Result.failure(AppwriteError(
+                message: error.localizedDescription
+            )))
             return
         }
 
@@ -281,7 +289,9 @@ open class Client {
         do {
             try buildBody(for: &request, with: validParams)
         } catch let error {
-            completion?(Result.failure(AppwriteError(message: error.localizedDescription)))
+            completion?(Result.failure(AppwriteError(
+                message: error.localizedDescription
+            )))
             return
         }
 
@@ -299,7 +309,7 @@ open class Client {
         with params: [String: Any?]
     ) throws {
         if request.headers["content-type"][0] == "multipart/form-data" {
-            buildMultipart(&request, with: params)
+            buildMultipart(&request, with: params, chunked: !request.headers["content-range"].isEmpty)
         } else {
             try buildJSON(&request, with: params)
         }
@@ -334,7 +344,10 @@ open class Client {
             }
 
             switch result {
-            case .failure(let error): print(error)
+            case .failure(let error): 
+                completion(.failure(AppwriteError(
+                    message: error.localizedDescription
+                )))
             case .success(var response):
                 switch response.status.code {
                 case 0..<400:
@@ -361,20 +374,32 @@ open class Client {
                     }
                 default:
                     var message = ""
+                    var type = ""
+
+                    if response.body == nil {
+                        completion(.failure(AppwriteError(
+                            message: "Unknown error with status code \(response.status.code)",
+                            code: Int(response.status.code)
+                        )))
+                        return
+                    }
 
                     do {
                         let dict = try JSONSerialization
                             .jsonObject(with: response.body!) as? [String: Any]
 
                         message = dict?["message"] as? String
                             ?? response.status.reasonPhrase
+                        
+                        type = dict?["type"] as? String ?? ""
                     } catch {
                         message =  response.body!.readString(length: response.body!.readableBytes)!
                     }
 
                     let error = AppwriteError(
                         message: message,
-                        code: Int(response.status.code)
+                        code: Int(response.status.code),
+                        type: type
                     )
 
                     completion(.failure(error))
@@ -383,7 +408,83 @@ open class Client {
         }
     }
 
-    private func randomBoundary() -> String {
+    func chunkedUpload<T>(
+        path: String,
+        headers: inout [String: String],
+        params: inout [String: Any?],
+        paramName: String,
+        convert: (([String: Any]) -> T)? = nil,
+        onProgress: ((UploadProgress) -> Void)? = nil,
+        completion: ((Result<T, AppwriteError>) -> Void)? = nil
+    ) {
+        let file = params[paramName] as! File
+        let size = file.buffer.readableBytes
+
+        if size < Client.chunkSize {
+            call(
+                method: "POST",
+                path: path,
+                headers: headers,
+                params: params,
+                convert: convert,
+                completion: completion
+            )
+            return
+        }
+
+        var input = file.buffer
+        var offset = 0
+        var result = [String:Any]()
+        let group = DispatchGroup()
+
+        while offset < size {
+            let slice = input.readSlice(length: Client.chunkSize)
+                ?? input.readSlice(length: Int(size - offset))
+            
+            params[paramName] = File(
+                name: file.name,
+                buffer: slice!
+            )
+            
+            headers["content-range"] = "bytes \(offset)-\(min((offset + Client.chunkSize) - 1, size))/\(size)"
+
+            group.enter()
+
+            call(
+                method: "POST",
+                path: path,
+                headers: headers,
+                params: params,
+                convert: { return $0 }
+            ) { response in
+                switch response {
+                case let .success(map):
+                    result = map
+                    group.leave()
+                case let .failure(error):
+                    completion?(.failure(error))
+                    return
+                }
+            }
+            
+            group.wait()
+
+            offset += Client.chunkSize
+            headers["x-appwrite-id"] = result["$id"] as? String
+            onProgress?(UploadProgress(
+                id: result["$id"] as? String ?? "",
+                progress: Double(min(offset, size))/Double(size) * 100.0,
+                sizeUploaded: min(offset, size),
+                chunksTotal: result["chunksTotal"] as? Int ?? -1,
+                chunksUploaded: result["chunksUploaded"] as? Int ?? -1
+            ))
+        }
+
+        completion?(.success(convert!(result)))
+    }
+
+
+    private static func randomBoundary() -> String {
         var string = ""
         for _ in 0..<16 {
             string.append(Client.boundaryChars.randomElement()!)
@@ -402,11 +503,12 @@ open class Client {
 
     private func buildMultipart(
         _ request: inout HTTPClient.Request,
-        with params: [String: Any?] = [:]
+        with params: [String: Any?] = [:],
+        chunked: Bool = false
     ) {
         func addPart(name: String, value: Any) {
             bodyBuffer.writeString(DASHDASH)
-            bodyBuffer.writeString(boundary)
+            bodyBuffer.writeString(Client.boundary)
             bodyBuffer.writeString(CRLF)
             bodyBuffer.writeString("Content-Disposition: form-data; name=\"\(name)\"")
 
@@ -428,7 +530,6 @@ open class Client {
             bodyBuffer.writeString(CRLF)
         }
 
-        let boundary = randomBoundary()
         var bodyBuffer = ByteBuffer()
 
         for (key, value) in params {
@@ -447,13 +548,15 @@ open class Client {
         }
 
         bodyBuffer.writeString(DASHDASH)
-        bodyBuffer.writeString(boundary)
+        bodyBuffer.writeString(Client.boundary)
         bodyBuffer.writeString(DASHDASH)
         bodyBuffer.writeString(CRLF)
 
         request.headers.remove(name: "content-type")
+        if !chunked {
         request.headers.add(name: "Content-Length", value: bodyBuffer.readableBytes.description)
-        request.headers.add(name: "Content-Type", value: "multipart/form-data;boundary=\"\(boundary)\"")
+        }
+        request.headers.add(name: "Content-Type", value: "multipart/form-data;boundary=\"\(Client.boundary)\"")
         request.body = .byteBuffer(bodyBuffer)
     }
 

Sources/Appwrite/Models/AppwriteError.swift

@@ -4,9 +4,11 @@ open class AppwriteError : Swift.Error, Decodable {
 
     public let message: String
     public let code: Int?
+    public let type: String?
 
-    init(message: String, code: Int? = nil) {
+    init(message: String, code: Int? = nil, type: String? = nil) {
         self.message = message
         self.code = code
+        self.type = type
     }
 }

Sources/Appwrite/Models/UploadProgress.swift

@@ -0,0 +1,15 @@
+public class UploadProgress {
+    public let id: String
+    public let progress: Double
+    public let sizeUploaded: Int
+    public let chunksTotal: Int
+    public let chunksUploaded: Int
+
+    public init(id: String, progress: Double, sizeUploaded: Int, chunksTotal: Int, chunksUploaded: Int) {
+        self.id = id
+        self.progress = progress
+        self.sizeUploaded = sizeUploaded
+        self.chunksTotal = chunksTotal
+        self.chunksUploaded = chunksUploaded
+    }
+}