chore: Divide messages into their own files

Finally.

Author: qdot

Buttplug/Buttplug.csproj

@@ -7,7 +7,7 @@
     <Version>4.0.0</Version>
     <Summary>Buttplug Sex Toy Control Library - Client Implementation</Summary>
     <Description>Buttplug Sex Toy Control Library. Contains Core (messages, errors, etc), Client, and Websocket Connector components</Description>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net46;net462;net47</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/buttplugio/buttplug-csharp</RepositoryUrl>
     <PackageProjectUrl>https://buttplug.io</PackageProjectUrl>

Buttplug/Client/ButtplugClientDevice.cs

@@ -263,10 +263,10 @@ public async Task<double> BatteryAsync()
                 throw new ButtplugDeviceException($"Device {Name} does not have battery capabilities.");
             }
 
-            var result = await _handler.SendMessageAsync(new SensorReadCmd(Index, SensorReadAttributes(SensorType.Battery).ElementAt(0).Index, SensorType.Battery)).ConfigureAwait(false);
+            var result = await _handler.SendMessageAsync(new InputCmd(Index, SensorReadAttributes(SensorType.Battery).ElementAt(0).Index, SensorType.Battery)).ConfigureAwait(false);
             switch (result)
             {
-                case SensorReading response:
+                case InputReading response:
                     return response.data[0] / 100.0;
                 case Error err:
                     throw ButtplugException.FromError(err);

Buttplug/Core/Messages/DeviceList.cs

@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+
+namespace Buttplug.Core.Messages
+{
+    /// <summary>
+    /// List of devices connected to the server.
+    /// </summary>
+    [ButtplugMessageMetadata("DeviceList")]
+    public class DeviceList : ButtplugMessage, IButtplugMessageOutgoingOnly
+    {
+        /// <summary>
+        /// List of devices currently connected.
+        /// </summary>
+        [JsonProperty(Required = Required.Always, NullValueHandling = NullValueHandling.Ignore)]
+        public readonly DeviceMessageInfo[] Devices = new DeviceMessageInfo[0];
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceList"/> class.
+        /// </summary>
+        /// <param name="deviceList">List of devices currently connected.</param>
+        /// <param name="id">Message ID.</param>
+        public DeviceList(DeviceMessageInfo[] deviceList, uint id)
+            : base(id)
+        {
+            Devices = deviceList;
+        }
+
+        /// <inheritdoc />
+        internal DeviceList()
+            : base(0)
+        {
+        }
+    }
+}

Buttplug/Core/Messages/DeviceMessageInfo.cs

@@ -0,0 +1,64 @@
+using Newtonsoft.Json;
+
+namespace Buttplug.Core.Messages
+{
+    /// <summary>
+    /// Container class for describing a device.
+    /// </summary>
+    public class DeviceMessageInfo : IButtplugDeviceInfoMessage
+    {
+        /// <summary>
+        /// Name of the device.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public readonly string DeviceName;
+
+        /// <summary>
+        /// Device index.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public readonly uint DeviceIndex;
+
+        /// <summary>
+        /// Device display name, set up by the user.
+        /// </summary>
+        public readonly string DeviceDisplayName;
+
+        /// <summary>
+        /// Recommended amount of time between commands, in milliseconds.
+        /// </summary>
+        [JsonProperty(Required = Required.Default)]
+        public readonly uint DeviceMessageTimingGap;
+
+        /// <summary>
+        /// List of messages that a device supports, with additional attribute data.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public readonly DeviceMessageAttributes DeviceMessages;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceMessageInfo"/> class.
+        /// </summary>
+        /// <param name="index">Device index.</param>
+        /// <param name="name">Device name.</param>
+        /// <param name="messages">List of device messages/attributes supported.</param>
+        public DeviceMessageInfo(uint index, string name,
+            DeviceMessageAttributes messages)
+        {
+            DeviceName = name;
+            DeviceIndex = index;
+            DeviceMessages = messages;
+        }
+
+        // Implementation details for IButtplugDeviceInfoMessage interface
+        string IButtplugDeviceInfoMessage.DeviceName => DeviceName;
+
+        uint IButtplugDeviceInfoMessage.DeviceIndex => DeviceIndex;
+
+        DeviceMessageAttributes IButtplugDeviceInfoMessage.DeviceMessages => DeviceMessages;
+
+        string IButtplugDeviceInfoMessage.DeviceDisplayName => DeviceDisplayName;
+
+        uint IButtplugDeviceInfoMessage.DeviceMessageTimingGap => DeviceMessageTimingGap;
+    }
+}

Buttplug/Core/Messages/Error.cs

@@ -0,0 +1,70 @@
+using Newtonsoft.Json;
+
+namespace Buttplug.Core.Messages
+{
+    /// <summary>
+    /// Indicator that there has been an error in the system, either due to the last message/query
+    /// sent, or due to an internal error.
+    /// </summary>
+    [ButtplugMessageMetadata("Error")]
+    public class Error : ButtplugMessage, IButtplugMessageOutgoingOnly
+    {
+        /// <summary>
+        /// Types of errors described by the message.
+        /// </summary>
+        public enum ErrorClass
+        {
+            /// <summary>
+            /// Error was caused by unknown factors.
+            /// </summary>
+            ERROR_UNKNOWN,
+
+            /// <summary>
+            /// Error was caused during connection handshake.
+            /// </summary>
+            ERROR_INIT,
+
+            /// <summary>
+            /// Max ping timeout has been exceeded.
+            /// </summary>
+            ERROR_PING,
+
+            /// <summary>
+            /// Error parsing messages.
+            /// </summary>
+            ERROR_MSG,
+
+            /// <summary>
+            /// Error at the device manager level (device doesn't exist/disconnected, etc...)
+            /// </summary>
+            ERROR_DEVICE,
+        }
+
+        /// <summary>
+        /// Specific error type this message describes.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public ErrorClass ErrorCode;
+
+        /// <summary>
+        /// Human-readable error description.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public string ErrorMessage;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Error"/> class. The message ID may be zero
+        /// if raised outside of servicing a message from the client, otherwise the message ID must
+        /// match the message being serviced.
+        /// </summary>
+        /// <param name="errorMessage">Human-readable error description.</param>
+        /// <param name="errorCode">Class of error.</param>
+        /// <param name="id">Message ID.</param>
+        public Error(string errorMessage, ErrorClass errorCode, uint id)
+            : base(id)
+        {
+            ErrorMessage = errorMessage;
+            ErrorCode = errorCode;
+        }
+    }
+}

Buttplug/Core/Messages/InputCmd.cs

@@ -0,0 +1,44 @@
+using Newtonsoft.Json;
+
+namespace Buttplug.Core.Messages
+{
+    /// <summary>
+    /// Sent to server, generic message that can control any device that takes a single value and staticly
+    /// sets an actuator to that value (speed, oscillation frequency, instanteous position, etc).
+    /// </summary>
+    [ButtplugMessageMetadata("SensorReadCmd")]
+    public class InputCmd : ButtplugDeviceMessage
+    {
+        /// <summary>
+        /// List of vibrator speeds.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public uint SensorIndex;
+
+        [JsonProperty(Required = Required.Always)]
+        public SensorType SensorType;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScalarCmd"/> class.
+        /// </summary>
+        /// <param name="deviceIndex">Device index.</param>
+        /// <param name="scalars">List of per-actuator scalar commands.</param>
+        /// <param name="id">Message ID.</param>
+        [JsonConstructor]
+        public InputCmd(uint deviceIndex, uint sensorIndex, SensorType sensorType, uint id = ButtplugConsts.DefaultMsgId)
+            : base(id, deviceIndex)
+        {
+            SensorIndex = sensorIndex;
+            SensorType = sensorType;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ScalarCmd"/> class.
+        /// </summary>
+        /// <param name="scalars">List of per-actuator scalar commands.</param>
+        public InputCmd(uint sensorIndex, SensorType sensorType)
+            : this(uint.MaxValue, sensorIndex, sensorType)
+        {
+        }
+    }
+}

Buttplug/Core/Messages/InputReading.cs

@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace Buttplug.Core.Messages
+{
+    /// <summary>
+    /// Sent to server, generic message that can control any device that takes a single value and staticly
+    /// sets an actuator to that value (speed, oscillation frequency, instanteous position, etc).
+    /// </summary>
+    [ButtplugMessageMetadata("SensorReading")]
+    public class InputReading : ButtplugDeviceMessage
+    {
+        /// <summary>
+        /// List of vibrator speeds.
+        /// </summary>
+        [JsonProperty(Required = Required.Always)]
+        public readonly uint SensorIndex;
+
+        [JsonProperty(Required = Required.Always)]
+        public readonly SensorType SensorType;
+
+        [JsonProperty(Required = Required.Always)]
+        public readonly List<int> data;
+    }
+}