Merge branch 'master' of git.starbeamrainbowlabs.com:sbrl/PixelHub

PixelHub-Server/PixelHub/PixelBot.cs

@@ -54,7 +54,7 @@ namespace PixelHub.Server
 		/// Sends the given command to the remote PixelBot.
 		/// </summary>
 		/// <param name="command">The command to send.</param>
-		public async Task Send(PixelCommand command)
+		public async Task Send(PixelMessage command)
 		{
 			byte[] message = command.AsCompiledCommand();
 			await client.GetStream().WriteAsync(message, 0, message.Length);

PixelHub-Server/PixelHub/PixelHub.csproj

@@ -40,14 +40,15 @@
     <Compile Include="SBRL.Utilities\ForgetTask.cs" />
     <Compile Include="SBRL.Utilities\Utilities.cs" />
     <Compile Include="SBRL.Utilities\PrefixedWriter.cs" />
-    <Compile Include="PixelCommand.cs" />
     <Compile Include="PixelBot.cs" />
     <Compile Include="NetTools.cs" />
-    <Compile Include="PixelCommands\ResetCommand.cs" />
+    <Compile Include="PixelMessage.cs" />
+    <Compile Include="PixelMessages\HandshakeRequestMessage.cs" />
+    <Compile Include="PixelMessages\ResetMessage.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Folder Include="SBRL.Utilities\" />
-    <Folder Include="PixelCommands\" />
+    <Folder Include="PixelMessages\" />
   </ItemGroup>
 </Project>

PixelHub-Server/PixelHub/PixelMessage.cs

@@ -34,7 +34,7 @@ namespace PixelHub
 	/// <summary>
 	/// Specifies a single command that is to be sent to a PixelBot.
 	/// </summary>
-	public abstract class PixelCommand
+	public abstract class PixelMessage
 	{
 		/// <summary>
 		/// A random number generator. Useful for generating default message ids.
@@ -73,7 +73,20 @@ namespace PixelHub
 		public byte[] Header
 		{
 			get {
+				byte[] result = new byte[HeaderSize];
+				// Fetch all the components needed to build the message header and convert them to byte arrays
+				byte[] rawProtocolVersion = BitConverter.GetBytes(ProtocolVersion);
+				byte[] rawMessageType = BitConverter.GetBytes((ushort)MessageType);
+				byte[] rawMessageId = BitConverter.GetBytes((ushort)MessageId);
+				byte[] rawMessageLength = BitConverter.GetBytes(Payload.Length);
 
+				// Copy the pieces into the correct places
+				Buffer.BlockCopy(rawProtocolVersion, 0, result, 0, rawProtocolVersion.Length);
+				Buffer.BlockCopy(rawMessageType, 0, result, 2, rawProtocolVersion.Length);
+				Buffer.BlockCopy(rawMessageId, 0, result, 4, rawProtocolVersion.Length);
+				Buffer.BlockCopy(rawMessageLength, 0, result, 8, rawProtocolVersion.Length);
+
+				return result;
 			}
 		}
 
@@ -82,16 +95,23 @@ namespace PixelHub
 		/// </summary>
 		public abstract byte[] Payload { get; protected set; }
 
-		public PixelCommand()
+		public PixelMessage()
 		{
 			byte[] rawMessageId = new byte[sizeof(uint)];
 			rand.NextBytes(rawMessageId);
 			MessageId = BitConverter.ToUInt32(rawMessageId, 0);
 		}
 
+		/// <summary>
+		/// Returns this message in it's raw format that's sent and received over the wire.
+		/// </summary>
+		/// <returns>This message, as a byte array.</returns>
 		public byte[] AsCompiledCommand()
 		{
 			byte[] message = new byte[HeaderSize + Payload.Length];
+			Buffer.BlockCopy(Header, 0, message, 0, HeaderSize);
+			Buffer.BlockCopy(Payload, 0, message, HeaderSize, Payload.Length);
+			return message;
 		}
 	}
 }

PixelHub-Server/PixelHub/PixelMessages/HandshakeRequestMessage.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Text;
+
+namespace PixelHub.Server.PixelMessages
+{
+	public class HandshakeRequestMessage : PixelMessage
+	{
+		/// <summary>
+		/// The type of PixelBot the client thinks it is. Rather like a user-agent string actually.
+		/// </summary>
+		public string PixelBotType = string.Empty;
+
+		public override byte[] Payload {
+			get {
+				return Encoding.UTF8.GetBytes(PixelBotType);
+			}
+			protected set {
+				PixelBotType = Encoding.UTF8.GetString(value);
+			}
+		}
+
+		public new MessageTypes MessageType { get; private set; } = MessageTypes.HandshakeRequest;
+		
+		public HandshakeRequestMessage()
+		{
+		}
+	}
+}
+

PixelHub-Server/PixelHub/PixelMessages/ResetMessage.cs

@@ -1,12 +1,12 @@
 using System;
 
-namespace PixelHub.Server.PixelCommands
+namespace PixelHub.Server.PixelMessages
 {
 	/// <summary>
 	/// Hard-resets the PixelBot. Useful if something has gone wrong, or to reset it's internal state.
 	/// Note that this will cause the PixelBot to drop it's connection!
 	/// </summary>
-	public class ResetCommand : PixelCommand
+	public class ResetMessage : PixelMessage
 	{
 		public override byte[] Payload {
 			get {
@@ -19,7 +19,7 @@ namespace PixelHub.Server.PixelCommands
 
 		public new MessageTypes MessageType { get; private set; } = MessageTypes.Reset;
 
-		public ResetCommand()
+		public ResetMessage()
 		{
 			
 		}