diff --git a/Esyur.Stores.EntityCore/EntityResource.cs b/Esiur.Stores.EntityCore/EntityResource.cs similarity index 96% rename from Esyur.Stores.EntityCore/EntityResource.cs rename to Esiur.Stores.EntityCore/EntityResource.cs index afadaaf..a5a18c8 100644 --- a/Esyur.Stores.EntityCore/EntityResource.cs +++ b/Esiur.Stores.EntityCore/EntityResource.cs @@ -26,13 +26,13 @@ using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Text; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Core; +using Esiur.Resource; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel; using System.Runtime.CompilerServices; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { public class EntityResource : IResource { diff --git a/Esyur.Stores.EntityCore/EntityStore.cs b/Esiur.Stores.EntityCore/EntityStore.cs similarity index 84% rename from Esyur.Stores.EntityCore/EntityStore.cs rename to Esiur.Stores.EntityCore/EntityStore.cs index 882c310..0e0da55 100644 --- a/Esyur.Stores.EntityCore/EntityStore.cs +++ b/Esiur.Stores.EntityCore/EntityStore.cs @@ -22,19 +22,19 @@ SOFTWARE. */ -using Esyur.Core; -using Esyur.Data; -using Esyur.Resource; -using Esyur.Resource.Template; +using Esiur.Core; +using Esiur.Data; +using Esiur.Resource; +using Esiur.Resource.Template; using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; -using Esyur.Proxy; +using Esiur.Proxy; using System.Linq; using Microsoft.EntityFrameworkCore.Metadata; using System.Reflection; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { public class EntityStore : IStore { @@ -43,6 +43,7 @@ namespace Esyur.Stores.EntityCore public event DestroyedEvent OnDestroy; Dictionary> DB = new Dictionary>(); + object DBLock = new object(); internal struct TypeInfo { @@ -58,19 +59,27 @@ namespace Esyur.Stores.EntityCore bool Loaded; - public async AsyncReply Get(string path) + public AsyncReply Get(string path) { var p = path.Split('/'); var ti = TypesByName[p[0]]; var id = Convert.ChangeType(p[1], ti.PrimaryKey.PropertyType);// Convert.ToInt32(); - //Type.cas ti.PrimaryKey.PropertyType. - return DbContextProvider().Find(ti.Type.ClrType, id) as IResource; + + + var db = DbContextProvider(); + var res = db.Find(ti.Type.ClrType, id); + var ent = db.Entry(res); + + foreach (var rf in ent.References) + rf.Load(); + + return new AsyncReply(res as IResource); } - public async AsyncReply Put(IResource resource) + public AsyncReply Put(IResource resource) { if (resource is EntityStore) - return false; + return new AsyncReply(false); var type = ResourceProxy.GetBaseType(resource);//.GetType().; @@ -78,23 +87,29 @@ namespace Esyur.Stores.EntityCore var eid = TypesByType[type].PrimaryKey.GetValue(resource); - if (DB[type].ContainsKey(eid)) - DB[type].Remove(eid); + lock (DBLock) + { + if (DB[type].ContainsKey(eid)) + DB[type].Remove(eid); - DB[type].Add(eid, new WeakReference(resource)); + DB[type].Add(eid, new WeakReference(resource)); + } - return true; + return new AsyncReply(true); } public IResource GetById(Type type, object id) { - if (!DB[type].ContainsKey(id)) - return null; + lock (DBLock) + { + if (!DB[type].ContainsKey(id)) + return null; - if (!DB[type][id].IsAlive) - return null; + if (!DB[type][id].IsAlive) + return null; - return DB[type][id].Target as IResource; + return DB[type][id].Target as IResource; + } } [Attribute] @@ -140,7 +155,7 @@ namespace Esyur.Stores.EntityCore //throw new NotImplementedException(); } - public new bool Remove(IResource resource) + public bool Remove(IResource resource) { throw new NotImplementedException(); } diff --git a/Esyur.Stores.EntityCore/Esyur.Stores.EntityCore.csproj b/Esiur.Stores.EntityCore/Esiur.Stores.EntityCore.csproj similarity index 58% rename from Esyur.Stores.EntityCore/Esyur.Stores.EntityCore.csproj rename to Esiur.Stores.EntityCore/Esiur.Stores.EntityCore.csproj index 99d29f3..876af97 100644 --- a/Esyur.Stores.EntityCore/Esyur.Stores.EntityCore.csproj +++ b/Esiur.Stores.EntityCore/Esiur.Stores.EntityCore.csproj @@ -2,12 +2,13 @@ netstandard2.0 - Esyur.Stores.EntityCore + Esiur.Stores.EntityCore Ahmed Kh. Zamil - Esyur Foundation - Esyur for Entity Framework Core - Esyur Entity Framework Extension + Esiur Foundation + Esiur for Entity Framework Core + Esiur Entity Framework Extension true + Esiur.Stores.EntityCore @@ -16,7 +17,7 @@ - + diff --git a/Esyur.Stores.EntityCore/EsyurExtensionOptions.cs b/Esiur.Stores.EntityCore/EsiurExtensionOptions.cs similarity index 87% rename from Esyur.Stores.EntityCore/EsyurExtensionOptions.cs rename to Esiur.Stores.EntityCore/EsiurExtensionOptions.cs index 318d418..97fc3cb 100644 --- a/Esyur.Stores.EntityCore/EsyurExtensionOptions.cs +++ b/Esiur.Stores.EntityCore/EsiurExtensionOptions.cs @@ -33,11 +33,11 @@ using Microsoft.EntityFrameworkCore.Utilities; using System.Linq; using Microsoft.EntityFrameworkCore.Metadata; using System.Reflection; -using Esyur.Proxy; +using Esiur.Proxy; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { - public class EsyurExtensionOptions : IDbContextOptionsExtension + public class EsiurExtensionOptions : IDbContextOptionsExtension { //public Dictionary Cache { get; } = new Dictionary(); @@ -62,7 +62,7 @@ namespace Esyur.Stores.EntityCore // services.AddEntityFrameworkProxies(); new EntityFrameworkServicesBuilder(services) - .TryAdd(); + .TryAdd(); } public void Validate(IDbContextOptions options) @@ -72,14 +72,14 @@ namespace Esyur.Stores.EntityCore { var scope = internalServiceProvider.CreateScope(); var conventionPlugins = scope.ServiceProvider.GetService>(); - if (conventionPlugins?.Any(s => s is EsyurPlugin) == false) + if (conventionPlugins?.Any(s => s is EsiurPlugin) == false) { throw new InvalidOperationException(""); } } } - public EsyurExtensionOptions(EntityStore store) + public EsiurExtensionOptions(EntityStore store) { _info = new ExtensionInfo(this); _store = store; @@ -94,12 +94,12 @@ namespace Esyur.Stores.EntityCore { } - private new EsyurExtensionOptions Extension - => (EsyurExtensionOptions)base.Extension; + private new EsiurExtensionOptions Extension + => (EsiurExtensionOptions)base.Extension; public override bool IsDatabaseProvider => false; - public override string LogFragment => "Esyur"; + public override string LogFragment => "Esiur"; public override long GetServiceProviderHashCode() => 2312; diff --git a/Esyur.Stores.EntityCore/EsyurExtensions.cs b/Esiur.Stores.EntityCore/EsiurExtensions.cs similarity index 90% rename from Esyur.Stores.EntityCore/EsyurExtensions.cs rename to Esiur.Stores.EntityCore/EsiurExtensions.cs index 57e4d8e..6e2002a 100644 --- a/Esyur.Stores.EntityCore/EsyurExtensions.cs +++ b/Esiur.Stores.EntityCore/EsiurExtensions.cs @@ -22,8 +22,8 @@ SOFTWARE. */ -using Esyur.Resource; -using Esyur.Security.Permissions; +using Esiur.Resource; +using Esiur.Security.Permissions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.DependencyInjection; @@ -32,9 +32,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { - public static class EsyurExtensions + public static class EsiurExtensions { //public static T CreateResource(this DbContext dbContext, object properties = null) where T:class,IResource //{ @@ -44,7 +44,7 @@ namespace Esyur.Stores.EntityCore public static T AddResource(this DbSet dbSet, object properties = null) where T : class, IResource { - var store = dbSet.GetInfrastructure().GetService().FindExtension().Store; + var store = dbSet.GetInfrastructure().GetService().FindExtension().Store; var manager = store.Instance.Managers.FirstOrDefault();// > 0 ? store.Instance.Managers.First() : null; //var db = dbSet.GetService().Context; @@ -64,7 +64,7 @@ namespace Esyur.Stores.EntityCore public static T CreateResource(this IServiceProvider serviceProvider, object properties = null) where T : class, IResource { - var options = serviceProvider.GetService().FindExtension(); + var options = serviceProvider.GetService().FindExtension(); var resource = Warehouse.New("", options.Store, null, null, null, properties); @@ -73,7 +73,7 @@ namespace Esyur.Stores.EntityCore return resource; } - public static DbContextOptionsBuilder UseEsyur(this DbContextOptionsBuilder optionsBuilder, + public static DbContextOptionsBuilder UseEsiur(this DbContextOptionsBuilder optionsBuilder, //DbContext context, string name = null, IResource parent = null, @@ -81,13 +81,13 @@ namespace Esyur.Stores.EntityCore Func dbContextProvider = null ) { - var extension = optionsBuilder.Options.FindExtension(); + var extension = optionsBuilder.Options.FindExtension(); if (extension == null) { var store = Warehouse.New(name, null, parent, manager, new { Options = optionsBuilder, DbContextProvider = dbContextProvider }); - extension = new EsyurExtensionOptions(store); + extension = new EsiurExtensionOptions(store); //store.Options = optionsBuilder; //store.DbContext = context; } @@ -98,7 +98,7 @@ namespace Esyur.Stores.EntityCore } - public static DbContextOptionsBuilder UseEsyur( + public static DbContextOptionsBuilder UseEsiur( this DbContextOptionsBuilder optionsBuilder, //DbContext context, string name = null, @@ -109,12 +109,12 @@ namespace Esyur.Stores.EntityCore { - var extension = optionsBuilder.Options.FindExtension(); + var extension = optionsBuilder.Options.FindExtension(); if (extension == null) { var store = Warehouse.New(name, null, parent, manager, new { Options = optionsBuilder, DbContextProvider = dbContextProvider }); - extension = new EsyurExtensionOptions(store); + extension = new EsiurExtensionOptions(store); //store.Options = optionsBuilder; //store.Options = extension; //store.DbContext = context; diff --git a/Esyur.Stores.EntityCore/EsyurPlugin.cs b/Esiur.Stores.EntityCore/EsiurPlugin.cs similarity index 89% rename from Esyur.Stores.EntityCore/EsyurPlugin.cs rename to Esiur.Stores.EntityCore/EsiurPlugin.cs index 91879e6..590f79c 100644 --- a/Esyur.Stores.EntityCore/EsyurPlugin.cs +++ b/Esiur.Stores.EntityCore/EsiurPlugin.cs @@ -30,14 +30,14 @@ using System; using System.Collections.Generic; using System.Text; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { - public class EsyurPlugin : IConventionSetPlugin + public class EsiurPlugin : IConventionSetPlugin { private readonly IDbContextOptions _options; private readonly ProviderConventionSetBuilderDependencies _conventionSetBuilderDependencies; - public EsyurPlugin( + public EsiurPlugin( IDbContextOptions options, ProviderConventionSetBuilderDependencies conventionSetBuilderDependencies) { @@ -48,8 +48,8 @@ namespace Esyur.Stores.EntityCore public ConventionSet ModifyConventions(ConventionSet conventionSet) { - var extension = _options.FindExtension(); - conventionSet.ModelFinalizedConventions.Add(new EsyurProxyRewrite( + var extension = _options.FindExtension(); + conventionSet.ModelFinalizedConventions.Add(new EsiurProxyRewrite( extension, _conventionSetBuilderDependencies)); return conventionSet; diff --git a/Esyur.Stores.EntityCore/EsyurProxyRewrite.cs b/Esiur.Stores.EntityCore/EsiurProxyRewrite.cs similarity index 86% rename from Esyur.Stores.EntityCore/EsyurProxyRewrite.cs rename to Esiur.Stores.EntityCore/EsiurProxyRewrite.cs index 7cd3f02..06ca2c6 100644 --- a/Esyur.Stores.EntityCore/EsyurProxyRewrite.cs +++ b/Esiur.Stores.EntityCore/EsiurProxyRewrite.cs @@ -27,8 +27,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text; -using Esyur.Proxy; -using Esyur.Resource; +using Esiur.Proxy; +using Esiur.Resource; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Internal; @@ -38,12 +38,12 @@ using Microsoft.EntityFrameworkCore.Metadata.Conventions; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace Esyur.Stores.EntityCore +namespace Esiur.Stores.EntityCore { - public class EsyurProxyRewrite : IModelFinalizedConvention + public class EsiurProxyRewrite : IModelFinalizedConvention { private static readonly MethodInfo _createInstance - = typeof(EsyurProxyRewrite).GetTypeInfo().GetDeclaredMethod(nameof(EsyurProxyRewrite.CreateInstance)); + = typeof(EsiurProxyRewrite).GetTypeInfo().GetDeclaredMethod(nameof(EsiurProxyRewrite.CreateInstance)); private readonly ConstructorBindingConvention _directBindingConvention; @@ -67,7 +67,7 @@ namespace Esyur.Stores.EntityCore ///var id = constructorArguments.Last(); var id = properties.First(); - var options = dbContextOptions.FindExtension(); + var options = dbContextOptions.FindExtension(); var manager = options.Store.Instance.Managers.Count > 0 ? options.Store.Instance.Managers.First() : null; var cache = options.Store.GetById(entityType.ClrType, id); @@ -87,7 +87,7 @@ namespace Esyur.Stores.EntityCore } - public EsyurProxyRewrite(EsyurExtensionOptions ext, ProviderConventionSetBuilderDependencies conventionSetBuilderDependencies) + public EsiurProxyRewrite(EsiurExtensionOptions ext, ProviderConventionSetBuilderDependencies conventionSetBuilderDependencies) { _directBindingConvention = new ConstructorBindingConvention(conventionSetBuilderDependencies); @@ -100,20 +100,26 @@ namespace Esyur.Stores.EntityCore { var proxyType = ResourceProxy.GetProxy(entityType.ClrType); - // var ann = entityType.GetAnnotation(CoreAnnotationNames.ConstructorBinding); + // var ann = entityType.GetAnnotation(CoreAnnotationNames.ConstructorBinding); +#pragma warning disable EF1001 // Internal EF Core API usage. var binding = (InstantiationBinding)entityType[CoreAnnotationNames.ConstructorBinding]; +#pragma warning restore EF1001 // Internal EF Core API usage. if (binding == null) _directBindingConvention.ProcessModelFinalized(modelBuilder, context); +#pragma warning disable EF1001 // Internal EF Core API usage. binding = (InstantiationBinding)entityType[CoreAnnotationNames.ConstructorBinding]; - +#pragma warning restore EF1001 // Internal EF Core API usage. + try { entityType.SetAnnotation( +#pragma warning disable EF1001 // Internal EF Core API usage. CoreAnnotationNames.ConstructorBinding, +#pragma warning restore EF1001 // Internal EF Core API usage. new FactoryMethodBinding( _createInstance, new List diff --git a/Esyur.Stores.EntityCore/Properties/launchSettings.json b/Esiur.Stores.EntityCore/Properties/launchSettings.json similarity index 74% rename from Esyur.Stores.EntityCore/Properties/launchSettings.json rename to Esiur.Stores.EntityCore/Properties/launchSettings.json index ed0d750..a8ff82e 100644 --- a/Esyur.Stores.EntityCore/Properties/launchSettings.json +++ b/Esiur.Stores.EntityCore/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "Esyur.Stores.EntityCore": { + "Esiur.Stores.EntityCore": { "commandName": "Project", "commandLineArgs": "--migrate" } diff --git a/Esyur.Stores.MongoDB/Esyur.Stores.MongoDB.csproj b/Esiur.Stores.MongoDB/Esiur.Stores.MongoDB.csproj similarity index 54% rename from Esyur.Stores.MongoDB/Esyur.Stores.MongoDB.csproj rename to Esiur.Stores.MongoDB/Esiur.Stores.MongoDB.csproj index 3a14028..301679c 100644 --- a/Esyur.Stores.MongoDB/Esyur.Stores.MongoDB.csproj +++ b/Esiur.Stores.MongoDB/Esiur.Stores.MongoDB.csproj @@ -3,15 +3,16 @@ netstandard2.0 Ahmed Kh. Zamil - Esyur - Esyur MongoDB Store - MongoDB Store for Esyur Library + Esiur + Esiur MongoDB Store + MongoDB Store for Esiur Library Ahmed Kh. Zamil - https://github.com/Esyur/Esyur-dotnet/blob/master/LICENSE - http://www.esyur.com - https://github.com/esyur/esyur-dotnet/ + https://github.com/Esiur/Esiur-dotnet/blob/master/LICENSE + http://www.esiur.com + https://github.com/esiur/esiur-dotnet/ True 1.4.0 + Esiur.Stores.MongoDB @@ -20,7 +21,7 @@ - + \ No newline at end of file diff --git a/Esyur.Stores.MongoDB/MongoDBStore.cs b/Esiur.Stores.MongoDB/MongoDBStore.cs similarity index 99% rename from Esyur.Stores.MongoDB/MongoDBStore.cs rename to Esiur.Stores.MongoDB/MongoDBStore.cs index fe67528..4bb63b7 100644 --- a/Esyur.Stores.MongoDB/MongoDBStore.cs +++ b/Esiur.Stores.MongoDB/MongoDBStore.cs @@ -22,22 +22,22 @@ SOFTWARE. */ -using Esyur.Resource; +using Esiur.Resource; using System; -using Esyur.Core; +using Esiur.Core; using MongoDB.Driver.Core; using MongoDB.Driver; using MongoDB.Bson; -using Esyur.Data; +using Esiur.Data; using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; -using Esyur.Resource.Template; +using Esiur.Resource.Template; using System.Linq; -using Esyur.Security.Permissions; -using Esyur.Proxy; +using Esiur.Security.Permissions; +using Esiur.Proxy; -namespace Esyur.Stores.MongoDB +namespace Esiur.Stores.MongoDB { public class MongoDBStore : IStore { @@ -523,7 +523,7 @@ namespace Esyur.Stores.MongoDB { var collectionName = Collection ?? "resources"; - var dbName = Database ?? "Esyur"; + var dbName = Database ?? "Esiur"; client = new MongoClient(Connection ?? "mongodb://localhost"); database = client.GetDatabase(dbName); diff --git a/Esyur.Stores.MongoDB/MongoDBStoreGeneric.cs b/Esiur.Stores.MongoDB/MongoDBStoreGeneric.cs similarity index 94% rename from Esyur.Stores.MongoDB/MongoDBStoreGeneric.cs rename to Esiur.Stores.MongoDB/MongoDBStoreGeneric.cs index 1cc86a0..0412d1a 100644 --- a/Esyur.Stores.MongoDB/MongoDBStoreGeneric.cs +++ b/Esiur.Stores.MongoDB/MongoDBStoreGeneric.cs @@ -22,16 +22,16 @@ SOFTWARE. */ -using Esyur.Core; -using Esyur.Data; -using Esyur.Proxy; -using Esyur.Resource; +using Esiur.Core; +using Esiur.Data; +using Esiur.Proxy; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Linq; using System.Text; -namespace Esyur.Stores.MongoDB +namespace Esiur.Stores.MongoDB { public class MongoDBStore : MongoDBStore where T:IResource { diff --git a/Esyur.sln b/Esiur.sln similarity index 82% rename from Esyur.sln rename to Esiur.sln index 882387e..16a18fd 100644 --- a/Esyur.sln +++ b/Esiur.sln @@ -2,11 +2,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29324.140 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esyur", "Esyur\Esyur.csproj", "{4F74A8C1-D38F-4CC0-ACD1-24459BA0EAFC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esiur", "Esiur\Esiur.csproj", "{4F74A8C1-D38F-4CC0-ACD1-24459BA0EAFC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esyur.Stores.MongoDB", "Esyur.Stores.MongoDB\Esyur.Stores.MongoDB.csproj", "{4C90D4B3-8EA2-48AE-A2F9-2B722FCEF9C4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esiur.Stores.MongoDB", "Esiur.Stores.MongoDB\Esiur.Stores.MongoDB.csproj", "{4C90D4B3-8EA2-48AE-A2F9-2B722FCEF9C4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esyur.Stores.EntityCore", "Esyur.Stores.EntityCore\Esyur.Stores.EntityCore.csproj", "{53DE5A30-CFA9-4DE7-A840-77CFF519D31B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Esiur.Stores.EntityCore", "Esiur.Stores.EntityCore\Esiur.Stores.EntityCore.csproj", "{53DE5A30-CFA9-4DE7-A840-77CFF519D31B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Esyur/Core/AsyncAwaiter.cs b/Esiur/Core/AsyncAwaiter.cs similarity index 98% rename from Esyur/Core/AsyncAwaiter.cs rename to Esiur/Core/AsyncAwaiter.cs index 4bedac1..424e872 100644 --- a/Esyur/Core/AsyncAwaiter.cs +++ b/Esiur/Core/AsyncAwaiter.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncAwaiter : INotifyCompletion { diff --git a/Esyur/Core/AsyncAwaiterGeneric.cs b/Esiur/Core/AsyncAwaiterGeneric.cs similarity index 98% rename from Esyur/Core/AsyncAwaiterGeneric.cs rename to Esiur/Core/AsyncAwaiterGeneric.cs index 095f9b9..e41942a 100644 --- a/Esyur/Core/AsyncAwaiterGeneric.cs +++ b/Esiur/Core/AsyncAwaiterGeneric.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncAwaiter : INotifyCompletion { diff --git a/Esyur/Core/AsyncBag.cs b/Esiur/Core/AsyncBag.cs similarity index 99% rename from Esyur/Core/AsyncBag.cs rename to Esiur/Core/AsyncBag.cs index c1eabd3..1f98322 100644 --- a/Esyur/Core/AsyncBag.cs +++ b/Esiur/Core/AsyncBag.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncBag: AsyncReply { diff --git a/Esyur/Core/AsyncBagAwaiter.cs b/Esiur/Core/AsyncBagAwaiter.cs similarity index 98% rename from Esyur/Core/AsyncBagAwaiter.cs rename to Esiur/Core/AsyncBagAwaiter.cs index 5b4a789..577da5f 100644 --- a/Esyur/Core/AsyncBagAwaiter.cs +++ b/Esiur/Core/AsyncBagAwaiter.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncBagAwaiter : INotifyCompletion { diff --git a/Esyur/Core/AsyncBagAwaiterGeneric.cs b/Esiur/Core/AsyncBagAwaiterGeneric.cs similarity index 98% rename from Esyur/Core/AsyncBagAwaiterGeneric.cs rename to Esiur/Core/AsyncBagAwaiterGeneric.cs index 39c32a7..562d4a7 100644 --- a/Esyur/Core/AsyncBagAwaiterGeneric.cs +++ b/Esiur/Core/AsyncBagAwaiterGeneric.cs @@ -4,7 +4,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncBagAwaiter : INotifyCompletion { diff --git a/Esyur/Core/AsyncBagGeneric.cs b/Esiur/Core/AsyncBagGeneric.cs similarity index 99% rename from Esyur/Core/AsyncBagGeneric.cs rename to Esiur/Core/AsyncBagGeneric.cs index 7a5afe4..acbcdd5 100644 --- a/Esyur/Core/AsyncBagGeneric.cs +++ b/Esiur/Core/AsyncBagGeneric.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncBag: AsyncBag { diff --git a/Esyur/Core/AsyncException.cs b/Esiur/Core/AsyncException.cs similarity index 98% rename from Esyur/Core/AsyncException.cs rename to Esiur/Core/AsyncException.cs index b09e052..69f6b68 100644 --- a/Esyur/Core/AsyncException.cs +++ b/Esiur/Core/AsyncException.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncException : Exception { diff --git a/Esyur/Core/AsyncQueue.cs b/Esiur/Core/AsyncQueue.cs similarity index 99% rename from Esyur/Core/AsyncQueue.cs rename to Esiur/Core/AsyncQueue.cs index d3e2a00..1dc3c3c 100644 --- a/Esyur/Core/AsyncQueue.cs +++ b/Esiur/Core/AsyncQueue.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncQueue : AsyncReply { diff --git a/Esyur/Core/AsyncReply.cs b/Esiur/Core/AsyncReply.cs similarity index 99% rename from Esyur/Core/AsyncReply.cs rename to Esiur/Core/AsyncReply.cs index 04c7fe0..8f5fd46 100644 --- a/Esyur/Core/AsyncReply.cs +++ b/Esiur/Core/AsyncReply.cs @@ -27,13 +27,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Resource; +using Esiur.Resource; using System.Reflection; using System.Threading; using System.Runtime.CompilerServices; using System.Diagnostics; -namespace Esyur.Core +namespace Esiur.Core { [AsyncMethodBuilder(typeof(AsyncReplyBuilder))] public class AsyncReply diff --git a/Esyur/Core/AsyncReplyBuilder.cs b/Esiur/Core/AsyncReplyBuilder.cs similarity index 98% rename from Esyur/Core/AsyncReplyBuilder.cs rename to Esiur/Core/AsyncReplyBuilder.cs index 3456d8e..0c5f08e 100644 --- a/Esyur/Core/AsyncReplyBuilder.cs +++ b/Esiur/Core/AsyncReplyBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncReplyBuilder { diff --git a/Esyur/Core/AsyncReplyBuilderGeneric.cs b/Esiur/Core/AsyncReplyBuilderGeneric.cs similarity index 98% rename from Esyur/Core/AsyncReplyBuilderGeneric.cs rename to Esiur/Core/AsyncReplyBuilderGeneric.cs index ad4594b..7992fc3 100644 --- a/Esyur/Core/AsyncReplyBuilderGeneric.cs +++ b/Esiur/Core/AsyncReplyBuilderGeneric.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncReplyBuilder { diff --git a/Esyur/Core/AsyncReplyGeneric.cs b/Esiur/Core/AsyncReplyGeneric.cs similarity index 99% rename from Esyur/Core/AsyncReplyGeneric.cs rename to Esiur/Core/AsyncReplyGeneric.cs index aeaceb3..6f6a41a 100644 --- a/Esyur/Core/AsyncReplyGeneric.cs +++ b/Esiur/Core/AsyncReplyGeneric.cs @@ -27,13 +27,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Resource; +using Esiur.Resource; using System.Reflection; using System.Threading; using System.Runtime.CompilerServices; using System.Diagnostics; -namespace Esyur.Core +namespace Esiur.Core { [AsyncMethodBuilder(typeof(AsyncReplyBuilder<>))] public class AsyncReply : AsyncReply diff --git a/Esyur/Core/AsyncReplyNon.cs b/Esiur/Core/AsyncReplyNon.cs similarity index 99% rename from Esyur/Core/AsyncReplyNon.cs rename to Esiur/Core/AsyncReplyNon.cs index 78ef147..4bb5493 100644 --- a/Esyur/Core/AsyncReplyNon.cs +++ b/Esiur/Core/AsyncReplyNon.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public class AsyncReply { diff --git a/Esyur/Core/ErrorType.cs b/Esiur/Core/ErrorType.cs similarity index 87% rename from Esyur/Core/ErrorType.cs rename to Esiur/Core/ErrorType.cs index 64a9678..4ec2271 100644 --- a/Esyur/Core/ErrorType.cs +++ b/Esiur/Core/ErrorType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public enum ErrorType { diff --git a/Esyur/Core/ExceptionCode.cs b/Esiur/Core/ExceptionCode.cs similarity index 97% rename from Esyur/Core/ExceptionCode.cs rename to Esiur/Core/ExceptionCode.cs index 4ce7a2c..17944bd 100644 --- a/Esyur/Core/ExceptionCode.cs +++ b/Esiur/Core/ExceptionCode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public enum ExceptionCode : ushort { diff --git a/Esyur/Core/IAsyncReply.cs b/Esiur/Core/IAsyncReply.cs similarity index 96% rename from Esyur/Core/IAsyncReply.cs rename to Esiur/Core/IAsyncReply.cs index 4dd36ba..5c49389 100644 --- a/Esyur/Core/IAsyncReply.cs +++ b/Esiur/Core/IAsyncReply.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public interface IAsyncReply//IAsyncEnumerator { diff --git a/Esyur/Core/IDestructible.cs b/Esiur/Core/IDestructible.cs similarity index 98% rename from Esyur/Core/IDestructible.cs rename to Esiur/Core/IDestructible.cs index 354316a..26ef401 100644 --- a/Esyur/Core/IDestructible.cs +++ b/Esiur/Core/IDestructible.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public delegate void DestroyedEvent(object sender); diff --git a/Esyur/Core/LogType.cs b/Esiur/Core/LogType.cs similarity index 98% rename from Esyur/Core/LogType.cs rename to Esiur/Core/LogType.cs index d1ab914..eafb8c0 100644 --- a/Esyur/Core/LogType.cs +++ b/Esiur/Core/LogType.cs @@ -29,7 +29,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Core +namespace Esiur.Core { public enum LogType { diff --git a/Esyur/Core/ProgressType.cs b/Esiur/Core/ProgressType.cs similarity index 87% rename from Esyur/Core/ProgressType.cs rename to Esiur/Core/ProgressType.cs index 1fa2cf4..5ee724a 100644 --- a/Esyur/Core/ProgressType.cs +++ b/Esiur/Core/ProgressType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Core +namespace Esiur.Core { public enum ProgressType { diff --git a/Esyur/Data/AutoList.cs b/Esiur/Data/AutoList.cs similarity index 90% rename from Esyur/Data/AutoList.cs rename to Esiur/Data/AutoList.cs index ff45dd8..a598912 100644 --- a/Esyur/Data/AutoList.cs +++ b/Esiur/Data/AutoList.cs @@ -27,15 +27,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Collections; -using Esyur.Core; +using Esiur.Core; using System.Reflection; -namespace Esyur.Data +namespace Esiur.Data { public class AutoList : IEnumerable, ICollection, ICollection { - private readonly object syncRoot = new object(); + private readonly object syncRoot = new object(); private List list = new List(); public delegate void Modified(ST sender, int index, T oldValue, T newValue); @@ -86,7 +86,7 @@ namespace Esyur.Data /// Array public T[] ToArray() { - // list.OrderBy() + // list.OrderBy() return list.ToArray(); } @@ -112,13 +112,13 @@ namespace Esyur.Data public AutoList(ST state, T[] values) { State = state; - #if NETSTANDARD - removableList = (typeof(IDestructible).GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo())); - #else +#if NETSTANDARD + removableList = (typeof(IDestructible).GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo())); +#else removableList = (typeof(IDestructible).IsAssignableFrom(typeof(T))); - #endif +#endif - AddRange(values); + AddRange(values); } /// @@ -196,17 +196,17 @@ namespace Esyur.Data { Remove((T)sender); } - + /// /// Clear the list /// public void Clear() { if (removableList) - foreach(IDestructible v in list) - if (v!=null) + foreach (IDestructible v in list) + if (v != null) v.OnDestroy -= ItemDestroyed; - + lock (syncRoot) list.Clear(); @@ -217,10 +217,10 @@ namespace Esyur.Data /// Remove an item from the list /// Item to remove /// - public void Remove(T value) + public bool Remove(T value) { if (!list.Contains(value)) - return; + return false; if (removableList) if (value != null) @@ -230,6 +230,8 @@ namespace Esyur.Data list.Remove(value); OnRemoved?.Invoke(State, value); + + return true; } /// @@ -242,7 +244,7 @@ namespace Esyur.Data public bool IsSynchronized => (list as ICollection).IsSynchronized; - public bool IsReadOnly => throw new NotImplementedException(); + public bool IsReadOnly => false; /// @@ -290,17 +292,20 @@ namespace Esyur.Data public void CopyTo(Array array, int index) { - (list as ICollection).CopyTo(array, index); + lock (syncRoot) + (list as ICollection).CopyTo(array, index); } public void CopyTo(T[] array, int arrayIndex) { - list.CopyTo(array, arrayIndex); + lock (syncRoot) + list.CopyTo(array, arrayIndex); } - bool ICollection.Remove(T item) - { - return list.Remove(item); - } + //bool ICollection.Remove(T item) + //{ + // lock(syncRoot) + // return Remove(item); + //} } } diff --git a/Esyur/Data/BinaryList.cs b/Esiur/Data/BinaryList.cs similarity index 99% rename from Esyur/Data/BinaryList.cs rename to Esiur/Data/BinaryList.cs index 69b2634..6d5ece2 100644 --- a/Esyur/Data/BinaryList.cs +++ b/Esiur/Data/BinaryList.cs @@ -26,11 +26,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Misc; +using Esiur.Misc; using System.Reflection; -using Esyur.Core; +using Esiur.Core; -namespace Esyur.Data +namespace Esiur.Data { /// /// BinaryList holds a list of items to be converted to binary for storage and transmission diff --git a/Esyur/Data/Codec.cs b/Esiur/Data/Codec.cs similarity index 99% rename from Esyur/Data/Codec.cs rename to Esiur/Data/Codec.cs index 73f98f6..c7898d7 100644 --- a/Esyur/Data/Codec.cs +++ b/Esiur/Data/Codec.cs @@ -25,19 +25,19 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Misc; +using Esiur.Misc; using System.ComponentModel; -using Esyur.Data; -using Esyur.Core; -using Esyur.Net.IIP; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Core; +using Esiur.Net.IIP; +using Esiur.Resource; using System.Linq; using System.Reflection; -using Esyur.Resource.Template; +using Esiur.Resource.Template; using System.Runtime.CompilerServices; using System.Collections; -namespace Esyur.Data +namespace Esiur.Data { public static class Codec { diff --git a/Esyur/Data/DataConverter.cs b/Esiur/Data/DataConverter.cs similarity index 99% rename from Esyur/Data/DataConverter.cs rename to Esiur/Data/DataConverter.cs index 0fafce3..aa551b4 100644 --- a/Esyur/Data/DataConverter.cs +++ b/Esiur/Data/DataConverter.cs @@ -26,18 +26,18 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Net.IIP; +using Esiur.Net.IIP; using System.Runtime.InteropServices; using System.Diagnostics; using System.Net; using System.Net.NetworkInformation; using System.Reflection; -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource; -namespace Esyur.Data +namespace Esiur.Data { public static class DC // Data Converter { diff --git a/Esyur/Data/DataType.cs b/Esiur/Data/DataType.cs similarity index 99% rename from Esyur/Data/DataType.cs rename to Esiur/Data/DataType.cs index 9be1abf..88a5f7a 100644 --- a/Esyur/Data/DataType.cs +++ b/Esiur/Data/DataType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Data +namespace Esiur.Data { public enum DataType : byte { diff --git a/Esyur/Data/IUserType.cs b/Esiur/Data/IUserType.cs similarity index 89% rename from Esyur/Data/IUserType.cs rename to Esiur/Data/IUserType.cs index 5c9cdf0..14dd77f 100644 --- a/Esyur/Data/IUserType.cs +++ b/Esiur/Data/IUserType.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Data +namespace Esiur.Data { public interface IUserType { diff --git a/Esyur/Data/KeyList.cs b/Esiur/Data/KeyList.cs similarity index 99% rename from Esyur/Data/KeyList.cs rename to Esiur/Data/KeyList.cs index 2229927..ce39cbb 100644 --- a/Esyur/Data/KeyList.cs +++ b/Esiur/Data/KeyList.cs @@ -31,9 +31,9 @@ using System.Reflection; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using Esyur.Core; +using Esiur.Core; -namespace Esyur.Data +namespace Esiur.Data { public class KeyList : IEnumerable> diff --git a/Esyur/Data/NotModified.cs b/Esiur/Data/NotModified.cs similarity index 98% rename from Esyur/Data/NotModified.cs rename to Esiur/Data/NotModified.cs index 34310d9..0ae002c 100644 --- a/Esyur/Data/NotModified.cs +++ b/Esiur/Data/NotModified.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Data +namespace Esiur.Data { public class NotModified { diff --git a/Esyur/Data/PropertyValue.cs b/Esiur/Data/PropertyValue.cs similarity index 97% rename from Esyur/Data/PropertyValue.cs rename to Esiur/Data/PropertyValue.cs index 683d23c..8a52c57 100644 --- a/Esyur/Data/PropertyValue.cs +++ b/Esiur/Data/PropertyValue.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Data +namespace Esiur.Data { public class PropertyValue { diff --git a/Esyur/Data/ResourceList.cs b/Esiur/Data/ResourceList.cs similarity index 99% rename from Esyur/Data/ResourceList.cs rename to Esiur/Data/ResourceList.cs index eb9e3bd..cb8e5f2 100644 --- a/Esyur/Data/ResourceList.cs +++ b/Esiur/Data/ResourceList.cs @@ -27,10 +27,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Collections; -using Esyur.Core; +using Esiur.Core; using System.Reflection; -namespace Esyur.Data +namespace Esiur.Data { public class ResourceList : IEnumerable, ICollection, ICollection { diff --git a/Esyur/Data/StringKeyList.cs b/Esiur/Data/StringKeyList.cs similarity index 99% rename from Esyur/Data/StringKeyList.cs rename to Esiur/Data/StringKeyList.cs index 1e31358..9e76af8 100644 --- a/Esyur/Data/StringKeyList.cs +++ b/Esiur/Data/StringKeyList.cs @@ -31,7 +31,7 @@ using System.Text; using System.Reflection; using System.Linq; -namespace Esyur.Data +namespace Esiur.Data { public class StringKeyList : IEnumerable> diff --git a/Esyur/Data/Structure.cs b/Esiur/Data/Structure.cs similarity index 98% rename from Esyur/Data/Structure.cs rename to Esiur/Data/Structure.cs index 1c2ab12..6a7b37c 100644 --- a/Esyur/Data/Structure.cs +++ b/Esiur/Data/Structure.cs @@ -28,12 +28,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; using System.Reflection; -namespace Esyur.Data +namespace Esiur.Data { public class Structure : IEnumerable> { diff --git a/Esyur/Esyur.csproj b/Esiur/Esiur.csproj similarity index 84% rename from Esyur/Esyur.csproj rename to Esiur/Esiur.csproj index f713aa5..0edc49f 100644 --- a/Esyur/Esyur.csproj +++ b/Esiur/Esiur.csproj @@ -4,17 +4,19 @@ netstandard2.0 Distributed Resources Platform Ahmed Kh. Zamil - https://github.com/Esyur/Esyur-dotnet/blob/master/LICENSE - http://www.esyur.com + https://github.com/Esiur/Esiur-dotnet/blob/master/LICENSE + http://www.esiur.com true 1.5.0 - https://github.com/esyur/esyur-dotnet + https://github.com/esiur/esiur-dotnet Ahmed Kh. Zamil 1.3.1.0 - Esyur Foundation + Esiur Foundation 1.3.1.0 - Esyur - Esyur + Esiur + Esiur + Esiur + Esiur diff --git a/Esyur/Misc/Global.cs b/Esiur/Misc/Global.cs similarity index 99% rename from Esyur/Misc/Global.cs rename to Esiur/Misc/Global.cs index 08197ba..8374536 100644 --- a/Esyur/Misc/Global.cs +++ b/Esiur/Misc/Global.cs @@ -29,17 +29,17 @@ using System.Xml; using System.Security.Cryptography; using System.Text; using System.Reflection; -using Esyur.Data; +using Esiur.Data; using System.Collections.Generic; -//using Esyur.Net.Packets; +//using Esiur.Net.Packets; using System.Text.RegularExpressions; using System.Net.NetworkInformation; using System.Linq; -using Esyur.Core; +using Esiur.Core; using System.Diagnostics; using System.Runtime.InteropServices; -namespace Esyur.Misc +namespace Esiur.Misc { public static class Global { diff --git a/Esyur/Net/DataLink/PacketFilter.cs b/Esiur/Net/DataLink/PacketFilter.cs similarity index 93% rename from Esyur/Net/DataLink/PacketFilter.cs rename to Esiur/Net/DataLink/PacketFilter.cs index 30fa795..3c6da41 100644 --- a/Esyur/Net/DataLink/PacketFilter.cs +++ b/Esiur/Net/DataLink/PacketFilter.cs @@ -26,12 +26,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Core; -using Esyur.Data; -using Esyur.Net.Packets; -using Esyur.Resource; +using Esiur.Core; +using Esiur.Data; +using Esiur.Net.Packets; +using Esiur.Resource; -namespace Esyur.Net.DataLink +namespace Esiur.Net.DataLink { public abstract class PacketFilter : IResource { diff --git a/Esyur/Net/DataLink/PacketServer.cs b/Esiur/Net/DataLink/PacketServer.cs similarity index 96% rename from Esyur/Net/DataLink/PacketServer.cs rename to Esiur/Net/DataLink/PacketServer.cs index e9152c3..1e62ab5 100644 --- a/Esyur/Net/DataLink/PacketServer.cs +++ b/Esiur/Net/DataLink/PacketServer.cs @@ -26,13 +26,13 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Core; -using Esyur.Data; +using Esiur.Core; +using Esiur.Data; using System.Runtime.InteropServices; -using Esyur.Net.Packets; -using Esyur.Resource; +using Esiur.Net.Packets; +using Esiur.Resource; -namespace Esyur.Net.DataLink +namespace Esiur.Net.DataLink { public class PacketServer:IResource { diff --git a/Esyur/Net/DataLink/PacketSource.cs b/Esiur/Net/DataLink/PacketSource.cs similarity index 96% rename from Esyur/Net/DataLink/PacketSource.cs rename to Esiur/Net/DataLink/PacketSource.cs index 3445dde..b2568a5 100644 --- a/Esyur/Net/DataLink/PacketSource.cs +++ b/Esiur/Net/DataLink/PacketSource.cs @@ -22,15 +22,15 @@ SOFTWARE. */ -using Esyur.Net.Packets; +using Esiur.Net.Packets; using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Core; +using Esiur.Resource; -namespace Esyur.Net.DataLink +namespace Esiur.Net.DataLink { public abstract class PacketSource: IResource { diff --git a/Esyur/Net/HTTP/HTTPConnection.cs b/Esiur/Net/HTTP/HTTPConnection.cs similarity index 98% rename from Esyur/Net/HTTP/HTTPConnection.cs rename to Esiur/Net/HTTP/HTTPConnection.cs index ccf1749..2c3f6e8 100644 --- a/Esyur/Net/HTTP/HTTPConnection.cs +++ b/Esiur/Net/HTTP/HTTPConnection.cs @@ -31,14 +31,14 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Net.Sockets; -using Esyur.Data; -using Esyur.Net.Packets; -using Esyur.Misc; +using Esiur.Net.Sockets; +using Esiur.Data; +using Esiur.Net.Packets; +using Esiur.Misc; using System.Security.Cryptography; -using Esyur.Core; +using Esiur.Core; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public class HTTPConnection : NetworkConnection { diff --git a/Esyur/Net/HTTP/HTTPFilter.cs b/Esiur/Net/HTTP/HTTPFilter.cs similarity index 96% rename from Esyur/Net/HTTP/HTTPFilter.cs rename to Esiur/Net/HTTP/HTTPFilter.cs index 70eeecb..37ef101 100644 --- a/Esyur/Net/HTTP/HTTPFilter.cs +++ b/Esiur/Net/HTTP/HTTPFilter.cs @@ -31,11 +31,11 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public abstract class HTTPFilter : IResource diff --git a/Esyur/Net/HTTP/HTTPServer.cs b/Esiur/Net/HTTP/HTTPServer.cs similarity index 95% rename from Esyur/Net/HTTP/HTTPServer.cs rename to Esiur/Net/HTTP/HTTPServer.cs index 63385e1..6fc8a02 100644 --- a/Esyur/Net/HTTP/HTTPServer.cs +++ b/Esiur/Net/HTTP/HTTPServer.cs @@ -31,15 +31,15 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Net.Sockets; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; -using Esyur.Net.Packets; +using Esiur.Net.Sockets; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; +using Esiur.Net.Packets; using System.Security.Cryptography.X509Certificates; -using Esyur.Resource; +using Esiur.Resource; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public class HTTPServer : NetworkServer, IResource { @@ -66,19 +66,19 @@ namespace Esyur.Net.HTTP set; } - [Attribute] - public virtual uint Timeout - { - get; - set; - } + //[Attribute] + //public virtual uint Timeout + //{ + // get; + // set; + //} - [Attribute] - public virtual uint Clock - { - get; - set; - } + //[Attribute] + //public virtual uint Clock + //{ + // get; + // set; + //} [Attribute] public virtual uint MaxPost diff --git a/Esyur/Net/HTTP/HTTPSession.cs b/Esiur/Net/HTTP/HTTPSession.cs similarity index 97% rename from Esyur/Net/HTTP/HTTPSession.cs rename to Esiur/Net/HTTP/HTTPSession.cs index 8f185e6..c2ea05a 100644 --- a/Esyur/Net/HTTP/HTTPSession.cs +++ b/Esiur/Net/HTTP/HTTPSession.cs @@ -31,11 +31,11 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public class HTTPSession : IDestructible // where T : TClient { diff --git a/Esyur/Net/HTTP/IIPoHTTP.cs b/Esiur/Net/HTTP/IIPoHTTP.cs similarity index 71% rename from Esyur/Net/HTTP/IIPoHTTP.cs rename to Esiur/Net/HTTP/IIPoHTTP.cs index de3f3c1..2ee4a5a 100644 --- a/Esyur/Net/HTTP/IIPoHTTP.cs +++ b/Esiur/Net/HTTP/IIPoHTTP.cs @@ -1,22 +1,22 @@ -using Esyur.Core; -using Esyur.Net.IIP; -using Esyur.Net.Packets; -using Esyur.Resource; +using Esiur.Core; +using Esiur.Net.IIP; +using Esiur.Net.Packets; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Text; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public class IIPoHTTP : HTTPFilter { [Attribute] EntryPoint EntryPoint { get; set; } - public async override AsyncReply Execute(HTTPConnection sender) + public override AsyncReply Execute(HTTPConnection sender) { if (sender.Request.URL != "iip") - return false; + return new AsyncReply(false); IIPPacket.IIPPacketAction action = (IIPPacket.IIPPacketAction)Convert.ToByte(sender.Request.Query["a"]); @@ -28,7 +28,7 @@ namespace Esyur.Net.HTTP }); } - return true; + return new AsyncReply(true); } public override AsyncReply Trigger(ResourceTrigger trigger) diff --git a/Esyur/Net/HTTP/IIPoWS.cs b/Esiur/Net/HTTP/IIPoWS.cs similarity index 90% rename from Esyur/Net/HTTP/IIPoWS.cs rename to Esiur/Net/HTTP/IIPoWS.cs index a9a6e68..cddbb69 100644 --- a/Esyur/Net/HTTP/IIPoWS.cs +++ b/Esiur/Net/HTTP/IIPoWS.cs @@ -27,12 +27,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Resource; -using Esyur.Net.IIP; -using Esyur.Net.Sockets; -using Esyur.Core; +using Esiur.Resource; +using Esiur.Net.IIP; +using Esiur.Net.Sockets; +using Esiur.Core; -namespace Esyur.Net.HTTP +namespace Esiur.Net.HTTP { public class IIPoWS: HTTPFilter { @@ -43,18 +43,18 @@ namespace Esyur.Net.HTTP set; } - public async override AsyncReply Execute(HTTPConnection sender) + public override AsyncReply Execute(HTTPConnection sender) { if (sender.IsWebsocketRequest()) { if (Server == null) - return false; + return new AsyncReply(false); var tcpSocket = sender.Unassign(); if (tcpSocket == null) - return false; + return new AsyncReply(false); var httpServer = sender.Parent; var wsSocket = new WSSocket(tcpSocket); @@ -66,10 +66,10 @@ namespace Esyur.Net.HTTP iipConnection.Assign(wsSocket); wsSocket.Begin(); - return true; + return new AsyncReply(true); } - return false; + return new AsyncReply( false); /* if (sender.Request.Filename.StartsWith("/iip/")) diff --git a/Esyur/Net/IIP/DistributedConnection.cs b/Esiur/Net/IIP/DistributedConnection.cs similarity index 99% rename from Esyur/Net/IIP/DistributedConnection.cs rename to Esiur/Net/IIP/DistributedConnection.cs index e81fa61..13ba8c8 100644 --- a/Esyur/Net/IIP/DistributedConnection.cs +++ b/Esiur/Net/IIP/DistributedConnection.cs @@ -28,19 +28,19 @@ using System.Text; using System.Net; using System.Net.Sockets; using System.Security.Cryptography; -using Esyur.Net.Sockets; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; -using Esyur.Net.Packets; -using Esyur.Resource; -using Esyur.Security.Authority; -using Esyur.Resource.Template; +using Esiur.Net.Sockets; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; +using Esiur.Net.Packets; +using Esiur.Resource; +using Esiur.Security.Authority; +using Esiur.Resource.Template; using System.Linq; using System.Diagnostics; -using static Esyur.Net.Packets.IIPPacket; +using static Esiur.Net.Packets.IIPPacket; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public partial class DistributedConnection : NetworkConnection, IStore { @@ -1058,12 +1058,12 @@ namespace Esyur.Net.IIP /// /// Resource. /// - public async AsyncReply Put(IResource resource) + public AsyncReply Put(IResource resource) { if (Codec.IsLocalResource(resource, this)) resources.Add((resource as DistributedResource).Id, (DistributedResource)resource); // else ... send it to the peer - return true; + return new AsyncReply(true); } public bool Record(IResource resource, string propertyName, object value, ulong age, DateTime dateTime) @@ -1107,7 +1107,7 @@ namespace Esyur.Net.IIP //if (Codec.IsLocalResource(resource, this)) // return new AsyncBag((resource as DistributedResource).children.Where(x => x.GetType() == typeof(T)).Select(x => (T)x)); - return null; + //return null; } public AsyncBag Parents(IResource resource, string name) where T : IResource @@ -1116,7 +1116,6 @@ namespace Esyur.Net.IIP //if (Codec.IsLocalResource(resource, this)) // return (resource as DistributedResource).parents.Where(x => x.GetType() == typeof(T)).Select(x => (T)x); - return null; } diff --git a/Esyur/Net/IIP/DistributedConnectionProtocol.cs b/Esiur/Net/IIP/DistributedConnectionProtocol.cs similarity index 99% rename from Esyur/Net/IIP/DistributedConnectionProtocol.cs rename to Esiur/Net/IIP/DistributedConnectionProtocol.cs index 4b7df69..6199a8e 100644 --- a/Esyur/Net/IIP/DistributedConnectionProtocol.cs +++ b/Esiur/Net/IIP/DistributedConnectionProtocol.cs @@ -22,13 +22,13 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Net.Packets; -using Esyur.Resource; -using Esyur.Resource.Template; -using Esyur.Security.Authority; -using Esyur.Security.Permissions; +using Esiur.Data; +using Esiur.Core; +using Esiur.Net.Packets; +using Esiur.Resource; +using Esiur.Resource.Template; +using Esiur.Security.Authority; +using Esiur.Security.Permissions; using System; using System.Collections.Generic; @@ -37,7 +37,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { partial class DistributedConnection { diff --git a/Esyur/Net/IIP/DistributedPropertyContext.cs b/Esiur/Net/IIP/DistributedPropertyContext.cs similarity index 97% rename from Esyur/Net/IIP/DistributedPropertyContext.cs rename to Esiur/Net/IIP/DistributedPropertyContext.cs index ec5202e..d30a034 100644 --- a/Esyur/Net/IIP/DistributedPropertyContext.cs +++ b/Esiur/Net/IIP/DistributedPropertyContext.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public class DistributedPropertyContext { diff --git a/Esyur/Net/IIP/DistributedResource.cs b/Esiur/Net/IIP/DistributedResource.cs similarity index 99% rename from Esyur/Net/IIP/DistributedResource.cs rename to Esiur/Net/IIP/DistributedResource.cs index b34e353..df4c076 100644 --- a/Esyur/Net/IIP/DistributedResource.cs +++ b/Esiur/Net/IIP/DistributedResource.cs @@ -29,20 +29,20 @@ using System.Reflection; using System.IO; using System.Collections; using System.ComponentModel; -using Esyur.Misc; -using Esyur.Data; +using Esiur.Misc; +using Esiur.Data; using System.Dynamic; using System.Security.Cryptography; -using Esyur.Core; +using Esiur.Core; using System.Runtime.CompilerServices; using System.Reflection.Emit; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Esyur.Resource; -using Esyur.Resource.Template; +using Esiur.Resource; +using Esiur.Resource.Template; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { //[System.Runtime.InteropServices.ComVisible(true)] diff --git a/Esyur/Net/IIP/DistributedResourceEvent.cs b/Esiur/Net/IIP/DistributedResourceEvent.cs similarity index 98% rename from Esyur/Net/IIP/DistributedResourceEvent.cs rename to Esiur/Net/IIP/DistributedResourceEvent.cs index b46d883..8241d15 100644 --- a/Esyur/Net/IIP/DistributedResourceEvent.cs +++ b/Esiur/Net/IIP/DistributedResourceEvent.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public delegate void DistributedResourceEvent(DistributedResource sender, params object[] arguments); } diff --git a/Esyur/Net/IIP/DistributedResourceQueueItem.cs b/Esiur/Net/IIP/DistributedResourceQueueItem.cs similarity index 98% rename from Esyur/Net/IIP/DistributedResourceQueueItem.cs rename to Esiur/Net/IIP/DistributedResourceQueueItem.cs index ed11e49..6f4ef36 100644 --- a/Esyur/Net/IIP/DistributedResourceQueueItem.cs +++ b/Esiur/Net/IIP/DistributedResourceQueueItem.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public class DistributedResourceQueueItem { diff --git a/Esyur/Net/IIP/DistributedServer.cs b/Esiur/Net/IIP/DistributedServer.cs similarity index 96% rename from Esyur/Net/IIP/DistributedServer.cs rename to Esiur/Net/IIP/DistributedServer.cs index d9e584b..2567de5 100644 --- a/Esyur/Net/IIP/DistributedServer.cs +++ b/Esiur/Net/IIP/DistributedServer.cs @@ -26,16 +26,16 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Net.Sockets; -using Esyur.Misc; +using Esiur.Net.Sockets; +using Esiur.Misc; using System.Threading; -using Esyur.Data; -using Esyur.Core; +using Esiur.Data; +using Esiur.Core; using System.Net; -using Esyur.Resource; -using Esyur.Security.Membership; +using Esiur.Resource; +using Esiur.Security.Membership; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public class DistributedServer : NetworkServer, IResource { diff --git a/Esyur/Net/IIP/DistributedSession.cs b/Esiur/Net/IIP/DistributedSession.cs similarity index 94% rename from Esyur/Net/IIP/DistributedSession.cs rename to Esiur/Net/IIP/DistributedSession.cs index c726304..cd11926 100644 --- a/Esyur/Net/IIP/DistributedSession.cs +++ b/Esiur/Net/IIP/DistributedSession.cs @@ -25,10 +25,10 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Net.Sockets; -using Esyur.Security.Authority; +using Esiur.Net.Sockets; +using Esiur.Security.Authority; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { public class DistributedSession : NetworkSession { diff --git a/Esyur/Net/IIP/EntryPoint.cs b/Esiur/Net/IIP/EntryPoint.cs similarity index 88% rename from Esyur/Net/IIP/EntryPoint.cs rename to Esiur/Net/IIP/EntryPoint.cs index ea908d5..5259189 100644 --- a/Esyur/Net/IIP/EntryPoint.cs +++ b/Esiur/Net/IIP/EntryPoint.cs @@ -24,14 +24,14 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Core; -using Esyur.Data; -using Esyur.Resource; -using Esyur.Resource.Template; +using Esiur.Core; +using Esiur.Data; +using Esiur.Resource; +using Esiur.Resource.Template; -namespace Esyur.Net.IIP +namespace Esiur.Net.IIP { - public abstract class EntryPoint : Esyur.Resource.Resource + public abstract class EntryPoint : Esiur.Resource.Resource { public abstract AsyncReply Query(string path, DistributedConnection sender); diff --git a/Esyur/Net/INetworkReceiver.cs b/Esiur/Net/INetworkReceiver.cs similarity index 93% rename from Esyur/Net/INetworkReceiver.cs rename to Esiur/Net/INetworkReceiver.cs index 4a026ed..dc1bc4e 100644 --- a/Esyur/Net/INetworkReceiver.cs +++ b/Esiur/Net/INetworkReceiver.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Net +namespace Esiur.Net { public interface INetworkReceiver { diff --git a/Esyur/Net/NetworkBuffer.cs b/Esiur/Net/NetworkBuffer.cs similarity index 99% rename from Esyur/Net/NetworkBuffer.cs rename to Esiur/Net/NetworkBuffer.cs index 552e098..ccfd471 100644 --- a/Esyur/Net/NetworkBuffer.cs +++ b/Esiur/Net/NetworkBuffer.cs @@ -26,10 +26,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Data; -using Esyur.Misc; +using Esiur.Data; +using Esiur.Misc; -namespace Esyur.Net +namespace Esiur.Net { public class NetworkBuffer { diff --git a/Esyur/Net/NetworkConnection.cs b/Esiur/Net/NetworkConnection.cs similarity index 96% rename from Esyur/Net/NetworkConnection.cs rename to Esiur/Net/NetworkConnection.cs index 5160a87..b2f9382 100644 --- a/Esyur/Net/NetworkConnection.cs +++ b/Esiur/Net/NetworkConnection.cs @@ -30,13 +30,13 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Misc; -using Esyur.Core; -using Esyur.Data; -using Esyur.Net.Sockets; -using Esyur.Resource; +using Esiur.Misc; +using Esiur.Core; +using Esiur.Data; +using Esiur.Net.Sockets; +using Esiur.Resource; -namespace Esyur.Net +namespace Esiur.Net { public abstract class NetworkConnection: IDestructible, INetworkReceiver// : IResource where TS : NetworkSession { @@ -81,11 +81,7 @@ namespace Esyur.Net OnDestroy = null; } - - - - - public Sockets.ISocket Socket + public ISocket Socket { get { @@ -93,7 +89,7 @@ namespace Esyur.Net } } - public virtual void Assign(Sockets.ISocket socket) + public virtual void Assign(ISocket socket) { lastAction = DateTime.Now; sock = socket; @@ -124,7 +120,7 @@ namespace Esyur.Net //{ //} - public Sockets.ISocket Unassign() + public ISocket Unassign() { if (sock != null) { @@ -323,7 +319,7 @@ namespace Esyur.Net return; // Closed ? - if (sock.State == SocketState.Closed || sock.State == SocketState.Terminated) // || !connected) + if (sock.State == SocketState.Closed)// || sock.State == SocketState.Terminated) // || !connected) return; lastAction = DateTime.Now; diff --git a/Esyur/Net/NetworkServer.cs b/Esiur/Net/NetworkServer.cs similarity index 98% rename from Esyur/Net/NetworkServer.cs rename to Esiur/Net/NetworkServer.cs index f413be7..54e0528 100644 --- a/Esyur/Net/NetworkServer.cs +++ b/Esiur/Net/NetworkServer.cs @@ -25,15 +25,15 @@ SOFTWARE. using System; using System.Threading; using System.Collections.Generic; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; -using Esyur.Net.Sockets; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; +using Esiur.Net.Sockets; +using Esiur.Resource; using System.Threading.Tasks; using System.Diagnostics; -namespace Esyur.Net +namespace Esiur.Net { public abstract class NetworkServer : IDestructible where TConnection : NetworkConnection, new() diff --git a/Esyur/Net/NetworkSession.cs b/Esiur/Net/NetworkSession.cs similarity index 98% rename from Esyur/Net/NetworkSession.cs rename to Esiur/Net/NetworkSession.cs index f35b28e..ea974c8 100644 --- a/Esyur/Net/NetworkSession.cs +++ b/Esiur/Net/NetworkSession.cs @@ -31,11 +31,11 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Core; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Core; -namespace Esyur.Net +namespace Esiur.Net { public class NetworkSession:IDestructible // where T : TClient { diff --git a/Esyur/Net/Packets/HTTPRequestPacket.cs b/Esiur/Net/Packets/HTTPRequestPacket.cs similarity index 97% rename from Esyur/Net/Packets/HTTPRequestPacket.cs rename to Esiur/Net/Packets/HTTPRequestPacket.cs index 449df59..97f4c10 100644 --- a/Esyur/Net/Packets/HTTPRequestPacket.cs +++ b/Esiur/Net/Packets/HTTPRequestPacket.cs @@ -27,11 +27,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Misc; -using Esyur.Data; +using Esiur.Misc; +using Esiur.Data; using System.Net; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { public class HTTPRequestPacket : Packet { @@ -243,9 +243,10 @@ namespace Esyur.Net.Packets return -(postSize - (data.Length - headerSize)); - if (Headers["content-type"].StartsWith("application/x-www-form-urlencoded") + if ( + Headers["content-type"] == null || Headers["content-type"] == "" - || Headers["content-type"] == null) + || Headers["content-type"].StartsWith("application/x-www-form-urlencoded")) { string[] PostVars = null; PostVars = Encoding.UTF8.GetString(data, (int)headerSize, (int)postSize).Split('&'); diff --git a/Esyur/Net/Packets/HTTPResponsePacket.cs b/Esiur/Net/Packets/HTTPResponsePacket.cs similarity index 98% rename from Esyur/Net/Packets/HTTPResponsePacket.cs rename to Esiur/Net/Packets/HTTPResponsePacket.cs index 01b22fa..40d60a7 100644 --- a/Esyur/Net/Packets/HTTPResponsePacket.cs +++ b/Esiur/Net/Packets/HTTPResponsePacket.cs @@ -25,10 +25,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Misc; -using Esyur.Data; +using Esiur.Misc; +using Esiur.Data; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { public class HTTPResponsePacket : Packet { @@ -137,7 +137,7 @@ namespace Esyur.Net.Packets private string MakeHeader(ComposeOptions options) { - string header = $"{Version} {(int)Number} {Text}\r\nServer: Esyur {Global.Version}\r\nDate: {DateTime.Now.ToUniversalTime().ToString("r")}\r\n"; + string header = $"{Version} {(int)Number} {Text}\r\nServer: Esiur {Global.Version}\r\nDate: {DateTime.Now.ToUniversalTime().ToString("r")}\r\n"; if (options == ComposeOptions.AllCalculateLength) Headers["Content-Length"] = Message?.Length.ToString() ?? "0"; diff --git a/Esyur/Net/Packets/IIPAuthPacket.cs b/Esiur/Net/Packets/IIPAuthPacket.cs similarity index 99% rename from Esyur/Net/Packets/IIPAuthPacket.cs rename to Esiur/Net/Packets/IIPAuthPacket.cs index 7da99f2..916c3f0 100644 --- a/Esyur/Net/Packets/IIPAuthPacket.cs +++ b/Esiur/Net/Packets/IIPAuthPacket.cs @@ -22,8 +22,8 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Security.Authority; +using Esiur.Data; +using Esiur.Security.Authority; using System; using System.Collections.Generic; using System.Linq; @@ -31,7 +31,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { class IIPAuthPacket : Packet { diff --git a/Esyur/Net/Packets/IIPPacket.cs b/Esiur/Net/Packets/IIPPacket.cs similarity index 99% rename from Esyur/Net/Packets/IIPPacket.cs rename to Esiur/Net/Packets/IIPPacket.cs index 175e088..b1a9e98 100644 --- a/Esyur/Net/Packets/IIPPacket.cs +++ b/Esiur/Net/Packets/IIPPacket.cs @@ -22,17 +22,17 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Misc; -using Esyur.Net.Packets; +using Esiur.Data; +using Esiur.Core; +using Esiur.Misc; +using Esiur.Net.Packets; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { class IIPPacket : Packet { diff --git a/Esyur/Net/Packets/IIPPacketAttachInfo.cs b/Esiur/Net/Packets/IIPPacketAttachInfo.cs similarity index 94% rename from Esyur/Net/Packets/IIPPacketAttachInfo.cs rename to Esiur/Net/Packets/IIPPacketAttachInfo.cs index ecbc81d..53723e7 100644 --- a/Esyur/Net/Packets/IIPPacketAttachInfo.cs +++ b/Esiur/Net/Packets/IIPPacketAttachInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { struct IIPPacketAttachInfo { diff --git a/Esyur/Net/Packets/Packet.cs b/Esiur/Net/Packets/Packet.cs similarity index 99% rename from Esyur/Net/Packets/Packet.cs rename to Esiur/Net/Packets/Packet.cs index 1e466b6..2f61616 100644 --- a/Esyur/Net/Packets/Packet.cs +++ b/Esiur/Net/Packets/Packet.cs @@ -33,12 +33,12 @@ using System; using System.Text; -using Esyur.Misc; -using Esyur.Net.DataLink; +using Esiur.Misc; +using Esiur.Net.DataLink; using System.Net.NetworkInformation; -using Esyur.Data; +using Esiur.Data; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { internal static class Functions { diff --git a/Esyur/Net/Packets/WebsocketPacket.cs b/Esiur/Net/Packets/WebsocketPacket.cs similarity index 99% rename from Esyur/Net/Packets/WebsocketPacket.cs rename to Esiur/Net/Packets/WebsocketPacket.cs index 6873687..14f4009 100644 --- a/Esyur/Net/Packets/WebsocketPacket.cs +++ b/Esiur/Net/Packets/WebsocketPacket.cs @@ -26,10 +26,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Misc; -using Esyur.Data; +using Esiur.Misc; +using Esiur.Data; -namespace Esyur.Net.Packets +namespace Esiur.Net.Packets { public class WebsocketPacket : Packet { diff --git a/Esyur/Net/SendList.cs b/Esiur/Net/SendList.cs similarity index 89% rename from Esyur/Net/SendList.cs rename to Esiur/Net/SendList.cs index 61e9d43..dd21b50 100644 --- a/Esyur/Net/SendList.cs +++ b/Esiur/Net/SendList.cs @@ -1,10 +1,10 @@ -using Esyur.Core; -using Esyur.Data; +using Esiur.Core; +using Esiur.Data; using System; using System.Collections.Generic; using System.Text; -namespace Esyur.Net +namespace Esiur.Net { public class SendList : BinaryList { diff --git a/Esyur/Net/Sockets/ISocket.cs b/Esiur/Net/Sockets/ISocket.cs similarity index 95% rename from Esyur/Net/Sockets/ISocket.cs rename to Esiur/Net/Sockets/ISocket.cs index db3855d..14a10b6 100644 --- a/Esyur/Net/Sockets/ISocket.cs +++ b/Esiur/Net/Sockets/ISocket.cs @@ -30,13 +30,13 @@ using System.Threading; using System.Net; using System.Collections; using System.Collections.Generic; -using Esyur.Data; -using Esyur.Misc; +using Esiur.Data; +using Esiur.Misc; using System.Collections.Concurrent; -using Esyur.Resource; -using Esyur.Core; +using Esiur.Resource; +using Esiur.Core; -namespace Esyur.Net.Sockets +namespace Esiur.Net.Sockets { //public delegate void ISocketReceiveEvent(NetworkBuffer buffer); //public delegate void ISocketConnectEvent(); diff --git a/Esyur/Net/Sockets/SSLSocket.cs b/Esiur/Net/Sockets/SSLSocket.cs similarity index 94% rename from Esyur/Net/Sockets/SSLSocket.cs rename to Esiur/Net/Sockets/SSLSocket.cs index 8bc4d52..ee1cf96 100644 --- a/Esyur/Net/Sockets/SSLSocket.cs +++ b/Esiur/Net/Sockets/SSLSocket.cs @@ -28,16 +28,16 @@ using System.Linq; using System.Text; using System.Net.Sockets; using System.Net; -using Esyur.Misc; -using Esyur.Core; +using Esiur.Misc; +using Esiur.Core; using System.Threading; using System.Net.Security; using System.Security.Cryptography.X509Certificates; -using Esyur.Resource; +using Esiur.Resource; using System.Threading.Tasks; -using Esyur.Data; +using Esiur.Data; -namespace Esyur.Net.Sockets +namespace Esiur.Net.Sockets { public class SSLSocket : ISocket { @@ -94,7 +94,7 @@ namespace Esyur.Net.Sockets } catch (Exception ex) { - state = SocketState.Terminated; + state = SocketState.Closed;// .Terminated; Close(); Global.Log(ex); } @@ -148,7 +148,7 @@ namespace Esyur.Net.Sockets { if (state != SocketState.Closed && !sock.Connected) { - state = SocketState.Terminated; + //state = SocketState.Closed;//.Terminated; Close(); } } @@ -175,13 +175,14 @@ namespace Esyur.Net.Sockets if (state != SocketState.Closed && !sock.Connected) { - state = SocketState.Terminated; + //state = SocketState.Terminated; Close(); } } catch (Exception ex2) { - state = SocketState.Terminated; + //state = SocketState.Closed;// .Terminated; + Close(); } //Global.Log("TCPSocket", LogType.Error, ex.ToString()); @@ -257,7 +258,7 @@ namespace Esyur.Net.Sockets public void Close() { - if (state != SocketState.Closed && state != SocketState.Terminated) + if (state != SocketState.Closed)// && state != SocketState.Terminated) { state = SocketState.Closed; @@ -269,7 +270,7 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + //state = SocketState.Terminated; } } @@ -311,7 +312,7 @@ namespace Esyur.Net.Sockets catch { asyncSending = false; - state = SocketState.Terminated; + //state = SocketState.Terminated; Close(); } } @@ -442,7 +443,7 @@ namespace Esyur.Net.Sockets { if (state != SocketState.Closed && !sock.Connected) { - state = SocketState.Terminated; + //state = SocketState.Terminated; Close(); } @@ -473,7 +474,7 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + state = SocketState.Closed;// Terminated; return null; } } @@ -528,7 +529,7 @@ namespace Esyur.Net.Sockets { rt.TriggerError(ex); asyncSending = false; - state = SocketState.Terminated; + //state = SocketState.Terminated; Close(); } } @@ -546,7 +547,7 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + state = SocketState.Closed;// .Terminated; return null; } } diff --git a/Esyur/Net/Sockets/SocketState.cs b/Esiur/Net/Sockets/SocketState.cs similarity index 96% rename from Esyur/Net/Sockets/SocketState.cs rename to Esiur/Net/Sockets/SocketState.cs index 363e434..a9dac54 100644 --- a/Esyur/Net/Sockets/SocketState.cs +++ b/Esiur/Net/Sockets/SocketState.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.Sockets +namespace Esiur.Net.Sockets { public enum SocketState { @@ -37,6 +37,6 @@ namespace Esyur.Net.Sockets Connecting, Established, Closed, - Terminated + //Terminated } } diff --git a/Esyur/Net/Sockets/TCPSocket.cs b/Esiur/Net/Sockets/TCPSocket.cs similarity index 56% rename from Esyur/Net/Sockets/TCPSocket.cs rename to Esiur/Net/Sockets/TCPSocket.cs index 13b83e1..e049ea6 100644 --- a/Esyur/Net/Sockets/TCPSocket.cs +++ b/Esiur/Net/Sockets/TCPSocket.cs @@ -28,14 +28,14 @@ using System.Linq; using System.Text; using System.Net.Sockets; using System.Net; -using Esyur.Misc; -using Esyur.Core; +using Esiur.Misc; +using Esiur.Core; using System.Threading; -using Esyur.Resource; +using Esiur.Resource; using System.Threading.Tasks; -using Esyur.Data; +using Esiur.Data; -namespace Esyur.Net.Sockets +namespace Esiur.Net.Sockets { public class TCPSocket : ISocket { @@ -46,7 +46,7 @@ namespace Esyur.Net.Sockets bool held; - ArraySegment receiveBufferSegment; + //ArraySegment receiveBufferSegment; NetworkBuffer receiveNetworkBuffer = new NetworkBuffer(); @@ -65,30 +65,80 @@ namespace Esyur.Net.Sockets //public event ISocketCloseEvent OnClose; public event DestroyedEvent OnDestroy; - SocketAsyncEventArgs socketArgs = new SocketAsyncEventArgs(); + //SocketAsyncEventArgs socketArgs = new SocketAsyncEventArgs(); - public async AsyncReply BeginAsync() + private AsyncCallback receiveCallback; + private AsyncCallback sendCallback; + + public AsyncReply BeginAsync() { - return Begin(); + return new AsyncReply(Begin()); } + + private AsyncReply currentReply = null; + public bool Begin() { if (began) return false; began = true; + /* socketArgs.SetBuffer(receiveBuffer, 0, receiveBuffer.Length); socketArgs.Completed += SocketArgs_Completed; if (!sock.ReceiveAsync(socketArgs)) SocketArgs_Completed(null, socketArgs); + */ + receiveCallback = new AsyncCallback(ReceiveCallback); + sendCallback = new AsyncCallback(SendCallback); + sock.BeginReceive(receiveBuffer, 0, receiveBuffer.Length, SocketFlags.None, receiveCallback, this); //sock.ReceiveAsync(receiveBufferSegment, SocketFlags.None).ContinueWith(DataReceived); return true; } + private static void ReceiveCallback(IAsyncResult ar) + { + var socket = ar.AsyncState as TCPSocket; + + try + { + + if (socket.state != SocketState.Established) + return; + + var recCount = socket.sock.EndReceive(ar); + + if (recCount > 0) + { + socket.receiveNetworkBuffer.Write(socket.receiveBuffer, 0, (uint)recCount); + socket.Receiver?.NetworkReceive(socket, socket.receiveNetworkBuffer); + + if (socket.state == SocketState.Established) + socket.sock.BeginReceive(socket.receiveBuffer, 0, socket.receiveBuffer.Length, SocketFlags.None, socket.receiveCallback, socket); + } + else + { + socket.Close(); + return; + } + } + catch (Exception ex) + { + if (socket.state != SocketState.Closed && !socket.sock.Connected) + { + //socket.state = SocketState.Terminated; + socket.Close(); + } + + //Global.Log("TCPSocket", LogType.Error, ex.ToString()); + } + } + + public AsyncReply Connect(string hostname, ushort port) { var rt = new AsyncReply(); @@ -121,115 +171,115 @@ namespace Esyur.Net.Sockets } - private void DataReceived(Task task) - { - try - { - // SocketError err; + //private void DataReceived(Task task) + //{ + // try + // { + // // SocketError err; - if (state == SocketState.Closed || state == SocketState.Terminated) - return; + // if (state == SocketState.Closed || state == SocketState.Terminated) + // return; - if (task.Result <= 0) - { - Close(); - return; - } + // if (task.Result <= 0) + // { + // Close(); + // return; + // } - receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)task.Result); - //OnReceive?.Invoke(receiveNetworkBuffer); - Receiver?.NetworkReceive(this, receiveNetworkBuffer); - if (state == SocketState.Established) - sock.ReceiveAsync(receiveBufferSegment, SocketFlags.None).ContinueWith(DataReceived); + // receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)task.Result); + // //OnReceive?.Invoke(receiveNetworkBuffer); + // Receiver?.NetworkReceive(this, receiveNetworkBuffer); + // if (state == SocketState.Established) + // sock.ReceiveAsync(receiveBufferSegment, SocketFlags.None).ContinueWith(DataReceived); - } - catch (Exception ex) - { - if (state != SocketState.Closed && !sock.Connected) - { - state = SocketState.Terminated; - Close(); - } + // } + // catch (Exception ex) + // { + // if (state != SocketState.Closed && !sock.Connected) + // { + // state = SocketState.Terminated; + // Close(); + // } - Global.Log("TCPSocket", LogType.Error, ex.ToString()); - } - } + // Global.Log("TCPSocket", LogType.Error, ex.ToString()); + // } + //} - private void SocketArgs_Completed(object sender, SocketAsyncEventArgs e) - { - try - { - if (state != SocketState.Established) - return; + //private void SocketArgs_Completed(object sender, SocketAsyncEventArgs e) + //{ + // try + // { + // if (state != SocketState.Established) + // return; - if (e.BytesTransferred <= 0) - { - Close(); - return; - } - else if (e.SocketError != SocketError.Success) - { - Close(); - return; + // if (e.BytesTransferred <= 0) + // { + // Close(); + // return; + // } + // else if (e.SocketError != SocketError.Success) + // { + // Close(); + // return; - } + // } - var recCount = e.BytesTransferred > e.Count ? e.Count : e.BytesTransferred; - receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)recCount); + // var recCount = e.BytesTransferred > e.Count ? e.Count : e.BytesTransferred; + // receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)recCount); - //OnReceive?.Invoke(receiveNetworkBuffer); - Receiver?.NetworkReceive(this, receiveNetworkBuffer); + // //OnReceive?.Invoke(receiveNetworkBuffer); + // Receiver?.NetworkReceive(this, receiveNetworkBuffer); - if (state == SocketState.Established) - while (!sock.ReceiveAsync(e)) - { - if (e.SocketError != SocketError.Success) - { - Close(); - return; - } + // if (state == SocketState.Established) + // while (!sock.ReceiveAsync(e)) + // { + // if (e.SocketError != SocketError.Success) + // { + // Close(); + // return; + // } - if (State != SocketState.Established) - return; + // if (State != SocketState.Established) + // return; - //if (e.BytesTransferred < 0) - // Console.WriteLine("BytesTransferred is less than zero"); + // //if (e.BytesTransferred < 0) + // // Console.WriteLine("BytesTransferred is less than zero"); - if (e.BytesTransferred <= 0) - { - Close(); - return; - } - else if (e.SocketError != SocketError.Success) - { - Close(); - return; - } + // if (e.BytesTransferred <= 0) + // { + // Close(); + // return; + // } + // else if (e.SocketError != SocketError.Success) + // { + // Close(); + // return; + // } - //if (e.BytesTransferred > 100000) - // Console.WriteLine("BytesTransferred is large " + e.BytesTransferred); + // //if (e.BytesTransferred > 100000) + // // Console.WriteLine("BytesTransferred is large " + e.BytesTransferred); - recCount = e.BytesTransferred > e.Count ? e.Count : e.BytesTransferred; + // recCount = e.BytesTransferred > e.Count ? e.Count : e.BytesTransferred; - receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)recCount); + // receiveNetworkBuffer.Write(receiveBuffer, 0, (uint)recCount); - //OnReceive?.Invoke(receiveNetworkBuffer); - Receiver?.NetworkReceive(this, receiveNetworkBuffer); - } + // //OnReceive?.Invoke(receiveNetworkBuffer); + // Receiver?.NetworkReceive(this, receiveNetworkBuffer); + // } - } - catch (Exception ex) - { - if (state != SocketState.Closed && !sock.Connected) - { - state = SocketState.Terminated; - Close(); - } + // } + // catch (Exception ex) + // { + // if (state != SocketState.Closed && !sock.Connected) + // { + // state = SocketState.Terminated; + // Close(); + // } - Global.Log("TCPSocket", LogType.Error, ex.ToString()); - } - } + // Global.Log("TCPSocket", LogType.Error, ex.ToString()); + // } + //} public IPEndPoint LocalEndPoint { @@ -242,7 +292,7 @@ namespace Esyur.Net.Sockets SocketType.Stream, ProtocolType.Tcp); receiveBuffer = new byte[sock.ReceiveBufferSize]; - receiveBufferSegment = new ArraySegment(receiveBuffer); + //receiveBufferSegment = new ArraySegment(receiveBuffer); } @@ -254,7 +304,7 @@ namespace Esyur.Net.Sockets ProtocolType.Tcp); receiveBuffer = new byte[sock.ReceiveBufferSize]; - receiveBufferSegment = new ArraySegment(receiveBuffer); + //receiveBufferSegment = new ArraySegment(receiveBuffer); Connect(hostname, port); @@ -336,14 +386,14 @@ namespace Esyur.Net.Sockets { sock = socket; receiveBuffer = new byte[sock.ReceiveBufferSize]; - receiveBufferSegment = new ArraySegment(receiveBuffer); + // receiveBufferSegment = new ArraySegment(receiveBuffer); if (socket.Connected) state = SocketState.Established; } public void Close() { - if (state != SocketState.Closed && state != SocketState.Terminated) + if (state != SocketState.Closed)// && state != SocketState.Terminated) { state = SocketState.Closed; @@ -355,12 +405,19 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + } } - //OnClose?.Invoke(); - Receiver?.NetworkClose(this); + try + { + sendBufferQueue?.Clear(); + Receiver?.NetworkClose(this); + } + catch (Exception ex) + { + Global.Log(ex); + } } } @@ -371,13 +428,17 @@ namespace Esyur.Net.Sockets public void Send(byte[] message, int offset, int size) { - + if (state == SocketState.Closed)// || state == SocketState.Terminated) + return; var msg = message.Clip((uint)offset, (uint)size); lock (sendLock) { + if (state == SocketState.Closed)// || state == SocketState.Terminated) + return; + if (!sock.Connected) return; @@ -390,12 +451,12 @@ namespace Esyur.Net.Sockets asyncSending = true; try { - sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, SendCallback, null); + sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, sendCallback, this); } catch { asyncSending = false; - state = SocketState.Terminated; + //state = SocketState.Closed;//.Terminated; Close(); } //sock.SendAsync(new ArraySegment(msg), SocketFlags.None).ContinueWith(DataSent); @@ -404,55 +465,45 @@ namespace Esyur.Net.Sockets } - private void SendCallback(IAsyncResult ar) + private static void Flush(TCPSocket socket) { - if (ar != null) + lock (socket.sendLock) { - try - { - sock.EndSend(ar); - if (ar.AsyncState != null) - ((AsyncReply)ar.AsyncState).Trigger(true); - } - catch - { - if (state != SocketState.Closed && !sock.Connected) - { - state = SocketState.Terminated; - Close(); - } - } - } + socket.currentReply?.Trigger(true); + socket.currentReply = null; - lock (sendLock) - { - if (sendBufferQueue.Count > 0) + if (socket.state == SocketState.Closed) //|| socket.state == SocketState.Terminated) + return; + + if (socket.sendBufferQueue.Count > 0) { - var kv = sendBufferQueue.Dequeue(); + var kv = socket.sendBufferQueue.Dequeue(); try { - sock.BeginSend(kv.Value, 0, kv.Value.Length, SocketFlags.None, SendCallback, kv.Key); + socket.currentReply = kv.Key; + socket.sock.BeginSend(kv.Value, 0, kv.Value.Length, SocketFlags.None, + socket.sendCallback, socket); } catch (Exception ex) { - asyncSending = false; + socket.asyncSending = false; try { - if (kv.Key != null) - kv.Key.Trigger(false); + kv.Key?.Trigger(false); - if (state != SocketState.Closed && !sock.Connected) + if (socket.state != SocketState.Closed && !socket.sock.Connected) { - state = SocketState.Terminated; - Close(); + // socket.state = SocketState.Closed;// Terminated; + socket.Close(); } } catch (Exception ex2) { - state = SocketState.Terminated; + socket.Close(); + //socket.state = SocketState.Closed;// .Terminated; } Global.Log("TCPSocket", LogType.Error, ex.ToString()); @@ -460,11 +511,28 @@ namespace Esyur.Net.Sockets } else { - asyncSending = false; + socket.asyncSending = false; } } } + private static void SendCallback(IAsyncResult ar) + { + + try + { + var socket = (TCPSocket)ar.AsyncState; + + socket.sock?.EndSend(ar); + Flush(socket); + + } + catch (Exception ex) + { + Global.Log(ex); + } + } + public bool Trigger(ResourceTrigger trigger) { return true; @@ -472,16 +540,25 @@ namespace Esyur.Net.Sockets public void Destroy() { + Global.Counters["Sck_D_1"]++; + Close(); - //OnClose = null; - //OnConnect = null; - //OnReceive = null; - Receiver = null; + receiveNetworkBuffer = null; - socketArgs.Completed -= SocketArgs_Completed; - socketArgs = null; + receiveCallback = null; + sendCallback = null; + sock = null; + receiveBuffer = null; + receiveNetworkBuffer = null; + sendBufferQueue = null; + + //socketArgs.Completed -= SocketArgs_Completed; + //socketArgs.Dispose(); + //socketArgs = null; OnDestroy?.Invoke(this); OnDestroy = null; + + Global.Counters["Sck_D_2"]++; } public ISocket Accept() @@ -493,7 +570,7 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + state = SocketState.Closed;// Terminated; return null; } } @@ -507,7 +584,7 @@ namespace Esyur.Net.Sockets } catch { - state = SocketState.Terminated; + state = SocketState.Closed;// Terminated; return null; } } @@ -522,7 +599,8 @@ namespace Esyur.Net.Sockets { try { - SendCallback(null); + Flush(this); + //SendCallback(null); } catch (Exception ex) { @@ -537,10 +615,16 @@ namespace Esyur.Net.Sockets public AsyncReply SendAsync(byte[] message, int offset, int length) { + if (state == SocketState.Closed)// || state == SocketState.Terminated) + return new AsyncReply(false); + var msg = message.Clip((uint)offset, (uint)length); lock (sendLock) { + if (state == SocketState.Closed)// || state == SocketState.Terminated) + return new AsyncReply(false); + if (!sock.Connected) return new AsyncReply(false); @@ -555,13 +639,14 @@ namespace Esyur.Net.Sockets asyncSending = true; try { - sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, SendCallback, rt);// null); + currentReply = rt; + sock.BeginSend(msg, 0, msg.Length, SocketFlags.None, sendCallback, this);// null); } catch (Exception ex) { rt.TriggerError(ex); asyncSending = false; - state = SocketState.Terminated; + //state = SocketState.Terminated; Close(); } //sock.SendAsync(new ArraySegment(msg), SocketFlags.None).ContinueWith(DataSent); @@ -570,7 +655,5 @@ namespace Esyur.Net.Sockets return rt; } } - - } } \ No newline at end of file diff --git a/Esyur/Net/Sockets/WSSocket.cs b/Esiur/Net/Sockets/WSSocket.cs similarity index 97% rename from Esyur/Net/Sockets/WSSocket.cs rename to Esiur/Net/Sockets/WSSocket.cs index f440cc2..5f9cc32 100644 --- a/Esyur/Net/Sockets/WSSocket.cs +++ b/Esiur/Net/Sockets/WSSocket.cs @@ -28,15 +28,15 @@ using System.Linq; using System.Text; using System.Net.Sockets; using System.Net; -using Esyur.Net.Packets; -using Esyur.Misc; +using Esiur.Net.Packets; +using Esiur.Misc; using System.IO; -using Esyur.Core; -using Esyur.Resource; -using Esyur.Data; +using Esiur.Core; +using Esiur.Resource; +using Esiur.Data; using System.Globalization; -namespace Esyur.Net.Sockets +namespace Esiur.Net.Sockets { public class WSSocket : ISocket, INetworkReceiver { @@ -257,7 +257,7 @@ namespace Esyur.Net.Sockets public void NetworkReceive(ISocket sender, NetworkBuffer buffer) { - if (sock.State == SocketState.Closed || sock.State == SocketState.Terminated) + if (sock.State == SocketState.Closed)// || sock.State == SocketState.Terminated) return; if (buffer.Protected) diff --git a/Esyur/Net/TCP/TCPConnection.cs b/Esiur/Net/TCP/TCPConnection.cs similarity index 95% rename from Esyur/Net/TCP/TCPConnection.cs rename to Esiur/Net/TCP/TCPConnection.cs index ea2a596..32ac8b0 100644 --- a/Esyur/Net/TCP/TCPConnection.cs +++ b/Esiur/Net/TCP/TCPConnection.cs @@ -26,13 +26,13 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Net.Sockets; +using Esiur.Net.Sockets; using System.Net; using System.Collections; -using Esyur.Misc; -using Esyur.Data; +using Esiur.Misc; +using Esiur.Data; -namespace Esyur.Net.TCP +namespace Esiur.Net.TCP { public class TCPConnection:NetworkConnection { diff --git a/Esyur/Net/TCP/TCPFilter.cs b/Esiur/Net/TCP/TCPFilter.cs similarity index 94% rename from Esyur/Net/TCP/TCPFilter.cs rename to Esiur/Net/TCP/TCPFilter.cs index e9f1a75..c39ad7f 100644 --- a/Esyur/Net/TCP/TCPFilter.cs +++ b/Esiur/Net/TCP/TCPFilter.cs @@ -27,12 +27,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Collections; -using Esyur.Data; -using Esyur.Net.Sockets; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Net.Sockets; +using Esiur.Core; +using Esiur.Resource; -namespace Esyur.Net.TCP +namespace Esiur.Net.TCP { public abstract class TCPFilter: IResource { diff --git a/Esyur/Net/TCP/TCPServer.cs b/Esiur/Net/TCP/TCPServer.cs similarity index 91% rename from Esyur/Net/TCP/TCPServer.cs rename to Esiur/Net/TCP/TCPServer.cs index 82420ea..7d30040 100644 --- a/Esyur/Net/TCP/TCPServer.cs +++ b/Esiur/Net/TCP/TCPServer.cs @@ -26,15 +26,15 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Net.Sockets; -using Esyur.Misc; +using Esiur.Net.Sockets; +using Esiur.Misc; using System.Threading; -using Esyur.Data; -using Esyur.Core; +using Esiur.Data; +using Esiur.Core; using System.Net; -using Esyur.Resource; +using Esiur.Resource; -namespace Esyur.Net.TCP +namespace Esiur.Net.TCP { public class TCPServer : NetworkServer, IResource { @@ -51,18 +51,18 @@ namespace Esyur.Net.TCP get; set; } - [Storable] - public uint Timeout - { - get; - set; - } - [Attribute] - public uint Clock - { - get; - set; - } + //[Storable] + //public uint Timeout + //{ + // get; + // set; + //} + //[Attribute] + //public uint Clock + //{ + // get; + // set; + //} public Instance Instance { get; set; } TCPFilter[] filters = null; @@ -128,7 +128,7 @@ namespace Esyur.Net.TCP foreach (var filter in filters) { - filter.Connected(connection); + filter.Disconnected(connection); } } @@ -148,7 +148,7 @@ namespace Esyur.Net.TCP { foreach (var filter in filters) { - filter.Disconnected(connection); + filter.Connected(connection); } } diff --git a/Esyur/Net/TCP/TCPSession.cs b/Esiur/Net/TCP/TCPSession.cs similarity index 98% rename from Esyur/Net/TCP/TCPSession.cs rename to Esiur/Net/TCP/TCPSession.cs index cad898b..f2cfb52 100644 --- a/Esyur/Net/TCP/TCPSession.cs +++ b/Esiur/Net/TCP/TCPSession.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Net.TCP +namespace Esiur.Net.TCP { public class TCPSession : NetworkSession { diff --git a/Esyur/Net/UDP/UDPFilter.cs b/Esiur/Net/UDP/UDPFilter.cs similarity index 95% rename from Esyur/Net/UDP/UDPFilter.cs rename to Esiur/Net/UDP/UDPFilter.cs index b7b0f1f..2ae4298 100644 --- a/Esyur/Net/UDP/UDPFilter.cs +++ b/Esiur/Net/UDP/UDPFilter.cs @@ -28,11 +28,11 @@ using System.Linq; using System.Text; using System.Collections; using System.Net; -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource; -namespace Esyur.Net.UDP +namespace Esiur.Net.UDP { public abstract class UDPFilter : IResource { diff --git a/Esyur/Net/UDP/UDPServer.cs b/Esiur/Net/UDP/UDPServer.cs similarity index 98% rename from Esyur/Net/UDP/UDPServer.cs rename to Esiur/Net/UDP/UDPServer.cs index 3adda0d..b4df1ab 100644 --- a/Esyur/Net/UDP/UDPServer.cs +++ b/Esiur/Net/UDP/UDPServer.cs @@ -28,12 +28,12 @@ using System.Net.Sockets; using System.Threading; using System.Text; using System.Collections; -using Esyur.Data; -using Esyur.Misc; -using Esyur.Resource; -using Esyur.Core; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Resource; +using Esiur.Core; -namespace Esyur.Net.UDP +namespace Esiur.Net.UDP { /* public class IIPConnection diff --git a/Esyur/Properties/PublishProfiles/FolderProfile.pubxml b/Esiur/Properties/PublishProfiles/FolderProfile.pubxml similarity index 88% rename from Esyur/Properties/PublishProfiles/FolderProfile.pubxml rename to Esiur/Properties/PublishProfiles/FolderProfile.pubxml index 74e9c90..9b0ed4f 100644 --- a/Esyur/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Esiur/Properties/PublishProfiles/FolderProfile.pubxml @@ -7,7 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem Debug netstandard2.0 - M:\opt\Esyur + M:\opt\Esiur Any CPU \ No newline at end of file diff --git a/Esyur/Proxy/ResourceProxy.cs b/Esiur/Proxy/ResourceProxy.cs similarity index 91% rename from Esyur/Proxy/ResourceProxy.cs rename to Esiur/Proxy/ResourceProxy.cs index e9945ec..260f8c2 100644 --- a/Esyur/Proxy/ResourceProxy.cs +++ b/Esiur/Proxy/ResourceProxy.cs @@ -1,4 +1,4 @@ -using Esyur.Resource; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Text; -namespace Esyur.Proxy +namespace Esiur.Proxy { public static class ResourceProxy { @@ -34,7 +34,7 @@ namespace Esyur.Proxy else return type; - if (type.FullName.Contains("Esyur.Proxy.T")) + if (type.FullName.Contains("Esiur.Proxy.T")) #if NETSTANDARD return type.GetTypeInfo().BaseType; #else @@ -57,7 +57,7 @@ namespace Esyur.Proxy throw new Exception("Sealed/Abastract classes can't be proxied."); var props = from p in typeInfo.GetProperties(BindingFlags.Instance | BindingFlags.Public) - where p.CanWrite && p.SetMethod.IsVirtual && + where p.CanWrite && p.SetMethod.IsVirtual && !p.SetMethod.IsFinal && p.GetCustomAttribute(false) != null select p; @@ -71,14 +71,14 @@ namespace Esyur.Proxy select p; #endif - var assemblyName = new AssemblyName("Esyur.Proxy.T." + type.Assembly.GetName().Name);// type.Namespace); + var assemblyName = new AssemblyName("Esiur.Proxy.T." + type.Assembly.GetName().Name);// type.Namespace); assemblyName.Version = type.Assembly.GetName().Version; assemblyName.CultureInfo = type.Assembly.GetName().CultureInfo; //assemblyName.SetPublicKeyToken(null); var assemblyBuilder = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run); var moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name); - var typeName = "Esyur.Proxy.T." + type.FullName;// Assembly.CreateQualifiedName(assemblyName.FullName, "Esyur.Proxy.T." + type.FullName); + var typeName = "Esiur.Proxy.T." + type.FullName;// Assembly.CreateQualifiedName(assemblyName.FullName, "Esiur.Proxy.T." + type.FullName); var typeBuilder = moduleBuilder.DefineType(typeName, TypeAttributes.Public | TypeAttributes.Class, type); @@ -186,7 +186,7 @@ namespace Esyur.Proxy // IL_0000: ldarg.0 - //IL_0001: call instance class [Esyur]Esyur.Resource.Instance [Esyur]Esyur.Resource.Resource::get_Instance() + //IL_0001: call instance class [Esiur]Esiur.Resource.Instance [Esiur]Esiur.Resource.Resource::get_Instance() //// (no C# code) //IL_0006: dup //IL_0007: brtrue.s IL_000c @@ -195,7 +195,7 @@ namespace Esyur.Proxy //IL_000a: br.s IL_0017 //// (no C# code) //IL_000c: ldstr "Level3" - //IL_0011: call instance void [Esyur]Esyur.Resource.Instance::Modified(string) + //IL_0011: call instance void [Esiur]Esiur.Resource.Instance::Modified(string) //IL_0016: nop //IL_0017: ret @@ -208,9 +208,9 @@ namespace Esyur.Proxy // IL_0000: ldarg.0 - // IL_0001: call instance class [Esyur]Esyur.Resource.Instance [Esyur]Esyur.Resource.Resource::get_Instance() + // IL_0001: call instance class [Esiur]Esiur.Resource.Instance [Esiur]Esiur.Resource.Resource::get_Instance() // IL_0006: ldstr "Level3" - //IL_000b: callvirt instance void [Esyur]Esyur.Resource.Instance::Modified(string) + //IL_000b: callvirt instance void [Esiur]Esiur.Resource.Instance::Modified(string) //IL_0010: ret diff --git a/Esyur/Resource/AnnotationAttribute.cs b/Esiur/Resource/AnnotationAttribute.cs similarity index 94% rename from Esyur/Resource/AnnotationAttribute.cs rename to Esiur/Resource/AnnotationAttribute.cs index 5e4763b..35e2531 100644 --- a/Esyur/Resource/AnnotationAttribute.cs +++ b/Esiur/Resource/AnnotationAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Event)] diff --git a/Esyur/Resource/AttributeAttribute.cs b/Esiur/Resource/AttributeAttribute.cs similarity index 98% rename from Esyur/Resource/AttributeAttribute.cs rename to Esiur/Resource/AttributeAttribute.cs index 19cdb2f..aa0b393 100644 --- a/Esyur/Resource/AttributeAttribute.cs +++ b/Esiur/Resource/AttributeAttribute.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Property)] diff --git a/Esyur/Resource/IResource.cs b/Esiur/Resource/IResource.cs similarity index 96% rename from Esyur/Resource/IResource.cs rename to Esiur/Resource/IResource.cs index 98f1ffc..08fc127 100644 --- a/Esyur/Resource/IResource.cs +++ b/Esiur/Resource/IResource.cs @@ -26,11 +26,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; -using Esyur.Data; -using Esyur.Core; +using Esiur.Data; +using Esiur.Core; using System.ComponentModel; -namespace Esyur.Resource +namespace Esiur.Resource { public delegate bool QueryFilter(T value); diff --git a/Esyur/Resource/IStore.cs b/Esiur/Resource/IStore.cs similarity index 95% rename from Esyur/Resource/IStore.cs rename to Esiur/Resource/IStore.cs index 1f315fb..02e4143 100644 --- a/Esyur/Resource/IStore.cs +++ b/Esiur/Resource/IStore.cs @@ -22,18 +22,18 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource.Template; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource.Template; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Security.Permissions; -using Esyur.Security.Authority; +using Esiur.Security.Permissions; +using Esiur.Security.Authority; -namespace Esyur.Resource +namespace Esiur.Resource { public interface IStore:IResource { diff --git a/Esyur/Resource/Instance.cs b/Esiur/Resource/Instance.cs similarity index 99% rename from Esyur/Resource/Instance.cs rename to Esiur/Resource/Instance.cs index 3ff8ed1..cbf8c5d 100644 --- a/Esyur/Resource/Instance.cs +++ b/Esiur/Resource/Instance.cs @@ -3,18 +3,18 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Data; +using Esiur.Data; using System.Runtime.CompilerServices; using System.Reflection; -using Esyur.Net.IIP; -using Esyur.Misc; -using Esyur.Security.Permissions; -using Esyur.Resource.Template; -using Esyur.Security.Authority; -using Esyur.Proxy; -using Esyur.Core; +using Esiur.Net.IIP; +using Esiur.Misc; +using Esiur.Security.Permissions; +using Esiur.Resource.Template; +using Esiur.Security.Authority; +using Esiur.Proxy; +using Esiur.Core; -namespace Esyur.Resource +namespace Esiur.Resource { public class Instance { diff --git a/Esyur/Resource/PrivateAttribute.cs b/Esiur/Resource/PrivateAttribute.cs similarity index 84% rename from Esyur/Resource/PrivateAttribute.cs rename to Esiur/Resource/PrivateAttribute.cs index bc320be..6587bcd 100644 --- a/Esyur/Resource/PrivateAttribute.cs +++ b/Esiur/Resource/PrivateAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { public class PrivateAttribute:Attribute { diff --git a/Esyur/Resource/PublicAttribute.cs b/Esiur/Resource/PublicAttribute.cs similarity index 95% rename from Esyur/Resource/PublicAttribute.cs rename to Esiur/Resource/PublicAttribute.cs index 8c87e5f..d74cfdf 100644 --- a/Esyur/Resource/PublicAttribute.cs +++ b/Esiur/Resource/PublicAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Event | AttributeTargets.Class)] diff --git a/Esyur/Resource/Resource.cs b/Esiur/Resource/Resource.cs similarity index 97% rename from Esyur/Resource/Resource.cs rename to Esiur/Resource/Resource.cs index c66753e..0201bff 100644 --- a/Esyur/Resource/Resource.cs +++ b/Esiur/Resource/Resource.cs @@ -24,9 +24,9 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Core; +using Esiur.Core; -namespace Esyur.Resource +namespace Esiur.Resource { public class Resource : IResource { diff --git a/Esyur/Resource/ResourceEvent.cs b/Esiur/Resource/ResourceEvent.cs similarity index 98% rename from Esyur/Resource/ResourceEvent.cs rename to Esiur/Resource/ResourceEvent.cs index 8ea1524..f308d48 100644 --- a/Esyur/Resource/ResourceEvent.cs +++ b/Esiur/Resource/ResourceEvent.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Event)] diff --git a/Esyur/Resource/ResourceEventHandler.cs b/Esiur/Resource/ResourceEventHandler.cs similarity index 94% rename from Esyur/Resource/ResourceEventHandler.cs rename to Esiur/Resource/ResourceEventHandler.cs index d86ff9c..b917d19 100644 --- a/Esyur/Resource/ResourceEventHandler.cs +++ b/Esiur/Resource/ResourceEventHandler.cs @@ -21,17 +21,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Net.IIP; -using Esyur.Security.Authority; +using Esiur.Data; +using Esiur.Core; +using Esiur.Net.IIP; +using Esiur.Security.Authority; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { public delegate void ResourceEventHanlder(params object[] args); // public delegate void CustomUsersEventHanlder(string[] usernames, params object[] args); diff --git a/Esyur/Resource/ResourceFunction.cs b/Esiur/Resource/ResourceFunction.cs similarity index 98% rename from Esyur/Resource/ResourceFunction.cs rename to Esiur/Resource/ResourceFunction.cs index 59bbb8b..c562e27 100644 --- a/Esyur/Resource/ResourceFunction.cs +++ b/Esiur/Resource/ResourceFunction.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Method)] public class ResourceFunction : System.Attribute diff --git a/Esyur/Resource/ResourceProperty.cs b/Esiur/Resource/ResourceProperty.cs similarity index 97% rename from Esyur/Resource/ResourceProperty.cs rename to Esiur/Resource/ResourceProperty.cs index 2c646ed..3234025 100644 --- a/Esyur/Resource/ResourceProperty.cs +++ b/Esiur/Resource/ResourceProperty.cs @@ -22,14 +22,14 @@ SOFTWARE. */ -using Esyur.Resource.Template; +using Esiur.Resource.Template; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Property)] diff --git a/Esyur/Resource/ResourceQuery.cs b/Esiur/Resource/ResourceQuery.cs similarity index 96% rename from Esyur/Resource/ResourceQuery.cs rename to Esiur/Resource/ResourceQuery.cs index ebc4752..fb08457 100644 --- a/Esyur/Resource/ResourceQuery.cs +++ b/Esiur/Resource/ResourceQuery.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Linq.Expressions; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { public class ResourceQuery : IQueryable { diff --git a/Esyur/Resource/ResourceTrigger.cs b/Esiur/Resource/ResourceTrigger.cs similarity index 98% rename from Esyur/Resource/ResourceTrigger.cs rename to Esiur/Resource/ResourceTrigger.cs index b9baf2a..237392f 100644 --- a/Esyur/Resource/ResourceTrigger.cs +++ b/Esiur/Resource/ResourceTrigger.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { public enum ResourceTrigger : int { diff --git a/Esyur/Resource/Storable.cs b/Esiur/Resource/Storable.cs similarity index 97% rename from Esyur/Resource/Storable.cs rename to Esiur/Resource/Storable.cs index 1ef0bd8..8701c4f 100644 --- a/Esyur/Resource/Storable.cs +++ b/Esiur/Resource/Storable.cs @@ -22,15 +22,15 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; +using Esiur.Data; +using Esiur.Core; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.All)] public class Storable : global::System.Attribute diff --git a/Esyur/Resource/StorageAttribute.cs b/Esiur/Resource/StorageAttribute.cs similarity index 92% rename from Esyur/Resource/StorageAttribute.cs rename to Esiur/Resource/StorageAttribute.cs index 2614d9d..38d2fd1 100644 --- a/Esyur/Resource/StorageAttribute.cs +++ b/Esiur/Resource/StorageAttribute.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { [AttributeUsage(AttributeTargets.Property)] public class StorageAttribute:Attribute diff --git a/Esyur/Resource/StorageMode.cs b/Esiur/Resource/StorageMode.cs similarity index 87% rename from Esyur/Resource/StorageMode.cs rename to Esiur/Resource/StorageMode.cs index f1183c4..5f557f5 100644 --- a/Esyur/Resource/StorageMode.cs +++ b/Esiur/Resource/StorageMode.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Resource +namespace Esiur.Resource { public enum StorageMode : byte { diff --git a/Esyur/Resource/StoreGeneric.cs b/Esiur/Resource/StoreGeneric.cs similarity index 95% rename from Esyur/Resource/StoreGeneric.cs rename to Esiur/Resource/StoreGeneric.cs index 4d4b74d..13e6e47 100644 --- a/Esyur/Resource/StoreGeneric.cs +++ b/Esiur/Resource/StoreGeneric.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Text; -using Esyur.Core; -using Esyur.Data; -using Esyur.Resource.Template; +using Esiur.Core; +using Esiur.Data; +using Esiur.Resource.Template; -namespace Esyur.Resource +namespace Esiur.Resource { public abstract class Store : IStore where T:IResource { diff --git a/Esyur/Resource/Template/AttributeTemplate.cs b/Esiur/Resource/Template/AttributeTemplate.cs similarity index 89% rename from Esyur/Resource/Template/AttributeTemplate.cs rename to Esiur/Resource/Template/AttributeTemplate.cs index 0ef7903..7c26dde 100644 --- a/Esyur/Resource/Template/AttributeTemplate.cs +++ b/Esiur/Resource/Template/AttributeTemplate.cs @@ -1,4 +1,4 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class AttributeTemplate : MemberTemplate { diff --git a/Esyur/Resource/Template/EventTemplate.cs b/Esiur/Resource/Template/EventTemplate.cs similarity index 95% rename from Esyur/Resource/Template/EventTemplate.cs rename to Esiur/Resource/Template/EventTemplate.cs index 6abc4ca..9d7372e 100644 --- a/Esyur/Resource/Template/EventTemplate.cs +++ b/Esiur/Resource/Template/EventTemplate.cs @@ -1,4 +1,4 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class EventTemplate : MemberTemplate { diff --git a/Esyur/Resource/Template/FunctionTemplate.cs b/Esiur/Resource/Template/FunctionTemplate.cs similarity index 96% rename from Esyur/Resource/Template/FunctionTemplate.cs rename to Esiur/Resource/Template/FunctionTemplate.cs index c2b5534..8ce3109 100644 --- a/Esyur/Resource/Template/FunctionTemplate.cs +++ b/Esiur/Resource/Template/FunctionTemplate.cs @@ -1,11 +1,11 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class FunctionTemplate : MemberTemplate { diff --git a/Esyur/Resource/Template/MemberTemplate.cs b/Esiur/Resource/Template/MemberTemplate.cs similarity index 94% rename from Esyur/Resource/Template/MemberTemplate.cs rename to Esiur/Resource/Template/MemberTemplate.cs index de520db..004e702 100644 --- a/Esyur/Resource/Template/MemberTemplate.cs +++ b/Esiur/Resource/Template/MemberTemplate.cs @@ -1,11 +1,11 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class MemberTemplate { diff --git a/Esyur/Resource/Template/PropertyTemplate.cs b/Esiur/Resource/Template/PropertyTemplate.cs similarity index 98% rename from Esyur/Resource/Template/PropertyTemplate.cs rename to Esiur/Resource/Template/PropertyTemplate.cs index 687d22f..d827388 100644 --- a/Esyur/Resource/Template/PropertyTemplate.cs +++ b/Esiur/Resource/Template/PropertyTemplate.cs @@ -1,4 +1,4 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class PropertyTemplate : MemberTemplate { diff --git a/Esyur/Resource/Template/ResourceTemplate.cs b/Esiur/Resource/Template/ResourceTemplate.cs similarity index 99% rename from Esyur/Resource/Template/ResourceTemplate.cs rename to Esiur/Resource/Template/ResourceTemplate.cs index b47ef2c..758e281 100644 --- a/Esyur/Resource/Template/ResourceTemplate.cs +++ b/Esiur/Resource/Template/ResourceTemplate.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Reflection; -using Esyur.Misc; -using Esyur.Data; -using Esyur.Core; +using Esiur.Misc; +using Esiur.Data; +using Esiur.Core; using System.Security.Cryptography; -using Esyur.Proxy; -using Esyur.Net.IIP; +using Esiur.Proxy; +using Esiur.Net.IIP; -namespace Esyur.Resource.Template +namespace Esiur.Resource.Template { public class ResourceTemplate { diff --git a/Esyur/Resource/Warehouse.cs b/Esiur/Resource/Warehouse.cs similarity index 99% rename from Esyur/Resource/Warehouse.cs rename to Esiur/Resource/Warehouse.cs index a68fd2b..19f409d 100644 --- a/Esyur/Resource/Warehouse.cs +++ b/Esiur/Resource/Warehouse.cs @@ -22,23 +22,23 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Proxy; -using Esyur.Resource.Template; -using Esyur.Security.Permissions; +using Esiur.Data; +using Esiur.Core; +using Esiur.Proxy; +using Esiur.Resource.Template; +using Esiur.Security.Permissions; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Net.IIP; +using Esiur.Net.IIP; using System.Text.RegularExpressions; -using Esyur.Misc; +using Esiur.Misc; using System.Collections.Concurrent; using System.Collections; -namespace Esyur.Resource +namespace Esiur.Resource { // Centeral Resource Issuer public static class Warehouse diff --git a/Esyur/Security/Authority/AlienAuthentication.cs b/Esiur/Security/Authority/AlienAuthentication.cs similarity index 97% rename from Esyur/Security/Authority/AlienAuthentication.cs rename to Esiur/Security/Authority/AlienAuthentication.cs index 74fb3ef..137c911 100644 --- a/Esyur/Security/Authority/AlienAuthentication.cs +++ b/Esiur/Security/Authority/AlienAuthentication.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class AlienAuthentication : Authentication { diff --git a/Esyur/Security/Authority/Authentication.cs b/Esiur/Security/Authority/Authentication.cs similarity index 95% rename from Esyur/Security/Authority/Authentication.cs rename to Esiur/Security/Authority/Authentication.cs index d4d5ebd..ae78131 100644 --- a/Esyur/Security/Authority/Authentication.cs +++ b/Esiur/Security/Authority/Authentication.cs @@ -27,9 +27,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static Esyur.Net.Packets.IIPAuthPacket; +using static Esiur.Net.Packets.IIPAuthPacket; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class Authentication { diff --git a/Esyur/Security/Authority/AuthenticationMethod.cs b/Esiur/Security/Authority/AuthenticationMethod.cs similarity index 85% rename from Esyur/Security/Authority/AuthenticationMethod.cs rename to Esiur/Security/Authority/AuthenticationMethod.cs index 56a0d27..571038d 100644 --- a/Esyur/Security/Authority/AuthenticationMethod.cs +++ b/Esiur/Security/Authority/AuthenticationMethod.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public enum AuthenticationMethod : byte { diff --git a/Esyur/Security/Authority/AuthenticationState.cs b/Esiur/Security/Authority/AuthenticationState.cs similarity index 97% rename from Esyur/Security/Authority/AuthenticationState.cs rename to Esiur/Security/Authority/AuthenticationState.cs index 3d04257..90515d8 100644 --- a/Esyur/Security/Authority/AuthenticationState.cs +++ b/Esiur/Security/Authority/AuthenticationState.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public enum AuthenticationState : int { diff --git a/Esyur/Security/Authority/AuthenticationType.cs b/Esiur/Security/Authority/AuthenticationType.cs similarity index 97% rename from Esyur/Security/Authority/AuthenticationType.cs rename to Esiur/Security/Authority/AuthenticationType.cs index 3a374ca..3b4bcf5 100644 --- a/Esyur/Security/Authority/AuthenticationType.cs +++ b/Esiur/Security/Authority/AuthenticationType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public enum AuthenticationType { diff --git a/Esyur/Security/Authority/CACertificate.cs b/Esiur/Security/Authority/CACertificate.cs similarity index 97% rename from Esyur/Security/Authority/CACertificate.cs rename to Esiur/Security/Authority/CACertificate.cs index f17e8e3..3dac45c 100644 --- a/Esyur/Security/Authority/CACertificate.cs +++ b/Esiur/Security/Authority/CACertificate.cs @@ -22,11 +22,11 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Misc; -using Esyur.Security.Cryptography; -using Esyur.Security.Integrity; +using Esiur.Data; +using Esiur.Core; +using Esiur.Misc; +using Esiur.Security.Cryptography; +using Esiur.Security.Integrity; using System; using System.Collections.Generic; using System.IO; @@ -35,7 +35,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class CACertificate : Certificate { diff --git a/Esyur/Security/Authority/Certificate.cs b/Esiur/Security/Authority/Certificate.cs similarity index 97% rename from Esyur/Security/Authority/Certificate.cs rename to Esiur/Security/Authority/Certificate.cs index aad1d20..f23ed87 100644 --- a/Esyur/Security/Authority/Certificate.cs +++ b/Esiur/Security/Authority/Certificate.cs @@ -22,11 +22,11 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Misc; -using Esyur.Security.Cryptography; -using Esyur.Security.Integrity; +using Esiur.Data; +using Esiur.Core; +using Esiur.Misc; +using Esiur.Security.Cryptography; +using Esiur.Security.Integrity; using System; using System.Collections.Generic; using System.IO; @@ -35,7 +35,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public abstract class Certificate { diff --git a/Esyur/Security/Authority/CertificateType.cs b/Esiur/Security/Authority/CertificateType.cs similarity index 97% rename from Esyur/Security/Authority/CertificateType.cs rename to Esiur/Security/Authority/CertificateType.cs index 48cb49c..5bbc8ff 100644 --- a/Esyur/Security/Authority/CertificateType.cs +++ b/Esiur/Security/Authority/CertificateType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public enum CertificateType { diff --git a/Esyur/Security/Authority/ClientAuthentication.cs b/Esiur/Security/Authority/ClientAuthentication.cs similarity index 98% rename from Esyur/Security/Authority/ClientAuthentication.cs rename to Esiur/Security/Authority/ClientAuthentication.cs index cbad81b..8863613 100644 --- a/Esyur/Security/Authority/ClientAuthentication.cs +++ b/Esiur/Security/Authority/ClientAuthentication.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class ClientAuthentication : Authentication { diff --git a/Esyur/Security/Authority/CoHostAuthentication.cs b/Esiur/Security/Authority/CoHostAuthentication.cs similarity index 97% rename from Esyur/Security/Authority/CoHostAuthentication.cs rename to Esiur/Security/Authority/CoHostAuthentication.cs index 8aa583e..33f5557 100644 --- a/Esyur/Security/Authority/CoHostAuthentication.cs +++ b/Esiur/Security/Authority/CoHostAuthentication.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class CoHostAuthentication : Authentication { diff --git a/Esyur/Security/Authority/DomainCertificate.cs b/Esiur/Security/Authority/DomainCertificate.cs similarity index 98% rename from Esyur/Security/Authority/DomainCertificate.cs rename to Esiur/Security/Authority/DomainCertificate.cs index d3a5b3c..ca034d2 100644 --- a/Esyur/Security/Authority/DomainCertificate.cs +++ b/Esiur/Security/Authority/DomainCertificate.cs @@ -22,10 +22,10 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Misc; -using Esyur.Security.Cryptography; -using Esyur.Security.Integrity; +using Esiur.Data; +using Esiur.Misc; +using Esiur.Security.Cryptography; +using Esiur.Security.Integrity; using System; using System.Collections.Generic; using System.IO; @@ -34,7 +34,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class DomainCertificate : Certificate { diff --git a/Esyur/Security/Authority/HostAuthentication.cs b/Esiur/Security/Authority/HostAuthentication.cs similarity index 97% rename from Esyur/Security/Authority/HostAuthentication.cs rename to Esiur/Security/Authority/HostAuthentication.cs index dcf070c..9ed62c5 100644 --- a/Esyur/Security/Authority/HostAuthentication.cs +++ b/Esiur/Security/Authority/HostAuthentication.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class HostAuthentication : Authentication { diff --git a/Esyur/Security/Authority/Session.cs b/Esiur/Security/Authority/Session.cs similarity index 94% rename from Esyur/Security/Authority/Session.cs rename to Esiur/Security/Authority/Session.cs index c13ba71..c502aeb 100644 --- a/Esyur/Security/Authority/Session.cs +++ b/Esiur/Security/Authority/Session.cs @@ -21,17 +21,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Net; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Core; +using Esiur.Net; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class Session { diff --git a/Esyur/Security/Authority/Source.cs b/Esiur/Security/Authority/Source.cs similarity index 97% rename from Esyur/Security/Authority/Source.cs rename to Esiur/Security/Authority/Source.cs index 5607a6c..e740f90 100644 --- a/Esyur/Security/Authority/Source.cs +++ b/Esiur/Security/Authority/Source.cs @@ -22,14 +22,14 @@ SOFTWARE. */ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class Source { diff --git a/Esyur/Security/Authority/SourceAttributeType.cs b/Esiur/Security/Authority/SourceAttributeType.cs similarity index 97% rename from Esyur/Security/Authority/SourceAttributeType.cs rename to Esiur/Security/Authority/SourceAttributeType.cs index 450118e..f773d8b 100644 --- a/Esyur/Security/Authority/SourceAttributeType.cs +++ b/Esiur/Security/Authority/SourceAttributeType.cs @@ -22,14 +22,14 @@ SOFTWARE. */ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public enum SourceAttributeType { diff --git a/Esyur/Security/Authority/UserCertificate.cs b/Esiur/Security/Authority/UserCertificate.cs similarity index 98% rename from Esyur/Security/Authority/UserCertificate.cs rename to Esiur/Security/Authority/UserCertificate.cs index 4eb141c..6e62678 100644 --- a/Esyur/Security/Authority/UserCertificate.cs +++ b/Esiur/Security/Authority/UserCertificate.cs @@ -22,9 +22,9 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Security.Cryptography; -using Esyur.Security.Integrity; +using Esiur.Data; +using Esiur.Security.Cryptography; +using Esiur.Security.Integrity; using System; using System.Collections.Generic; using System.IO; @@ -33,7 +33,7 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Authority +namespace Esiur.Security.Authority { public class UserCertificate : Certificate { diff --git a/Esyur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs b/Esiur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs similarity index 97% rename from Esyur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs rename to Esiur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs index 506ed89..a2ee1f0 100644 --- a/Esyur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs +++ b/Esiur/Security/Cryptography/AsymetricEncryptionAlgorithmType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Cryptography +namespace Esiur.Security.Cryptography { // Enums public enum AsymetricEncryptionAlgorithmType diff --git a/Esyur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs b/Esiur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs similarity index 97% rename from Esyur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs rename to Esiur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs index 11238e3..e2a4348 100644 --- a/Esyur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs +++ b/Esiur/Security/Cryptography/SymetricEncryptionAlgorithmType.cs @@ -27,7 +27,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Cryptography +namespace Esiur.Security.Cryptography { public enum SymetricEncryptionAlgorithmType { diff --git a/Esyur/Security/Integrity/CRC16IBM.cs b/Esiur/Security/Integrity/CRC16IBM.cs similarity index 98% rename from Esyur/Security/Integrity/CRC16IBM.cs rename to Esiur/Security/Integrity/CRC16IBM.cs index d09cb0e..da15d68 100644 --- a/Esyur/Security/Integrity/CRC16IBM.cs +++ b/Esiur/Security/Integrity/CRC16IBM.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Integrity +namespace Esiur.Security.Integrity { public class CRC16IBM diff --git a/Esyur/Security/Integrity/CRC16ITU.cs b/Esiur/Security/Integrity/CRC16ITU.cs similarity index 98% rename from Esyur/Security/Integrity/CRC16ITU.cs rename to Esiur/Security/Integrity/CRC16ITU.cs index b081d71..0f25819 100644 --- a/Esyur/Security/Integrity/CRC16ITU.cs +++ b/Esiur/Security/Integrity/CRC16ITU.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Integrity +namespace Esiur.Security.Integrity { public class CRC16ITU diff --git a/Esyur/Security/Integrity/HashFunctionType.cs b/Esiur/Security/Integrity/HashFunctionType.cs similarity index 97% rename from Esyur/Security/Integrity/HashFunctionType.cs rename to Esiur/Security/Integrity/HashFunctionType.cs index 00dcfef..b1e1ac9 100644 --- a/Esyur/Security/Integrity/HashFunctionType.cs +++ b/Esiur/Security/Integrity/HashFunctionType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Integrity +namespace Esiur.Security.Integrity { public enum HashFunctionType { diff --git a/Esyur/Security/Integrity/NMEA0183.cs b/Esiur/Security/Integrity/NMEA0183.cs similarity index 93% rename from Esyur/Security/Integrity/NMEA0183.cs rename to Esiur/Security/Integrity/NMEA0183.cs index cba0cc3..277106b 100644 --- a/Esyur/Security/Integrity/NMEA0183.cs +++ b/Esiur/Security/Integrity/NMEA0183.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Integrity +namespace Esiur.Security.Integrity { public class NMEA0183 diff --git a/Esyur/Security/Integrity/SHA256.cs b/Esiur/Security/Integrity/SHA256.cs similarity index 99% rename from Esyur/Security/Integrity/SHA256.cs rename to Esiur/Security/Integrity/SHA256.cs index c4c39b6..3e2541e 100644 --- a/Esyur/Security/Integrity/SHA256.cs +++ b/Esiur/Security/Integrity/SHA256.cs @@ -1,9 +1,9 @@ -using Esyur.Data; +using Esiur.Data; using System; using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Integrity +namespace Esiur.Security.Integrity { public static class SHA256 { diff --git a/Esyur/Security/Membership/IDomain.cs b/Esiur/Security/Membership/IDomain.cs similarity index 94% rename from Esyur/Security/Membership/IDomain.cs rename to Esiur/Security/Membership/IDomain.cs index 96f0e75..c58d11b 100644 --- a/Esyur/Security/Membership/IDomain.cs +++ b/Esiur/Security/Membership/IDomain.cs @@ -22,15 +22,15 @@ SOFTWARE. */ -using Esyur.Resource; -using Esyur.Security.Authority; +using Esiur.Resource; +using Esiur.Security.Authority; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Authority +namespace Esiur.Authority { public interface IDomain : IResource { diff --git a/Esyur/Security/Membership/IMembership.cs b/Esiur/Security/Membership/IMembership.cs similarity index 91% rename from Esyur/Security/Membership/IMembership.cs rename to Esiur/Security/Membership/IMembership.cs index 80f36a0..0fbd743 100644 --- a/Esyur/Security/Membership/IMembership.cs +++ b/Esiur/Security/Membership/IMembership.cs @@ -27,13 +27,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Data; -using Esyur.Net.IIP; -using Esyur.Core; -using Esyur.Security.Authority; -using Esyur.Resource; +using Esiur.Data; +using Esiur.Net.IIP; +using Esiur.Core; +using Esiur.Security.Authority; +using Esiur.Resource; -namespace Esyur.Security.Membership +namespace Esiur.Security.Membership { public interface IMembership : IResource { diff --git a/Esyur/Security/Membership/IUser.cs b/Esiur/Security/Membership/IUser.cs similarity index 95% rename from Esyur/Security/Membership/IUser.cs rename to Esiur/Security/Membership/IUser.cs index 9dc86bb..e354baf 100644 --- a/Esyur/Security/Membership/IUser.cs +++ b/Esiur/Security/Membership/IUser.cs @@ -22,14 +22,14 @@ SOFTWARE. */ -using Esyur.Core; +using Esiur.Core; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Membership +namespace Esiur.Security.Membership { public interface IUser { diff --git a/Esyur/Security/Permissions/ActionType.cs b/Esiur/Security/Permissions/ActionType.cs similarity index 97% rename from Esyur/Security/Permissions/ActionType.cs rename to Esiur/Security/Permissions/ActionType.cs index 57bba11..9ec856c 100644 --- a/Esyur/Security/Permissions/ActionType.cs +++ b/Esiur/Security/Permissions/ActionType.cs @@ -28,7 +28,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Permissions +namespace Esiur.Security.Permissions { public enum ActionType { diff --git a/Esyur/Security/Permissions/IPermissionsManager.cs b/Esiur/Security/Permissions/IPermissionsManager.cs similarity index 91% rename from Esyur/Security/Permissions/IPermissionsManager.cs rename to Esiur/Security/Permissions/IPermissionsManager.cs index dbe3bfe..fca2d65 100644 --- a/Esyur/Security/Permissions/IPermissionsManager.cs +++ b/Esiur/Security/Permissions/IPermissionsManager.cs @@ -22,19 +22,19 @@ SOFTWARE. */ -using Esyur.Data; -using Esyur.Core; -using Esyur.Net; -using Esyur.Resource; -using Esyur.Resource.Template; -using Esyur.Security.Authority; +using Esiur.Data; +using Esiur.Core; +using Esiur.Net; +using Esiur.Resource; +using Esiur.Resource.Template; +using Esiur.Security.Authority; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Esyur.Security.Permissions +namespace Esiur.Security.Permissions { public interface IPermissionsManager { diff --git a/Esyur/Security/Permissions/Ruling.cs b/Esiur/Security/Permissions/Ruling.cs similarity index 81% rename from Esyur/Security/Permissions/Ruling.cs rename to Esiur/Security/Permissions/Ruling.cs index 9898650..d87cf75 100644 --- a/Esyur/Security/Permissions/Ruling.cs +++ b/Esiur/Security/Permissions/Ruling.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Esyur.Security.Permissions +namespace Esiur.Security.Permissions { public enum Ruling { diff --git a/Esyur/Security/Permissions/StorePermissionsManager.cs b/Esiur/Security/Permissions/StorePermissionsManager.cs similarity index 91% rename from Esyur/Security/Permissions/StorePermissionsManager.cs rename to Esiur/Security/Permissions/StorePermissionsManager.cs index 208c9e6..01c6102 100644 --- a/Esyur/Security/Permissions/StorePermissionsManager.cs +++ b/Esiur/Security/Permissions/StorePermissionsManager.cs @@ -25,13 +25,13 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource; -using Esyur.Resource.Template; -using Esyur.Security.Authority; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource; +using Esiur.Resource.Template; +using Esiur.Security.Authority; -namespace Esyur.Security.Permissions +namespace Esiur.Security.Permissions { public class StorePermissionsManager : IPermissionsManager { diff --git a/Esyur/Security/Permissions/UserPermissionsManager.cs b/Esiur/Security/Permissions/UserPermissionsManager.cs similarity index 96% rename from Esyur/Security/Permissions/UserPermissionsManager.cs rename to Esiur/Security/Permissions/UserPermissionsManager.cs index edd1bb1..e318bb0 100644 --- a/Esyur/Security/Permissions/UserPermissionsManager.cs +++ b/Esiur/Security/Permissions/UserPermissionsManager.cs @@ -25,13 +25,13 @@ SOFTWARE. using System; using System.Collections.Generic; using System.Text; -using Esyur.Data; -using Esyur.Core; -using Esyur.Resource; -using Esyur.Resource.Template; -using Esyur.Security.Authority; +using Esiur.Data; +using Esiur.Core; +using Esiur.Resource; +using Esiur.Resource.Template; +using Esiur.Security.Authority; -namespace Esyur.Security.Permissions +namespace Esiur.Security.Permissions { public class UserPermissionsManager : IPermissionsManager { diff --git a/Esyur/Stores/MemoryStore.cs b/Esiur/Stores/MemoryStore.cs similarity index 97% rename from Esyur/Stores/MemoryStore.cs rename to Esiur/Stores/MemoryStore.cs index cb7e1a3..d17aa2a 100644 --- a/Esyur/Stores/MemoryStore.cs +++ b/Esiur/Stores/MemoryStore.cs @@ -1,14 +1,14 @@ -using Esyur.Resource; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Core; -using Esyur.Data; -using Esyur.Resource.Template; +using Esiur.Core; +using Esiur.Data; +using Esiur.Resource.Template; -namespace Esyur.Stores +namespace Esiur.Stores { public class MemoryStore : IStore { diff --git a/Esyur/Stores/TemporaryStore.cs b/Esiur/Stores/TemporaryStore.cs similarity index 96% rename from Esyur/Stores/TemporaryStore.cs rename to Esiur/Stores/TemporaryStore.cs index 77d5a81..8ff1757 100644 --- a/Esyur/Stores/TemporaryStore.cs +++ b/Esiur/Stores/TemporaryStore.cs @@ -1,14 +1,14 @@ -using Esyur.Resource; +using Esiur.Resource; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Esyur.Core; -using Esyur.Data; -using Esyur.Resource.Template; +using Esiur.Core; +using Esiur.Data; +using Esiur.Resource.Template; -namespace Esyur.Stores +namespace Esiur.Stores { public class TemporaryStore : IStore {