Merge pull request #28 from appwrite/dev

Fix nested models

Author: lohanidamodar

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2022 Appwrite (https://appwrite.io) and individual contributors.
+Copyright (c) 2023 Appwrite (https://appwrite.io) and individual contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Package.resolved

@@ -0,0 +1,88 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "async-http-client",
+        "repositoryURL": "https://github.com/swift-server/async-http-client.git",
+        "state": {
+          "branch": null,
+          "revision": "03b3e7b34153299e9b4c4b5c2a6ac790a582a3ac",
+          "version": "1.12.0"
+        }
+      },
+      {
+        "package": "swift-atomics",
+        "repositoryURL": "https://github.com/apple/swift-atomics.git",
+        "state": {
+          "branch": null,
+          "revision": "919eb1d83e02121cdb434c7bfc1f0c66ef17febe",
+          "version": "1.0.2"
+        }
+      },
+      {
+        "package": "swift-collections",
+        "repositoryURL": "https://github.com/apple/swift-collections.git",
+        "state": {
+          "branch": null,
+          "revision": "f504716c27d2e5d4144fa4794b12129301d17729",
+          "version": "1.0.3"
+        }
+      },
+      {
+        "package": "swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log.git",
+        "state": {
+          "branch": null,
+          "revision": "6fe203dc33195667ce1759bf0182975e4653ba1c",
+          "version": "1.4.4"
+        }
+      },
+      {
+        "package": "swift-nio",
+        "repositoryURL": "https://github.com/apple/swift-nio.git",
+        "state": {
+          "branch": null,
+          "revision": "bc4c55b9f9584f09eb971d67d956e28d08caa9d0",
+          "version": "2.43.1"
+        }
+      },
+      {
+        "package": "swift-nio-extras",
+        "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
+        "state": {
+          "branch": null,
+          "revision": "6c84d247754ad77487a6f0694273b89b83efd056",
+          "version": "1.14.0"
+        }
+      },
+      {
+        "package": "swift-nio-http2",
+        "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
+        "state": {
+          "branch": null,
+          "revision": "00576e6f1efa5c46dca2ca3081dc56dd233b402d",
+          "version": "1.23.0"
+        }
+      },
+      {
+        "package": "swift-nio-ssl",
+        "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
+        "state": {
+          "branch": null,
+          "revision": "4fb7ead803e38949eb1d6fabb849206a72c580f3",
+          "version": "2.23.0"
+        }
+      },
+      {
+        "package": "swift-nio-transport-services",
+        "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
+        "state": {
+          "branch": null,
+          "revision": "c0d9a144cfaec8d3d596aadde3039286a266c15c",
+          "version": "1.15.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

README.md

@@ -31,7 +31,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "1.2.0"),
+        .package(url: "[email protected]:appwrite/sdk-for-apple.git", from: "1.2.1"),
     ],
 ```
 

Sources/Appwrite/Client.swift

@@ -23,7 +23,7 @@ open class Client {
         "x-sdk-name": "Apple",
         "x-sdk-platform": "client",
         "x-sdk-language": "apple",
-        "x-sdk-version": "1.2.0",
+        "x-sdk-version": "1.2.1",
         "X-Appwrite-Response-Format": "1.0.0"
     ]
 

Sources/Appwrite/Services/Account.swift

@@ -15,7 +15,7 @@ open class Account: Service {
     /// @return array
     ///
     open func get<T>(
-        nestedType: T.Type,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account"
 
@@ -74,8 +74,8 @@ open class Account: Service {
         userId: String,
         email: String,
         password: String,
-        name: String? = nil
-        nestedType: T.Type,
+        name: String? = nil,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account"
 
@@ -154,8 +154,8 @@ open class Account: Service {
     ///
     open func updateEmail<T>(
         email: String,
-        password: String
-        nestedType: T.Type,
+        password: String,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/email"
 
@@ -290,8 +290,8 @@ open class Account: Service {
     /// @return array
     ///
     open func updateName<T>(
-        name: String
-        nestedType: T.Type,
+        name: String,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/name"
 
@@ -348,8 +348,8 @@ open class Account: Service {
     ///
     open func updatePassword<T>(
         password: String,
-        oldPassword: String? = nil
-        nestedType: T.Type,
+        oldPassword: String? = nil,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/password"
 
@@ -414,8 +414,8 @@ open class Account: Service {
     ///
     open func updatePhone<T>(
         phone: String,
-        password: String
-        nestedType: T.Type,
+        password: String,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/phone"
 
@@ -475,7 +475,7 @@ open class Account: Service {
     /// @return array
     ///
     open func getPrefs<T>(
-        nestedType: T.Type,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Preferences<T> {
         let path: String = "/account/prefs"
 
@@ -525,8 +525,8 @@ open class Account: Service {
     /// @return array
     ///
     open func updatePrefs<T>(
-        prefs: T
-        nestedType: T.Type,
+        prefs: T,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/prefs"
 
@@ -938,7 +938,7 @@ open class Account: Service {
         success: String? = nil,
         failure: String? = nil,
         scopes: [String]? = nil
-    ) async throws -> Bool {
+    ) throws -> Bool {
         let path: String = "/account/sessions/oauth2/{provider}"
             .replacingOccurrences(of: "{provider}", with: provider)
 
@@ -1164,7 +1164,7 @@ open class Account: Service {
     /// @return array
     ///
     open func updateStatus<T>(
-        nestedType: T.Type,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Account<T> {
         let path: String = "/account/status"
 

Sources/Appwrite/Services/Databases.swift

@@ -21,8 +21,8 @@ open class Databases: Service {
     open func listDocuments<T>(
         databaseId: String,
         collectionId: String,
-        queries: [String]? = nil
-        nestedType: T.Type,
+        queries: [String]? = nil,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.DocumentList<T> {
         let path: String = "/databases/{databaseId}/collections/{collectionId}/documents"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -95,8 +95,8 @@ open class Databases: Service {
         collectionId: String,
         documentId: String,
         data: T,
-        permissions: [String]? = nil
-        nestedType: T.Type,
+        permissions: [String]? = nil,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Document<T> {
         let path: String = "/databases/{databaseId}/collections/{collectionId}/documents"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -173,8 +173,8 @@ open class Databases: Service {
     open func getDocument<T>(
         databaseId: String,
         collectionId: String,
-        documentId: String
-        nestedType: T.Type,
+        documentId: String,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Document<T> {
         let path: String = "/databases/{databaseId}/collections/{collectionId}/documents/{documentId}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -244,8 +244,8 @@ open class Databases: Service {
         collectionId: String,
         documentId: String,
         data: T? = nil,
-        permissions: [String]? = nil
-        nestedType: T.Type,
+        permissions: [String]? = nil,
+        nestedType: T.Type
     ) async throws -> AppwriteModels.Document<T> {
         let path: String = "/databases/{databaseId}/collections/{collectionId}/documents/{documentId}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)

Sources/Appwrite/WebSockets/WebSocketClient.swift

@@ -26,10 +26,10 @@ public class WebSocketClient {
     var channel: Channel? = nil
     var tlsEnabled: Bool = false
     var closeSent: Bool = false
-    
-    let upgradedSignalled = DispatchSemaphore(value: 0)
-    let locker = DispatchQueue(label: WEBSOCKET_LOCKER_QUEUE)
-    let threadGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+
+    let locker = DispatchQueue(label: WEBSOCKET_LOCKER_QUEUE, qos: .background)
+
+    var threadGroup: MultiThreadedEventLoopGroup? = nil
 
     weak var delegate: WebSocketClientDelegate? = nil
 
@@ -184,6 +184,10 @@ public class WebSocketClient {
         self.maxFrameSize = maxFrameSize
         self.tlsEnabled = tlsEnabled
         self.delegate = delegate
+
+        DispatchQueue.global(qos: .background).async {
+            self.threadGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+        }
     }
 
     /// Create a new `WebSocketClient`.
@@ -207,10 +211,14 @@ public class WebSocketClient {
         self.maxFrameSize = 24
         self.tlsEnabled = tlsEnabled
         self.delegate = delegate
+
+        DispatchQueue.global(qos: .background).async {
+            self.threadGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
+        }
     }
 
     deinit {
-        try! threadGroup.syncShutdownGracefully()
+        try! threadGroup!.syncShutdownGracefully()
     }
 
     // MARK: - Open connection
@@ -221,16 +229,16 @@ public class WebSocketClient {
             SocketOptionLevel(SOL_SOCKET),
             SO_REUSEPORT
         )
+
+        while(threadGroup == nil) {}
 
-        let bootstrap = ClientBootstrap(group: threadGroup)
+        let bootstrap = ClientBootstrap(group: threadGroup!)
             .channelOption(socketOptions, value: 1)
             .channelInitializer(self.openChannel)
 
         _ = try bootstrap
             .connect(host: self.host, port: self.port)
             .wait()
-        
-        self.upgradedSignalled.wait()
     }
 
     private func openChannel(channel: Channel) -> EventLoopFuture<Void> {
@@ -260,13 +268,10 @@ public class WebSocketClient {
     }
 
     private func upgradePipelineHandler(channel: Channel, response: HTTPResponseHead) -> EventLoopFuture<Void> {
-        self.onOpen(channel)
-        
         let handler = MessageHandler(client: self)
 
         if response.status == .switchingProtocols {
             self.channel = channel
-            self.upgradedSignalled.signal()
         }
 
         return channel.pipeline.addHandler(handler)