spllitted DTLib to 3 projects
This commit is contained in:
28
DTLib.Network/DTLib.Network.csproj
Normal file
28
DTLib.Network/DTLib.Network.csproj
Normal file
@@ -0,0 +1,28 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0;net48</TargetFrameworks>
|
||||
<LangVersion>10</LangVersion>
|
||||
<ImplicitUsings>disable</ImplicitUsings>
|
||||
<Nullable>disable</Nullable>
|
||||
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
|
||||
<DebugType>portable</DebugType>
|
||||
<Configurations>Debug;Release;Release-net48</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\DTLib.Dtsod\DTLib.Dtsod.csproj" />
|
||||
<ProjectReference Include="..\DTLib\DTLib.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release-net48' ">
|
||||
<TargetFramework>net48</TargetFramework>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Dynamic" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
205
DTLib.Network/FSP.cs
Normal file
205
DTLib.Network/FSP.cs
Normal file
@@ -0,0 +1,205 @@
|
||||
using DTLib.Dtsod;
|
||||
|
||||
namespace DTLib.Network;
|
||||
|
||||
//
|
||||
// передача файлов по сети
|
||||
//
|
||||
public class FSP
|
||||
{
|
||||
Socket MainSocket { get; init; }
|
||||
public static bool debug = false;
|
||||
public FSP(Socket _mainSocket) => MainSocket = _mainSocket;
|
||||
|
||||
public uint BytesDownloaded = 0;
|
||||
public uint BytesUploaded = 0;
|
||||
public uint Filesize = 0;
|
||||
|
||||
// скачивает файл с помощью FSP протокола
|
||||
public void DownloadFile(string filePath_server, string filePath_client)
|
||||
{
|
||||
lock (MainSocket)
|
||||
{
|
||||
Debug("b", $"requesting file download: {filePath_server}");
|
||||
MainSocket.SendPackage("requesting file download".ToBytes());
|
||||
MainSocket.SendPackage(filePath_server.ToBytes());
|
||||
}
|
||||
DownloadFile(filePath_client);
|
||||
}
|
||||
|
||||
public void DownloadFile(string filePath_client)
|
||||
{
|
||||
using System.IO.Stream fileStream = File.OpenWrite(filePath_client);
|
||||
Download_SharedCode(fileStream, true);
|
||||
fileStream.Close();
|
||||
Debug("g", $" downloaded {BytesDownloaded} of {Filesize} bytes");
|
||||
}
|
||||
|
||||
public byte[] DownloadFileToMemory(string filePath_server)
|
||||
{
|
||||
lock (MainSocket)
|
||||
{
|
||||
Debug("b", $"requesting file download: {filePath_server}");
|
||||
MainSocket.SendPackage("requesting file download".ToBytes());
|
||||
MainSocket.SendPackage(filePath_server.ToBytes());
|
||||
}
|
||||
return DownloadFileToMemory();
|
||||
}
|
||||
|
||||
public byte[] DownloadFileToMemory()
|
||||
{
|
||||
using var fileStream = new System.IO.MemoryStream();
|
||||
Download_SharedCode(fileStream, false);
|
||||
byte[] output = fileStream.GetBuffer();
|
||||
fileStream.Close();
|
||||
Debug("g", $" downloaded {BytesDownloaded} of {Filesize} bytes");
|
||||
return output;
|
||||
}
|
||||
|
||||
void Download_SharedCode(System.IO.Stream fileStream, bool requiresFlushing)
|
||||
{
|
||||
lock (MainSocket)
|
||||
{
|
||||
BytesDownloaded = 0;
|
||||
Filesize = MainSocket.GetPackage().BytesToString().ToUInt();
|
||||
MainSocket.SendPackage("ready".ToBytes());
|
||||
int packagesCount = 0;
|
||||
byte[] buffer = new byte[5120];
|
||||
int fullPackagesCount = (Filesize / buffer.Length).Truncate();
|
||||
// получение полных пакетов файла
|
||||
for (byte n = 0; packagesCount < fullPackagesCount; packagesCount++)
|
||||
{
|
||||
buffer = MainSocket.GetPackage();
|
||||
BytesDownloaded += (uint)buffer.Length;
|
||||
fileStream.Write(buffer, 0, buffer.Length);
|
||||
if (requiresFlushing)
|
||||
{
|
||||
if (n == 100)
|
||||
{
|
||||
fileStream.Flush();
|
||||
n = 0;
|
||||
}
|
||||
else
|
||||
n++;
|
||||
}
|
||||
}
|
||||
// получение остатка
|
||||
if ((Filesize - fileStream.Position) > 0)
|
||||
{
|
||||
MainSocket.SendPackage("remain request".ToBytes());
|
||||
buffer = MainSocket.GetPackage();
|
||||
BytesDownloaded += (uint)buffer.Length;
|
||||
fileStream.Write(buffer, 0, buffer.Length);
|
||||
}
|
||||
}
|
||||
if (requiresFlushing)
|
||||
fileStream.Flush();
|
||||
}
|
||||
|
||||
// отдаёт файл с помощью FSP протокола
|
||||
public void UploadFile(string filePath)
|
||||
{
|
||||
BytesUploaded = 0;
|
||||
Debug("b", $"uploading file {filePath}");
|
||||
using System.IO.FileStream fileStream = File.OpenRead(filePath);
|
||||
Filesize = File.GetSize(filePath).ToUInt();
|
||||
lock (MainSocket)
|
||||
{
|
||||
MainSocket.SendPackage(Filesize.ToString().ToBytes());
|
||||
MainSocket.GetAnswer("ready");
|
||||
byte[] buffer = new byte[5120];
|
||||
int packagesCount = 0;
|
||||
int fullPackagesCount = (Filesize / buffer.Length).Truncate();
|
||||
// отправка полных пакетов файла
|
||||
for (; packagesCount < fullPackagesCount; packagesCount++)
|
||||
{
|
||||
fileStream.Read(buffer, 0, buffer.Length);
|
||||
MainSocket.SendPackage(buffer);
|
||||
BytesUploaded += (uint)buffer.Length;
|
||||
}
|
||||
// отправка остатка
|
||||
if ((Filesize - fileStream.Position) > 0)
|
||||
{
|
||||
MainSocket.GetAnswer("remain request");
|
||||
buffer = new byte[(Filesize - fileStream.Position).ToInt()];
|
||||
fileStream.Read(buffer, 0, buffer.Length);
|
||||
MainSocket.SendPackage(buffer);
|
||||
BytesUploaded += (uint)buffer.Length;
|
||||
}
|
||||
}
|
||||
fileStream.Close();
|
||||
Debug("g", $" uploaded {BytesUploaded} of {Filesize} bytes");
|
||||
}
|
||||
|
||||
public void DownloadByManifest(string dirOnServer, string dirOnClient, bool overwrite = false, bool delete_excess = false)
|
||||
{
|
||||
if (!dirOnClient.EndsWith("\\"))
|
||||
dirOnClient += "\\";
|
||||
if (!dirOnServer.EndsWith("\\"))
|
||||
dirOnServer += "\\";
|
||||
Debug("b", "downloading manifest <", "c", dirOnServer + "manifest.dtsod", "b", ">");
|
||||
var manifest = new DtsodV23(DownloadFileToMemory(dirOnServer + "manifest.dtsod").BytesToString());
|
||||
Debug("g", $"found {manifest.Values.Count} files in manifest");
|
||||
var hasher = new Hasher();
|
||||
foreach (string fileOnServer in manifest.Keys)
|
||||
{
|
||||
string fileOnClient = dirOnClient + fileOnServer;
|
||||
Debug("b", "file <", "c", fileOnClient, "b", ">... ");
|
||||
if (!File.Exists(fileOnClient))
|
||||
{
|
||||
DebugNoTime("y", "doesn't exist");
|
||||
DownloadFile(dirOnServer + fileOnServer, fileOnClient);
|
||||
}
|
||||
else if (overwrite && hasher.HashFile(fileOnClient).HashToString() != manifest[fileOnServer])
|
||||
{
|
||||
DebugNoTime("y", "outdated");
|
||||
DownloadFile(dirOnServer + fileOnServer, fileOnClient);
|
||||
}
|
||||
else
|
||||
DebugNoTime("g", "without changes");
|
||||
}
|
||||
// удаление лишних файлов
|
||||
if (delete_excess)
|
||||
{
|
||||
foreach (string file in Directory.GetAllFiles(dirOnClient))
|
||||
{
|
||||
if (!manifest.ContainsKey(file.Remove(0, dirOnClient.Length)))
|
||||
{
|
||||
Debug("y", $"deleting excess file: {file}");
|
||||
File.Delete(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void CreateManifest(string dir)
|
||||
{
|
||||
if (!dir.EndsWith("\\"))
|
||||
dir += "\\";
|
||||
Log($"b", $"creating manifest of {dir}");
|
||||
StringBuilder manifestBuilder = new();
|
||||
Hasher hasher = new();
|
||||
if (Directory.GetFiles(dir).Contains(dir + "manifest.dtsod"))
|
||||
File.Delete(dir + "manifest.dtsod");
|
||||
foreach (string _file in Directory.GetAllFiles(dir))
|
||||
{
|
||||
string file = _file.Remove(0, dir.Length);
|
||||
manifestBuilder.Append(file);
|
||||
manifestBuilder.Append(": \"");
|
||||
byte[] hash = hasher.HashFile(dir + file);
|
||||
manifestBuilder.Append(hash.HashToString());
|
||||
manifestBuilder.Append("\";\n");
|
||||
}
|
||||
Debug($"g", $" manifest of {dir} created");
|
||||
File.WriteAllText(dir + "manifest.dtsod", manifestBuilder.ToString());
|
||||
}
|
||||
|
||||
static void Debug(params string[] msg)
|
||||
{
|
||||
if (debug) Log(msg);
|
||||
}
|
||||
static void DebugNoTime(params string[] msg)
|
||||
{
|
||||
if (debug) LogNoTime(msg);
|
||||
}
|
||||
}
|
||||
7
DTLib.Network/FrameworkFix.cs
Normal file
7
DTLib.Network/FrameworkFix.cs
Normal file
@@ -0,0 +1,7 @@
|
||||
using System.ComponentModel;
|
||||
|
||||
// включает init и record из c# 9.0
|
||||
namespace System.Runtime.CompilerServices;
|
||||
|
||||
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||
public class IsExternalInit { }
|
||||
40
DTLib.Network/OldNetwork.cs
Normal file
40
DTLib.Network/OldNetwork.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
global using System.Net.Sockets;
|
||||
global using System;
|
||||
global using System.Threading;
|
||||
global using System.Collections.Generic;
|
||||
global using System.Text;
|
||||
global using DTLib.Extensions;
|
||||
global using DTLib.Filesystem;
|
||||
global using static DTLib.PublicLog;
|
||||
using System.Diagnostics;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace DTLib.Network;
|
||||
|
||||
//
|
||||
// пара почти никогда не используемых методов
|
||||
//
|
||||
public static class OldNetwork
|
||||
{
|
||||
|
||||
|
||||
// получает с сайта публичный ip
|
||||
public static string GetPublicIP() => new HttpClient().GetStringAsync("https://ifconfig.me/ip").GetAwaiter().GetResult();
|
||||
|
||||
// пингует айпи с помощью встроенной в винду проги, возвращает задержку
|
||||
public static string PingIP(string address)
|
||||
{
|
||||
var proc = new Process();
|
||||
proc.StartInfo.FileName = "cmd.exe";
|
||||
proc.StartInfo.Arguments = "/c @echo off & chcp 65001 >nul & ping -n 5 " + address;
|
||||
proc.StartInfo.CreateNoWindow = true;
|
||||
proc.StartInfo.UseShellExecute = false;
|
||||
proc.StartInfo.RedirectStandardOutput = true;
|
||||
proc.Start();
|
||||
System.IO.StreamReader outStream = proc.StandardOutput;
|
||||
string rezult = outStream.ReadToEnd();
|
||||
rezult = rezult.Remove(0, rezult.LastIndexOf('=') + 2);
|
||||
return rezult.Remove(rezult.Length - 4);
|
||||
}
|
||||
|
||||
}
|
||||
63
DTLib.Network/Package.cs
Normal file
63
DTLib.Network/Package.cs
Normal file
@@ -0,0 +1,63 @@
|
||||
namespace DTLib.Network;
|
||||
|
||||
//
|
||||
// отправка/получение пакетов
|
||||
//
|
||||
public static class Package
|
||||
{
|
||||
// принимает пакет
|
||||
public static byte[] GetPackage(this Socket socket)
|
||||
{
|
||||
int packageSize = 0;
|
||||
byte[] data = new byte[2];
|
||||
// цикл выполняется пока не пройдёт 2000 мс
|
||||
for (ushort s = 0; s < 400; s += 1)
|
||||
{
|
||||
if (packageSize == 0 && socket.Available >= 2)
|
||||
{
|
||||
socket.Receive(data, data.Length, 0);
|
||||
packageSize = data.ToInt();
|
||||
}
|
||||
if (packageSize != 0 && socket.Available >= packageSize)
|
||||
{
|
||||
data = new byte[packageSize];
|
||||
socket.Receive(data, data.Length, 0);
|
||||
return data;
|
||||
}
|
||||
else Thread.Sleep(5);
|
||||
}
|
||||
throw new Exception($"GetPackage() error: timeout. socket.Available={socket.Available}");
|
||||
}
|
||||
|
||||
// отправляет пакет
|
||||
public static void SendPackage(this Socket socket, byte[] data)
|
||||
{
|
||||
if (data.Length > 65536)
|
||||
throw new Exception($"SendPackage() error: package is too big ({data.Length} bytes)");
|
||||
if (data.Length == 0)
|
||||
throw new Exception($"SendPackage() error: package has zero size");
|
||||
var list = new List<byte>();
|
||||
byte[] packageSize = data.Length.ToBytes();
|
||||
if (packageSize.Length == 1)
|
||||
list.Add(0);
|
||||
list.AddRange(packageSize);
|
||||
list.AddRange(data);
|
||||
socket.Send(list.ToArray());
|
||||
}
|
||||
public static void SendPackage(this Socket socket, string data) => SendPackage(socket, data.ToBytes());
|
||||
|
||||
// получает пакет и выбрасывает исключение, если пакет не соответствует образцу
|
||||
public static void GetAnswer(this Socket socket, string answer)
|
||||
{
|
||||
string rec = socket.GetPackage().BytesToString();
|
||||
if (rec != answer)
|
||||
throw new Exception($"GetAnswer() error: invalid answer: <{rec}>");
|
||||
}
|
||||
|
||||
public static byte[] RequestPackage(this Socket socket, byte[] request)
|
||||
{
|
||||
socket.SendPackage(request);
|
||||
return socket.GetPackage();
|
||||
}
|
||||
public static byte[] RequestPackage(this Socket socket, string request) => socket.RequestPackage(request.ToBytes());
|
||||
}
|
||||
Reference in New Issue
Block a user