chore(core): make createClient async

Author: JKRhb

lib/src/binding_coap/coap_client_factory.dart

@@ -36,7 +36,7 @@ final class CoapClientFactory implements ProtocolClientFactory {
   }
 
   @override
-  ProtocolClient createClient() => CoapClient(
+  Future<ProtocolClient> createClient() async => CoapClient(
         coapConfig: coapConfig,
         pskCredentialsCallback: _pskCredentialsCallback,
         aceSecurityCallback: _aceSecurityCallback,

lib/src/binding_http/http_client_factory.dart

@@ -33,7 +33,7 @@ final class HttpClientFactory implements ProtocolClientFactory {
   }
 
   @override
-  ProtocolClient createClient() => HttpClient(
+  Future<ProtocolClient> createClient() async => HttpClient(
         basicCredentialsCallback: _basicCredentialsCallback,
         bearerCredentialsCallback: _bearerCredentialsCallback,
       );

lib/src/binding_mqtt/mqtt_client_factory.dart

@@ -25,7 +25,7 @@ final class MqttClientFactory implements ProtocolClientFactory {
       _basicCredentialsCallback;
 
   @override
-  ProtocolClient createClient() => MqttClient(
+  Future<ProtocolClient> createClient() async => MqttClient(
         mqttConfig: _mqttConfig,
         basicCredentialsCallback: _basicCredentialsCallback,
       );

lib/src/core/implementation/consumed_thing.dart

@@ -35,13 +35,13 @@ class ConsumedThing implements scripting_api.ConsumedThing {
   /// Determines the id of this [ConsumedThing].
   String get identifier => thingDescription.identifier;
 
-  (ProtocolClient client, AugmentedForm form) _getClientFor(
+  Future<(ProtocolClient client, AugmentedForm form)> _getClientFor(
     List<Form> forms,
     OperationType operationType,
     InteractionAffordance interactionAffordance, {
     required int? formIndex,
     required Map<String, Object>? uriVariables,
-  }) {
+  }) async {
     final augmentedForms = forms
         .map(
           (form) => AugmentedForm.new(
@@ -59,7 +59,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       if (formIndex >= 0 && formIndex < forms.length) {
         foundForm = augmentedForms[formIndex];
         final scheme = foundForm.href.scheme;
-        client = servient.clientFor(scheme);
+        client = await servient.createClient(scheme);
       } else {
         throw ArgumentError(
           'ConsumedThing "$title" missing formIndex for '
@@ -86,7 +86,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
         orElse: () => throw Exception("No matching form found!"),
       );
       final scheme = foundForm.href.scheme;
-      client = servient.clientFor(scheme);
+      client = await servient.createClient(scheme);
     }
 
     return (client, foundForm);
@@ -108,7 +108,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       );
     }
 
-    final (ProtocolClient client, AugmentedForm form) = _getClientFor(
+    final (ProtocolClient client, AugmentedForm form) = await _getClientFor(
       property.forms,
       OperationType.readproperty,
       property,
@@ -137,7 +137,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       );
     }
 
-    final (client, form) = _getClientFor(
+    final (client, form) = await _getClientFor(
       property.forms,
       OperationType.writeproperty,
       property,
@@ -173,7 +173,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       );
     }
 
-    final (client, form) = _getClientFor(
+    final (client, form) = await _getClientFor(
       action.forms,
       OperationType.invokeaction,
       action,
@@ -269,7 +269,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
         subscriptions = _subscribedEvents;
     }
 
-    final (client, form) = _getClientFor(
+    final (client, form) = await _getClientFor(
       affordance.forms,
       operationType,
       affordance,

lib/src/core/implementation/protocol_interfaces/protocol_client_factory.dart

@@ -26,7 +26,7 @@ abstract interface class ProtocolClientFactory {
 
   /// Creates a new [ProtocolClient] with that supports one or more of the given
   /// [schemes].
-  ProtocolClient createClient();
+  Future<ProtocolClient> createClient();
 
   /// Indicates whether this [ProtocolClientFactory] supports a given
   /// [operationType] and subprotocol.

lib/src/core/implementation/servient.dart

@@ -198,7 +198,7 @@ class Servient {
       _clientFactories.remove(scheme);
 
   /// Returns the [ProtocolClient] associated with a given [scheme].
-  ProtocolClient clientFor(String scheme) {
+  Future<ProtocolClient> createClient(String scheme) async {
     final clientFactory = _clientFactories[scheme];
 
     if (clientFactory == null) {
@@ -232,7 +232,7 @@ class Servient {
 
   /// Requests a [ThingDescription] from a [url].
   Future<ThingDescription> requestThingDescription(Uri url) async {
-    final client = clientFor(url.scheme);
+    final client = await createClient(url.scheme);
     final content = await client.requestThingDescription(url);
 
     final dataSchemaValue = await contentSerdes.contentToValue(content, null);

lib/src/core/implementation/thing_discovery.dart

@@ -69,15 +69,15 @@ class ThingDiscovery extends Stream<ThingDescription>
     }
   }
 
-  ProtocolClient _clientForUriScheme(Uri uri) {
+  Future<ProtocolClient> _clientForUriScheme(Uri uri) async {
     final uriScheme = uri.scheme;
     final existingClient = _clients[uriScheme];
 
     if (existingClient != null) {
       return existingClient;
     }
 
-    final newClient = _servient.clientFor(uriScheme);
+    final newClient = await _servient.createClient(uriScheme);
     _clients[uriScheme] = newClient;
     return newClient;
   }
@@ -106,7 +106,7 @@ class ThingDiscovery extends Stream<ThingDescription>
   }
 
   Stream<ThingDescription> _discoverDirectly(Uri uri) async* {
-    final client = _clientForUriScheme(uri);
+    final client = await _clientForUriScheme(uri);
 
     yield* client
         .discoverDirectly(uri, disableMulticast: true)
@@ -180,7 +180,7 @@ class ThingDiscovery extends Stream<ThingDescription>
   ) async* {
     final Set<Uri> discoveredUris = {};
     final discoveryUri = uri.toLinkFormatDiscoveryUri(resourceType);
-    final client = _clientForUriScheme(uri);
+    final client = await _clientForUriScheme(uri);
 
     await for (final coreWebLink
         in client.discoverWithCoreLinkFormat(discoveryUri)) {

test/binding_coap/binding_coap_test.dart

@@ -50,9 +50,9 @@ void main() {
       expect(defaultClientFactory.coapConfig, null);
       expect(defaultClientFactory.init(), true);
 
-      final coapClient = defaultClientFactory.createClient();
 
       await coapClient.start();
+      final coapClient = await defaultClientFactory.createClient();
 
       await coapClient.stop();
 

test/core/discovery_test.dart

@@ -242,7 +242,7 @@ class _MockedProtocolClient implements ProtocolClient {
 
 class _MockedProtocolClientFactory implements ProtocolClientFactory {
   @override
-  ProtocolClient createClient() {
+  Future<ProtocolClient> createClient() async {
     return _MockedProtocolClient();
   }
 

test/core/servient_test.dart

@@ -11,7 +11,7 @@ const testUriScheme = "test";
 
 class MockedProtocolClientFactory implements ProtocolClientFactory {
   @override
-  ProtocolClient createClient() {
+  Future<ProtocolClient> createClient() {
     throw UnimplementedError("Instantiating a client is not supported yet.");
   }
 
@@ -69,7 +69,7 @@ void main() {
       final servient = Servient();
 
       expect(
-        () => servient.clientFor(testUriScheme),
+        () => servient.createClient(testUriScheme),
         throwsA(isA<DartWotException>()),
       );
     },