esiur/esiur-dotnet
2
0
Fork 0
mirror of https://github.com/esiur/esiur-dotnet.git synced 2025-06-26 21:13:13 +00:00
Code Issues Projects Releases Wiki Activity

Nullable

Browse Source
This commit is contained in:
Ahmed Zamil
2024-11-09 01:46:00 +03:00
parent 2006c47013
commit 2dc373770c
30 changed files with 155 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Esiur/Core/IDestructible.cs
View File

@ -29,10 +29,12 @@ using System.Threading.Tasks;
namespace Esiur.Core;
#nullable enable
public delegate void DestroyedEvent(object sender);
public interface IDestructible
{
event DestroyedEvent OnDestroy;
event DestroyedEvent? OnDestroy;
void Destroy();
}

21
Esiur/Data/Codec.cs
View File

@ -24,22 +24,18 @@ SOFTWARE.
using System;
using System.Collections.Generic;
using System.Text;
using Esiur.Misc;
using System.ComponentModel;
using Esiur.Data;
using Esiur.Core;
using Esiur.Net.IIP;
using Esiur.Resource;
using System.Linq;
using System.Reflection;
using Esiur.Resource.Template;
using System.Runtime.CompilerServices;
using System.Collections;
using System.Dynamic;
namespace Esiur.Data;
#nullable enable
public static class Codec
{
@ -122,6 +118,10 @@ public static class Codec
if (dataType == null)
{
(var longLen, dataType) = TransmissionType.Parse(data, offset, (uint)data.Length);
if (dataType == null)
throw new NullReferenceException("DataType can't be parsed.");
len = (uint)longLen;
offset = dataType.Value.Offset;
}
@ -153,8 +153,11 @@ public static class Codec
/// <returns>True, if the resource owner is the given connection, otherwise False.</returns>
public static bool IsLocalResource(IResource resource, DistributedConnection connection)
{
if (resource == null)
throw new NullReferenceException("Resource is null.");
if (resource is DistributedResource)
if ((resource as DistributedResource).DistributedResourceConnection == connection)
if (((DistributedResource)(resource)).DistributedResourceConnection == connection)
return true;
return false;
@ -270,7 +273,7 @@ public static class Codec
}
if (valueOrSource is IUserType)
valueOrSource = (valueOrSource as IUserType).Get();
valueOrSource = ((IUserType)valueOrSource).Get();
//if (valueOrSource is Func<DistributedConnection, object>)
// valueOrSource = (valueOrSource as Func<DistributedConnection, object>)(connection);
@ -366,7 +369,7 @@ public static class Codec
}
public static Type GetGenericType(Type type, Type ifaceType, int argument = 0)
public static Type? GetGenericType(Type type, Type ifaceType, int argument = 0)
{
if (ifaceType.IsAssignableFrom(type))
{

81
Esiur/Data/RepresentationType.cs
View File

@ -9,6 +9,8 @@ using System.Dynamic;
using System.Linq;
using System.Text;
#nullable enable
namespace Esiur.Data
{
public enum RepresentationTypeIdentifier
@ -83,8 +85,9 @@ namespace Esiur.Data
flags.RemoveAt(0);
}
foreach (var st in SubTypes)
st.SetNull(flags);
if (SubTypes != null)
foreach (var st in SubTypes)
st.SetNull(flags);
}
public void SetNull(byte flag)
@ -94,8 +97,9 @@ namespace Esiur.Data
Nullable = (flag == 2);
}
foreach (var st in SubTypes)
st.SetNull(flag);
if (SubTypes != null)
foreach (var st in SubTypes)
st.SetNull(flag);
}
@ -108,8 +112,9 @@ namespace Esiur.Data
flags.RemoveAt(0);
}
foreach (var st in SubTypes)
st.SetNotNull(flags);
if (SubTypes != null)
foreach (var st in SubTypes)
st.SetNotNull(flags);
}
@ -126,8 +131,9 @@ namespace Esiur.Data
Nullable = (flag != 1);
}
foreach (var st in SubTypes)
st.SetNotNull(flag);
if (SubTypes != null)
foreach (var st in SubTypes)
st.SetNotNull(flag);
}
public Type? GetRuntimeType()
@ -135,7 +141,7 @@ namespace Esiur.Data
if (Identifier == RepresentationTypeIdentifier.TypedList)
{
var sub = SubTypes[0].GetRuntimeType();
var sub = SubTypes?[0].GetRuntimeType();
if (sub == null)
return null;
@ -149,7 +155,7 @@ namespace Esiur.Data
var rt = typeof(Map<,>).MakeGenericType(subs);
return rt;
}
return Identifier switch
{
(RepresentationTypeIdentifier.Void) => typeof(void),
@ -171,9 +177,9 @@ namespace Esiur.Data
(RepresentationTypeIdentifier.DateTime) => Nullable ? typeof(DateTime?) : typeof(DateTime),
(RepresentationTypeIdentifier.Resource) => typeof(IResource),
(RepresentationTypeIdentifier.Record) => typeof(IRecord),
(RepresentationTypeIdentifier.TypedRecord) => Warehouse.GetTemplateByClassId((Guid)GUID, TemplateType.Record)?.DefinedType,
(RepresentationTypeIdentifier.TypedResource) => Warehouse.GetTemplateByClassId((Guid)GUID, TemplateType.Resource)?.DefinedType,
(RepresentationTypeIdentifier.Enum) => Warehouse.GetTemplateByClassId((Guid)GUID, TemplateType.Enum)?.DefinedType,
(RepresentationTypeIdentifier.TypedRecord) => Warehouse.GetTemplateByClassId((Guid)GUID!, TemplateType.Record)?.DefinedType,
(RepresentationTypeIdentifier.TypedResource) => Warehouse.GetTemplateByClassId((Guid)GUID!, TemplateType.Resource)?.DefinedType,
(RepresentationTypeIdentifier.Enum) => Warehouse.GetTemplateByClassId((Guid)GUID!, TemplateType.Enum)?.DefinedType,
_ => null
};
@ -186,7 +192,7 @@ namespace Esiur.Data
//public RepresentationType? SubType2; // Map
//public RepresentationType? SubType3; // No types yet
public RepresentationType?[] SubTypes = new RepresentationType[3];
public RepresentationType[]? SubTypes = null;
public RepresentationType ToNullable()
@ -194,11 +200,11 @@ namespace Esiur.Data
return new RepresentationType(Identifier, true, GUID, SubTypes);
}
public static RepresentationType? FromType(Type type)
public static RepresentationType? FromType(Type type)
{
var nullable = false;
var nullable = false;
var nullType = System.Nullable.GetUnderlyingType(type);
if (nullType != null)
@ -245,7 +251,8 @@ namespace Esiur.Data
if (subType == null) // unrecongnized type
return null;
return new RepresentationType(RepresentationTypeIdentifier.TypedList, nullable, null, subType);
return new RepresentationType(RepresentationTypeIdentifier.TypedList, nullable, null,
new RepresentationType[] { subType });
}
}
@ -266,7 +273,8 @@ namespace Esiur.Data
if (subType2 == null)
return null;
return new RepresentationType(RepresentationTypeIdentifier.TypedMap, nullable, null, subType1, subType2);
return new RepresentationType(RepresentationTypeIdentifier.TypedMap, nullable, null,
new RepresentationType[] { subType1, subType2 });
}
}
//else if (genericType == typeof(AsyncReply<>))
@ -285,9 +293,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple2, nullable, null, subTypes);
@ -298,9 +307,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple3, nullable, null, subTypes);
@ -312,9 +322,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple4, nullable, null, subTypes);
@ -325,9 +336,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple5, nullable, null, subTypes);
@ -338,9 +350,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple6, nullable, null, subTypes);
@ -351,9 +364,10 @@ namespace Esiur.Data
var subTypes = new RepresentationType[args.Length];
for (var i = 0; i < args.Length; i++)
{
subTypes[i] = FromType(args[i]);
if (subTypes[i] == null)
var t = FromType(args[i]);
if (t == null)
return null;
subTypes[i] = t;
}
return new RepresentationType(RepresentationTypeIdentifier.Tuple7, nullable, null, subTypes);
@ -373,7 +387,8 @@ namespace Esiur.Data
if (subType == null)
return null;
return new RepresentationType(RepresentationTypeIdentifier.TypedList, nullable, null, subType);
return new RepresentationType(RepresentationTypeIdentifier.TypedList, nullable, null,
new RepresentationType[] { subType });
}
}
@ -410,7 +425,7 @@ namespace Esiur.Data
}
public RepresentationType(RepresentationTypeIdentifier identifier, bool nullable, Guid? guid = null, params RepresentationType[] subTypes)
public RepresentationType(RepresentationTypeIdentifier identifier, bool nullable, Guid? guid = null, RepresentationType[]? subTypes = null)
{
Nullable = nullable;
Identifier = identifier;

1
Esiur/Net/DataLink/PacketServer.cs
View File

@ -61,7 +61,6 @@ public class PacketServer : IResource
}
public event DestroyedEvent OnDestroy;
public event PropertyModifiedEvent PropertyModified;
public void Destroy()
{

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

@ -206,7 +206,8 @@ public partial class DistributedConnection : NetworkConnection, IStore
{
base.Assign(socket);
session.LocalHeaders[IIPAuthPacketHeader.IPv4] = socket.RemoteEndPoint.Address.Address;
session.LocalHeaders[IIPAuthPacketHeader.IPAddress] = socket.RemoteEndPoint.Address.GetAddressBytes();
if (socket.State == SocketState.Established &&
session.AuthenticationType == AuthenticationType.Client)
{

1
Esiur/Net/IIP/DistributedServer.cs
View File

@ -104,7 +104,6 @@ public class DistributedServer : NetworkServer<DistributedConnection>, IResource
set;
}
public event PropertyModifiedEvent PropertyModified;
public AsyncReply<bool> Trigger(ResourceTrigger trigger)
{

2
Esiur/Net/Packets/IIPAuthPacketHeader.cs
View File

@ -24,6 +24,6 @@ namespace Esiur.Net.Packets
Referrer = 15,
Time = 16,
Certificate = 17,
IPv4 = 18
IPAddress = 18,
}
}

6
Esiur/Net/Sockets/FrameworkWebSocket.cs
View File

@ -122,8 +122,8 @@ namespace Esiur.Net.Sockets
await ws.ConnectAsync(url, new CancellationToken());
sock.ReceiveAsync(websocketReceiveBufferSegment, CancellationToken.None)
_ = sock.ReceiveAsync(websocketReceiveBufferSegment, CancellationToken.None)
.ContinueWith(NetworkReceive);
return true;
@ -236,6 +236,8 @@ namespace Esiur.Net.Sockets
var receivedLength = task.Result.Count;
totalReceived += receivedLength;
receiveNetworkBuffer.Write(websocketReceiveBuffer, 0, (uint)receivedLength);
Receiver?.NetworkReceive(this, receiveNetworkBuffer);

10
Esiur/Proxy/ResourceGenerator.cs
View File

@ -18,6 +18,7 @@ using Esiur.Core;
namespace Esiur.Proxy;
[Generator]
[System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisCorrectness", "RS1036:Specify analyzer banned API enforcement setting", Justification = "<Pending>")]
public class ResourceGenerator : ISourceGenerator
{
@ -182,7 +183,10 @@ public class ResourceGenerator : ISourceGenerator
{
var code = @$"using Esiur.Resource;
using Esiur.Core;
using Esiur.Core;
#nullable enable
namespace {ci.ClassSymbol.ContainingNamespace.ToDisplayString()} {{
";
@ -192,8 +196,8 @@ namespace {ci.ClassSymbol.ContainingNamespace.ToDisplayString()} {{
{
code +=
@$" public partial class {ci.Name} : IResource {{
public virtual Instance Instance {{ get; set; }}
public virtual event DestroyedEvent OnDestroy;
public virtual Instance? Instance {{ get; set; }}
public virtual event DestroyedEvent? OnDestroy;
public virtual void Destroy() {{ OnDestroy?.Invoke(this); }}
";

2
Esiur/Proxy/TemplateGenerator.cs
View File

@ -270,6 +270,8 @@ public static class TemplateGenerator
var rt = new StringBuilder();
rt.AppendLine("using System;\r\nusing Esiur.Resource;\r\nusing Esiur.Core;\r\nusing Esiur.Data;\r\nusing Esiur.Net.IIP;");
rt.AppendLine("#nullable enable");
rt.AppendLine($"namespace {nameSpace} {{");
if (template.Annotation != null)

15
Esiur/Resource/IResource.cs
View File

@ -22,29 +22,22 @@ SOFTWARE.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Esiur.Data;
using Esiur.Core;
using System.ComponentModel;
using System.Text.Json.Serialization;
using System.ComponentModel.DataAnnotations.Schema;
#nullable enable
namespace Esiur.Resource;
public delegate bool QueryFilter<T>(T value);
//[JsonConverter(typeof(ResourceJsonConverter))]
public interface IResource : IDestructible///, INotifyPropertyChanged
public interface IResource : IDestructible
{
AsyncReply<bool> Trigger(ResourceTrigger trigger);
[NotMapped]
[JsonIgnore]
Instance Instance { get; set; }
Instance? Instance { get; set; }
}

11
Esiur/Resource/Template/MemberData.cs
View File

@ -5,6 +5,8 @@ using System.Text;
namespace Esiur.Resource.Template;
#nullable enable
public class MemberData
{
public MemberInfo Info;
@ -15,6 +17,13 @@ public class MemberData
public MemberData? Child;
public byte Index;
public MemberData(string name, MemberInfo info, int order)
{
this.Name = name;
this.Info = info;
this.Order = order;
}
public MemberInfo GetMemberInfo()
{
var rt = Info;
@ -29,7 +38,7 @@ public class MemberData
public string? GetAnnotation()
{
string rt = null;
string? rt = null;
var md = this;
while (md != null)
{

28
Esiur/Resource/Template/TypeTemplate.cs
View File

@ -601,18 +601,17 @@ public class TypeTemplate
.Where(x => x.GetCustomAttribute<IgnoreAttribute>() == null)
.Where(x => x.Name != "Instance")
.Where(x => !(x is MethodInfo m && m.IsSpecialName))
.Where(x=> !(x is EventInfo e &&
!(e.EventHandlerType.IsGenericType &&
.Where(x => !(x is EventInfo e &&
!(e.EventHandlerType.IsGenericType &&
(e.EventHandlerType.GetGenericTypeDefinition() == typeof(ResourceEventHandler<>)
|| e.EventHandlerType.GetGenericTypeDefinition() == typeof(CustomResourceEventHandler<>))
)
))
.Select(x => new MemberData()
{
Name = x.GetCustomAttribute<ExportAttribute>()?.Name ?? x.Name,
Info = x,
Order = order
})
.Select(x => new MemberData(
name: x.GetCustomAttribute<ExportAttribute>()?.Name ?? x.Name,
info: x,
order: order
))
.OrderBy(x => x.Name);
members.AddRange(mis.ToArray());
@ -627,12 +626,11 @@ public class TypeTemplate
.Where(x => !(x is FieldInfo c && !c.IsStatic))
.Where(x => x.GetCustomAttribute<ExportAttribute>() != null)
.Where(x => !(x is MethodInfo m && m.IsSpecialName))
.Select(x => new MemberData
{
Name = x.GetCustomAttribute<ExportAttribute>()?.Name ?? x.Name,
Info = x,
Order = order
})
.Select(x => new MemberData (
name : x.GetCustomAttribute<ExportAttribute>()?.Name ?? x.Name,
info : x,
order : order
))
.OrderBy(x => x.Name);
members.AddRange(mis.ToArray());
@ -641,7 +639,7 @@ public class TypeTemplate
type = type.BaseType;
if (type == null
if (type == null
|| type == typeof(Resource)
|| type == typeof(Record)
|| type == typeof(EntryPoint))

2
Esiur/Security/Membership/AuthorizationRequest.cs
View File

@ -4,6 +4,8 @@ using System;
using System.Collections.Generic;
using System.Text;
#nullable enable
namespace Esiur.Security.Membership
{
public class AuthorizationRequest

4
Esiur/Security/Membership/AuthorizationResults.cs
View File

@ -3,6 +3,8 @@ using System;
using System.Collections.Generic;
using System.Text;
#nullable enable
namespace Esiur.Security.Membership
{
public class AuthorizationResults
@ -12,7 +14,7 @@ namespace Esiur.Security.Membership
public uint Reference { get; set; }
public IIPAuthPacketIAuthDestination Destination { get; set; }
public string Clue { get; set; }
public string? Clue { get; set; }
public IIPAuthPacketIAuthFormat? RequiredFormat { get; set; }
public IIPAuthPacketIAuthFormat? ContentFormat { get; set; }
public object? Content { get; set; }

2
Esiur/Security/Membership/SimpleMembership.cs
View File

@ -15,7 +15,7 @@ namespace Esiur.Security.Membership
{
public bool GuestsAllowed { get; set; } = false;
public event ResourceEventHandler<AuthorizationIndication> Authorization;
public event ResourceEventHandler<AuthorizationIndication> Authorization { add { } remove { } }
KeyList<string, UserInfo> users = new KeyList<string, UserInfo>();