Merge pull request #590 from appwrite/fix-apple-xcode14-realtime

Author: lohanidamodar

templates/swift/Sources/Services/Service.swift.twig

@@ -34,7 +34,7 @@ open class {{ service.name | caseUcfirst }}: Service {
         {%~ if 'multipart/form-data' in method.consumes %}
         onProgress: ((UploadProgress) -> Void)? = nil
         {%~ endif %}
-    ) async throws -> {{ method | returnType(spec) | raw }} {
+    ){%~ if method.type != "webAuth" %} async{% endif %} throws -> {{ method | returnType(spec) | raw }} {
         {{~ include('swift/base/params.twig') }}
         {%~ if method.type == 'webAuth' %}
         {{~ include('swift/base/requests/OAuth.twig') }}

templates/swift/Sources/WebSockets/WebSocketClient.swift.twig

@@ -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)

tests/AppleSwift55Test.php

@@ -26,7 +26,7 @@ class AppleSwift55Test extends Base
         ...Base::LARGE_FILE_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES,
-        //...Base::REALTIME_RESPONSES,
+        ...Base::REALTIME_RESPONSES,
         ...Base::COOKIE_RESPONSES,
         ...Base::QUERY_HELPER_RESPONSES,
         ...Base::PERMISSION_HELPER_RESPONSES,

tests/languages/apple/Tests.swift

@@ -31,12 +31,12 @@ class Tests: XCTestCase {
         let realtime = Realtime(client)
         var realtimeResponse = "Realtime failed!"
 
-//         let expectation = XCTestExpectation(description: "realtime server")
-//
-//         realtime.subscribe(channels: ["tests"]) { message in
-//             realtimeResponse = message.payload!["response"] as! String
-//             expectation.fulfill()
-//         }
+        let expectation = XCTestExpectation(description: "realtime server")
+
+        realtime.subscribe(channels: ["tests"]) { message in
+            realtimeResponse = message.payload!["response"] as! String
+            expectation.fulfill()
+        }
 
         var mock: Mock
 
@@ -132,8 +132,8 @@ class Tests: XCTestCase {
             print(error.localizedDescription)
         }
 
-//         wait(for: [expectation], timeout: 10.0)
-//         print(realtimeResponse)
+        wait(for: [expectation], timeout: 10.0)
+        print(realtimeResponse)
 
         mock = try await general.setCookie()
         print(mock.result)