diff --git a/Client.cs b/Client.cs new file mode 100644 index 0000000..e579316 --- /dev/null +++ b/Client.cs @@ -0,0 +1,97 @@ +using System.Collections.Generic; +using System.Collections.Concurrent; +using System.Net.Sockets; + +namespace Passer.Control { + + public class Client { + //public ConnectionMethod connection; + public UdpClient udpClient; + public string ipAddress; + public int port; + + public byte networkId; + + public readonly ConcurrentQueue messageQueue = new(); + + public static Client GetClient(string ipAddress, int port) { + foreach (Client c in clients) { + if (c.ipAddress == ipAddress && c.port == port) + return c; + } + return null; + } + static public List clients = new List(); + + public static Client NewClient() { + Client client = new(); + clients.Add(client); + client.networkId = 0; + + return client; + } + + public static Client NewUDPClient(UdpClient udpClient, string ipAddress, int port) { + Client client = NewClient(); + client.ipAddress = null; + client.port = port; + client.udpClient = udpClient; + return client; + } + + public void ProcessMessage(IMessage msg) { + switch (msg) { + case ClientMsg clientMsg: + ProcessClient(clientMsg); + break; + case NetworkIdMsg networkId: + ProcessNetworkId(networkId); + break; + case InvestigateMsg investigate: + ProcessInvestigate(investigate); + break; + case ThingMsg thing: + ProcessThing(thing); + break; + case NameMsg name: + ProcessName(name); + break; + case ModelUrlMsg modelUrl: + ProcessModelUrl(modelUrl); + break; + case PoseMsg pose: + ProcessPose(pose); + break; + case CustomMsg custom: + ProcessCustom(custom); + break; + case TextMsg text: + ProcessText(text); + break; + case DestroyMsg destroy: + ProcessDestroy(destroy); + break; + } + } + + protected virtual void ProcessClient(ClientMsg client) { } + + protected virtual void ProcessNetworkId(NetworkIdMsg networkId) { } + + protected virtual void ProcessInvestigate(InvestigateMsg investigate) { } + + protected virtual void ProcessThing(ThingMsg thing) { } + + protected virtual void ProcessName(NameMsg name) { } + + protected virtual void ProcessModelUrl(ModelUrlMsg modelUrl) { } + + protected virtual void ProcessPose(PoseMsg pose) { } + + protected virtual void ProcessCustom(CustomMsg custom) { } + + protected virtual void ProcessText(TextMsg text) { } + + protected virtual void ProcessDestroy(DestroyMsg destroy) { } + } +} \ No newline at end of file diff --git a/Client.cs.meta b/Client.cs.meta new file mode 100644 index 0000000..c346934 --- /dev/null +++ b/Client.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: db9cd79cff119a9438110ead000031c3 \ No newline at end of file diff --git a/Messages.cs b/Messages.cs index 56518cd..e79554e 100644 --- a/Messages.cs +++ b/Messages.cs @@ -1,212 +1,172 @@ -using System.Collections.Generic; -using System.Collections.Concurrent; using System.IO; -using System.Net.Sockets; using System.Threading.Tasks; -using System; namespace Passer.Control { - public class Client { - //public ConnectionMethod connection; - public UdpClient udpClient; - public string ipAddress; - public int port; + public class IMessage { + public IMessage() { } + public IMessage(byte[] data) { + Deserialize(data); + } - public byte networkId; + public virtual byte[] Serialize() { return null; } + public virtual void Deserialize(byte[] data) { } - public readonly ConcurrentQueue messageQueue = new(); + public static bool SendMsg(Client client, IMessage msg) { + return SendMsg(client, msg.Serialize()); + } + public static bool SendMsg(Client client, byte[] data) { + if (client == null || client.ipAddress == null) + return false; - public static Client GetClient(string ipAddress, int port) { - foreach (Client c in clients) { - if (c.ipAddress == ipAddress && c.port == port) - return c; - } - return null; - } - static public List clients = new List(); - - public static Client NewClient() { - Client client = new(); - clients.Add(client); - client.networkId = 0; - - return client; - } - - public static Client NewUDPClient(UdpClient udpClient, string ipAddress, int port) { - Client client = NewClient(); - client.ipAddress = null; - client.port = port; - client.udpClient = udpClient; - return client; - } - } - - public class IMessage { - public IMessage() { } - public IMessage(byte[] data) { - Deserialize(data); - } - - public virtual byte[] Serialize() { return null; } - public virtual void Deserialize(byte[] data) { } - - public static bool SendMsg(Client client, IMessage msg) { - return SendMsg(client, msg.Serialize()); - } - public static bool SendMsg(Client client, byte[] data) { - if (client == null || client.ipAddress == null) - return false; - - client.udpClient.Send(data, data.Length, client.ipAddress, client.port); - return true; - } + client.udpClient.Send(data, data.Length, client.ipAddress, client.port); + return true; + } public static bool PublishMsg(Client client, IMessage msg) { return PublishMsg(client, msg.Serialize()); } public static bool PublishMsg(Client client, byte[] data) { - if (client == null) - return false; + if (client == null) + return false; client.udpClient.Send(data, data.Length, "127.0.0.1", client.port); - return true; + return true; } - public static async Task Receive(Stream dataStream, byte packetSize) { - byte[] buffer = new byte[packetSize - 1]; // without msgId - int byteCount = dataStream.Read(buffer, 0, packetSize - 1); - while (byteCount < packetSize - 1) { - // not all bytes have been read, wait and try again - await Task.Delay(1); - byteCount += dataStream.Read(buffer, byteCount, packetSize - 1 - byteCount); - } - return buffer; - } - } - - #region Client - - public class ClientMsg : IMessage { - public const byte Id = 0xA0; - public const byte length = 2; - public byte networkId; - - public ClientMsg(byte networkId) { - this.networkId = networkId; - } - public ClientMsg(byte[] data) : base(data) { } - - public override byte[] Serialize() { - byte[] buffer = new byte[ClientMsg.length]; - buffer[0] = ClientMsg.Id; - buffer[1] = networkId; - return buffer; + public static async Task Receive(Stream dataStream, byte packetSize) { + byte[] buffer = new byte[packetSize - 1]; // without msgId + int byteCount = dataStream.Read(buffer, 0, packetSize - 1); + while (byteCount < packetSize - 1) { + // not all bytes have been read, wait and try again + await Task.Delay(1); + byteCount += dataStream.Read(buffer, byteCount, packetSize - 1 - byteCount); + } + return buffer; } - public override void Deserialize(byte[] data) { - base.Deserialize(data); - uint ix = 0; - networkId = data[ix]; - } + } - public static bool Send(Client client, byte networkId) { - ClientMsg msg = new(networkId); - return SendMsg(client, msg); - } - public static bool Publish(Client client, byte networkId) { - ClientMsg msg = new(networkId); - return PublishMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - if (packetSize != length) - return false; + #region Client - byte[] buffer = await Receive(dataStream, packetSize); - ClientMsg msg = new(buffer); + public class ClientMsg : IMessage { + public const byte Id = 0xA0; + public const byte length = 2; + public byte networkId; - if (client.networkId == 0) { - client.networkId = (byte)(Client.clients.Count); - NetworkIdMsg.Send(client, client.networkId); - //if (string.IsNullOrEmpty(sceneUrl) == false) - //SendModelUrl(client, sceneUrl); - } - else if (msg.networkId == 0) { - NetworkIdMsg.Send(client, client.networkId); - //if (string.IsNullOrEmpty(sceneUrl) == false) - //SendModelUrl(client, sceneUrl); - } - - return true; - } - } - - #endregion Client - - #region Network Id - - public class NetworkIdMsg : IMessage { - public const byte Id = 0xA1; - public const byte length = 2; - public byte networkId; - - NetworkIdMsg(byte networkId) { + public ClientMsg(byte networkId) { this.networkId = networkId; } - NetworkIdMsg(byte[] data) : base(data) { } + public ClientMsg(byte[] data) : base(data) { } + + public override byte[] Serialize() { + byte[] buffer = new byte[ClientMsg.length]; + buffer[0] = ClientMsg.Id; + buffer[1] = networkId; + return buffer; + } + public override void Deserialize(byte[] data) { + base.Deserialize(data); + uint ix = 0; + networkId = data[ix]; + } + + public static bool Send(Client client, byte networkId) { + ClientMsg msg = new(networkId); + return SendMsg(client, msg); + } + public static bool Publish(Client client, byte networkId) { + ClientMsg msg = new(networkId); + return PublishMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + if (packetSize != length) + return false; + + byte[] buffer = await Receive(dataStream, packetSize); + ClientMsg msg = new(buffer); + + if (client.networkId == 0) { + client.networkId = (byte)(Client.clients.Count); + NetworkIdMsg.Send(client, client.networkId); + //if (string.IsNullOrEmpty(sceneUrl) == false) + //SendModelUrl(client, sceneUrl); + } + else if (msg.networkId == 0) { + NetworkIdMsg.Send(client, client.networkId); + //if (string.IsNullOrEmpty(sceneUrl) == false) + //SendModelUrl(client, sceneUrl); + } + + return true; + } + } + + #endregion Client + + #region Network Id + + public class NetworkIdMsg : IMessage { + public const byte Id = 0xA1; + public const byte length = 2; + public byte networkId; + + NetworkIdMsg(byte networkId) { + this.networkId = networkId; + } + NetworkIdMsg(byte[] data) : base(data) { } public override byte[] Serialize() { byte[] data = new byte[NetworkIdMsg.length]; data[0] = NetworkIdMsg.Id; data[1] = this.networkId; - return data; + return data; } - public override void Deserialize(byte[] data) { - uint ix = 0; - this.networkId = data[ix]; + public override void Deserialize(byte[] data) { + uint ix = 0; + this.networkId = data[ix]; } public static bool Send(Client client, byte networkId) { - NetworkIdMsg msg = new(networkId); - return SendMsg(client, msg); - //byte[] data = new byte[NetworkIdMsg.length]; - //data[0] = NetworkIdMsg.Id; - //data[1] = client.networkId; - //return SendMsg(client, data); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + NetworkIdMsg msg = new(networkId); + return SendMsg(client, msg); + //byte[] data = new byte[NetworkIdMsg.length]; + //data[0] = NetworkIdMsg.Id; + //data[1] = client.networkId; + //return SendMsg(client, data); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { if (packetSize != length) return false; byte[] buffer = await Receive(dataStream, packetSize); NetworkIdMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; + client.messageQueue.Enqueue(msg); + return true; } - } + } #endregion Network Id #region Investigate - class InvestigateMsg : IMessage { + public class InvestigateMsg : IMessage { public const byte Id = 0x81; public const byte length = 3; public byte networkId; public byte thingId; - public InvestigateMsg(byte networkId, byte thingId) { - this.networkId = networkId; - this.thingId = thingId; - } + public InvestigateMsg(byte networkId, byte thingId) { + this.networkId = networkId; + this.thingId = thingId; + } public InvestigateMsg(byte[] data) : base(data) { } public override byte[] Serialize() { - byte[] buffer = new byte[InvestigateMsg.length]; - buffer[0] = InvestigateMsg.Id; - buffer[1] = this.networkId; - buffer[2] = this.thingId; - return buffer; + byte[] buffer = new byte[InvestigateMsg.length]; + buffer[0] = InvestigateMsg.Id; + buffer[1] = this.networkId; + buffer[2] = this.thingId; + return buffer; } public override void Deserialize(byte[] data) { uint ix = 0; @@ -214,11 +174,11 @@ namespace Passer.Control { this.thingId = data[ix++]; } - public static bool Send(Client client, byte thingId) { - InvestigateMsg msg = new(client.networkId, thingId); - return SendMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + public static bool Send(Client client, byte thingId) { + InvestigateMsg msg = new(client.networkId, thingId); + return SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { if (packetSize != length) return false; @@ -235,20 +195,20 @@ namespace Passer.Control { #region Thing public class ThingMsg : IMessage { - public const byte length = 5; - public const byte Id = 0x80; - public byte networkId; - public byte thingId; - public byte thingType; - public byte parentId; + public const byte length = 5; + public const byte Id = 0x80; + public byte networkId; + public byte thingId; + public byte thingType; + public byte parentId; - public ThingMsg(byte networkId, byte thingId, byte thingType, byte parentId) { - this.networkId = networkId; - this.thingId = thingId; - this.thingType = thingType; - this.parentId = parentId; - } - public ThingMsg(byte[] data) : base(data) { } + public ThingMsg(byte networkId, byte thingId, byte thingType, byte parentId) { + this.networkId = networkId; + this.thingId = thingId; + this.thingType = thingType; + this.parentId = parentId; + } + public ThingMsg(byte[] data) : base(data) { } public override byte[] Serialize() { byte[] data = new byte[ThingMsg.length]; @@ -257,281 +217,303 @@ namespace Passer.Control { data[2] = this.thingId; data[3] = this.thingType; data[4] = this.parentId; - return data; + return data; } public override void Deserialize(byte[] data) { - uint ix = 0; - this.networkId = data[ix++]; - this.thingId = data[ix++]; - this.thingType = data[ix++]; - this.parentId = data[ix]; - } + uint ix = 0; + this.networkId = data[ix++]; + this.thingId = data[ix++]; + this.thingType = data[ix++]; + this.parentId = data[ix]; + } - public static bool Send(Client client, byte thingId, byte thingType, byte parentId) { - ThingMsg msg = new(client.networkId, thingId, thingType, parentId); - return SendMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - if (packetSize != length) - return false; + public static bool Send(Client client, byte thingId, byte thingType, byte parentId) { + ThingMsg msg = new(client.networkId, thingId, thingType, parentId); + return SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + if (packetSize != length) + return false; - byte[] buffer = await Receive(dataStream, packetSize); - ThingMsg msg = new(buffer); + byte[] buffer = await Receive(dataStream, packetSize); + ThingMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; - } - } + client.messageQueue.Enqueue(msg); + return true; + } + } - #endregion Thing + #endregion Thing - #region Name + #region Name - public class NameMsg : IMessage { - public const byte Id = 0x91; // 145 - public const byte length = 3; - public byte networkId = 0; - public byte thingId; - public byte len; - public string name; + public class NameMsg : IMessage { + public const byte Id = 0x91; // 145 + public const byte length = 3; + public byte networkId = 0; + public byte thingId; + public byte len; + public string name; - public NameMsg(byte thingId, string name) { - this.thingId = thingId; - this.name = name; - } - public NameMsg(byte[] data) : base(data) { } + public NameMsg(byte thingId, string name) { + this.thingId = thingId; + this.name = name; + } + public NameMsg(byte[] data) : base(data) { } public override byte[] Serialize() { - byte[] buffer = new byte[length + this.name.Length]; - buffer[0] = NameMsg.Id; - buffer[1] = this.thingId; - buffer[2] = (byte)this.name.Length; - for (int ix = 0; ix < this.name.Length; ix++) - buffer[3 + ix] = (byte)this.name[ix]; - return buffer; + byte[] buffer = new byte[length + this.name.Length]; + buffer[0] = NameMsg.Id; + buffer[1] = this.thingId; + buffer[2] = (byte)this.name.Length; + for (int ix = 0; ix < this.name.Length; ix++) + buffer[3 + ix] = (byte)this.name[ix]; + return buffer; } public override void Deserialize(byte[] data) { - uint ix = 0; - this.thingId = data[ix++]; - int strlen = data[ix++]; - this.name = System.Text.Encoding.UTF8.GetString(data, (int)ix, strlen); - } + uint ix = 0; + this.thingId = data[ix++]; + int strlen = data[ix++]; + this.name = System.Text.Encoding.UTF8.GetString(data, (int)ix, strlen); + } - public static bool Send(Client client, byte thingId, string name) { - NameMsg msg = new(thingId, name); - return SendMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - byte[] buffer = await Receive(dataStream, packetSize); - NameMsg msg = new(buffer); + public static bool Send(Client client, byte thingId, string name) { + NameMsg msg = new(thingId, name); + return SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + byte[] buffer = await Receive(dataStream, packetSize); + NameMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; - } - } + client.messageQueue.Enqueue(msg); + return true; + } + } - #endregion + #endregion - #region Model URL + #region Model URL - public class ModelUrlMsg : IMessage { - public const byte Id = 0x90; // (144) Model URL - public byte thingId; - public Spherical position; - public float scale; - public string url; + public class ModelUrlMsg : IMessage { + public const byte Id = 0x90; // (144) Model URL + public byte thingId; + public Spherical position; + public float scale; + public string url; - public ModelUrlMsg(byte thingId, string url, float scale = 1) { - this.thingId = thingId; - this.url = url; - this.scale = scale; - this.position = Spherical.zero; - } - public ModelUrlMsg(byte[] data) : base(data) { } + public ModelUrlMsg(byte thingId, string url, float scale = 1) { + this.thingId = thingId; + this.url = url; + this.scale = scale; + this.position = Spherical.zero; + } + public ModelUrlMsg(byte[] data) : base(data) { } - public override byte[] Serialize() { - byte[] data = new byte[this.url.Length + 9]; - data[0] = ModelUrlMsg.Id; - data[1] = this.thingId; // Thing Id - // data[2]..[5] == position 0, 0, 0 - data[6] = 0x3C; // Dummy float16 value 1 - data[7] = 0x00; + public override byte[] Serialize() { + byte[] data = new byte[this.url.Length + 9]; + data[0] = ModelUrlMsg.Id; + data[1] = this.thingId; // Thing Id + // data[2]..[5] == position 0, 0, 0 + data[6] = 0x3C; // Dummy float16 value 1 + data[7] = 0x00; - data[8] = (byte)url.Length; - for (int ix = 0; ix < this.url.Length; ix++) - data[9 + ix] = (byte)url[ix]; - return data; - } - public override void Deserialize(byte[] data) { - uint ix = 0; - this.thingId = data[ix++]; - this.position = LowLevelMessages.ReceiveSpherical(data, ref ix); - this.scale = LowLevelMessages.ReceiveFloat16(data, ref ix); - int strlen = data[ix++]; - url = System.Text.Encoding.UTF8.GetString(data, (int)ix, strlen); - } + data[8] = (byte)url.Length; + for (int ix = 0; ix < this.url.Length; ix++) + data[9 + ix] = (byte)url[ix]; + return data; + } + public override void Deserialize(byte[] data) { + uint ix = 0; + this.thingId = data[ix++]; + this.position = LowLevelMessages.ReceiveSpherical(data, ref ix); + this.scale = LowLevelMessages.ReceiveFloat16(data, ref ix); + int strlen = data[ix++]; + url = System.Text.Encoding.UTF8.GetString(data, (int)ix, strlen); + } - public static bool Send(Client client, byte thingId, string modelUrl) { - ModelUrlMsg msg = new(thingId, modelUrl); - return SendMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - byte[] buffer = await Receive(dataStream, packetSize); - ModelUrlMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; - } - } + public static bool Send(Client client, byte thingId, string modelUrl) { + ModelUrlMsg msg = new(thingId, modelUrl); + return SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + byte[] buffer = await Receive(dataStream, packetSize); + ModelUrlMsg msg = new(buffer); + client.messageQueue.Enqueue(msg); + return true; + } + } - #endregion Model URL + #endregion Model URL - #region Pose + #region Pose - public class PoseMsg : IMessage { - public const byte Id = 0x10; - public const byte length = 3 + 4 + 4; - public byte thingId; + public class PoseMsg : IMessage { + public const byte Id = 0x10; + public const byte length = 3 + 4 + 4; + public byte thingId; - public byte poseType; - public const byte Pose_Position = 0x01; - public const byte Pose_Orientation = 0x02; + public byte poseType; + public const byte Pose_Position = 0x01; + public const byte Pose_Orientation = 0x02; - public Spherical position; - public Quat32 orientation; + public Spherical position; + public Quat32 orientation; - public PoseMsg(byte thingId, Spherical position, Quat32 orientation) { - this.thingId = thingId; - this.position = position; - this.orientation = orientation; + public PoseMsg(byte thingId, Spherical position, Quat32 orientation) { + this.thingId = thingId; + this.position = position; + this.orientation = orientation; this.poseType = 0; - if (this.position != null) - this.poseType |= Pose_Position; - else - this.position = new Spherical(0, 0, 0); - if (this.orientation != null) - this.poseType |= Pose_Orientation; - else - this.orientation = new Quat32(0, 0, 0, 1); + if (this.position != null) + this.poseType |= Pose_Position; + else + this.position = new Spherical(0, 0, 0); + if (this.orientation != null) + this.poseType |= Pose_Orientation; + else + this.orientation = new Quat32(0, 0, 0, 1); } public PoseMsg(byte[] data) : base(data) { } public override byte[] Serialize() { - byte[] buffer = new byte[PoseMsg.length]; - uint ix = 0; - buffer[ix++] = PoseMsg.Id; - buffer[ix++] = this.thingId; - buffer[ix++] = this.poseType; + byte[] buffer = new byte[PoseMsg.length]; + uint ix = 0; + buffer[ix++] = PoseMsg.Id; + buffer[ix++] = this.thingId; + buffer[ix++] = this.poseType; - LowLevelMessages.SendSpherical(buffer, ref ix, position); - LowLevelMessages.SendQuat32(buffer, ref ix, orientation); - return buffer; + LowLevelMessages.SendSpherical(buffer, ref ix, position); + LowLevelMessages.SendQuat32(buffer, ref ix, orientation); + return buffer; } public override void Deserialize(byte[] data) { - uint ix = 0; - thingId = data[ix++]; - poseType = data[ix++]; + uint ix = 0; + thingId = data[ix++]; + poseType = data[ix++]; - //if ((poseType & Pose_Position) != 0) - position = LowLevelMessages.ReceiveSpherical(data, ref ix); - //if ((poseType & Pose_Orientation) != 0) { - orientation = LowLevelMessages.ReceiveQuat32(data, ref ix); - } + //if ((poseType & Pose_Position) != 0) + position = LowLevelMessages.ReceiveSpherical(data, ref ix); + //if ((poseType & Pose_Orientation) != 0) { + orientation = LowLevelMessages.ReceiveQuat32(data, ref ix); + } - public static bool Send(Client client, byte thingId, Spherical position, Quat32 orientation) { - PoseMsg msg = new(thingId, position, orientation); - return SendMsg(client, msg); - } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - if (packetSize != length) - return false; + public static bool Send(Client client, byte thingId, Spherical position, Quat32 orientation) { + PoseMsg msg = new(thingId, position, orientation); + return SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + if (packetSize != length) + return false; - byte[] buffer = await Receive(dataStream, packetSize); - PoseMsg msg = new(buffer); + byte[] buffer = await Receive(dataStream, packetSize); + PoseMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; - } - } + client.messageQueue.Enqueue(msg); + return true; + } + } - #endregion Pose + #endregion Pose - #region Bytes + #region Custom - public class BytesMsg : IMessage { - public const byte Id = 0xB1; - public byte networkId; - public byte thingId; - public byte[] bytes; + public class CustomMsg : IMessage { + public const byte Id = 0xB1; + public byte networkId; + public byte thingId; + public byte[] bytes; - public BytesMsg(byte[] data) : base(data) { } - public BytesMsg(byte networkId, byte thingId, byte[] bytes) : base() { - this.networkId = networkId; - this.thingId = thingId; - this.bytes = bytes; - } - public override byte[] Serialize() { - byte[] buffer = new byte[4 + this.bytes.Length]; - int ix = 0; - buffer[ix++] = BytesMsg.Id; - buffer[ix++] = this.networkId; - buffer[ix++] = this.thingId; - buffer[ix++] = (byte)bytes.Length; - foreach (byte b in bytes) - buffer[ix++] = b; + public CustomMsg(byte[] data) : base(data) { } + public CustomMsg(byte networkId, byte thingId, byte[] bytes) : base() { + this.networkId = networkId; + this.thingId = thingId; + this.bytes = bytes; + } - return buffer; - } - public override void Deserialize(byte[] data) { - //this.bytes = data; - uint ix = 0; - this.thingId = data[ix++]; - this.bytes = new byte[data.Length - ix]; - for (uint bytesIx = 0; ix < data.Length; ix++, bytesIx++) - this.bytes[bytesIx] = data[ix]; - } + public override byte[] Serialize() { + byte[] buffer = new byte[4 + this.bytes.Length]; + int ix = 0; + buffer[ix++] = CustomMsg.Id; + buffer[ix++] = this.networkId; + buffer[ix++] = this.thingId; + buffer[ix++] = (byte)bytes.Length; + foreach (byte b in bytes) + buffer[ix++] = b; + + return buffer; + } + public override void Deserialize(byte[] data) { + uint ix = 0; + this.thingId = data[ix++]; + this.bytes = new byte[data.Length - ix]; + for (uint bytesIx = 0; ix < data.Length; ix++, bytesIx++) + this.bytes[bytesIx] = data[ix]; + } - public static void Send(Client client, byte thingId, byte[] bytes) { - BytesMsg msg = new(client.networkId, thingId, bytes); - SendMsg(client, msg); - } + public static void Send(Client client, byte thingId, byte[] bytes) { + CustomMsg msg = new(client.networkId, thingId, bytes); + SendMsg(client, msg); + } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + byte[] buffer = await Receive(dataStream, packetSize); + CustomMsg msg = new(buffer); + client.messageQueue.Enqueue(msg); + return true; + } + } - // received bytes - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - byte[] buffer = await Receive(dataStream, packetSize); - BytesMsg msg = new(buffer); - client.messageQueue.Enqueue(msg); - return true; - } - } + #endregion Custom - #endregion Bytes + #region Text - #region Destroy + public class TextMsg : IMessage { + public const byte Id = 0xB0; + public string text; - public class DestroyMsg : IMessage { - public const byte Id = 0x20; - public const byte length = 2; - public byte objectId; + public TextMsg(byte[] data) : base(data) { } + public override void Deserialize(byte[] data) { + uint ix = 0; + uint strlen = data[ix++]; + this.text = System.Text.Encoding.UTF8.GetString(data, (int)ix, (int)strlen); + } - public DestroyMsg(byte[] data) : base(data) { } + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + byte[] buffer = await Receive(dataStream, packetSize); + TextMsg msg = new(buffer); - public override void Deserialize(byte[] data) { - objectId = data[0]; - } + client.messageQueue.Enqueue(msg); + return true; + } + } - public static async Task Receive(Stream dataStream, Client client, byte packetSize) { - if (packetSize != length) - return false; + #endregion - byte[] buffer = await Receive(dataStream, packetSize); - DestroyMsg msg = new(buffer); + #region Destroy - client.messageQueue.Enqueue(msg); - return true; - } - } + public class DestroyMsg : IMessage { + public const byte Id = 0x20; + public const byte length = 2; + public byte objectId; + + public DestroyMsg(byte[] data) : base(data) { } + + public override void Deserialize(byte[] data) { + objectId = data[0]; + } + + public static async Task Receive(Stream dataStream, Client client, byte packetSize) { + if (packetSize != length) + return false; + + byte[] buffer = await Receive(dataStream, packetSize); + DestroyMsg msg = new(buffer); + + client.messageQueue.Enqueue(msg); + return true; + } + } - #endregion Destroy + #endregion Destroy } diff --git a/SiteServer.cs b/SiteServer.cs index cd01666..16b0278 100644 --- a/SiteServer.cs +++ b/SiteServer.cs @@ -26,35 +26,35 @@ namespace Passer.Control { bool result = false; switch (msgId) { - case PoseMsg.Id: // Object Pose (16) - result = await PoseMsg.Receive(dataStream, client, packetSize); - break; - case DestroyMsg.Id: // Destroy object (32) - result = await DestroyMsg.Receive(dataStream, client, packetSize); - break; - case ThingMsg.Id: - result = await ThingMsg.Receive(dataStream, client, packetSize); - break; - case InvestigateMsg.Id: - result = await InvestigateMsg.Receive(dataStream, client, packetSize); - break; - case ModelUrlMsg.Id: // Model URL (144) - result = await BytesMsg.Receive(dataStream, client, packetSize); - break; - case NameMsg.Id: // Object Name (145) - result = await NameMsg.Receive(dataStream, client, packetSize); - break; - case ClientMsg.Id: + case ClientMsg.Id: // 0xA0 / 160 result = await ClientMsg.Receive(dataStream, client, packetSize); break; - case NetworkIdMsg.Id: + case NetworkIdMsg.Id: // 0xA1 / 161 result = await NetworkIdMsg.Receive(dataStream, client, packetSize); break; - //case TextMsg.Id: // Text (176) - // result = await TextMsg.Receive(dataStream, client, packetSize); - // break; - case BytesMsg.Id: - result = await BytesMsg.Receive(dataStream, client, packetSize); + case InvestigateMsg.Id: // 0x81 + result = await InvestigateMsg.Receive(dataStream, client, packetSize); + break; + case ThingMsg.Id: // 0x80 / 128 + result = await ThingMsg.Receive(dataStream, client, packetSize); + break; + case NameMsg.Id: // 0x91 / 145 + result = await NameMsg.Receive(dataStream, client, packetSize); + break; + case ModelUrlMsg.Id: // 0x90 / 144 + result = await ModelUrlMsg.Receive(dataStream, client, packetSize); + break; + case PoseMsg.Id: // 0x10 / 16 + result = await PoseMsg.Receive(dataStream, client, packetSize); + break; + case CustomMsg.Id: // 0xB1 / 177 + result = await CustomMsg.Receive(dataStream, client, packetSize); + break; + case TextMsg.Id: // 0xB0 / 176 + result = await TextMsg.Receive(dataStream, client, packetSize); + break; + case DestroyMsg.Id: // 0x20 / 32 + result = await DestroyMsg.Receive(dataStream, client, packetSize); break; default: break; @@ -65,21 +65,54 @@ namespace Passer.Control { } } - public static void ProcessMessage(ISiteServer site, Client client, IMessage msg) { - switch (msg) { - case NetworkIdMsg networkId: - site.ProcessNetworkId(client, networkId); - break; - case ModelUrlMsg modelUrl: - site.ProcessModelUrl(client, modelUrl); - break; - } - } + //public static void ProcessMessage(ISiteServer site, Client client, IMessage msg) { + // client.ProcessMessage(site, client, msg); + // switch (msg) { + // case ClientMsg clientMsg: + // site.ProcessClient(client, clientMsg); + // break; + // case NetworkIdMsg networkId: + // site.ProcessNetworkId(client, networkId); + // break; + // case InvestigateMsg investigate: + // site.ProcessInvestigate(client, investigate); + // break; + // case ThingMsg thing: + // site.ProcessThing(client, thing); + // break; + // case NameMsg name: + // site.ProcessName(client, name); + // break; + // case ModelUrlMsg modelUrl: + // site.ProcessModelUrl(client, modelUrl); + // break; + // case PoseMsg pose: + // site.ProcessPose(client, pose); + // break; + // case CustomMsg custom: + // site.ProcessCustom(client, custom); + // break; + // case TextMsg text: + // site.ProcessText(client, text); + // break; + // case DestroyMsg destroy: + // site.ProcessDestroy(client, destroy); + // break; + // } + //} } - public interface ISiteServer { + //public interface ISiteServer { - public void ProcessNetworkId(Client client, NetworkIdMsg networkId); - public void ProcessModelUrl(Client client, ModelUrlMsg modelUrl); - } + // public void ProcessClient(Client client, ClientMsg clientMsg); + // public void ProcessNetworkId(Client client, NetworkIdMsg networkId); + // public void ProcessInvestigate(Client client, InvestigateMsg investigate); + // public void ProcessThing(Client client, ThingMsg thing); + // public void ProcessName(Client client, NameMsg name); + // public void ProcessModelUrl(Client client, ModelUrlMsg modelUrl); + // public void ProcessPose(Client client, PoseMsg pose); + // public void ProcessCustom(Client client, CustomMsg custom); + // public void ProcessText(Client client, TextMsg text); + // public void ProcessDestroy(Client client, DestroyMsg destroy); + //} } \ No newline at end of file