WS client support for MessageAttributes

This also includes the change that declares the message version of the client to the server.

Author: blackspherefollower

Buttplug.Client/ButtplugClientDevice.cs

@@ -13,34 +13,34 @@ public class ButtplugClientDevice
         public readonly string Name;
 
         [NotNull]
-        public readonly List<string> AllowedMessages;
+        public readonly Dictionary<string, MessageAttributes> AllowedMessages;
 
         public ButtplugClientDevice(DeviceMessageInfo aDevInfo)
         {
             Index = aDevInfo.DeviceIndex;
             Name = aDevInfo.DeviceName;
-            AllowedMessages = new List<string>(aDevInfo.DeviceMessages);
+            AllowedMessages = new Dictionary<string, MessageAttributes>(aDevInfo.DeviceMessages);
         }
 
-        public ButtplugClientDevice(uint aIndex, string aName, string[] aMessages)
+        public ButtplugClientDevice(uint aIndex, string aName, Dictionary<string, MessageAttributes> aMessages)
         {
             Index = aIndex;
             Name = aName;
-            AllowedMessages = new List<string>(aMessages);
+            AllowedMessages = new Dictionary<string, MessageAttributes>(aMessages);
         }
 
         public ButtplugClientDevice(DeviceAdded aDevInfo)
         {
             Index = aDevInfo.DeviceIndex;
             Name = aDevInfo.DeviceName;
-            AllowedMessages = new List<string>(aDevInfo.DeviceMessages);
+            AllowedMessages = new Dictionary<string, MessageAttributes>(aDevInfo.DeviceMessages);
         }
 
         public ButtplugClientDevice(DeviceRemoved aDevInfo)
         {
             Index = aDevInfo.DeviceIndex;
             Name = string.Empty;
-            AllowedMessages = new List<string>();
+            AllowedMessages = new Dictionary<string, MessageAttributes>();
         }
     }
 }

Buttplug.Client/ButtplugWSClient.cs

@@ -29,6 +29,9 @@ public class ButtplugWSClient
         [NotNull]
         private readonly string _clientName;
 
+        [NotNull]
+        private uint _messageSchemaVersion;
+
         [NotNull]
         private ConcurrentDictionary<uint, TaskCompletionSource<ButtplugMessage>> _waitingMsgs = new ConcurrentDictionary<uint, TaskCompletionSource<ButtplugMessage>>();
 
@@ -150,6 +153,14 @@ public async Task Connect(Uri aURL, bool aIgnoreSSLErrors = false)
                         _pingTimer = new Timer(onPingTimer, null, 0, Convert.ToInt32(Math.Round(((double)si.MaxPingTime) / 2, 0)));
                     }
 
+                    _messageSchemaVersion = si.MessageVersion;
+                    if (_messageSchemaVersion < ButtplugMessage.CurrentMessageVersion)
+                    {
+                        throw new Exception("Buttplug Server's schema version (" + _messageSchemaVersion +
+                            ") is less than the client's (" + ButtplugMessage.CurrentMessageVersion +
+                            "). A newer server is required!");
+                    }
+
                     break;
 
                 case Error e:
@@ -382,7 +393,7 @@ public async Task<ButtplugMessage> SendDeviceMessage(ButtplugClientDevice aDevic
         {
             if (_devices.TryGetValue(aDevice.Index, out ButtplugClientDevice dev))
             {
-                if (!dev.AllowedMessages.Contains(aDeviceMsg.GetType().Name))
+                if (!dev.AllowedMessages.ContainsKey(aDeviceMsg.GetType().Name))
                 {
                     return new Error("Device does not accept message type: " + aDeviceMsg.GetType().Name, Error.ErrorClass.ERROR_DEVICE, ButtplugConsts.SystemMsgId);
                 }
@@ -436,12 +447,12 @@ protected async Task<ButtplugMessage> SendMessage(ButtplugMessage aMsg)
 
         protected string Serialize(ButtplugMessage aMsg)
         {
-            return _parser.Serialize(aMsg);
+            return _parser.Serialize(aMsg, ButtplugMessage.CurrentMessageVersion);
         }
 
         protected string Serialize(ButtplugMessage[] aMsgs)
         {
-            return _parser.Serialize(aMsgs);
+            return _parser.Serialize(aMsgs, ButtplugMessage.CurrentMessageVersion);
         }
 
         protected ButtplugMessage[] Deserialize(string aMsg)