DTLib nuget packages, dotnet8
This commit is contained in:
@@ -4,7 +4,6 @@ using System.Net;
|
||||
using System.Net.Sockets;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using DTLib;
|
||||
using DTLib.Dtsod;
|
||||
using DTLib.Extensions;
|
||||
using DTLib.Filesystem;
|
||||
@@ -15,8 +14,9 @@ namespace launcher_server;
|
||||
|
||||
static class Server
|
||||
{
|
||||
private static ConsoleLogger Info = new("logs","info");
|
||||
private static ConsoleLogger Error = new("logs","error");
|
||||
private static ILogger logger = new CompositeLogger(
|
||||
new FileLogger("logs","launcher_server"),
|
||||
new ConsoleLogger());
|
||||
static readonly Socket mainSocket = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
|
||||
static DtsodV23 config;
|
||||
static bool debug;
|
||||
@@ -30,50 +30,49 @@ static class Server
|
||||
Console.Title = "minecraft_launcher_server";
|
||||
Console.InputEncoding = Encoding.Unicode;
|
||||
Console.OutputEncoding = Encoding.Unicode;
|
||||
PublicLog.LogEvent += Info.Log;
|
||||
DTLibInternalLogging.SetLogger(logger);
|
||||
config = new DtsodV23(File.ReadAllText("launcher-server.dtsod"));
|
||||
if (args.Contains("debug")) debug = true;
|
||||
Info.Log("b", "local address: <", "c", config["local_ip"], "b",
|
||||
">\npublic address: <", "c", OldNetwork.GetPublicIP(), "b",
|
||||
">\nport: <", "c", config["local_port"].ToString(), "b", ">");
|
||||
logger.LogInfo("Main", $"local address: {config["local_ip"]}");
|
||||
logger.LogInfo("Main", $"public address: {OldNetwork.GetPublicIP()}");
|
||||
logger.LogInfo("Main", $"port: {config["local_port"]}");
|
||||
mainSocket.Bind(new IPEndPoint(IPAddress.Parse(config["local_ip"]), config["local_port"]));
|
||||
mainSocket.Listen(1000);
|
||||
CreateManifestы();
|
||||
Info.Log("g", "server started succesfully");
|
||||
CreateManifests();
|
||||
logger.LogInfo("Main", "server started succesfully");
|
||||
// запуск отдельного потока для каждого юзера
|
||||
Info.Log("b", "waiting for users");
|
||||
logger.LogInfo("Main", "waiting for users");
|
||||
while (true)
|
||||
{
|
||||
var userSocket = mainSocket.Accept();
|
||||
var userThread = new Thread(obj => UserHandle((Socket)obj));
|
||||
var userThread = new Thread(obj => HandleUser((Socket)obj));
|
||||
userThread.Start(userSocket);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Error.Log("r", $"{ex.Message}\n{ex.StackTrace}");
|
||||
logger.LogError("Main", ex);
|
||||
mainSocket.Close();
|
||||
}
|
||||
Info.Log("gray", "");
|
||||
logger.LogInfo("Main", "");
|
||||
}
|
||||
|
||||
// запускается для каждого юзера в отдельном потоке
|
||||
static void UserHandle(Socket handlerSocket)
|
||||
static void HandleUser(Socket handlerSocket)
|
||||
{
|
||||
Info.Log("b", "user connecting... ");
|
||||
logger.LogInfo(nameof(HandleUser), "user connecting... ");
|
||||
try
|
||||
{
|
||||
// тут запрос пароля заменён запросом заглушки
|
||||
handlerSocket.SendPackage("requesting hash".ToBytes());
|
||||
var hasher = new Hasher();
|
||||
var hash = hasher.HashCycled(handlerSocket.GetPackage(), 64);
|
||||
handlerSocket.SendPackage("requesting user name");
|
||||
string connectionString = handlerSocket.GetPackage().BytesToString();
|
||||
FSP fsp = new(handlerSocket);
|
||||
FSP.debug = debug;
|
||||
// запрос от апдейтера
|
||||
if (hash.HashToString() == "39368b9c9ca9a74007acd2358fb7945cf172fc86c93969d0933e40aee6c10ca8")
|
||||
if (connectionString == "minecraft-launcher")
|
||||
{
|
||||
Info.Log("b", "user is ", "c", "updater");
|
||||
handlerSocket.SendPackage("updater".ToBytes());
|
||||
logger.LogInfo(nameof(HandleUser), "incoming connection from minecraft-launcher");
|
||||
handlerSocket.SendPackage("minecraft-launcher OK");
|
||||
// обработка запросов
|
||||
while (true)
|
||||
{
|
||||
@@ -83,39 +82,39 @@ static class Server
|
||||
switch (request)
|
||||
{
|
||||
case "requesting launcher update":
|
||||
Info.Log("c","updater", "b", " requested launcher update");
|
||||
logger.LogInfo(nameof(HandleUser), "updater requested launcher update");
|
||||
fsp.UploadFile("share\\minecraft-launcher.exe");
|
||||
break;
|
||||
case "requesting file download":
|
||||
var file = handlerSocket.GetPackage().BytesToString();
|
||||
Info.Log("b", "user ", "c","updater", "b", " requested file ", "c", file + "");
|
||||
logger.LogInfo(nameof(HandleUser), $"updater requested file {file}");
|
||||
fsp.UploadFile($"share\\{file}");
|
||||
break;
|
||||
default:
|
||||
throw new Exception("unknown request: " + request);
|
||||
}
|
||||
}
|
||||
else Thread.Sleep(10);
|
||||
else Thread.Sleep(50);
|
||||
}
|
||||
}
|
||||
// неизвестный юзер
|
||||
|
||||
Error.Log("y", $"user with hash <{hash.HashToString()}> not found");
|
||||
handlerSocket.SendPackage("user not found".ToBytes());
|
||||
logger.LogWarn(nameof(HandleUser),$"invalid connection string: '{connectionString}'");
|
||||
handlerSocket.SendPackage("invalid connection string");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Error.Log("y", $"{ex.Message}\n{ex.StackTrace}");
|
||||
logger.LogWarn(nameof(HandleUser), ex);
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (handlerSocket.Connected) handlerSocket.Shutdown(SocketShutdown.Both);
|
||||
handlerSocket.Close();
|
||||
Info.Log("g", "user disconnected");
|
||||
logger.LogInfo(nameof(HandleUser), "user disconnected");
|
||||
}
|
||||
}
|
||||
|
||||
static void CreateManifestы()
|
||||
static void CreateManifests()
|
||||
{
|
||||
lock (manifestLocker)
|
||||
{
|
||||
@@ -124,17 +123,21 @@ static class Server
|
||||
if(!Directory.Exists("share\\sync_and_remove"))
|
||||
{
|
||||
Directory.Create("share\\sync_and_remove");
|
||||
Info.Log("y", "can't create manifest, dir <share\\sync_and_remove> doesn't exist");
|
||||
logger.LogInfo(nameof(CreateManifests), "can't create manifest, dir <share\\sync_and_remove> doesn't exist");
|
||||
}
|
||||
else foreach (string dir in Directory.GetDirectories("share\\sync_and_remove"))
|
||||
FSP.CreateManifest(dir);
|
||||
if(Directory.GetDirectories("share\\sync_and_remove").Length==0)
|
||||
File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod", "dirs: [ ];");
|
||||
else File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod",
|
||||
"dirs: [\""
|
||||
+Directory.GetDirectories("share\\sync_and_remove")
|
||||
.MergeToString("\", \"").Replace("share\\sync_and_remove\\", "")
|
||||
+"\"];");
|
||||
else
|
||||
{
|
||||
File.WriteAllText("share\\sync_and_remove\\dirlist.dtsod",
|
||||
"dirs: [\""
|
||||
+ Directory.GetDirectories("share\\sync_and_remove")
|
||||
.MergeToString("\", \"")
|
||||
.Replace("share\\sync_and_remove\\", "")
|
||||
+ "\"];");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>disable</Nullable>
|
||||
<OutputType>Exe</OutputType>
|
||||
@@ -8,14 +8,14 @@
|
||||
<AssemblyName>minecraft-launcher-server</AssemblyName>
|
||||
<ApplicationIcon>launcher.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\DTLib\DTLib.Network\DTLib.Network.csproj" />
|
||||
<ProjectReference Include="..\..\..\DTLib\DTLib.Dtsod\DTLib.Dtsod.csproj" />
|
||||
<ProjectReference Include="..\..\..\DTLib\DTLib\DTLib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Update="launcher-server.dtsod">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DTLib.Dtsod" Version="1.3.0" />
|
||||
<PackageReference Include="DTLib.Logging" Version="1.3.0" />
|
||||
<PackageReference Include="DTLib.Network" Version="1.3.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user