Merge pull request #103 from muzzammilshahid/named-constructor

Add named construtors in messages

lib/src/acceptor.dart

@@ -79,9 +79,7 @@ class Acceptor {
           Response response = _authenticator.authenticate(request);
           _state = stateWelcomeSent;
 
-          Welcome welcome = Welcome(
-            WelcomeFields(_sessionID, routerRoles, response.authID, response.authRole, method, authExtra: {}),
-          );
+          Welcome welcome = Welcome(_sessionID, routerRoles, response.authID, response.authRole, method, authExtra: {});
           _sessionDetails = SessionDetails(_sessionID, msg.realm, welcome.authID, welcome.authRole);
 
           return welcome;
@@ -99,7 +97,7 @@ class Acceptor {
           String challenge = generateCryptoSignChallenge();
           _state = stateChallengeSent;
 
-          return Challenge(ChallengeFields(method, {"challenge": challenge}));
+          return Challenge(method, {"challenge": challenge});
 
         case wampcra:
           WAMPCRARequest request = WAMPCRARequest(msg.realm, msg.authID, msg.authExtra);
@@ -115,12 +113,12 @@ class Acceptor {
           _state = stateChallengeSent;
           _challenge = challenge;
 
-          return Challenge(ChallengeFields(method, {"challenge": challenge}));
+          return Challenge(method, {"challenge": challenge});
 
         case ticket:
           _state = stateChallengeSent;
 
-          return Challenge(ChallengeFields(method, {}));
+          return Challenge(method, {});
 
         default:
           throw ProtocolError("unknown auth method '$method'");
@@ -135,13 +133,12 @@ class Acceptor {
           var isVerified = verifyCryptoSignSignature(msg.signature, Base16Encoder.instance.decode(_publicKey));
           if (!isVerified) {
             _state = stateAborted;
-            return Abort(AbortFields({}, errAuthenticationFailed));
+            return Abort({}, errAuthenticationFailed);
           }
           _state = stateWelcomeSent;
 
-          Welcome welcome = Welcome(
-            WelcomeFields(_sessionID, routerRoles, _response.authID, _response.authRole, cryptosign, authExtra: {}),
-          );
+          Welcome welcome =
+              Welcome(_sessionID, routerRoles, _response.authID, _response.authRole, cryptosign, authExtra: {});
           _sessionDetails = SessionDetails(welcome.sessionID, _hello.realm, welcome.authID, welcome.authRole);
 
           return welcome;
@@ -150,13 +147,12 @@ class Acceptor {
           var isVerified = verifyWampCRASignature(msg.signature, _challenge, Uint8List.fromList(_secret.codeUnits));
           if (!isVerified) {
             _state = stateAborted;
-            return Abort(AbortFields({}, errAuthenticationFailed));
+            return Abort({}, errAuthenticationFailed);
           }
           _state = stateWelcomeSent;
 
-          Welcome welcome = Welcome(
-            WelcomeFields(_sessionID, routerRoles, _response.authID, _response.authRole, wampcra, authExtra: {}),
-          );
+          Welcome welcome =
+              Welcome(_sessionID, routerRoles, _response.authID, _response.authRole, wampcra, authExtra: {});
           _sessionDetails = SessionDetails(welcome.sessionID, _hello.realm, welcome.authID, welcome.authRole);
 
           return welcome;
@@ -166,9 +162,7 @@ class Acceptor {
           Response response = _authenticator.authenticate(request);
           _state = stateWelcomeSent;
 
-          Welcome welcome = Welcome(
-            WelcomeFields(_sessionID, routerRoles, response.authID, response.authRole, ticket, authExtra: {}),
-          );
+          Welcome welcome = Welcome(_sessionID, routerRoles, response.authID, response.authRole, ticket, authExtra: {});
           _sessionDetails = SessionDetails(welcome.sessionID, _hello.realm, welcome.authID, welcome.authRole);
 
           return welcome;

lib/src/auth/cryptosign.dart

@@ -31,7 +31,7 @@ class CryptoSignAuthenticator extends IClientAuthenticator {
     var challengeHex = challenge.extra["challenge"];
     var signed = signCryptoSignChallenge(challengeHex, getPrivateKey());
 
-    return Authenticate(AuthenticateFields(signed + challengeHex, {}));
+    return Authenticate(signed + challengeHex, {});
   }
 }
 

lib/src/auth/ticket.dart

@@ -9,6 +9,6 @@ class TicketAuthenticator extends IClientAuthenticator {
 
   @override
   Authenticate authenticate(Challenge challenge) {
-    return Authenticate(AuthenticateFields(_ticket, {}));
+    return Authenticate(_ticket, {});
   }
 }

lib/src/auth/wampcra.dart

@@ -15,7 +15,7 @@ class WAMPCRAAuthenticator extends IClientAuthenticator {
   @override
   Authenticate authenticate(Challenge challenge) {
     String signed = signWampCRAChallenge(challenge.extra["challenge"], utf8.encode(_secret));
-    return Authenticate(AuthenticateFields(signed, {}));
+    return Authenticate(signed, {});
   }
 }
 

lib/src/broker.dart

@@ -59,7 +59,7 @@ class Broker {
 
       _subscriptionsBySession.putIfAbsent(sessionID, () => {})[subscription.id] = subscription;
 
-      Subscribed subscribed = Subscribed(SubscribedFields(message.requestID, subscription.id));
+      Subscribed subscribed = Subscribed(message.requestID, subscription.id);
       return MessageWithRecipient(subscribed, sessionID);
     } else if (message is UnSubscribe) {
       if (!_subscriptionsBySession.containsKey(sessionID)) {
@@ -82,7 +82,7 @@ class Broker {
 
       _subscriptionsBySession[sessionID]?.remove(message.subscriptionID);
 
-      UnSubscribed unSubscribed = UnSubscribed(UnSubscribedFields(message.requestID));
+      UnSubscribed unSubscribed = UnSubscribed(message.requestID);
       return MessageWithRecipient(unSubscribed, sessionID);
     } else {
       throw Exception("message type not supported");
@@ -99,14 +99,14 @@ class Broker {
 
     var subscription = _subscriptionsByTopic[message.uri];
     if (subscription != null) {
-      var event = Event(EventFields(subscription.id, publicationId, args: message.args, kwargs: message.kwargs));
+      var event = Event(subscription.id, publicationId, args: message.args, kwargs: message.kwargs);
       result.event = event;
       result.recipients!.addAll(subscription.subscribers.keys);
     }
 
     var ack = message.options["acknowledge"] ?? false;
     if (ack) {
-      var published = Published(PublishedFields(message.requestID, publicationId));
+      var published = Published(message.requestID, publicationId);
       result.ack = MessageWithRecipient(published, sessionId);
     }
 

lib/src/dealer.dart

@@ -61,7 +61,7 @@ class Dealer {
     if (message is Call) {
       var registration = _registrationsByProcedure[message.uri];
       if (registration == null) {
-        var error = Error(ErrorFields(Register.id, message.requestID, errNoSuchProcedure));
+        var error = Error(Register.id, message.requestID, errNoSuchProcedure);
         return MessageWithRecipient(error, sessionID);
       }
 
@@ -81,13 +81,11 @@ class Dealer {
       );
 
       var invocation = Invocation(
-        InvocationFields(
-          requestID,
-          registration.id,
-          args: message.args,
-          kwargs: message.kwargs,
-          details: receiveProgress ? {optionReceiveProgress: receiveProgress} : {},
-        ),
+        requestID,
+        registration.id,
+        args: message.args,
+        kwargs: message.kwargs,
+        details: receiveProgress ? {optionReceiveProgress: receiveProgress} : {},
       );
       return MessageWithRecipient(invocation, calleeID);
     } else if (message is Yield) {
@@ -108,8 +106,7 @@ class Dealer {
       } else {
         _pendingCalls.remove(message.requestID);
       }
-      var result =
-          Result(ResultFields(invocation.requestID, args: message.args, kwargs: message.kwargs, details: details));
+      var result = Result(invocation.requestID, args: message.args, kwargs: message.kwargs, details: details);
       return MessageWithRecipient(result, invocation.callerID);
     } else if (message is Register) {
       if (!_registrationsBySession.containsKey(sessionID)) {
@@ -123,11 +120,11 @@ class Dealer {
         _registrationsBySession.putIfAbsent(sessionID, () => {})[registrations.id] = registrations;
       } else {
         // TODO: implement shared registrations.
-        var error = Error(ErrorFields(Register.id, message.requestID, errProcedureAlreadyExists));
+        var error = Error(Register.id, message.requestID, errProcedureAlreadyExists);
         return MessageWithRecipient(error, sessionID);
       }
 
-      var registered = Registered(RegisteredFields(message.requestID, registrations.id));
+      var registered = Registered(message.requestID, registrations.id);
       return MessageWithRecipient(registered, sessionID);
     } else if (message is UnRegister) {
       var registrations = _registrationsBySession[sessionID];
@@ -147,7 +144,7 @@ class Dealer {
       }
       _registrationsBySession[sessionID] = registrations;
 
-      var unRegistered = UnRegistered(UnRegisteredFields(message.requestID));
+      var unRegistered = UnRegistered(message.requestID);
       return MessageWithRecipient(unRegistered, sessionID);
     } else {
       throw Exception("message type not supported");

lib/src/joiner.dart

@@ -29,13 +29,11 @@ class Joiner {
 
   Object sendHello() {
     final hello = Hello(
-      HelloFields(
-        _realm,
-        clientRoles,
-        _authenticator.authID,
-        [_authenticator.authMethod],
-        authExtra: _authenticator.authExtra,
-      ),
+      _realm,
+      clientRoles,
+      _authenticator.authID,
+      [_authenticator.authMethod],
+      authExtra: _authenticator.authExtra,
     );
 
     _state = stateHelloSent;

lib/src/messages/abort.dart

@@ -22,7 +22,11 @@ class AbortFields implements IAbortFields {
 }
 
 class Abort implements Message {
-  Abort(this._abortFields);
+  Abort(Map<String, dynamic> details, String reason) {
+    _abortFields = AbortFields(details, reason);
+  }
+
+  Abort.withFields(this._abortFields);
 
   static const int id = 3;
 
@@ -38,7 +42,7 @@ class Abort implements Message {
     },
   );
 
-  final IAbortFields _abortFields;
+  late IAbortFields _abortFields;
 
   Map<String, dynamic> get details => _abortFields.details;
 
@@ -47,7 +51,7 @@ class Abort implements Message {
   static Abort parse(final List<dynamic> message) {
     var fields = validateMessage(message, id, text, _validationSpec);
 
-    return Abort(AbortFields(fields.details!, fields.reason!));
+    return Abort(fields.details!, fields.reason!);
   }
 
   @override

lib/src/messages/authenticate.dart

@@ -23,7 +23,11 @@ class AuthenticateFields implements IAuthenticateFields {
 }
 
 class Authenticate implements Message {
-  Authenticate(this._authenticateFields);
+  Authenticate(String signature, Map<String, dynamic> extra) {
+    _authenticateFields = AuthenticateFields(signature, extra);
+  }
+
+  Authenticate.withFields(this._authenticateFields);
 
   static const int id = 5;
 
@@ -39,7 +43,7 @@ class Authenticate implements Message {
     },
   );
 
-  final IAuthenticateFields _authenticateFields;
+  late IAuthenticateFields _authenticateFields;
 
   String get signature => _authenticateFields.signature;
 
@@ -48,7 +52,7 @@ class Authenticate implements Message {
   static Authenticate parse(final List<dynamic> message) {
     var fields = validateMessage(message, id, text, _validationSpec);
 
-    return Authenticate(AuthenticateFields(fields.signature!, fields.extra!));
+    return Authenticate(fields.signature!, fields.extra!);
   }
 
   @override

lib/src/messages/call.dart

@@ -48,7 +48,11 @@ class CallFields implements ICallFields {
 }
 
 class Call implements Message {
-  Call(this._callFields);
+  Call(int requestID, String uri, {List<dynamic>? args, Map<String, dynamic>? kwargs, Map<String, dynamic>? options}) {
+    _callFields = CallFields(requestID, uri, args: args, kwargs: kwargs, options: options);
+  }
+
+  Call.withFields(this._callFields);
 
   static const int id = 48;
 
@@ -67,7 +71,7 @@ class Call implements Message {
     },
   );
 
-  final ICallFields _callFields;
+  late ICallFields _callFields;
 
   int get requestID => _callFields.requestID;
 
@@ -82,9 +86,7 @@ class Call implements Message {
   static Call parse(final List<dynamic> message) {
     var fields = validateMessage(message, id, text, _validationSpec);
 
-    return Call(
-      CallFields(fields.requestID!, fields.uri!, args: fields.args, kwargs: fields.kwargs, options: fields.options),
-    );
+    return Call(fields.requestID!, fields.uri!, args: fields.args, kwargs: fields.kwargs, options: fields.options);
   }
 
   @override

lib/src/messages/cancel.dart

@@ -22,7 +22,11 @@ class CancelFields implements ICancelFields {
 }
 
 class Cancel implements Message {
-  Cancel(this._cancelFields);
+  Cancel(int requestID, {Map<String, dynamic>? options}) {
+    _cancelFields = CancelFields(requestID, options: options);
+  }
+
+  Cancel.withFields(this._cancelFields);
 
   static const int id = 49;
 
@@ -38,7 +42,7 @@ class Cancel implements Message {
     },
   );
 
-  final ICancelFields _cancelFields;
+  late ICancelFields _cancelFields;
 
   int get requestID => _cancelFields.requestID;
 
@@ -47,7 +51,7 @@ class Cancel implements Message {
   static Cancel parse(final List<dynamic> message) {
     var fields = validateMessage(message, id, text, _validationSpec);
 
-    return Cancel(CancelFields(fields.requestID!, options: fields.options));
+    return Cancel(fields.requestID!, options: fields.options);
   }
 
   @override

lib/src/messages/challenge.dart

@@ -23,7 +23,11 @@ class ChallengeFields implements IChallengeFields {
 }
 
 class Challenge implements Message {
-  Challenge(this._challengeFields);
+  Challenge(String authMethod, Map<String, dynamic> extra) {
+    _challengeFields = ChallengeFields(authMethod, extra);
+  }
+
+  Challenge.withFields(this._challengeFields);
 
   static const int id = 4;
 
@@ -39,7 +43,7 @@ class Challenge implements Message {
     },
   );
 
-  final IChallengeFields _challengeFields;
+  late IChallengeFields _challengeFields;
 
   String get authMethod => _challengeFields.authMethod;
 
@@ -48,7 +52,7 @@ class Challenge implements Message {
   static Challenge parse(final List<dynamic> message) {
     var fields = validateMessage(message, id, text, _validationSpec);
 
-    return Challenge(ChallengeFields(fields.authmethod!, fields.extra!));
+    return Challenge(fields.authmethod!, fields.extra!);
   }
 
   @override