Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DownloadManager works!

Browse Source
This commit is contained in:
EntenKoeniq
2022-04-03 02:27:30 +02:00
parent 7c194f38a6
commit 989dcaeb0b
8 changed files with 296 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Client/DownloadManager.cs
View File

@ -6,14 +6,16 @@ namespace CoopClient
{
public byte FileID { get; set; }
public Packets.DataFileType FileType { get; set; }
public string FileName { get; set; }
private string FileName = string.Empty;
public long FileLength { get; set; }
private readonly FileStream _stream;
public DownloadManager()
public DownloadManager(string fileName)
{
string downloadFolder = $"scripts\\{Main.MainSettings.LastServerAddress.Replace(":", ".")}";
FileName = fileName;
string downloadFolder = $"scripts\\resources\\{Main.MainSettings.LastServerAddress.Replace(":", ".")}";
if (!Directory.Exists(downloadFolder))
{
Directory.CreateDirectory(downloadFolder);
@ -25,7 +27,7 @@ namespace CoopClient
}
}
_stream = new FileStream(downloadFolder + "\\" + FileName, FileMode.CreateNew);
_stream = new FileStream($"{downloadFolder}\\{fileName}", File.Exists($"{downloadFolder}\\{fileName}") ? FileMode.Truncate : FileMode.CreateNew);
}
/// <summary>

12
Client/Networking.cs
View File

@ -22,7 +22,7 @@ namespace CoopClient
public int BytesReceived = 0;
public int BytesSend = 0;
private Dictionary<byte, DownloadManager> _downloads = new Dictionary<byte, DownloadManager>();
private readonly Dictionary<byte, DownloadManager> _downloads = new Dictionary<byte, DownloadManager>();
public void DisConnectFromServer(string address)
{
@ -139,6 +139,7 @@ namespace CoopClient
// Reset all values
Latency = 0;
LastPlayerFullSync = 0;
_downloads.Clear();
Main.CleanUpWorld();
@ -462,11 +463,10 @@ namespace CoopClient
Packets.FileRequest packet = new Packets.FileRequest();
packet.NetIncomingMessageToPacket(data);
_downloads.Add(packet.ID, new DownloadManager()
_downloads.Add(packet.ID, new DownloadManager(packet.FileName)
{
FileID = packet.ID,
FileType = (Packets.DataFileType)packet.FileType,
FileName = packet.FileName,
FileLength = packet.FileLength
});
}
@ -488,10 +488,12 @@ namespace CoopClient
packet.NetIncomingMessageToPacket(data);
KeyValuePair<byte, DownloadManager> dm = _downloads.FirstOrDefault(x => x.Key == packet.ID);
if (dm.Value != null)
if (dm.Value == null)
{
dm.Value.DownloadPart(packet.FileChunk);
throw new Exception("File to download not found!");
}
dm.Value.DownloadPart(packet.FileChunk);
}
catch (Exception ex)
{

6
Client/Packets/DownloadPackets.cs
View File

@ -27,7 +27,7 @@ namespace CoopClient
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FullSyncNpc);
message.Write((byte)PacketTypes.FileTransferRequest);
List<byte> byteArray = new List<byte>();
@ -75,7 +75,7 @@ namespace CoopClient
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FullSyncNpc);
message.Write((byte)PacketTypes.FileTransferTick);
List<byte> byteArray = new List<byte>();
@ -112,7 +112,7 @@ namespace CoopClient
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FullSyncNpc);
message.Write((byte)PacketTypes.FileTransferComplete);
List<byte> byteArray = new List<byte>();

3
Server/Client.cs
View File

@ -26,7 +26,8 @@ namespace CoopServer
private readonly Dictionary<string, object> CustomData = new();
private long CallbacksCount = 0;
internal readonly Dictionary<long, Action<object>> Callbacks = new();
internal bool FilesSent = false;
internal bool FilesReceived = false;
public bool FilesSent = false;
#region CUSTOMDATA FUNCTIONS
public void SetData<T>(string name, T data)

136
Server/DownloadManager.cs
View File

@ -2,12 +2,13 @@
using System.Linq;
using System.Collections.Generic;
using Lidgren.Network;
using System;
namespace CoopServer
{
internal static class DownloadManager
{
const int MAX_BUFFER = 1048576; // 1MB
private static readonly List<DownloadClient> _clients = new();
private static readonly List<DownloadFile> _files = new();
public static bool AnyFileExists = false;
@ -19,19 +20,28 @@ namespace CoopServer
return;
}
_clients.Add(new DownloadClient() { NetHandle = nethandle, FilesCount = _files.Count });
_clients.Add(new DownloadClient(nethandle, _files));
}
public static bool CheckForDirectoryAndFiles()
{
string[] filePaths = Directory.GetFiles("clientside");
string[] filePaths;
if (!Directory.Exists("clientside") || filePaths.Length == 0)
if (!Directory.Exists("clientside"))
{
AnyFileExists = false;
return false;
}
filePaths = Directory.GetFiles("clientside");
if (filePaths.Length == 0)
{
AnyFileExists = false;
return false;
}
byte fileCount = 0;
foreach (string file in filePaths)
{
FileInfo fileInfo = new(file);
@ -43,18 +53,15 @@ namespace CoopServer
continue;
}
Logging.Debug($"===== {fileInfo.Name} =====");
int MAX_BUFFER = fileInfo.Length < 5120 ? (int)fileInfo.Length : 5120; // 5KB
byte[] buffer = new byte[MAX_BUFFER];
int bytesRead = 0;
bool fileCreated = false;
DownloadFile newFile = null;
byte fileCount = 0;
using (FileStream fs = File.Open(file, FileMode.Open, FileAccess.Read))
using (BufferedStream bs = new(fs))
{
while ((bytesRead = bs.Read(buffer, 0, MAX_BUFFER)) != 0) // Reading 1MB chunks at time
while (bs.Read(buffer, 0, MAX_BUFFER) != 0) // Reading 5KB chunks at time
{
if (!fileCreated)
{
@ -63,12 +70,11 @@ namespace CoopServer
}
newFile.AddData(buffer);
Logging.Debug($"{bytesRead}");
}
}
_files.Add(newFile);
fileCount++;
}
Logging.Info($"{_files.Count} files found!");
@ -81,12 +87,12 @@ namespace CoopServer
{
_clients.ForEach(client =>
{
if (!client.SendFiles(_files))
if (!client.SendFiles())
{
Client x = Server.Clients.FirstOrDefault(x => x.NetHandle == client.NetHandle);
if (x != null)
{
x.FilesSent = true;
x.FilesReceived = true;
}
}
});
@ -100,60 +106,117 @@ namespace CoopServer
_clients.Remove(client);
}
}
/// <summary>
/// We try to remove the client when all files have been sent
/// </summary>
/// <param name="nethandle"></param>
/// <param name="id"></param>
public static void TryToRemoveClient(long nethandle, int id)
{
DownloadClient client = _clients.FirstOrDefault(x => x.NetHandle == nethandle);
if (client == null)
{
return;
}
client.FilePosition++;
if (client.DownloadComplete())
{
_clients.Remove(client);
}
}
}
internal class DownloadClient
{
public long NetHandle { get; set; }
public int FilesCount { get; set; }
public int FilesSent = 0;
public long NetHandle = 0;
private List<DownloadFile> Files = null;
public int FilePosition = 0;
public DownloadClient(long nethandle, List<DownloadFile> files)
{
NetHandle = nethandle;
Files = files;
NetConnection conn = Server.MainNetServer.Connections.FirstOrDefault(x => x.RemoteUniqueIdentifier == NetHandle);
if (conn != null)
{
Files.ForEach(file =>
{
NetOutgoingMessage outgoingMessage = Server.MainNetServer.CreateMessage();
new Packets.FileRequest()
{
ID = file.FileID,
FileType = (byte)Packets.DataFileType.Script,
FileName = file.FileName,
FileLength = file.FileLength
}.PacketToNetOutGoingMessage(outgoingMessage);
Server.MainNetServer.SendMessage(outgoingMessage, conn, NetDeliveryMethod.ReliableOrdered, (byte)ConnectionChannel.File);
});
}
}
/// <summary>
///
/// </summary>
/// <returns>true if files should be sent otherwise false</returns>
public bool SendFiles(List<DownloadFile> files)
public bool SendFiles()
{
if (FilesSent >= FilesCount)
if (DownloadComplete())
{
return false;
}
DownloadFile file = files.FirstOrDefault(x => !x.DownloadFinished());
if (file == null)
{
return false;
}
DownloadFile file = Files[FilePosition];
file.Send(NetHandle);
// Check it again, maybe this file is finish now
if (file.DownloadFinished())
{
FilesSent++;
FilePosition++;
if (FilesSent >= FilesCount)
{
return false;
}
return DownloadComplete();
}
return true;
}
public bool DownloadComplete()
{
return FilePosition >= Files.Count;
}
}
internal class DownloadFile
{
public int FileID { get; set; }
public byte FileID { get; set; }
public string FileName { get; set; }
public long FileLength { get; set; }
private readonly List<byte[]> _data = new();
private readonly long _sent = 0;
private int _dataPosition = 0;
public void Send(long nethandle)
{
// TODO
NetConnection conn = Server.MainNetServer.Connections.FirstOrDefault(x => x.RemoteUniqueIdentifier == nethandle);
if (conn == null)
{
return;
}
NetOutgoingMessage outgoingMessage = Server.MainNetServer.CreateMessage();
new Packets.FileTransferTick() { ID = FileID, FileChunk = _data.ElementAt(_dataPosition) }.PacketToNetOutGoingMessage(outgoingMessage);
Server.MainNetServer.SendMessage(outgoingMessage, conn, NetDeliveryMethod.ReliableOrdered, (byte)ConnectionChannel.File);
Logging.Debug($"Send _data[{_dataPosition}] ~ {_data.ElementAt(_dataPosition).Length}");
_dataPosition++;
}
public void AddData(byte[] data)
@ -161,9 +224,14 @@ namespace CoopServer
_data.Add(data);
}
public void Cancel()
{
_dataPosition = _data.Count - 1;
}
public bool DownloadFinished()
{
return _sent >= FileLength;
return _dataPosition >= _data.Count;
}
}
}

139
Server/Packets/DownloadPackets.cs Normal file
View File

@ -0,0 +1,139 @@
using System;
using System.Collections.Generic;
using System.Text;
using Lidgren.Network;
namespace CoopServer
{
internal partial class Packets
{
public enum DataFileType
{
Script = 0,
Map = 1
}
public class FileRequest : Packet
{
public byte ID { get; set; }
public byte FileType { get; set; }
public string FileName { get; set; }
public long FileLength { get; set; }
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FileTransferRequest);
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
// The type of the file
byteArray.Add(FileType);
// The name of the file
byte[] nameBytes = Encoding.UTF8.GetBytes(FileName);
byteArray.AddRange(BitConverter.GetBytes(nameBytes.Length));
byteArray.AddRange(nameBytes);
// The length of the file
byteArray.AddRange(BitConverter.GetBytes(FileLength));
byte[] result = byteArray.ToArray();
message.Write(result.Length);
message.Write(result);
#endregion
}
public override void NetIncomingMessageToPacket(byte[] array)
{
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
FileType = reader.ReadByte();
int nameArrayLength = reader.ReadInt();
FileName = reader.ReadString(nameArrayLength);
FileLength = reader.ReadLong();
#endregion
}
}
public class FileTransferTick : Packet
{
public byte ID { get; set; }
public byte[] FileChunk { get; set; }
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FileTransferTick);
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
// The chunk of the file
byteArray.AddRange(BitConverter.GetBytes(FileChunk.Length));
byteArray.AddRange(FileChunk);
byte[] result = byteArray.ToArray();
message.Write(result.Length);
message.Write(result);
#endregion
}
public override void NetIncomingMessageToPacket(byte[] array)
{
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
int chunkLength = reader.ReadInt();
FileChunk = reader.ReadByteArray(chunkLength);
#endregion
}
}
public class FileTransferComplete : Packet
{
public byte ID { get; set; }
public override void PacketToNetOutGoingMessage(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FileTransferComplete);
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
byte[] result = byteArray.ToArray();
message.Write(result.Length);
message.Write(result);
#endregion
}
public override void NetIncomingMessageToPacket(byte[] array)
{
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
#endregion
}
}
}
}

8
Server/Packets/Packets.cs
View File

@ -99,7 +99,10 @@ namespace CoopServer
NativeCall,
NativeResponse,
Mod,
CleanUpWorld
CleanUpWorld,
FileTransferTick,
FileTransferRequest,
FileTransferComplete
}
enum ConnectionChannel
@ -111,7 +114,8 @@ namespace CoopServer
NPCFull = 4,
Chat = 5,
Native = 6,
Mod = 7
Mod = 7,
File = 8
}
[Flags]

32
Server/Server.cs
View File

@ -224,6 +224,7 @@ namespace CoopServer
if (!client.FilesSent)
{
DownloadManager.InsertClient(client.NetHandle);
client.FilesSent = true;
}
});
}
@ -268,7 +269,11 @@ namespace CoopServer
if (status == NetConnectionStatus.Disconnected)
{
SendPlayerDisconnectPacket(message.SenderConnection.RemoteUniqueIdentifier);
long nethandle = message.SenderConnection.RemoteUniqueIdentifier;
DownloadManager.RemoveClient(nethandle);
SendPlayerDisconnectPacket(nethandle);
}
else if (status == NetConnectionStatus.Connected)
{
@ -504,6 +509,31 @@ namespace CoopServer
}
}
break;
case (byte)PacketTypes.FileTransferComplete:
{
try
{
if (DownloadManager.AnyFileExists)
{
int len = message.ReadInt32();
byte[] data = message.ReadBytes(len);
Packets.FileTransferComplete packet = new();
packet.NetIncomingMessageToPacket(data);
Client client = Clients.Find(x => x.NetHandle == message.SenderConnection.RemoteUniqueIdentifier);
if (client != null && !client.FilesReceived)
{
DownloadManager.TryToRemoveClient(client.NetHandle, packet.ID);
}
}
}
catch (Exception e)
{
DisconnectAndLog(message.SenderConnection, type, e);
}
}
break;
default:
Logging.Error("Unhandled Data / Packet type");
break;