Make client params optional and export session, client

xconnio · Apr 30, 2024 · 071fe81 · 071fe81
1 parent 623d5c0
commit 071fe81
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/lib/exports.dart b/lib/exports.dart
@@ -0,0 +1,3 @@
+export "src/client.dart" show Client;
+export "src/session.dart" show Session;
+export "src/types.dart" show Registration, Subscription;
diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -5,13 +5,16 @@ import "package:wampproto/auth.dart";
 import "package:wampproto/serializers.dart";
 
 class Client {
-  Client(this._authenticator, this._serializer);
+  Client({IClientAuthenticator? authenticator, Serializer? serializer}) {
+    _authenticator = authenticator;
+    _serializer = serializer;
+  }
 
-  final IClientAuthenticator _authenticator;
-  final Serializer _serializer;
+  IClientAuthenticator? _authenticator;
+  Serializer? _serializer;
 
   Future<Session> connect(String url, String realm) async {
-    WAMPSessionJoiner joiner = WAMPSessionJoiner(_authenticator, serializer: _serializer);
+    WAMPSessionJoiner joiner = WAMPSessionJoiner(authenticator: _authenticator, serializer: _serializer);
     BaseSession baseSession = await joiner.join(url, realm);
 
     return Session(baseSession);

diff --git a/lib/src/helpers.dart b/lib/src/helpers.dart
@@ -1,4 +1,4 @@
-import "package:wamp/wamp_session.dart";
+import "package:wamp/src/wsjoiner.dart";
 import "package:wampproto/messages.dart";
 import "package:wampproto/serializers.dart";
 

diff --git a/lib/src/wsjoiner.dart b/lib/src/wsjoiner.dart
@@ -9,14 +9,17 @@ import "package:wampproto/joiner.dart";
 import "package:wampproto/serializers.dart";
 
 class WAMPSessionJoiner {
-  WAMPSessionJoiner(this._authenticator, {Serializer? serializer}) : _serializer = serializer ?? JSONSerializer();
+  WAMPSessionJoiner({IClientAuthenticator? authenticator, Serializer? serializer}) {
+    _serializer = serializer ?? JSONSerializer();
+    _authenticator = authenticator;
+  }
 
   static const String jsonSubProtocol = "wamp.2.json";
   static const String cborSubProtocol = "wamp.2.cbor";
   static const String msgpackSubProtocol = "wamp.2.msgpack";
 
-  final IClientAuthenticator _authenticator;
-  final Serializer _serializer;
+  IClientAuthenticator? _authenticator;
+  late Serializer _serializer;
 
   Future<BaseSession> join(String uri, String realm) async {
     // ignore: close_sinks

diff --git a/lib/wamp_session.dart b/lib/wamp_session.dart