esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-10-29 07:10:29 +00:00
Code Issues Projects Releases Wiki Activity

Extended

Browse Source
This commit is contained in:
ahmed
2025-10-15 06:09:05 +03:00
parent 6c1d038bbb
commit 9386cc7a84
7 changed files with 194 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Esiur/Data/Codec.cs
View File

@@ -41,7 +41,7 @@ public static class Codec
//delegate AsyncReply AsyncParser(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence); //delegate AsyncReply AsyncParser(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence);
delegate object AsyncParser(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence); delegate object AsyncParser(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence);
delegate object SyncParser(ParsedTDU tdu, Warehouse warehouse); delegate object SyncParser(ParsedTDU tdu, Warehouse warehouse);
static AsyncParser[][] FixedAsyncParsers = new AsyncParser[][] static AsyncParser[][] FixedAsyncParsers = new AsyncParser[][]
@@ -107,6 +107,10 @@ public static class Codec
DataDeserializer.ConstantParserAsync, DataDeserializer.ConstantParserAsync,
}; };
static AsyncParser[] ExtendedAsyncParsers = new AsyncParser[]
{
};
static SyncParser[][] FixedParsers = new SyncParser[][] static SyncParser[][] FixedParsers = new SyncParser[][]
{ {
@@ -171,6 +175,11 @@ public static class Codec
DataDeserializer.ConstantParser, DataDeserializer.ConstantParser,
}; };
static SyncParser[] ExtendedParsers = new SyncParser[]
{
};
/// <summary> /// <summary>
/// Parse a value /// Parse a value
/// </summary> /// </summary>
@@ -203,34 +212,56 @@ public static class Codec
if (tt.Class == TDUClass.Fixed) if (tt.Class == TDUClass.Fixed)
{ {
return (len, FixedAsyncParsers[tt.Exponent][tt.Index](data, dataType.Value.Offset, (uint)tt.ContentLength, connection, requestSequence)); return (len, FixedAsyncParsers[tt.Exponent][tt.Index](tt, connection, requestSequence));
} }
else if (tt.Class == TDUClass.Dynamic) else if (tt.Class == TDUClass.Dynamic)
{ {
return (len, DynamicAsyncParsers[tt.Index](data, dataType.Value.Offset, (uint)tt.ContentLength, connection, requestSequence)); return (len, DynamicAsyncParsers[tt.Index](tt, connection, requestSequence));
} }
else //if (tt.Class == TransmissionDataUnitClass.Typed) else if (tt.Class == TDUClass.Typed)
{ {
return (len, TypedAsyncParsers[tt.Index](data, dataType.Value.Offset, (uint)tt.ContentLength, connection, requestSequence)); return (len, TypedAsyncParsers[tt.Index](tt, connection, requestSequence));
}
else if (tt.Class == TDUClass.Extension)
{
return (len, ExtendedAsyncParsers[tt.Index](tt, connection, requestSequence));
} }
} }
public static (uint, object) ParseSync(byte[] data, uint offset, Warehouse warehouse, ParsedTDU? dataType = null) public static (uint, object) ParseSync(ParsedTDU tdu, Warehouse warehouse)
{
if (tdu.Class == TDUClass.Fixed)
{
return ((uint)tdu.TotalLength, FixedParsers[tdu.Exponent][tdu.Index](tdu, warehouse));
}
else if (tdu.Class == TDUClass.Dynamic)
{
return ((uint)tdu.TotalLength, DynamicParsers[tdu.Index](tdu, warehouse));
}
else if (tdu.Class == TDUClass.Typed)
{
return ((uint)tdu.TotalLength, TypedParsers[tdu.Index](tdu, warehouse));
}
else // Extension
{
return ((uint)tdu.TotalLength, ExtendedParsers[tdu.Index](tdu, warehouse));
}
}
public static (uint, object) ParseSync(byte[] data, uint offset, Warehouse warehouse)
{ {
uint len = 0; uint len = 0;
var (longLen, dataType) = ParsedTDU.Parse(data, offset, (uint)data.Length);
if (dataType == null) if (dataType == null)
{ throw new NullReferenceException("DataType can't be parsed.");
(var longLen, dataType) = ParsedTDU.Parse(data, offset, (uint)data.Length);
if (dataType == null) len = (uint)longLen;
throw new NullReferenceException("DataType can't be parsed."); offset = dataType.Value.Offset;
len = (uint)longLen;
offset = dataType.Value.Offset;
}
else
len = (uint)dataType.Value.ContentLength;
var tt = dataType.Value; var tt = dataType.Value;
@@ -242,10 +273,14 @@ public static class Codec
{ {
return (len, DynamicParsers[tt.Index](tt, warehouse)); return (len, DynamicParsers[tt.Index](tt, warehouse));
} }
else //if (tt.Class == TransmissionDataUnitClass.Typed) else if (tt.Class == TDUClass.Typed)
{ {
return (len, TypedParsers[tt.Index](tt, warehouse)); return (len, TypedParsers[tt.Index](tt, warehouse));
} }
else
{
return (len, ExtendedParsers[tt.Index](tt, warehouse));
}
} }
/// <summary> /// <summary>
/// Check if a resource is local to a given connection. /// Check if a resource is local to a given connection.

236
Esiur/Data/DataDeserializer.cs
View File

@@ -15,7 +15,7 @@ namespace Esiur.Data;
public static class DataDeserializer public static class DataDeserializer
{ {
public static object NullParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object NullParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return null; return null;
} }
@@ -25,7 +25,7 @@ public static class DataDeserializer
return null; return null;
} }
public static object BooleanTrueParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object BooleanTrueParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return true; return true;
} }
@@ -35,7 +35,7 @@ public static class DataDeserializer
return true; return true;
} }
public static object BooleanFalseParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object BooleanFalseParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return false; return false;
} }
@@ -45,7 +45,7 @@ public static class DataDeserializer
return false; return false;
} }
public static object NotModifiedParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object NotModifiedParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return NotModified.Default; return NotModified.Default;
} }
@@ -55,27 +55,27 @@ public static class DataDeserializer
return NotModified.Default; return NotModified.Default;
} }
public static object UInt8ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object UInt8ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return data[offset]; return tdu.Data[tdu.Offset];
} }
public static object UInt8Parser(ParsedTDU tdu, Warehouse warehouse) public static object UInt8Parser(ParsedTDU tdu, Warehouse warehouse)
{ {
return tdu.Data[tdu.Offset]; return tdu.Data[tdu.Offset];
} }
public static object Int8ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object Int8ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return (sbyte)data[offset]; return (sbyte)tdu.Data[tdu.Offset];
} }
public static object Int8Parser(ParsedTDU tdu, Warehouse warehouse) public static object Int8Parser(ParsedTDU tdu, Warehouse warehouse)
{ {
return (sbyte)tdu.Data[tdu.Offset]; return (sbyte)tdu.Data[tdu.Offset];
} }
public static unsafe object Char16ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Char16ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(char*)ptr; return *(char*)ptr;
} }
@@ -85,9 +85,9 @@ public static class DataDeserializer
return *(char*)ptr; return *(char*)ptr;
} }
public static object Char8ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static object Char8ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return (char)data[offset]; return (char)tdu.Data[tdu.Offset];
} }
public static object Char8Parser(ParsedTDU tdu, Warehouse warehouse) public static object Char8Parser(ParsedTDU tdu, Warehouse warehouse)
@@ -96,9 +96,9 @@ public static class DataDeserializer
} }
public static unsafe object Int16ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Int16ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(short*)ptr; return *(short*)ptr;
} }
@@ -108,9 +108,9 @@ public static class DataDeserializer
return *(short*)ptr; return *(short*)ptr;
} }
public static unsafe object UInt16ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object UInt16ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(ushort*)ptr; return *(ushort*)ptr;
} }
@@ -120,9 +120,9 @@ public static class DataDeserializer
return *(ushort*)ptr; return *(ushort*)ptr;
} }
public static unsafe object Int32ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Int32ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(int*)ptr; return *(int*)ptr;
} }
@@ -132,9 +132,9 @@ public static class DataDeserializer
return *(int*)ptr; return *(int*)ptr;
} }
public static unsafe object UInt32ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object UInt32ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(uint*)ptr; return *(uint*)ptr;
} }
@@ -145,9 +145,9 @@ public static class DataDeserializer
} }
public static unsafe object Float32ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Float32ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(float*)ptr; return *(float*)ptr;
} }
@@ -157,9 +157,9 @@ public static class DataDeserializer
return *(float*)ptr; return *(float*)ptr;
} }
public static unsafe object Float64ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Float64ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(double*)ptr; return *(double*)ptr;
} }
@@ -170,9 +170,9 @@ public static class DataDeserializer
} }
public static unsafe object Decimal128ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Decimal128ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(decimal*)ptr; return *(decimal*)ptr;
} }
@@ -182,9 +182,9 @@ public static class DataDeserializer
return *(decimal*)ptr; return *(decimal*)ptr;
} }
public static unsafe object UUIDParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object UUIDParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return new UUID(data, offset); return new UUID(tdu.Data, tdu.Offset);
} }
public static unsafe object UUIDParser(ParsedTDU tdu, Warehouse warehouse) public static unsafe object UUIDParser(ParsedTDU tdu, Warehouse warehouse)
@@ -194,10 +194,10 @@ public static class DataDeserializer
public static unsafe object Int128ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Int128ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr1 = &data[offset]) fixed (byte* ptr1 = &tdu.Data[tdu.Offset])
fixed (byte* ptr2 = &data[offset + 8]) fixed (byte* ptr2 = &tdu.Data[tdu.Offset + 8])
return new Int128(*(ulong*)ptr1, *(ulong*)ptr2); return new Int128(*(ulong*)ptr1, *(ulong*)ptr2);
} }
@@ -208,10 +208,10 @@ public static class DataDeserializer
return new Int128(*(ulong*)ptr1, *(ulong*)ptr2); return new Int128(*(ulong*)ptr1, *(ulong*)ptr2);
} }
public static unsafe object UInt128ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object UInt128ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr1 = &data[offset]) fixed (byte* ptr1 = &tdu.Data[tdu.Offset])
fixed (byte* ptr2 = &data[offset + 8]) fixed (byte* ptr2 = &tdu.Data[tdu.Offset + 8])
return new UInt128(*(ulong*)ptr1, *(ulong*)ptr2); return new UInt128(*(ulong*)ptr1, *(ulong*)ptr2);
} }
@@ -222,9 +222,9 @@ public static class DataDeserializer
return new UInt128(*(ulong*)ptr1, *(ulong*)ptr2); return new UInt128(*(ulong*)ptr1, *(ulong*)ptr2);
} }
public static unsafe object Int64ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object Int64ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(long*)ptr; return *(long*)ptr;
} }
@@ -235,9 +235,9 @@ public static class DataDeserializer
} }
public static unsafe object UInt64ParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object UInt64ParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return *(ulong*)ptr; return *(ulong*)ptr;
} }
@@ -248,9 +248,9 @@ public static class DataDeserializer
} }
public static unsafe object DateTimeParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object DateTimeParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
return new DateTime(*(long*)ptr, DateTimeKind.Utc); return new DateTime(*(long*)ptr, DateTimeKind.Utc);
} }
@@ -262,12 +262,12 @@ public static class DataDeserializer
} }
public static unsafe object ResourceParser8Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object ResourceParser8Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
if (connection == null) if (connection == null)
return new ResourceId(false, data[offset]); return new ResourceId(false, tdu.Data[tdu.Offset]);
else else
return connection.Fetch(data[offset], requestSequence); return connection.Fetch(tdu.Data[tdu.Offset], requestSequence);
} }
public static unsafe object ResourceParser8(ParsedTDU tdu, Warehouse warehouse) public static unsafe object ResourceParser8(ParsedTDU tdu, Warehouse warehouse)
@@ -275,12 +275,12 @@ public static class DataDeserializer
return new ResourceId(false, tdu.Data[tdu.Offset]); return new ResourceId(false, tdu.Data[tdu.Offset]);
} }
public static unsafe object LocalResourceParser8Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object LocalResourceParser8Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
if (connection == null) if (connection == null)
return new ResourceId(true, data[offset]); return new ResourceId(true, tdu.Data[tdu.Offset]);
else else
return connection.Instance.Warehouse.GetById(data[offset]); return connection.Instance.Warehouse.GetById(tdu.Data[tdu.Offset]);
} }
public static unsafe object LocalResourceParser8(ParsedTDU tdu, Warehouse warehouse) public static unsafe object LocalResourceParser8(ParsedTDU tdu, Warehouse warehouse)
@@ -288,9 +288,9 @@ public static class DataDeserializer
return new ResourceId(true, tdu.Data[tdu.Offset]); return new ResourceId(true, tdu.Data[tdu.Offset]);
} }
public static unsafe object ResourceParser16Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object ResourceParser16Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
if (connection == null) if (connection == null)
return new ResourceId(false, *(ushort*)ptr); return new ResourceId(false, *(ushort*)ptr);
else else
@@ -304,9 +304,9 @@ public static class DataDeserializer
} }
public static unsafe object LocalResourceParser16Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object LocalResourceParser16Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
if (connection == null) if (connection == null)
return new ResourceId(true, *(ushort*)ptr); return new ResourceId(true, *(ushort*)ptr);
else else
@@ -319,9 +319,9 @@ public static class DataDeserializer
return new ResourceId(true, *(ushort*)ptr); return new ResourceId(true, *(ushort*)ptr);
} }
public static unsafe object ResourceParser32Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object ResourceParser32Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
if (connection == null) if (connection == null)
return new ResourceId(false, *(uint*)ptr); return new ResourceId(false, *(uint*)ptr);
else else
@@ -335,9 +335,9 @@ public static class DataDeserializer
} }
public static unsafe object LocalResourceParser32Async(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object LocalResourceParser32Async(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
fixed (byte* ptr = &data[offset]) fixed (byte* ptr = &tdu.Data[tdu.Offset])
if (connection == null) if (connection == null)
return new ResourceId(true, *(uint*)ptr); return new ResourceId(true, *(uint*)ptr);
else else
@@ -351,9 +351,9 @@ public static class DataDeserializer
} }
public static unsafe object RawDataParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object RawDataParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return data.Clip(offset, length); return tdu.Data.Clip(tdu.Offset, (uint)tdu.ContentLength);
} }
public static unsafe object RawDataParser(ParsedTDU tdu, Warehouse warehouse) public static unsafe object RawDataParser(ParsedTDU tdu, Warehouse warehouse)
@@ -362,9 +362,9 @@ public static class DataDeserializer
} }
public static unsafe object StringParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object StringParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
return data.GetString(offset, length); return tdu.Data.GetString(tdu.Offset, (uint)tdu.ContentLength);
} }
public static unsafe object StringParser(ParsedTDU tdu, Warehouse warehouse) public static unsafe object StringParser(ParsedTDU tdu, Warehouse warehouse)
@@ -372,21 +372,18 @@ public static class DataDeserializer
return tdu.Data.GetString(tdu.Offset, (uint)tdu.ContentLength); return tdu.Data.GetString(tdu.Offset, (uint)tdu.ContentLength);
} }
public static unsafe object RecordParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object RecordParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var reply = new AsyncReply<IRecord>(); var reply = new AsyncReply<IRecord>();
var classId = data.GetUUID(offset); var classId = tdu.Metadata.GetUUID(0);
offset += 16;
length -= 16;
var template = connection.Instance.Warehouse.GetTemplateByClassId(classId, TemplateType.Record); var template = connection.Instance.Warehouse.GetTemplateByClassId(classId, TemplateType.Record);
var initRecord = (TypeTemplate template) => var initRecord = (TypeTemplate template) =>
{ {
ListParserAsync(data, offset, length, connection, requestSequence).Then(r => ListParserAsync(tdu, connection, requestSequence).Then(r =>
{ {
var ar = (object[])r; var ar = (object[])r;
@@ -497,7 +494,7 @@ public static class DataDeserializer
} }
} }
public static unsafe object ConstantParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe object ConstantParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
@@ -507,12 +504,13 @@ public static class DataDeserializer
throw new NotImplementedException(); throw new NotImplementedException();
} }
public static unsafe AsyncReply EnumParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static unsafe AsyncReply EnumParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var classId = data.GetUUID(offset); var classId = tdu.Metadata.GetUUID(0);
offset += 16;
var index = data[offset++];
var index = tdu.Data[tdu.Offset];
var template = connection.Instance.Warehouse.GetTemplateByClassId(classId, TemplateType.Enum); var template = connection.Instance.Warehouse.GetTemplateByClassId(classId, TemplateType.Enum);
@@ -554,13 +552,16 @@ public static class DataDeserializer
} }
public static AsyncReply RecordListParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncReply RecordListParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var rt = new AsyncBag<IRecord>(); var rt = new AsyncBag<IRecord>();
var length = tdu.ContentLength;
var offset = tdu.Offset;
while (length > 0) while (length > 0)
{ {
var (cs, reply) = Codec.ParseAsync(data, offset, connection, requestSequence); var (cs, reply) = Codec.ParseAsync(tdu.Data, offset, connection, requestSequence);
rt.Add(reply); rt.Add(reply);
@@ -604,13 +605,16 @@ public static class DataDeserializer
return rt.ToArray(); return rt.ToArray();
} }
public static AsyncReply ResourceListParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncReply ResourceListParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var rt = new AsyncBag<IResource>(); var rt = new AsyncBag<IResource>();
var length = tdu.ContentLength;
var offset = tdu.Offset;
while (length > 0) while (length > 0)
{ {
var (cs, reply) = Codec.ParseAsync(data, offset, connection, requestSequence); var (cs, reply) = Codec.ParseAsync(tdu.Data, offset, connection, requestSequence);
rt.Add(reply); rt.Add(reply);
@@ -655,13 +659,17 @@ public static class DataDeserializer
return rt.ToArray(); return rt.ToArray();
} }
public static AsyncBag<object> ListParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncBag<object> ListParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var rt = new AsyncBag<object>(); var rt = new AsyncBag<object>();
var offset = tdu.Offset;
var length = tdu.ContentLength;
while (length > 0) while (length > 0)
{ {
var (cs, reply) = Codec.ParseAsync(data, offset, connection, requestSequence); var (cs, reply) = Codec.ParseAsync(tdu.Data, offset, connection, requestSequence);
rt.Add(reply); rt.Add(reply);
@@ -683,24 +691,11 @@ public static class DataDeserializer
{ {
var rt = new List<object>(); var rt = new List<object>();
//TransmissionDataUnitIdentifier? previous = null;
//byte[]? previousUUID = null;
ParsedTDU? previous = null;
ParsedTDU? current = null;
var offset = tdu.Offset; var offset = tdu.Offset;
var length = tdu.ContentLength; var length = tdu.ContentLength;
while (length > 0) while (length > 0)
{ {
var (longLen, dataType) = ParsedTDU.Parse(tdu.Data, offset, (uint)tdu.ContentLength);
if (dataType.Value.Identifier == TDUIdentifier.Same)
{
// Add UUID
}
var (cs, reply) = Codec.ParseSync(tdu.Data, offset, warehouse); var (cs, reply) = Codec.ParseSync(tdu.Data, offset, warehouse);
rt.Add(reply); rt.Add(reply);
@@ -743,16 +738,12 @@ public static class DataDeserializer
} }
public static AsyncReply TypedMapParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncReply TypedMapParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
// get key type // get key type
var (keyCs, keyRepType) = RepresentationType.Parse(data, offset);
offset += keyCs;
length -= keyCs;
var (valueCs, valueRepType) = RepresentationType.Parse(data, offset); var (keyCs, keyRepType) = RepresentationType.Parse(tdu.Metadata, 0);
offset += valueCs; var (valueCs, valueRepType) = RepresentationType.Parse(tdu.Metadata, keyCs);
length -= valueCs;
var wh = connection.Instance.Warehouse; var wh = connection.Instance.Warehouse;
@@ -762,9 +753,12 @@ public static class DataDeserializer
var results = new AsyncBag<object>(); var results = new AsyncBag<object>();
var offset = tdu.Offset;
var length = tdu.ContentLength;
while (length > 0) while (length > 0)
{ {
var (cs, reply) = Codec.ParseAsync(data, offset, connection, requestSequence); var (cs, reply) = Codec.ParseAsync(tdu.Data, offset, connection, requestSequence);
results.Add(reply); results.Add(reply);
@@ -832,28 +826,29 @@ public static class DataDeserializer
return map; return map;
} }
public static AsyncReply TupleParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncReply TupleParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var results = new AsyncBag<object>(); var results = new List<object>();
var rt = new AsyncReply(); var tupleSize = tdu.Metadata[0];
var tupleSize = data[offset++];
length--;
var types = new List<Type>(); var types = new List<Type>();
uint mtOffset = 1;
for (var i = 0; i < tupleSize; i++) for (var i = 0; i < tupleSize; i++)
{ {
var (cs, rep) = RepresentationType.Parse(data, offset); var (cs, rep) = RepresentationType.Parse(tdu.Metadata, mtOffset);
types.Add(rep.GetRuntimeType(connection.Instance.Warehouse)); types.Add(rep.GetRuntimeType(connection.Instance.Warehouse));
offset += cs; mtOffset += cs;
length -= cs;
} }
var length = tdu.ContentLength;
var offset = tdu.Offset;
while (length > 0) while (length > 0)
{ {
var (cs, reply) = Codec.ParseAsync(data, offset, connection, requestSequence); var (cs, reply) = Codec.ParseAsync(tdu.Data, offset, connection, requestSequence);
results.Add(reply); results.Add(reply);
@@ -910,17 +905,13 @@ public static class DataDeserializer
public static object TupleParser(ParsedTDU tdu, Warehouse warehouse) public static object TupleParser(ParsedTDU tdu, Warehouse warehouse)
{ {
var results = new List<object>(); var results = new List<object>();
var tupleSize = tdu.Metadata[0];
var tupleSize = tdu.Metadata[0];// data[offset++];
//length--;
var types = new List<Type>(); var types = new List<Type>();
uint mtOffset = 1; uint mtOffset = 1;
for (var i = 0; i < tupleSize; i++) for (var i = 0; i < tupleSize; i++)
{ {
var (cs, rep) = RepresentationType.Parse(tdu.Metadata, mtOffset); var (cs, rep) = RepresentationType.Parse(tdu.Metadata, mtOffset);
types.Add(rep.GetRuntimeType(warehouse)); types.Add(rep.GetRuntimeType(warehouse));
mtOffset += cs; mtOffset += cs;
@@ -981,7 +972,7 @@ public static class DataDeserializer
} }
public static AsyncReply TypedListParserAsync(byte[] data, uint offset, uint length, DistributedConnection connection, uint[] requestSequence) public static AsyncReply TypedListParserAsync(ParsedTDU tdu, DistributedConnection connection, uint[] requestSequence)
{ {
var rt = new AsyncBag<object>(); var rt = new AsyncBag<object>();
@@ -1035,15 +1026,25 @@ public static class DataDeserializer
var offset = tdu.Offset; var offset = tdu.Offset;
var length = tdu.ContentLength; var length = tdu.ContentLength;
var ends = offset + (uint)length;
while (length > 0) while (length > 0)
{ {
(var longLen, current) = ParsedTDU.Parse(tdu.Data, offset, (uint)tdu.ContentLength); (var longLen, current) = ParsedTDU.Parse(tdu.Data, offset, ends);
if (current.Value.Identifier == TDUIdentifier.NotModified) if (current == null)
current = previous; throw new Exception("Unknown type.");
var (cs, reply) = Codec.ParseSync(tdu.Data, offset, warehouse, current); var cur = (ParsedTDU)current.Value;
if (cur.Identifier == TDUIdentifier.TypeContinuation)
{
cur.Class = previous.Value.Class;
cur.Identifier = previous.Value.Identifier;
cur.Metadata = previous.Value.Metadata;
}
var (cs, reply) = Codec.ParseSync(cur, warehouse);
list.Add(reply); list.Add(reply);
@@ -1051,6 +1052,7 @@ public static class DataDeserializer
{ {
offset += (uint)cs; offset += (uint)cs;
length -= (uint)cs; length -= (uint)cs;
previous = cur;
} }
else else
throw new Exception("Error while parsing structured data"); throw new Exception("Error while parsing structured data");

8
Esiur/Data/DataSerializer.cs
View File

@@ -333,9 +333,11 @@ public static class DataSerializer
var tdu = Codec.ComposeInternal(i, warehouse, connection); var tdu = Codec.ComposeInternal(i, warehouse, connection);
if (previous != null && tdu.MatchType(previous.Value)) if (previous != null && tdu.MatchType(previous.Value))
{ {
rt.Add((byte)TDUIdentifier.NotModified); var d = tdu.Composed.Clip(tdu.ContentOffset,
rt.AddRange(tdu.Composed.Clip(tdu.ContentOffset, (uint)tdu.Composed.Length - tdu.ContentOffset);
(uint)tdu.Composed.Length - tdu.ContentOffset));
var ntd = new TDU(TDUIdentifier.TypeContinuation, d,(ulong) d.Length);
rt.AddRange(ntd.Composed);
} }
else else
{ {

2
Esiur/Data/ParsedTDU.cs
View File

@@ -83,7 +83,7 @@ namespace Esiur.Data
Data = data, Data = data,
Offset = offset, Offset = offset,
Class = cls, Class = cls,
ContentLength = cl, ContentLength = cl - 1 - (uint)metaData.Length,
TotalLength = 1 + cl + cll, TotalLength = 1 + cl + cll,
Index = (byte)h & 0x7, Index = (byte)h & 0x7,
Metadata = metaData, Metadata = metaData,

4
Esiur/Data/TDUIdentifier.cs
View File

@@ -47,6 +47,7 @@ namespace Esiur.Data
RecordList = 0x44, RecordList = 0x44,
Map = 0x45, Map = 0x45,
MapList = 0x46, MapList = 0x46,
ResourceLink = 0x47,
Record = 0x80, Record = 0x80,
TypedList = 0x81, TypedList = 0x81,
@@ -55,9 +56,8 @@ namespace Esiur.Data
TypedEnum = 0x84, TypedEnum = 0x84,
TypedConstant = 0x85, TypedConstant = 0x85,
ResourceLink = 0xC0, TypeContinuation = 0xC0,
Same = 0xFF
} }
} }

10
Esiur/Net/IIP/DistributedConnection.cs
View File

@@ -665,7 +665,7 @@ public partial class DistributedConnection : NetworkConnection, IStore
var dataType = authPacket.DataType.Value; var dataType = authPacket.DataType.Value;
var (_, parsed) = Codec.ParseSync(data, dataType.Offset, Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Instance.Warehouse);
var rt = (Map<byte, object>)parsed; var rt = (Map<byte, object>)parsed;
@@ -792,7 +792,7 @@ public partial class DistributedConnection : NetworkConnection, IStore
else if (authPacket.Event == IIPAuthPacketEvent.IAuthPlain) else if (authPacket.Event == IIPAuthPacketEvent.IAuthPlain)
{ {
var dataType = authPacket.DataType.Value; var dataType = authPacket.DataType.Value;
var (_, parsed) = Codec.ParseSync(data, dataType.Offset, Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Instance.Warehouse);
var rt = (Map<byte, object>)parsed; var rt = (Map<byte, object>)parsed;
var headers = rt.Select(x => new KeyValuePair<IIPAuthPacketIAuthHeader, object>((IIPAuthPacketIAuthHeader)x.Key, x.Value)); var headers = rt.Select(x => new KeyValuePair<IIPAuthPacketIAuthHeader, object>((IIPAuthPacketIAuthHeader)x.Key, x.Value));
@@ -832,7 +832,7 @@ public partial class DistributedConnection : NetworkConnection, IStore
else if (authPacket.Event == IIPAuthPacketEvent.IAuthHashed) else if (authPacket.Event == IIPAuthPacketEvent.IAuthHashed)
{ {
var dataType = authPacket.DataType.Value; var dataType = authPacket.DataType.Value;
var (_, parsed) = Codec.ParseSync(data, dataType.Offset, Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Instance.Warehouse);
var rt = (Map<byte, object>)parsed; var rt = (Map<byte, object>)parsed;
@@ -895,7 +895,7 @@ public partial class DistributedConnection : NetworkConnection, IStore
var dataType = authPacket.DataType.Value; var dataType = authPacket.DataType.Value;
var (_, parsed) = Codec.ParseSync(data, dataType.Offset, Server.Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Server.Instance.Warehouse);
var rt = (Map<byte, object>)parsed; var rt = (Map<byte, object>)parsed;
@@ -1153,7 +1153,7 @@ public partial class DistributedConnection : NetworkConnection, IStore
var reference = authPacket.Reference; var reference = authPacket.Reference;
var dataType = authPacket.DataType.Value; var dataType = authPacket.DataType.Value;
var (_, value) = Codec.ParseSync(data, dataType.Offset, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
Server.Membership.AuthorizePlain(session, reference, value) Server.Membership.AuthorizePlain(session, reference, value)
.Then(x => ProcessAuthorization(x)); .Then(x => ProcessAuthorization(x));

20
Esiur/Net/IIP/DistributedConnectionProtocol.cs
View File

@@ -400,7 +400,7 @@ partial class DistributedConnection
void IIPNotificationResourceDestroyed(ParsedTDU dataType, byte[] data) void IIPNotificationResourceDestroyed(ParsedTDU dataType, byte[] data)
{ {
var (size, rt) = Codec.ParseSync(data, dataType.Offset, Instance.Warehouse, dataType); var (size, rt) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceId = (uint)rt; var resourceId = (uint)rt;
@@ -520,7 +520,7 @@ partial class DistributedConnection
void IIPRequestAttachResource(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestAttachResource(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceId = (uint)value; var resourceId = (uint)value;
@@ -633,7 +633,7 @@ partial class DistributedConnection
void IIPRequestDetachResource(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestDetachResource(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceId = (uint)value; var resourceId = (uint)value;
@@ -725,7 +725,7 @@ partial class DistributedConnection
void IIPRequestDeleteResource(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestDeleteResource(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceId = (uint)value; var resourceId = (uint)value;
@@ -797,7 +797,7 @@ partial class DistributedConnection
void IIPRequestLinkTemplates(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestLinkTemplates(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceLink = (string)value; var resourceLink = (string)value;
@@ -830,7 +830,7 @@ partial class DistributedConnection
void IIPRequestTemplateFromClassName(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestTemplateFromClassName(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var className = (string)value; var className = (string)value;
@@ -850,7 +850,7 @@ partial class DistributedConnection
void IIPRequestTemplateFromClassId(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestTemplateFromClassId(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var classId = (UUID)value; var classId = (UUID)value;
@@ -872,7 +872,7 @@ partial class DistributedConnection
void IIPRequestTemplateFromResourceId(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestTemplateFromResourceId(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, value) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, value) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceId = (uint)value; var resourceId = (uint)value;
@@ -894,7 +894,7 @@ partial class DistributedConnection
void IIPRequestGetResourceIdByLink(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestGetResourceIdByLink(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, parsed) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceLink = (string)parsed; var resourceLink = (string)parsed;
Action<IResource> queryCallback = (r) => Action<IResource> queryCallback = (r) =>
@@ -922,7 +922,7 @@ partial class DistributedConnection
void IIPRequestQueryResources(uint callback, ParsedTDU dataType, byte[] data) void IIPRequestQueryResources(uint callback, ParsedTDU dataType, byte[] data)
{ {
var (_, parsed) = Codec.ParseSync(data, 0, Instance.Warehouse, dataType); var (_, parsed) = Codec.ParseSync(dataType, Instance.Warehouse);
var resourceLink = (string)parsed; var resourceLink = (string)parsed;