From baa4d7b0e7dc60472f72adc2c85b84a86d604c8c Mon Sep 17 00:00:00 2001 From: Malloc of Kuzkycyziklistan Date: Thu, 27 Apr 2017 15:44:30 -0500 Subject: [PATCH] ef6 sqlite + binary compression on release good shit --- server/App.config | 13 +- server/CircleScape.csproj | 112 ++- server/CircleScape.sln | 6 + server/DAL/ScapeDb.Context.cs | 31 + server/DAL/ScapeDb.Context.tt | 636 +++++++++++++++ server/DAL/ScapeDb.Designer.cs | 10 + server/DAL/ScapeDb.cs | 9 + server/DAL/ScapeDb.edmx | 158 ++++ server/DAL/ScapeDb.edmx.diagram | 14 + server/DAL/ScapeDb.tt | 733 ++++++++++++++++++ server/DAL/Sessions.cs | 23 + server/DAL/Users.cs | 34 + server/Database/Database.cs | 10 - server/Database/Table.cs | 10 - server/Entrypoint.cs | 2 +- server/Fodyweavers.xml | 4 + server/{Websocket => Kneesocks}/Connection.cs | 4 +- server/{Websocket => Kneesocks}/Frame.cs | 4 +- server/{Websocket => Kneesocks}/Handshake.cs | 6 +- server/Kneesocks/Kneesocks.csproj | 60 ++ server/{Websocket => Kneesocks}/Pool.cs | 4 +- server/Kneesocks/Properties/AssemblyInfo.cs | 36 + .../Query.cs => Kneesocks/Server.cs} | 5 +- server/{Websocket => Kneesocks}/Stack.cs | 6 +- server/Kneesocks/Utilities.cs | 58 ++ server/Properties/AssemblyInfo.cs | 2 +- server/{ => Socks}/ActiveConnection.cs | 3 +- server/{ => Socks}/PendingConnection.cs | 0 server/{ => Socks}/PoolManager.cs | 2 +- server/Websocket/Server.cs | 11 - server/packages.config | 12 +- server/scape.db | Bin 32768 -> 32768 bytes 32 files changed, 1943 insertions(+), 75 deletions(-) create mode 100644 server/DAL/ScapeDb.Context.cs create mode 100644 server/DAL/ScapeDb.Context.tt create mode 100644 server/DAL/ScapeDb.Designer.cs create mode 100644 server/DAL/ScapeDb.cs create mode 100644 server/DAL/ScapeDb.edmx create mode 100644 server/DAL/ScapeDb.edmx.diagram create mode 100644 server/DAL/ScapeDb.tt create mode 100644 server/DAL/Sessions.cs create mode 100644 server/DAL/Users.cs delete mode 100644 server/Database/Database.cs delete mode 100644 server/Database/Table.cs create mode 100644 server/Fodyweavers.xml rename server/{Websocket => Kneesocks}/Connection.cs (96%) rename server/{Websocket => Kneesocks}/Frame.cs (92%) rename server/{Websocket => Kneesocks}/Handshake.cs (98%) create mode 100644 server/Kneesocks/Kneesocks.csproj rename server/{Websocket => Kneesocks}/Pool.cs (98%) create mode 100644 server/Kneesocks/Properties/AssemblyInfo.cs rename server/{Database/Query.cs => Kneesocks/Server.cs} (71%) rename server/{Websocket => Kneesocks}/Stack.cs (92%) create mode 100644 server/Kneesocks/Utilities.cs rename server/{ => Socks}/ActiveConnection.cs (84%) rename server/{ => Socks}/PendingConnection.cs (100%) rename server/{ => Socks}/PoolManager.cs (96%) delete mode 100644 server/Websocket/Server.cs diff --git a/server/App.config b/server/App.config index f3b2534..fa9846a 100644 --- a/server/App.config +++ b/server/App.config @@ -1,11 +1,11 @@  -
+ - + @@ -20,8 +20,15 @@ + - + + + + + \ No newline at end of file diff --git a/server/CircleScape.csproj b/server/CircleScape.csproj index a316260..7198ba0 100644 --- a/server/CircleScape.csproj +++ b/server/CircleScape.csproj @@ -9,9 +9,12 @@ Properties CircleScape server - v4.5.2 + v4.6 512 true + + + AnyCPU @@ -32,6 +35,9 @@ prompt 4 + + OnBuildSuccess + packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll @@ -41,13 +47,26 @@ packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll True + + ..\..\..\..\..\..\Program Files (x86)\System.Data.SQLite\2015\bin\SQLite.Designer.dll + - packages\System.Data.SQLite.Core.1.0.105.0\lib\net451\System.Data.SQLite.dll + packages\System.Data.SQLite.Core.1.0.105.0\lib\net46\System.Data.SQLite.dll True + + packages\System.Data.SQLite.EF6.1.0.105.0\lib\net46\System.Data.SQLite.EF6.dll + True + + + packages\System.Data.SQLite.Linq.1.0.105.0\lib\net46\System.Data.SQLite.Linq.dll + True + + + @@ -56,25 +75,48 @@ - - - - + + True + True + ScapeDb.Context.tt + + + True + True + ScapeDb.tt + + + True + True + ScapeDb.edmx + + + ScapeDb.tt + + + ScapeDb.tt + + - - + + - - - - - - - - + + Designer + + + EntityModelCodeGenerator + ScapeDb.Designer.cs + + + ScapeDb.edmx + + + Designer + @@ -82,13 +124,47 @@ + + + {347353f6-cecd-4895-8717-2b5394ac71cc} + Kneesocks + + + + + + + + TextTemplatingFileGenerator + ScapeDb.edmx + ScapeDb.Context.cs + + + TextTemplatingFileGenerator + ScapeDb.edmx + ScapeDb.cs + + + Designer + + - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + + + COPY "$(ProjectDir)scape.db" "$(TargetDir)" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT +[Sessions].[UserId] AS [UserId], +[Sessions].[SessionKey] AS [SessionKey], +[Sessions].[IpAddress] AS [IpAddress] +FROM [Sessions] AS [Sessions] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/DAL/ScapeDb.edmx.diagram b/server/DAL/ScapeDb.edmx.diagram new file mode 100644 index 0000000..d9dc191 --- /dev/null +++ b/server/DAL/ScapeDb.edmx.diagram @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/DAL/ScapeDb.tt b/server/DAL/ScapeDb.tt new file mode 100644 index 0000000..305822a --- /dev/null +++ b/server/DAL/ScapeDb.tt @@ -0,0 +1,733 @@ +<#@ template language="C#" debug="false" hostspecific="true"#> +<#@ include file="EF6.Utility.CS.ttinclude"#><#@ + output extension=".cs"#><# + +const string inputFile = @"ScapeDb.edmx"; +var textTransform = DynamicTextTransformation.Create(this); +var code = new CodeGenerationTools(this); +var ef = new MetadataTools(this); +var typeMapper = new TypeMapper(code, ef, textTransform.Errors); +var fileManager = EntityFrameworkTemplateFileManager.Create(this); +var itemCollection = new EdmMetadataLoader(textTransform.Host, textTransform.Errors).CreateEdmItemCollection(inputFile); +var codeStringGenerator = new CodeStringGenerator(code, typeMapper, ef); + +if (!typeMapper.VerifyCaseInsensitiveTypeUniqueness(typeMapper.GetAllGlobalItems(itemCollection), inputFile)) +{ + return string.Empty; +} + +WriteHeader(codeStringGenerator, fileManager); + +foreach (var entity in typeMapper.GetItemsToGenerate(itemCollection)) +{ + fileManager.StartNewFile(entity.Name + ".cs"); + BeginNamespace(code); +#> +<#=codeStringGenerator.UsingDirectives(inHeader: false)#> +<#=codeStringGenerator.EntityClassOpening(entity)#> +{ +<# + var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(entity); + var collectionNavigationProperties = typeMapper.GetCollectionNavigationProperties(entity); + var complexProperties = typeMapper.GetComplexProperties(entity); + + if (propertiesWithDefaultValues.Any() || collectionNavigationProperties.Any() || complexProperties.Any()) + { +#> + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public <#=code.Escape(entity)#>() + { +<# + foreach (var edmProperty in propertiesWithDefaultValues) + { +#> + this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>; +<# + } + + foreach (var navigationProperty in collectionNavigationProperties) + { +#> + this.<#=code.Escape(navigationProperty)#> = new HashSet<<#=typeMapper.GetTypeName(navigationProperty.ToEndMember.GetEntityType())#>>(); +<# + } + + foreach (var complexProperty in complexProperties) + { +#> + this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>(); +<# + } +#> + } + +<# + } + + var simpleProperties = typeMapper.GetSimpleProperties(entity); + if (simpleProperties.Any()) + { + foreach (var edmProperty in simpleProperties) + { +#> + <#=codeStringGenerator.Property(edmProperty)#> +<# + } + } + + if (complexProperties.Any()) + { +#> + +<# + foreach(var complexProperty in complexProperties) + { +#> + <#=codeStringGenerator.Property(complexProperty)#> +<# + } + } + + var navigationProperties = typeMapper.GetNavigationProperties(entity); + if (navigationProperties.Any()) + { +#> + +<# + foreach (var navigationProperty in navigationProperties) + { + if (navigationProperty.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many) + { +#> + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] +<# + } +#> + <#=codeStringGenerator.NavigationProperty(navigationProperty)#> +<# + } + } +#> +} +<# + EndNamespace(code); +} + +foreach (var complex in typeMapper.GetItemsToGenerate(itemCollection)) +{ + fileManager.StartNewFile(complex.Name + ".cs"); + BeginNamespace(code); +#> +<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#> +<#=Accessibility.ForType(complex)#> partial class <#=code.Escape(complex)#> +{ +<# + var complexProperties = typeMapper.GetComplexProperties(complex); + var propertiesWithDefaultValues = typeMapper.GetPropertiesWithDefaultValues(complex); + + if (propertiesWithDefaultValues.Any() || complexProperties.Any()) + { +#> + public <#=code.Escape(complex)#>() + { +<# + foreach (var edmProperty in propertiesWithDefaultValues) + { +#> + this.<#=code.Escape(edmProperty)#> = <#=typeMapper.CreateLiteral(edmProperty.DefaultValue)#>; +<# + } + + foreach (var complexProperty in complexProperties) + { +#> + this.<#=code.Escape(complexProperty)#> = new <#=typeMapper.GetTypeName(complexProperty.TypeUsage)#>(); +<# + } +#> + } + +<# + } + + var simpleProperties = typeMapper.GetSimpleProperties(complex); + if (simpleProperties.Any()) + { + foreach(var edmProperty in simpleProperties) + { +#> + <#=codeStringGenerator.Property(edmProperty)#> +<# + } + } + + if (complexProperties.Any()) + { +#> + +<# + foreach(var edmProperty in complexProperties) + { +#> + <#=codeStringGenerator.Property(edmProperty)#> +<# + } + } +#> +} +<# + EndNamespace(code); +} + +foreach (var enumType in typeMapper.GetEnumItemsToGenerate(itemCollection)) +{ + fileManager.StartNewFile(enumType.Name + ".cs"); + BeginNamespace(code); +#> +<#=codeStringGenerator.UsingDirectives(inHeader: false, includeCollections: false)#> +<# + if (typeMapper.EnumIsFlags(enumType)) + { +#> +[Flags] +<# + } +#> +<#=codeStringGenerator.EnumOpening(enumType)#> +{ +<# + var foundOne = false; + + foreach (MetadataItem member in typeMapper.GetEnumMembers(enumType)) + { + foundOne = true; +#> + <#=code.Escape(typeMapper.GetEnumMemberName(member))#> = <#=typeMapper.GetEnumMemberValue(member)#>, +<# + } + + if (foundOne) + { + this.GenerationEnvironment.Remove(this.GenerationEnvironment.Length - 3, 1); + } +#> +} +<# + EndNamespace(code); +} + +fileManager.Process(); + +#> +<#+ + +public void WriteHeader(CodeStringGenerator codeStringGenerator, EntityFrameworkTemplateFileManager fileManager) +{ + fileManager.StartHeader(); +#> +//------------------------------------------------------------------------------ +// +// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine1")#> +// +// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine2")#> +// <#=CodeGenerationTools.GetResourceString("Template_GeneratedCodeCommentLine3")#> +// +//------------------------------------------------------------------------------ +<#=codeStringGenerator.UsingDirectives(inHeader: true)#> +<#+ + fileManager.EndBlock(); +} + +public void BeginNamespace(CodeGenerationTools code) +{ + var codeNamespace = code.VsNamespaceSuggestion(); + if (!String.IsNullOrEmpty(codeNamespace)) + { +#> +namespace <#=code.EscapeNamespace(codeNamespace)#> +{ +<#+ + PushIndent(" "); + } +} + +public void EndNamespace(CodeGenerationTools code) +{ + if (!String.IsNullOrEmpty(code.VsNamespaceSuggestion())) + { + PopIndent(); +#> +} +<#+ + } +} + +public const string TemplateId = "CSharp_DbContext_Types_EF6"; + +public class CodeStringGenerator +{ + private readonly CodeGenerationTools _code; + private readonly TypeMapper _typeMapper; + private readonly MetadataTools _ef; + + public CodeStringGenerator(CodeGenerationTools code, TypeMapper typeMapper, MetadataTools ef) + { + ArgumentNotNull(code, "code"); + ArgumentNotNull(typeMapper, "typeMapper"); + ArgumentNotNull(ef, "ef"); + + _code = code; + _typeMapper = typeMapper; + _ef = ef; + } + + public string Property(EdmProperty edmProperty) + { + return string.Format( + CultureInfo.InvariantCulture, + "{0} {1} {2} {{ {3}get; {4}set; }}", + Accessibility.ForProperty(edmProperty), + _typeMapper.GetTypeName(edmProperty.TypeUsage), + _code.Escape(edmProperty), + _code.SpaceAfter(Accessibility.ForGetter(edmProperty)), + _code.SpaceAfter(Accessibility.ForSetter(edmProperty))); + } + + public string NavigationProperty(NavigationProperty navProp) + { + var endType = _typeMapper.GetTypeName(navProp.ToEndMember.GetEntityType()); + return string.Format( + CultureInfo.InvariantCulture, + "{0} {1} {2} {{ {3}get; {4}set; }}", + AccessibilityAndVirtual(Accessibility.ForNavigationProperty(navProp)), + navProp.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many ? ("ICollection<" + endType + ">") : endType, + _code.Escape(navProp), + _code.SpaceAfter(Accessibility.ForGetter(navProp)), + _code.SpaceAfter(Accessibility.ForSetter(navProp))); + } + + public string AccessibilityAndVirtual(string accessibility) + { + return accessibility + (accessibility != "private" ? " virtual" : ""); + } + + public string EntityClassOpening(EntityType entity) + { + return string.Format( + CultureInfo.InvariantCulture, + "{0} {1}partial class {2}{3}", + Accessibility.ForType(entity), + _code.SpaceAfter(_code.AbstractOption(entity)), + _code.Escape(entity), + _code.StringBefore(" : ", _typeMapper.GetTypeName(entity.BaseType))); + } + + public string EnumOpening(SimpleType enumType) + { + return string.Format( + CultureInfo.InvariantCulture, + "{0} enum {1} : {2}", + Accessibility.ForType(enumType), + _code.Escape(enumType), + _code.Escape(_typeMapper.UnderlyingClrType(enumType))); + } + + public void WriteFunctionParameters(EdmFunction edmFunction, Action writeParameter) + { + var parameters = FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); + foreach (var parameter in parameters.Where(p => p.NeedsLocalVariable)) + { + var isNotNull = parameter.IsNullableOfT ? parameter.FunctionParameterName + ".HasValue" : parameter.FunctionParameterName + " != null"; + var notNullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", " + parameter.FunctionParameterName + ")"; + var nullInit = "new ObjectParameter(\"" + parameter.EsqlParameterName + "\", typeof(" + TypeMapper.FixNamespaces(parameter.RawClrTypeName) + "))"; + writeParameter(parameter.LocalVariableName, isNotNull, notNullInit, nullInit); + } + } + + public string ComposableFunctionMethod(EdmFunction edmFunction, string modelNamespace) + { + var parameters = _typeMapper.GetParameters(edmFunction); + + return string.Format( + CultureInfo.InvariantCulture, + "{0} IQueryable<{1}> {2}({3})", + AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), + _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), + _code.Escape(edmFunction), + string.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray())); + } + + public string ComposableCreateQuery(EdmFunction edmFunction, string modelNamespace) + { + var parameters = _typeMapper.GetParameters(edmFunction); + + return string.Format( + CultureInfo.InvariantCulture, + "return ((IObjectContextAdapter)this).ObjectContext.CreateQuery<{0}>(\"[{1}].[{2}]({3})\"{4});", + _typeMapper.GetTypeName(_typeMapper.GetReturnType(edmFunction), modelNamespace), + edmFunction.NamespaceName, + edmFunction.Name, + string.Join(", ", parameters.Select(p => "@" + p.EsqlParameterName).ToArray()), + _code.StringBefore(", ", string.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray()))); + } + + public string FunctionMethod(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) + { + var parameters = _typeMapper.GetParameters(edmFunction); + var returnType = _typeMapper.GetReturnType(edmFunction); + + var paramList = String.Join(", ", parameters.Select(p => TypeMapper.FixNamespaces(p.FunctionParameterType) + " " + p.FunctionParameterName).ToArray()); + if (includeMergeOption) + { + paramList = _code.StringAfter(paramList, ", ") + "MergeOption mergeOption"; + } + + return string.Format( + CultureInfo.InvariantCulture, + "{0} {1} {2}({3})", + AccessibilityAndVirtual(Accessibility.ForMethod(edmFunction)), + returnType == null ? "int" : "ObjectResult<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", + _code.Escape(edmFunction), + paramList); + } + + public string ExecuteFunction(EdmFunction edmFunction, string modelNamespace, bool includeMergeOption) + { + var parameters = _typeMapper.GetParameters(edmFunction); + var returnType = _typeMapper.GetReturnType(edmFunction); + + var callParams = _code.StringBefore(", ", String.Join(", ", parameters.Select(p => p.ExecuteParameterName).ToArray())); + if (includeMergeOption) + { + callParams = ", mergeOption" + callParams; + } + + return string.Format( + CultureInfo.InvariantCulture, + "return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction{0}(\"{1}\"{2});", + returnType == null ? "" : "<" + _typeMapper.GetTypeName(returnType, modelNamespace) + ">", + edmFunction.Name, + callParams); + } + + public string DbSet(EntitySet entitySet) + { + return string.Format( + CultureInfo.InvariantCulture, + "{0} virtual DbSet<{1}> {2} {{ get; set; }}", + Accessibility.ForReadOnlyProperty(entitySet), + _typeMapper.GetTypeName(entitySet.ElementType), + _code.Escape(entitySet)); + } + + public string UsingDirectives(bool inHeader, bool includeCollections = true) + { + return inHeader == string.IsNullOrEmpty(_code.VsNamespaceSuggestion()) + ? string.Format( + CultureInfo.InvariantCulture, + "{0}using System;{1}" + + "{2}", + inHeader ? Environment.NewLine : "", + includeCollections ? (Environment.NewLine + "using System.Collections.Generic;") : "", + inHeader ? "" : Environment.NewLine) + : ""; + } +} + +public class TypeMapper +{ + private const string ExternalTypeNameAttributeName = @"http://schemas.microsoft.com/ado/2006/04/codegeneration:ExternalTypeName"; + + private readonly System.Collections.IList _errors; + private readonly CodeGenerationTools _code; + private readonly MetadataTools _ef; + + public TypeMapper(CodeGenerationTools code, MetadataTools ef, System.Collections.IList errors) + { + ArgumentNotNull(code, "code"); + ArgumentNotNull(ef, "ef"); + ArgumentNotNull(errors, "errors"); + + _code = code; + _ef = ef; + _errors = errors; + } + + public static string FixNamespaces(string typeName) + { + return typeName.Replace("System.Data.Spatial.", "System.Data.Entity.Spatial."); + } + + public string GetTypeName(TypeUsage typeUsage) + { + return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace: null); + } + + public string GetTypeName(EdmType edmType) + { + return GetTypeName(edmType, isNullable: null, modelNamespace: null); + } + + public string GetTypeName(TypeUsage typeUsage, string modelNamespace) + { + return typeUsage == null ? null : GetTypeName(typeUsage.EdmType, _ef.IsNullable(typeUsage), modelNamespace); + } + + public string GetTypeName(EdmType edmType, string modelNamespace) + { + return GetTypeName(edmType, isNullable: null, modelNamespace: modelNamespace); + } + + public string GetTypeName(EdmType edmType, bool? isNullable, string modelNamespace) + { + if (edmType == null) + { + return null; + } + + var collectionType = edmType as CollectionType; + if (collectionType != null) + { + return String.Format(CultureInfo.InvariantCulture, "ICollection<{0}>", GetTypeName(collectionType.TypeUsage, modelNamespace)); + } + + var typeName = _code.Escape(edmType.MetadataProperties + .Where(p => p.Name == ExternalTypeNameAttributeName) + .Select(p => (string)p.Value) + .FirstOrDefault()) + ?? (modelNamespace != null && edmType.NamespaceName != modelNamespace ? + _code.CreateFullName(_code.EscapeNamespace(edmType.NamespaceName), _code.Escape(edmType)) : + _code.Escape(edmType)); + + if (edmType is StructuralType) + { + return typeName; + } + + if (edmType is SimpleType) + { + var clrType = UnderlyingClrType(edmType); + if (!IsEnumType(edmType)) + { + typeName = _code.Escape(clrType); + } + + typeName = FixNamespaces(typeName); + + return clrType.IsValueType && isNullable == true ? + String.Format(CultureInfo.InvariantCulture, "Nullable<{0}>", typeName) : + typeName; + } + + throw new ArgumentException("edmType"); + } + + public Type UnderlyingClrType(EdmType edmType) + { + ArgumentNotNull(edmType, "edmType"); + + var primitiveType = edmType as PrimitiveType; + if (primitiveType != null) + { + return primitiveType.ClrEquivalentType; + } + + if (IsEnumType(edmType)) + { + return GetEnumUnderlyingType(edmType).ClrEquivalentType; + } + + return typeof(object); + } + + public object GetEnumMemberValue(MetadataItem enumMember) + { + ArgumentNotNull(enumMember, "enumMember"); + + var valueProperty = enumMember.GetType().GetProperty("Value"); + return valueProperty == null ? null : valueProperty.GetValue(enumMember, null); + } + + public string GetEnumMemberName(MetadataItem enumMember) + { + ArgumentNotNull(enumMember, "enumMember"); + + var nameProperty = enumMember.GetType().GetProperty("Name"); + return nameProperty == null ? null : (string)nameProperty.GetValue(enumMember, null); + } + + public System.Collections.IEnumerable GetEnumMembers(EdmType enumType) + { + ArgumentNotNull(enumType, "enumType"); + + var membersProperty = enumType.GetType().GetProperty("Members"); + return membersProperty != null + ? (System.Collections.IEnumerable)membersProperty.GetValue(enumType, null) + : Enumerable.Empty(); + } + + public bool EnumIsFlags(EdmType enumType) + { + ArgumentNotNull(enumType, "enumType"); + + var isFlagsProperty = enumType.GetType().GetProperty("IsFlags"); + return isFlagsProperty != null && (bool)isFlagsProperty.GetValue(enumType, null); + } + + public bool IsEnumType(GlobalItem edmType) + { + ArgumentNotNull(edmType, "edmType"); + + return edmType.GetType().Name == "EnumType"; + } + + public PrimitiveType GetEnumUnderlyingType(EdmType enumType) + { + ArgumentNotNull(enumType, "enumType"); + + return (PrimitiveType)enumType.GetType().GetProperty("UnderlyingType").GetValue(enumType, null); + } + + public string CreateLiteral(object value) + { + if (value == null || value.GetType() != typeof(TimeSpan)) + { + return _code.CreateLiteral(value); + } + + return string.Format(CultureInfo.InvariantCulture, "new TimeSpan({0})", ((TimeSpan)value).Ticks); + } + + public bool VerifyCaseInsensitiveTypeUniqueness(IEnumerable types, string sourceFile) + { + ArgumentNotNull(types, "types"); + ArgumentNotNull(sourceFile, "sourceFile"); + + var hash = new HashSet(StringComparer.InvariantCultureIgnoreCase); + if (types.Any(item => !hash.Add(item))) + { + _errors.Add( + new CompilerError(sourceFile, -1, -1, "6023", + String.Format(CultureInfo.CurrentCulture, CodeGenerationTools.GetResourceString("Template_CaseInsensitiveTypeConflict")))); + return false; + } + return true; + } + + public IEnumerable GetEnumItemsToGenerate(IEnumerable itemCollection) + { + return GetItemsToGenerate(itemCollection) + .Where(e => IsEnumType(e)); + } + + public IEnumerable GetItemsToGenerate(IEnumerable itemCollection) where T: EdmType + { + return itemCollection + .OfType() + .Where(i => !i.MetadataProperties.Any(p => p.Name == ExternalTypeNameAttributeName)) + .OrderBy(i => i.Name); + } + + public IEnumerable GetAllGlobalItems(IEnumerable itemCollection) + { + return itemCollection + .Where(i => i is EntityType || i is ComplexType || i is EntityContainer || IsEnumType(i)) + .Select(g => GetGlobalItemName(g)); + } + + public string GetGlobalItemName(GlobalItem item) + { + if (item is EdmType) + { + return ((EdmType)item).Name; + } + else + { + return ((EntityContainer)item).Name; + } + } + + public IEnumerable GetSimpleProperties(EntityType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); + } + + public IEnumerable GetSimpleProperties(ComplexType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type); + } + + public IEnumerable GetComplexProperties(EntityType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); + } + + public IEnumerable GetComplexProperties(ComplexType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is ComplexType && p.DeclaringType == type); + } + + public IEnumerable GetPropertiesWithDefaultValues(EntityType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); + } + + public IEnumerable GetPropertiesWithDefaultValues(ComplexType type) + { + return type.Properties.Where(p => p.TypeUsage.EdmType is SimpleType && p.DeclaringType == type && p.DefaultValue != null); + } + + public IEnumerable GetNavigationProperties(EntityType type) + { + return type.NavigationProperties.Where(np => np.DeclaringType == type); + } + + public IEnumerable GetCollectionNavigationProperties(EntityType type) + { + return type.NavigationProperties.Where(np => np.DeclaringType == type && np.ToEndMember.RelationshipMultiplicity == RelationshipMultiplicity.Many); + } + + public FunctionParameter GetReturnParameter(EdmFunction edmFunction) + { + ArgumentNotNull(edmFunction, "edmFunction"); + + var returnParamsProperty = edmFunction.GetType().GetProperty("ReturnParameters"); + return returnParamsProperty == null + ? edmFunction.ReturnParameter + : ((IEnumerable)returnParamsProperty.GetValue(edmFunction, null)).FirstOrDefault(); + } + + public bool IsComposable(EdmFunction edmFunction) + { + ArgumentNotNull(edmFunction, "edmFunction"); + + var isComposableProperty = edmFunction.GetType().GetProperty("IsComposableAttribute"); + return isComposableProperty != null && (bool)isComposableProperty.GetValue(edmFunction, null); + } + + public IEnumerable GetParameters(EdmFunction edmFunction) + { + return FunctionImportParameter.Create(edmFunction.Parameters, _code, _ef); + } + + public TypeUsage GetReturnType(EdmFunction edmFunction) + { + var returnParam = GetReturnParameter(edmFunction); + return returnParam == null ? null : _ef.GetElementType(returnParam.TypeUsage); + } + + public bool GenerateMergeOptionFunction(EdmFunction edmFunction, bool includeMergeOption) + { + var returnType = GetReturnType(edmFunction); + return !includeMergeOption && returnType != null && returnType.EdmType.BuiltInTypeKind == BuiltInTypeKind.EntityType; + } +} + +public static void ArgumentNotNull(T arg, string name) where T : class +{ + if (arg == null) + { + throw new ArgumentNullException(name); + } +} +#> \ No newline at end of file diff --git a/server/DAL/Sessions.cs b/server/DAL/Sessions.cs new file mode 100644 index 0000000..47c442c --- /dev/null +++ b/server/DAL/Sessions.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CircleScape.DAL +{ + using System; + using System.Collections.Generic; + + public partial class Sessions + { + public long UserId { get; set; } + public string SessionKey { get; set; } + public long IpAddress { get; set; } + + public virtual Users Users { get; set; } + } +} diff --git a/server/DAL/Users.cs b/server/DAL/Users.cs new file mode 100644 index 0000000..e8d1985 --- /dev/null +++ b/server/DAL/Users.cs @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CircleScape.DAL +{ + using System; + using System.Collections.Generic; + + public partial class Users + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public Users() + { + this.Sessions = new HashSet(); + } + + public long Id { get; set; } + public string Username { get; set; } + public string Password { get; set; } + public Nullable Joined { get; set; } + public Nullable LastLogin { get; set; } + public long JoinedIp { get; set; } + public Nullable LastIp { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection Sessions { get; set; } + } +} diff --git a/server/Database/Database.cs b/server/Database/Database.cs deleted file mode 100644 index 7650103..0000000 --- a/server/Database/Database.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CircleScape.Database { - class Database { - } -} diff --git a/server/Database/Table.cs b/server/Database/Table.cs deleted file mode 100644 index af47325..0000000 --- a/server/Database/Table.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CircleScape.Database { - class Table { - } -} diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs index 3a922c0..5b66413 100644 --- a/server/Entrypoint.cs +++ b/server/Entrypoint.cs @@ -4,11 +4,11 @@ using System.Data.SQLite; using System.Linq; using System.Text; using System.Threading.Tasks; +using CircleScape.DAL; namespace CircleScape { class Entrypoint { static void Main(string[] args) { - } } } diff --git a/server/Fodyweavers.xml b/server/Fodyweavers.xml new file mode 100644 index 0000000..67f6988 --- /dev/null +++ b/server/Fodyweavers.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/server/Websocket/Connection.cs b/server/Kneesocks/Connection.cs similarity index 96% rename from server/Websocket/Connection.cs rename to server/Kneesocks/Connection.cs index b06abe4..62b5024 100644 --- a/server/Websocket/Connection.cs +++ b/server/Kneesocks/Connection.cs @@ -5,8 +5,8 @@ using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -namespace CircleScape.Websocket { - abstract class Connection { +namespace Kneesocks { + public abstract class Connection { private TcpClient Socket; private NetworkStream Stream; diff --git a/server/Websocket/Frame.cs b/server/Kneesocks/Frame.cs similarity index 92% rename from server/Websocket/Frame.cs rename to server/Kneesocks/Frame.cs index b2c21f1..85dbdb3 100644 --- a/server/Websocket/Frame.cs +++ b/server/Kneesocks/Frame.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CircleScape.Websocket { - class Frame { +namespace Kneesocks { + public class Frame { public enum kOpcode { Continuation = 0x0, TextFrame = 0x1, diff --git a/server/Websocket/Handshake.cs b/server/Kneesocks/Handshake.cs similarity index 98% rename from server/Websocket/Handshake.cs rename to server/Kneesocks/Handshake.cs index 7fd5630..1381067 100644 --- a/server/Websocket/Handshake.cs +++ b/server/Kneesocks/Handshake.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CircleScape.Websocket { - class Handshake { +namespace Kneesocks { + public class Handshake { private const string HttpVersion = "1.1"; public enum kStatusCode { @@ -132,7 +132,7 @@ namespace CircleScape.Websocket { return this; } - public void ClearContent() { + public Handshake ClearContent() { Content = null; return this; } diff --git a/server/Kneesocks/Kneesocks.csproj b/server/Kneesocks/Kneesocks.csproj new file mode 100644 index 0000000..8d4f9a5 --- /dev/null +++ b/server/Kneesocks/Kneesocks.csproj @@ -0,0 +1,60 @@ + + + + + Debug + AnyCPU + {347353F6-CECD-4895-8717-2B5394AC71CC} + Library + Properties + Kneesocks + Kneesocks + v4.5.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/Websocket/Pool.cs b/server/Kneesocks/Pool.cs similarity index 98% rename from server/Websocket/Pool.cs rename to server/Kneesocks/Pool.cs index e507a5b..6895c76 100644 --- a/server/Websocket/Pool.cs +++ b/server/Kneesocks/Pool.cs @@ -4,8 +4,8 @@ using System.Linq; using System.Text; using System.Threading; -namespace CircleScape.Websocket { - class Pool where T : Connection { +namespace Kneesocks { + public class Pool where T : Connection { // number of threads that should be started when the pool is created // these threads will run for as long as the pool exists public int InitialCount { get; set; } = 3; diff --git a/server/Kneesocks/Properties/AssemblyInfo.cs b/server/Kneesocks/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..93e808d --- /dev/null +++ b/server/Kneesocks/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Kneesocks")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Kneesocks")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("347353f6-cecd-4895-8717-2b5394ac71cc")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/server/Database/Query.cs b/server/Kneesocks/Server.cs similarity index 71% rename from server/Database/Query.cs rename to server/Kneesocks/Server.cs index 7b159c0..a8370e6 100644 --- a/server/Database/Query.cs +++ b/server/Kneesocks/Server.cs @@ -4,7 +4,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace CircleScape.Database { - class Query { +namespace Kneesocks { + public class Server { + } } diff --git a/server/Websocket/Stack.cs b/server/Kneesocks/Stack.cs similarity index 92% rename from server/Websocket/Stack.cs rename to server/Kneesocks/Stack.cs index 06ebc1a..f85a2a8 100644 --- a/server/Websocket/Stack.cs +++ b/server/Kneesocks/Stack.cs @@ -5,8 +5,8 @@ using System.Net.Sockets; using System.Text; using System.Threading; -namespace CircleScape.Websocket { - class Stack where T : Connection { +namespace Kneesocks { + public class Stack where T : Connection { private Pool PoolRef = null; private List Clients = new List(); private Mutex ClientsMutex = new Mutex(); @@ -52,7 +52,7 @@ namespace CircleScape.Websocket { public void ManageStack() { while(Running && (Count > 0 || RunWithNoClients)) { for(var i = Count - 1; i >= 0 && Running; ++i) { - PoolRef.OnConnectionParse(Clients[i]); + Clients[i].OnParse(); } diff --git a/server/Kneesocks/Utilities.cs b/server/Kneesocks/Utilities.cs new file mode 100644 index 0000000..87d7204 --- /dev/null +++ b/server/Kneesocks/Utilities.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Kneesocks { + public static class StringExtensions { + public enum kHashReturnType { + RAW, HEX, BASE64 + } + + public static string Base64Encode(this string str, bool isUtf8 = true) { + var raw = + isUtf8 ? Encoding.UTF8.GetBytes(str) + : Encoding.ASCII.GetBytes(str); + return Convert.ToBase64String(raw); + } + + public static string Base64Decode(this string str, bool isUtf8 = true) { + var raw = Convert.FromBase64String(str); + return isUtf8 ? Encoding.UTF8.GetString(raw) + : Encoding.ASCII.GetString(raw); + } + + public static string SHA1(this string str, kHashReturnType type = kHashReturnType.RAW) { + using(var hasher = System.Security.Cryptography.SHA1.Create()) { + return ParseRawHash( + hasher.ComputeHash(Encoding.ASCII.GetBytes(str)), + type + ); + } + } + + public static string MD5(this string str, kHashReturnType type = kHashReturnType.RAW) { + using(var hasher = System.Security.Cryptography.MD5.Create()) { + return ParseRawHash( + hasher.ComputeHash(Encoding.ASCII.GetBytes(str)), + type + ); + } + } + + private static string ParseRawHash(byte[] hash, kHashReturnType type) { + var raw = Encoding.ASCII.GetString(hash); + + switch(type) { + case kHashReturnType.BASE64: + return Base64Encode(raw, false); + case kHashReturnType.HEX: + return BitConverter.ToString(hash).Replace("-", ""); + case kHashReturnType.RAW: + default: + return raw; + } + } + } +} diff --git a/server/Properties/AssemblyInfo.cs b/server/Properties/AssemblyInfo.cs index 4702e00..9d86ea7 100644 --- a/server/Properties/AssemblyInfo.cs +++ b/server/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("server")] +[assembly: AssemblyTitle("CircleScape Server")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] diff --git a/server/ActiveConnection.cs b/server/Socks/ActiveConnection.cs similarity index 84% rename from server/ActiveConnection.cs rename to server/Socks/ActiveConnection.cs index 78953a7..588f9a2 100644 --- a/server/ActiveConnection.cs +++ b/server/Socks/ActiveConnection.cs @@ -4,9 +4,10 @@ using System.Linq; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; +using Kneesocks; namespace CircleScape { - class ActiveConnection : Websocket.Connection { + class ActiveConnection : Connection { public ActiveConnection(TcpClient sock) : base(sock) { } public ActiveConnection(PendingConnection conn) : base(conn) { } diff --git a/server/PendingConnection.cs b/server/Socks/PendingConnection.cs similarity index 100% rename from server/PendingConnection.cs rename to server/Socks/PendingConnection.cs diff --git a/server/PoolManager.cs b/server/Socks/PoolManager.cs similarity index 96% rename from server/PoolManager.cs rename to server/Socks/PoolManager.cs index 3900030..a2c87c2 100644 --- a/server/PoolManager.cs +++ b/server/Socks/PoolManager.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using CircleScape.Websocket; +using Kneesocks; using System.Net.Sockets; namespace CircleScape { diff --git a/server/Websocket/Server.cs b/server/Websocket/Server.cs deleted file mode 100644 index 93560f0..0000000 --- a/server/Websocket/Server.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CircleScape.Websocket { - class Server { - - } -} diff --git a/server/packages.config b/server/packages.config index 865793e..d28215b 100644 --- a/server/packages.config +++ b/server/packages.config @@ -1,8 +1,10 @@  - - - - - + + + + + + + \ No newline at end of file diff --git a/server/scape.db b/server/scape.db index f3b9da61cb49ffabfe8c2a63cd6f905e6bf62922..2504da12d365f58efb6149179a75755513618cce 100644 GIT binary patch delta 940 zcma)5QESss6u#+fQ_>_QlM$uH-n}(5rkg_;j8VERN@|F@CAcTEj$|X!HMNNppV~}+ zfRZ2Kv-C|weD$vkMDS63F!!c6v=19TBgg?vlIw94|5BcweT)?QQC!9(7N8UiiA_M_w4c zas9xFyz_x`9bDc!(At&;t@f^=!7Fwf41~T5b<8%<{o8g*p(UhL#NvV^g2Dz`))RqSDdW!|nJTxnJLeuUZ>DdK(t?!> zbmiuHN!*i?@BFRXlF`j3>DCD5Y>=$Pf5BGqquK(S$v6J}>S|mSvIF#R z?f{imO6jcvAeNM5i*+lRfJ4oKo#YdHm(g9g15NFPs!#t^sddVp{%uuZ5iJ#`!tt*< G1^xjygdBqa delta 669 zcmZo@U}|V!njkI6%fP_E0mY0!T4$n;u`Dlx9%BSAk1_)Xw+AENTb`@DCwQlGd+_bz zG35){EGTe>i={C_mVL4hxBg@o9GSRvRo1ZJtNLP}yuYDs2ps)l-Ae!04)Lb!)( zkgGywih`|zpKG{YW{S0ftDj4wy(GK1tSns}(vV()z6cQeV qIhiG?Y@)ExmH>seF&Uw~`4>N<0b}XrKlc0zo4Fmn@-J3M5C8xW-@>{8