Skip to content

Commit

Permalink
Moved decoding functions to Encoder.cs (#123)
Browse files Browse the repository at this point in the history 
* Moved functions to Encoder.cs

* fixed indentation

* fixed ArrayUtils whitespaces
  • Loading branch information
@jimmydjabali
jimmydjabali authored Jun 1, 2020
1 parent 9db9eca commit b61fb49
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 65 deletions.
5 changes: 3 additions & 2 deletions Assets/Plugins/Colyseus/Room.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public class Room<T> : IRoom

protected Dictionary<string, IMessageHandler> OnMessageHandlers = new Dictionary<string, IMessageHandler>();

private Schema.Encoder Encode = Schema.Encoder.GetInstance();
private Schema.Decoder Decode = Schema.Decoder.GetInstance();

/// <summary>
Expand Down Expand Up @@ -155,7 +156,7 @@ public async Task Send(byte type, object message)
public async Task Send(string type)
{
byte[] encodedType = System.Text.Encoding.UTF8.GetBytes(type);
byte[] initialBytes = ArrayUtils.getInitialBytesFromEncodedType(encodedType);
byte[] initialBytes = Encode.getInitialBytesFromEncodedType(encodedType);

byte[] bytes = new byte[initialBytes.Length + encodedType.Length];
Buffer.BlockCopy(initialBytes, 0, bytes, 0, initialBytes.Length);
Expand All @@ -175,7 +176,7 @@ public async Task Send(string type, object message)
MsgPack.Serialize(message, serializationOutput, SerializationOptions.SuppressTypeInformation);

byte[] encodedType = System.Text.Encoding.UTF8.GetBytes(type);
byte[] initialBytes = ArrayUtils.getInitialBytesFromEncodedType(encodedType);
byte[] initialBytes = Encode.getInitialBytesFromEncodedType(encodedType);
byte[] encodedMessage = serializationOutput.ToArray();

byte[] bytes = new byte[encodedType.Length + encodedMessage.Length + initialBytes.Length];
Expand Down
85 changes: 85 additions & 0 deletions Assets/Plugins/Colyseus/Serializer/Schema/Encoder.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
using System;
using MiscUtil.Conversion;

namespace Colyseus.Schema
{
public class Encoder
{
/*
* Singleton
*/
protected static Encoder Instance = new Encoder();

public static Encoder GetInstance()
{
return Instance;
}

public Encoder()
{

}

public byte[] getInitialBytesFromEncodedType(byte[] encodedType)
{
byte[] initialBytes = { Protocol.ROOM_DATA };

if (encodedType.Length < 0x20)
{
initialBytes = addByteToArray(initialBytes, new byte[] { (byte)(encodedType.Length | 0xa0) });
}
else if (encodedType.Length < 0x100)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xd9 });
initialBytes = uint8(initialBytes, encodedType.Length);
}
else if (encodedType.Length < 0x10000)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xda });
initialBytes = uint16(initialBytes, encodedType.Length);
}
else if (encodedType.Length < 0x7fffffff)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xdb });
initialBytes = uint32(initialBytes, encodedType.Length);
}
else
{
throw new System.Exception("String too long");
}

return initialBytes;
}

private byte[] addByteToArray(byte[] byteArray, byte[] newBytes)
{
byte[] bytes = new byte[byteArray.Length + newBytes.Length];
System.Buffer.BlockCopy(byteArray, 0, bytes, 0, byteArray.Length);
System.Buffer.BlockCopy(newBytes, 0, bytes, byteArray.Length, newBytes.Length);
return bytes;
}

private byte[] uint8(byte[] bytes, int value)
{
return addByteToArray(bytes, new byte[] { (byte)(value & 255) });
}

private byte[] uint16(byte[] bytes, int value)
{
var a1 = addByteToArray(bytes, new byte[] { (byte)(value & 255) });
return addByteToArray(a1, new byte[] { (byte)((value >> 8) & 255) });
}

private byte[] uint32(byte[] bytes, int value)
{
var b4 = value >> 24;
var b3 = value >> 16;
var b2 = value >> 8;
var b1 = value;
var a1 = addByteToArray(bytes, new byte[] { (byte)(b1 & 255) });
var a2 = addByteToArray(a1, new byte[] { (byte)(b2 & 255) });
var a3 = addByteToArray(a2, new byte[] { (byte)(b3 & 255) });
return addByteToArray(a3, new byte[] { (byte)(b4 & 255) });
}
}
}
63 changes: 0 additions & 63 deletions Assets/Plugins/Colyseus/Utils/ArrayUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,5 @@ public static byte[] SubArray(byte[] bytes, int index, int length)
{
return new List<byte>(bytes).GetRange(index, length).ToArray();
}

public static byte[] getInitialBytesFromEncodedType(byte[] encodedType)
{
byte[] initialBytes = { Protocol.ROOM_DATA };

if (encodedType.Length < 0x20)
{
initialBytes = addByteToArray(initialBytes, new byte[] { (byte)(encodedType.Length | 0xa0) });
}
else if (encodedType.Length < 0x100)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xd9 });
initialBytes = uint8(initialBytes, encodedType.Length);
}
else if (encodedType.Length < 0x10000)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xda });
initialBytes = uint16(initialBytes, encodedType.Length);
}
else if (encodedType.Length < 0x7fffffff)
{
initialBytes = addByteToArray(initialBytes, new byte[] { 0xdb });
initialBytes = uint32(initialBytes, encodedType.Length);
}
else
{
throw new System.Exception("String too long");
}

return initialBytes;
}

private static byte[] addByteToArray(byte[] byteArray, byte[] newBytes)
{
byte[] bytes = new byte[byteArray.Length + newBytes.Length];
System.Buffer.BlockCopy(byteArray, 0, bytes, 0, byteArray.Length);
System.Buffer.BlockCopy(newBytes, 0, bytes, byteArray.Length, newBytes.Length);
return bytes;
}

private static byte[] uint8(byte[] bytes, int value)
{
return addByteToArray(bytes, new byte[] { (byte)(value & 255) });
}

private static byte[] uint16(byte[] bytes, int value)
{
var a1 = addByteToArray(bytes, new byte[] { (byte)(value & 255) });
return addByteToArray(a1, new byte[] { (byte)((value >> 8) & 255) });
}

private static byte[] uint32(byte[] bytes, int value)
{
var b4 = value >> 24;
var b3 = value >> 16;
var b2 = value >> 8;
var b1 = value;
var a1 = addByteToArray(bytes, new byte[] { (byte)(b1 & 255) });
var a2 = addByteToArray(a1, new byte[] { (byte)(b2 & 255) });
var a3 = addByteToArray(a2, new byte[] { (byte)(b3 & 255) });
return addByteToArray(a3, new byte[] { (byte)(b4 & 255) });
}
}
}
}

0 comments on commit b61fb49

Please sign in to comment.