diff --git a/AyCode.Core.Server/AyCode.Core.Server.csproj b/AyCode.Core.Server/AyCode.Core.Server.csproj index a113558..6b4f0a1 100644 --- a/AyCode.Core.Server/AyCode.Core.Server.csproj +++ b/AyCode.Core.Server/AyCode.Core.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Core.Tests.Internal/AyCode.Core.Tests.Internal.csproj b/AyCode.Core.Tests.Internal/AyCode.Core.Tests.Internal.csproj index eed753f..2696a5d 100644 --- a/AyCode.Core.Tests.Internal/AyCode.Core.Tests.Internal.csproj +++ b/AyCode.Core.Tests.Internal/AyCode.Core.Tests.Internal.csproj @@ -7,6 +7,7 @@ false true + Debug;Release;Product diff --git a/AyCode.Core.Tests/AyCode.Core.Tests.csproj b/AyCode.Core.Tests/AyCode.Core.Tests.csproj index 46f456b..fe3d266 100644 --- a/AyCode.Core.Tests/AyCode.Core.Tests.csproj +++ b/AyCode.Core.Tests/AyCode.Core.Tests.csproj @@ -7,6 +7,7 @@ false true + Debug;Release;Product diff --git a/AyCode.Core.sln b/AyCode.Core.sln index 7edeef5..6374196 100644 --- a/AyCode.Core.sln +++ b/AyCode.Core.sln @@ -42,75 +42,107 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Product|Any CPU = Product|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Product|Any CPU.ActiveCfg = Product|Any CPU + {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Product|Any CPU.Build.0 = Product|Any CPU {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU {8CCC4969-7306-4747-8A58-80AC5A062EE1}.Release|Any CPU.Build.0 = Release|Any CPU {A2105535-1397-4307-B61B-E49C983353B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A2105535-1397-4307-B61B-E49C983353B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2105535-1397-4307-B61B-E49C983353B9}.Product|Any CPU.ActiveCfg = Product|Any CPU + {A2105535-1397-4307-B61B-E49C983353B9}.Product|Any CPU.Build.0 = Product|Any CPU {A2105535-1397-4307-B61B-E49C983353B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2105535-1397-4307-B61B-E49C983353B9}.Release|Any CPU.Build.0 = Release|Any CPU {FB027D80-8949-403B-9A86-8E99F305016E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FB027D80-8949-403B-9A86-8E99F305016E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB027D80-8949-403B-9A86-8E99F305016E}.Product|Any CPU.ActiveCfg = Product|Any CPU + {FB027D80-8949-403B-9A86-8E99F305016E}.Product|Any CPU.Build.0 = Product|Any CPU {FB027D80-8949-403B-9A86-8E99F305016E}.Release|Any CPU.ActiveCfg = Release|Any CPU {FB027D80-8949-403B-9A86-8E99F305016E}.Release|Any CPU.Build.0 = Release|Any CPU {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Product|Any CPU.ActiveCfg = Product|Any CPU + {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Product|Any CPU.Build.0 = Product|Any CPU {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Release|Any CPU.ActiveCfg = Release|Any CPU {CAB60420-9F66-42D9-B67E-8E837DBA1F30}.Release|Any CPU.Build.0 = Release|Any CPU {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Product|Any CPU.ActiveCfg = Product|Any CPU + {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Product|Any CPU.Build.0 = Product|Any CPU {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Release|Any CPU.ActiveCfg = Release|Any CPU {DC42F79D-EEF0-4F32-8608-230F24C6F22A}.Release|Any CPU.Build.0 = Release|Any CPU {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Product|Any CPU.ActiveCfg = Product|Any CPU + {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Product|Any CPU.Build.0 = Product|Any CPU {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Release|Any CPU.ActiveCfg = Release|Any CPU {0B5AC35E-3E71-42DC-B503-80D6D3089F91}.Release|Any CPU.Build.0 = Release|Any CPU {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Product|Any CPU.ActiveCfg = Product|Any CPU + {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Product|Any CPU.Build.0 = Product|Any CPU {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Release|Any CPU.ActiveCfg = Release|Any CPU {F8ECCA33-B5EA-490D-B1A1-D33B5E4238A5}.Release|Any CPU.Build.0 = Release|Any CPU {35D47907-CE4F-435B-823E-A02BE59C16D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35D47907-CE4F-435B-823E-A02BE59C16D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35D47907-CE4F-435B-823E-A02BE59C16D7}.Product|Any CPU.ActiveCfg = Product|Any CPU + {35D47907-CE4F-435B-823E-A02BE59C16D7}.Product|Any CPU.Build.0 = Product|Any CPU {35D47907-CE4F-435B-823E-A02BE59C16D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {35D47907-CE4F-435B-823E-A02BE59C16D7}.Release|Any CPU.Build.0 = Release|Any CPU {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Product|Any CPU.ActiveCfg = Product|Any CPU + {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Product|Any CPU.Build.0 = Product|Any CPU {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {EBC6371C-9454-473D-9547-DF9DECEB2D2A}.Release|Any CPU.Build.0 = Release|Any CPU {15272F57-771E-47BE-A960-AD75935254D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15272F57-771E-47BE-A960-AD75935254D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15272F57-771E-47BE-A960-AD75935254D0}.Product|Any CPU.ActiveCfg = Product|Any CPU {15272F57-771E-47BE-A960-AD75935254D0}.Release|Any CPU.ActiveCfg = Release|Any CPU {320A245F-6731-476D-A9D8-77888E6B5D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {320A245F-6731-476D-A9D8-77888E6B5D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {320A245F-6731-476D-A9D8-77888E6B5D9C}.Product|Any CPU.ActiveCfg = Product|Any CPU {320A245F-6731-476D-A9D8-77888E6B5D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU {21392620-7D0E-44B6-9485-93C57F944C20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21392620-7D0E-44B6-9485-93C57F944C20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21392620-7D0E-44B6-9485-93C57F944C20}.Product|Any CPU.ActiveCfg = Product|Any CPU + {21392620-7D0E-44B6-9485-93C57F944C20}.Product|Any CPU.Build.0 = Product|Any CPU {21392620-7D0E-44B6-9485-93C57F944C20}.Release|Any CPU.ActiveCfg = Release|Any CPU {21392620-7D0E-44B6-9485-93C57F944C20}.Release|Any CPU.Build.0 = Release|Any CPU {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Product|Any CPU.ActiveCfg = Product|Any CPU + {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Product|Any CPU.Build.0 = Product|Any CPU {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {58C8A6A7-D624-4E32-93B9-16B879405CAA}.Release|Any CPU.Build.0 = Release|Any CPU {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Product|Any CPU.ActiveCfg = Product|Any CPU + {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Product|Any CPU.Build.0 = Product|Any CPU {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Release|Any CPU.ActiveCfg = Release|Any CPU {44CF90C8-76E4-4BD6-A957-E8F7AE019B06}.Release|Any CPU.Build.0 = Release|Any CPU {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Product|Any CPU.ActiveCfg = Product|Any CPU + {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Product|Any CPU.Build.0 = Product|Any CPU {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C74C94F-2FEB-47F7-ABB3-B0C9CBCCC876}.Release|Any CPU.Build.0 = Release|Any CPU {9AC9AF60-280A-4871-A7FA-69AB4D0C858A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9AC9AF60-280A-4871-A7FA-69AB4D0C858A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9AC9AF60-280A-4871-A7FA-69AB4D0C858A}.Product|Any CPU.ActiveCfg = Product|Any CPU {9AC9AF60-280A-4871-A7FA-69AB4D0C858A}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Product|Any CPU.ActiveCfg = Product|Any CPU {DE2DD6A4-A906-4BA6-8AAA-2A0433DF523F}.Release|Any CPU.ActiveCfg = Release|Any CPU {73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Product|Any CPU.ActiveCfg = Product|Any CPU {73261A8C-FB41-4C4C-90D4-ED5EEC991413}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/AyCode.Core/AcDomain.cs b/AyCode.Core/AcDomain.cs new file mode 100644 index 0000000..3ffe100 --- /dev/null +++ b/AyCode.Core/AcDomain.cs @@ -0,0 +1,79 @@ +namespace AyCode.Core +{ + /// + /// Singleton! + /// + public sealed class AcDomain + { + private readonly object _forLock = new(); + private static readonly AcDomain Instance = new(); + + private int _uniqueInt32; + private long _uniqueInt64; + + private string _processName; + public string ProcessName => Instance._processName; + + static AcDomain() + { } + + private AcDomain() + { + //AppDomain.CurrentDomain.UnhandledException += (sender, args) => + //{ + // var ex = (Exception) args?.ExceptionObject; + + // if (ex == null) Instance._logger.Error($"GLOBAL EXCEPTION"); + // else Instance._logger.Error($"GLOBAL EXCEPTION{Env.NL}{ex.Message}{Env.NL}{sender}", ex); + //}; + + //_processName = System.Diagnostics.Process.GetCurrentProcess()?.ProcessName ?? "Unknown ProcessName"; + } + + public static bool IsDeveloperVersion + { + get + { + #if Product + { + return false; + } + #endif + + return true; + } + } + + public static bool IsProductVersion + { + get + { + #if Product + { + return true; + } + #endif + + return false; + } + } + + //public static string CdnBaseUrl => IsProductVersion ? "https://cdn2.anataworld.com/" : "https://cdn2.anataworld.com/"; + + + /// + /// + /// + /// + /// (int)(multiplier * Environment.ProcessorCount), but minimum: 1 + public static int ProcessorCount(double multiplier = 1) + { + var pCount = (int)(multiplier * Environment.ProcessorCount); + + return pCount > 0 ? pCount : ++pCount; + } + + public static int NextUniqueInt32 => Interlocked.Increment(ref Instance._uniqueInt32); + public static long NextUniqueInt64 => Interlocked.Increment(ref Instance._uniqueInt64); + } +} \ No newline at end of file diff --git a/AyCode.Core/AyCode.Core.csproj b/AyCode.Core/AyCode.Core.csproj index 045dbf2..a7005ad 100644 --- a/AyCode.Core/AyCode.Core.csproj +++ b/AyCode.Core/AyCode.Core.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Core/Extensions/SerializeObjectExtensions.cs b/AyCode.Core/Extensions/SerializeObjectExtensions.cs index 4607b9b..7540924 100644 --- a/AyCode.Core/Extensions/SerializeObjectExtensions.cs +++ b/AyCode.Core/Extensions/SerializeObjectExtensions.cs @@ -24,6 +24,6 @@ public static class SerializeObjectExtensions public static byte[] ToMessagePack(this object message) => MessagePackSerializer.Serialize(message); public static byte[] ToMessagePack(this object message, MessagePackSerializerOptions options) => MessagePackSerializer.Serialize(message, options); - public static T? MessagePackTo(this byte[] message) => MessagePackSerializer.Deserialize(message); - public static T? MessagePackTo(this byte[] message, MessagePackSerializerOptions options) => MessagePackSerializer.Deserialize(message, options); + public static T MessagePackTo(this byte[] message) => MessagePackSerializer.Deserialize(message); + public static T MessagePackTo(this byte[] message, MessagePackSerializerOptions options) => MessagePackSerializer.Deserialize(message, options); } \ No newline at end of file diff --git a/AyCode.Core/Helpers/AcCharGenerator.cs b/AyCode.Core/Helpers/AcCharGenerator.cs new file mode 100644 index 0000000..8062a50 --- /dev/null +++ b/AyCode.Core/Helpers/AcCharGenerator.cs @@ -0,0 +1,40 @@ +using AyCode.Core.Consts; + +namespace AyCode.Core.Helpers +{ + public static class AcCharGenerator + { + public static readonly char[] Letters; + public static readonly char[] Numbers; + public static readonly char[] LettersAndNumbers; + + static AcCharGenerator() + { + //"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" + + Numbers = "0123456789".ToCharArray(); + Letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray(); + + LettersAndNumbers = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray(); + } + + private static char[] GetRandomChars() => GetRandomChars(LettersAndNumbers, 8, 12); + private static char[] GetRandomChars(int length) => GetRandomChars(LettersAndNumbers, length, length); + private static char[] GetRandomChars(int minLength, int maxLength) => GetRandomChars(LettersAndNumbers, minLength, maxLength); + private static char[] GetRandomChars(char[] sourceChars, int minLength, int maxLength) + { + var random = new Random(); + return Enumerable.Repeat(sourceChars, random.Next(minLength, maxLength)).Select(s => s[random.Next(s.Length)]).ToArray(); + } + + public static string NewToken() + { + return new string(GetRandomChars(AcConst.MinUserTokenLength, AcConst.MaxUserTokenLength)); + } + + public static string NewPassword() + { + return new string(GetRandomChars(AcConst.MinPasswordLength, AcConst.MaxPasswordLength)); + } + } +} \ No newline at end of file diff --git a/AyCode.Core/Loggers/AcLogWriterBase.cs b/AyCode.Core/Loggers/AcLogWriterBase.cs index bf224a3..ff5a360 100644 --- a/AyCode.Core/Loggers/AcLogWriterBase.cs +++ b/AyCode.Core/Loggers/AcLogWriterBase.cs @@ -43,35 +43,35 @@ public abstract class AcLogWriterBase : IAcLogWriterBase [Conditional("DEBUG")] public void DetailConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Detail(text, memberName, categoryName); + => Detail(text, categoryName, memberName); public void Debug(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) => Write(AppType, LogLevel.Debug, text, memberName, categoryName ?? CategoryName); [Conditional("DEBUG")] public void DebugConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Debug(text, memberName, categoryName); + => Debug(text, categoryName, memberName); public void Info(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) => Write(AppType, LogLevel.Info, text, memberName, categoryName ?? CategoryName); [Conditional("DEBUG")] public void InfoConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Info(text, memberName, categoryName); + => Info(text, categoryName, memberName); public void Warning(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) => Write(AppType, LogLevel.Warning, text, memberName, categoryName ?? CategoryName); [Conditional("DEBUG")] public void WarningConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Warning(text, memberName, categoryName); + => Warning(text, categoryName, memberName); public void Suggest(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) => Write(AppType, LogLevel.Suggest, text, memberName, categoryName ?? CategoryName); [Conditional("DEBUG")] public void SuggestConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Suggest(text, memberName, categoryName); + => Suggest(text, categoryName, memberName); public void Error(string? text, Exception? ex = null, string? categoryName = null, [CallerMemberName] string? memberName = null) => Write(AppType, LogLevel.Error, text, memberName, categoryName ?? CategoryName, ex); diff --git a/AyCode.Core/Loggers/AcLoggerBase.cs b/AyCode.Core/Loggers/AcLoggerBase.cs index 7527e37..ff01c23 100644 --- a/AyCode.Core/Loggers/AcLoggerBase.cs +++ b/AyCode.Core/Loggers/AcLoggerBase.cs @@ -62,7 +62,7 @@ public abstract class AcLoggerBase : IAcLoggerBase [Conditional("DEBUG")] public void DetailConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Detail(text, memberName, categoryName); + => Detail(text, categoryName, memberName); public virtual void Debug(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) { @@ -71,7 +71,7 @@ public abstract class AcLoggerBase : IAcLoggerBase [Conditional("DEBUG")] public void DebugConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Debug(text, memberName, categoryName); + => Debug(text, categoryName, memberName); public virtual void Info(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) { @@ -80,7 +80,7 @@ public abstract class AcLoggerBase : IAcLoggerBase [Conditional("DEBUG")] public void InfoConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Info(text, memberName, categoryName); + => Info(text, categoryName, memberName); public virtual void Warning(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) { @@ -89,7 +89,7 @@ public abstract class AcLoggerBase : IAcLoggerBase [Conditional("DEBUG")] public void WarningConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Warning(text, memberName, categoryName); + => Warning(text, categoryName, memberName); public virtual void Suggest(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) { @@ -98,7 +98,7 @@ public abstract class AcLoggerBase : IAcLoggerBase [Conditional("DEBUG")] public void SuggestConditional(string? text, string? categoryName = null, [CallerMemberName] string? memberName = null) - => Suggest(text, memberName, categoryName); + => Suggest(text, categoryName, memberName); public virtual void Error(string? text, Exception? ex = null, string? categoryName = null, [CallerMemberName] string? memberName = null) { diff --git a/AyCode.Database.Tests.Internal/AyCode.Database.Tests.Internal.csproj b/AyCode.Database.Tests.Internal/AyCode.Database.Tests.Internal.csproj index 8693fa6..b1778d2 100644 --- a/AyCode.Database.Tests.Internal/AyCode.Database.Tests.Internal.csproj +++ b/AyCode.Database.Tests.Internal/AyCode.Database.Tests.Internal.csproj @@ -7,6 +7,7 @@ false true + Debug;Release;Product diff --git a/AyCode.Database.Tests/AyCode.Database.Tests.csproj b/AyCode.Database.Tests/AyCode.Database.Tests.csproj index 44886bc..d3873e6 100644 --- a/AyCode.Database.Tests/AyCode.Database.Tests.csproj +++ b/AyCode.Database.Tests/AyCode.Database.Tests.csproj @@ -7,6 +7,7 @@ false true + Debug;Release;Product diff --git a/AyCode.Database/AyCode.Database.csproj b/AyCode.Database/AyCode.Database.csproj index 81932ad..74f3457 100644 --- a/AyCode.Database/AyCode.Database.csproj +++ b/AyCode.Database/AyCode.Database.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Entities.Server/AyCode.Entities.Server.csproj b/AyCode.Entities.Server/AyCode.Entities.Server.csproj index 4cd69d2..85e9a0e 100644 --- a/AyCode.Entities.Server/AyCode.Entities.Server.csproj +++ b/AyCode.Entities.Server/AyCode.Entities.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Entities/AyCode.Entities.csproj b/AyCode.Entities/AyCode.Entities.csproj index 370e3ce..a575837 100644 --- a/AyCode.Entities/AyCode.Entities.csproj +++ b/AyCode.Entities/AyCode.Entities.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Interfaces.Server/AyCode.Interfaces.Server.csproj b/AyCode.Interfaces.Server/AyCode.Interfaces.Server.csproj index 8bb0da8..508b026 100644 --- a/AyCode.Interfaces.Server/AyCode.Interfaces.Server.csproj +++ b/AyCode.Interfaces.Server/AyCode.Interfaces.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Interfaces/AyCode.Interfaces.csproj b/AyCode.Interfaces/AyCode.Interfaces.csproj index ef82ca1..b49ba65 100644 --- a/AyCode.Interfaces/AyCode.Interfaces.csproj +++ b/AyCode.Interfaces/AyCode.Interfaces.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Models.Server/AyCode.Models.Server.csproj b/AyCode.Models.Server/AyCode.Models.Server.csproj index 5b62685..e0946ae 100644 --- a/AyCode.Models.Server/AyCode.Models.Server.csproj +++ b/AyCode.Models.Server/AyCode.Models.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Models/AyCode.Models.csproj b/AyCode.Models/AyCode.Models.csproj index 86295b3..5de7b46 100644 --- a/AyCode.Models/AyCode.Models.csproj +++ b/AyCode.Models/AyCode.Models.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Services.Server.Tests/AyCode.Services.Server.Tests.csproj b/AyCode.Services.Server.Tests/AyCode.Services.Server.Tests.csproj index fe4ca76..82dbd6a 100644 --- a/AyCode.Services.Server.Tests/AyCode.Services.Server.Tests.csproj +++ b/AyCode.Services.Server.Tests/AyCode.Services.Server.Tests.csproj @@ -7,6 +7,7 @@ false true + Debug;Release;Product diff --git a/AyCode.Services.Server/AyCode.Services.Server.csproj b/AyCode.Services.Server/AyCode.Services.Server.csproj index efaa724..4a8fc5a 100644 --- a/AyCode.Services.Server/AyCode.Services.Server.csproj +++ b/AyCode.Services.Server/AyCode.Services.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Services.Server/SignalRs/IAcSignalRHubItemServer.cs b/AyCode.Services.Server/SignalRs/IAcSignalRHubItemServer.cs new file mode 100644 index 0000000..bc50e9c --- /dev/null +++ b/AyCode.Services.Server/SignalRs/IAcSignalRHubItemServer.cs @@ -0,0 +1,13 @@ +using AyCode.Services.SignalRs; + +namespace AyCode.Services.Server.SignalRs; + +public interface IAcSignalRHubItemServer : IAcSignalRHubBase +{ + //string ConnectionId { get; set; } + //string? UserIdentifier { get; set; } +} + +public interface IAcSignalRHubServer : IAcSignalRHubBase //: IAcSignalRHubBase +{ +} \ No newline at end of file diff --git a/AyCode.Services.Server/SignalRs/IAcSignalRHubServer.cs b/AyCode.Services.Server/SignalRs/IAcSignalRHubServer.cs deleted file mode 100644 index f45e5d8..0000000 --- a/AyCode.Services.Server/SignalRs/IAcSignalRHubServer.cs +++ /dev/null @@ -1,7 +0,0 @@ -using AyCode.Services.SignalRs; - -namespace AyCode.Services.Server.SignalRs; - -public interface IAcSignalRHubServer : IAcSignalRHubBase -{ -} \ No newline at end of file diff --git a/AyCode.Services/AyCode.Services.csproj b/AyCode.Services/AyCode.Services.csproj index 070b8e8..1159a33 100644 --- a/AyCode.Services/AyCode.Services.csproj +++ b/AyCode.Services/AyCode.Services.csproj @@ -4,10 +4,12 @@ net8.0 enable enable + Debug;Release;Product + diff --git a/AyCode.Services/SignalRs/IAcSignalRHubBase.cs b/AyCode.Services/SignalRs/IAcSignalRHubBase.cs index bcd587a..6ad9fb9 100644 --- a/AyCode.Services/SignalRs/IAcSignalRHubBase.cs +++ b/AyCode.Services/SignalRs/IAcSignalRHubBase.cs @@ -2,10 +2,13 @@ public interface IAcSignalRHubClient : IAcSignalRHubBase { + Task SendMessageToServerAsync(int messageTag, object message, int? requestId ); + Task SendRequestToServerAsync(int messageTag, int requestId); + } public interface IAcSignalRHubBase { - Task Send(string user, int messageTag, object? message); - Task MessageReceived(string user, int messageTag, byte[]? message); + Task OnRequestMessage(int messageTag, int requesrId); + Task OnReceiveMessage(int messageTag, byte[] message, int? requestId); } \ No newline at end of file diff --git a/AyCode.Utils.Server/AyCode.Utils.Server.csproj b/AyCode.Utils.Server/AyCode.Utils.Server.csproj index 30402ac..ce102a4 100644 --- a/AyCode.Utils.Server/AyCode.Utils.Server.csproj +++ b/AyCode.Utils.Server/AyCode.Utils.Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product diff --git a/AyCode.Utils/AyCode.Utils.csproj b/AyCode.Utils/AyCode.Utils.csproj index b26949a..b939e32 100644 --- a/AyCode.Utils/AyCode.Utils.csproj +++ b/AyCode.Utils/AyCode.Utils.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + Debug;Release;Product