Merge pull request #6 from atelier-saulx/feature/tls-host-discovery

Update based universal client

Author: MinneSchalekamp

Examples/BasicExample/BasicExample/ActorListView.swift

@@ -25,8 +25,7 @@ public struct Actors: Decodable {
 
     @Published var actors = Actors(actors: [])
     private var task: Task<(), Error>?
-    private var sequence: BasedAsyncSequence<Actors>?
-    
+
     func fetchActors() {
         let query = BasedQuery.query(
             .field(
@@ -41,21 +40,15 @@ public struct Actors: Decodable {
                     )
             )
         )
-        
-        sequence = Current.client.based.subscribe(query: query).asBasedAsyncSequence()
-        
-        if let sequence {
-            
-            task = Task {
-                do {
-                    for try await actors in sequence {
-                        self.actors = actors
-                    }
-                } catch {
-                    print(error)
+
+        task = Task {
+            do {
+                for try await actors in try Current.client.based.subscribe(query: query) as AsyncThrowingStream<Actors, Error> {
+                    self.actors = actors
                 }
+            } catch {
+                print(error)
             }
-            
         }
     }
 

Examples/BasicExample/BasicExample/MovieListView.swift

@@ -25,28 +25,21 @@ class MovieListViewModel: ObservableObject {
 
     @Published var movies = Movies(movies: [])
     private var task: Task<(), Error>?
-    private var sequence: BasedAsyncSequence<Movies>?
-    
+
     func fetchMovies() {
 
         let query = BasedQuery.query(
             .field("movies", .field("name", true), .field("id", true), .list(.find(.traverse("children"), .filter(.from("type"), .operator("="), .value("movie")))))
         )
 
-        sequence = Current.client.based.subscribe(query: query).asBasedAsyncSequence()
-        
-        if let sequence {
-            
-            task = Task {
-                do {
-                    for try await movies in sequence {
-                        self.movies = movies
-                    }
-                } catch {
-                    print(error)
+        task = Task {
+            do {
+                for try await movies in try Current.client.based.subscribe(query: query) as AsyncThrowingStream<Movies, Error> {
+                    self.movies = movies
                 }
+            } catch {
+                print(error)
             }
-            
         }
     }
 

Package.swift

@@ -16,10 +16,11 @@ let package = Package(
             targets: ["BasedClient"])
     ],
     targets: [
-        .binaryTarget(name: "Based", url: "https://github.com/atelier-saulx/based-universal/releases/download/v2.1.4/based-universal-v2.1.4-xcframework.zip", checksum: "61501392276a6dbd098bbd2d00a39d07fb8662995ef1d126d657ff0625fdfb71"),
-//        .binaryTarget(
-//            name: "Based",
-//            path: "Based.xcframework"),
+        .binaryTarget(
+            name: "Based",
+            url: "https://github.com/atelier-saulx/based-universal/releases/download/v2.1.6/based-universal-v2.1.6-xcframework.zip",
+            checksum: "40d1d754633942985f01253db14b10bde4534ad85538f1f0dc80c20305356eb4"
+        ),
         .target(
             name: "BasedOBJCWrapper",
             dependencies: [

Sources/BasedClient/Based.swift

@@ -35,7 +35,9 @@ public final class Based {
             env: configuration.env,
             name: configuration.name,
             key: configuration.key,
-            optionalKey: configuration.optionalKey
+            optionalKey: configuration.optionalKey,
+            host: configuration.host,
+            discoveryUrl: configuration.discoveryUrl
         )
     }
 }

Sources/BasedClient/BasedConfiguration.swift

@@ -15,7 +15,9 @@ public struct BasedConfiguration {
     let name: String = "@based/env-hub"
     let key: String = ""
     let optionalKey: Bool = false
-    
+    let host: String = ""
+    let discoveryUrl: String = ""
+
     public init(org: String, project: String, env: String) {
         self.org = org
         self.project = project

Sources/BasedClient/Client/BasedClient.swift

@@ -109,10 +109,11 @@ final class BasedClient: BasedClientProtocol {
     var functionCallbacks: FunctionCallbackStore
 
     var basedCClient: BasedCClientProtocol
-    
+    var enableTls: Bool = false
+
     /// 32 bit integer representing the id of the c++ client
     var clientId: BasedClientId
-    
+
     required init(
         cClient: BasedCClientProtocol = BasedCClient(),
         observeCallbacks: ObserveCallbackStore = ObserveCallbacks.shared,
@@ -123,7 +124,7 @@ final class BasedClient: BasedClientProtocol {
         self.observeCallbacks = observeCallbacks
         self.getCallbacks = getCallbacks
         self.functionCallbacks = functionCallbacks
-        clientId = basedCClient.create()
+        clientId = basedCClient.create(enableTls: enableTls)
     }
 
     deinit {

Sources/BasedClient/Client/BasedClientProtocol+Ext.swift

@@ -21,9 +21,11 @@ extension BasedClientProtocol {
         env: String,
         name: String = "@based/env-hub",
         key: String = "",
-        optionalKey: Bool = false
+        optionalKey: Bool = false,
+        host: String,
+        discoveryUrl: String
     ) {
-        basedCClient.connect(clientId: clientId, cluster: cluster, org: org, project: project, env: env, name: name, key: key, optionalKey: optionalKey)
+        basedCClient.connect(clientId: clientId, cluster: cluster, org: org, project: project, env: env, name: name, key: key, optionalKey: optionalKey, host: host, discoveryUrl: discoveryUrl)
     }
 
     func disconnect() {

Sources/BasedClient/Client/BasedClientProtocol.swift

@@ -44,7 +44,9 @@ protocol BasedClientProtocol {
         env: String,
         name: String,
         key: String,
-        optionalKey: Bool
+        optionalKey: Bool,
+        host: String,
+        discoveryUrl: String
     )
 
     /// Disconnects the client with id

Sources/BasedOBJCWrapper/BasedCClient.mm

@@ -14,9 +14,8 @@ @interface BasedCClient ()
 
 @implementation BasedCClient
 
-- (BasedClientID) create {
-    int clientId = Based__new_client();
-    return clientId;
+- (BasedClientID)create:(BOOL)enableTls {
+    return Based__new_client(enableTls);
 }
 
 - (void)delete:(BasedClientID)clientId {
@@ -27,8 +26,8 @@ - (void)connect:(BasedClientID)clientId withUrl:(NSString *)url {
     Based__connect_to_url(clientId, (char *)url.UTF8String);
 }
 
-- (void)connect:(BasedClientID)clientId withCluster:(NSString *)cluster withOrg:(NSString *)org withProject:(NSString *)project withEnv:(NSString *)env withName:(NSString *)name withKey:(NSString *)key withOptionalKey:(BOOL) optionalKey {
-    Based__connect(clientId, (char *)cluster.UTF8String, (char *)org.UTF8String, (char *)project.UTF8String, (char *)env.UTF8String, (char *)name.UTF8String, (char *)key.UTF8String, optionalKey);
+- (void)connect:(BasedClientID)clientId withCluster:(NSString *)cluster withOrg:(NSString *)org withProject:(NSString *)project withEnv:(NSString *)env withName:(NSString *)name withKey:(NSString *)key withOptionalKey:(BOOL)optionalKey withHost:(NSString *)host withDiscoveryUrl:(NSString *)discovery_url {
+    Based__connect(clientId, (char *)cluster.UTF8String, (char *)org.UTF8String, (char *)project.UTF8String, (char *)env.UTF8String, (char *)name.UTF8String, (char *)key.UTF8String, optionalKey, (char *)host.UTF8String, (char *)discovery_url.UTF8String);
 }
 
 - (void)disconnect:(BasedClientID)clientId {

Sources/BasedOBJCWrapper/include/BasedCClientProtocol.h

@@ -14,15 +14,16 @@ typedef int BasedClientID;
 
 @protocol BasedCClientProtocol
 
-- (int)create;
+- (int)create: (BOOL)enableTls
+NS_SWIFT_NAME(create(enableTls:));
 
 - (void)delete: (BasedClientID)clientId;
 
 - (void)connect: (BasedClientID)clientId withUrl: (NSString *)url
 NS_SWIFT_NAME(connect(clientId:url:));
 
-- (void)connect: (BasedClientID)clientId withCluster: (NSString *)cluster withOrg: (NSString *)org withProject: (NSString *)project withEnv: (NSString *)env withName: (NSString *) name withKey: (NSString *) key withOptionalKey: (BOOL) optionalKey
-NS_SWIFT_NAME(connect(clientId:cluster:org:project:env:name:key:optionalKey:));
+- (void)connect: (BasedClientID)clientId withCluster: (NSString *)cluster withOrg: (NSString *)org withProject: (NSString *)project withEnv: (NSString *)env withName: (NSString *)name withKey: (NSString *)key withOptionalKey: (BOOL)optionalKey withHost: (NSString *)host withDiscoveryUrl: (NSString *)discovery_url
+NS_SWIFT_NAME(connect(clientId:cluster:org:project:env:name:key:optionalKey:host:discoveryUrl:));
 
 - (void)disconnect: (BasedClientID)clientId
 NS_SWIFT_NAME(disconnect(clientId:));