Merge pull request #1 from Stone-Red-Code/develop

Develop

HyperbolicDownloader/HyperbolicDownloaderCli.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

HyperbolicDownloaderApi/Commands/DownloadCommands.cs

@@ -114,7 +114,7 @@ public class DownloadCommands
             int bytesRead;
             try
             {
-                bytesRead = nwStream.Read(buffer, 0, tcpClient.ReceiveBufferSize);
+                bytesRead = nwStream.Read(buffer, 0, 1000);
             }
             catch (IOException)
             {
@@ -127,8 +127,12 @@ public class DownloadCommands
 
             string[] parts = dataReceived.Split('/');
 
-            if (parts.Length == 2) //If received data does not contain 2 parts -> error
+            if (parts.Length != 2) //If received data does not contain 2 parts -> error
             {
+                ApiManager.SendMessageNewLine(dataReceived, NotificationMessageType.Error);
+                continue;
+            }
+
             bool validFileSize = int.TryParse(parts[0], out int fileSize);
 
             if (!validFileSize || fileSize <= 0)
@@ -165,8 +169,9 @@ public class DownloadCommands
                 {
                     bytesRead = nwStream.Read(reciveBuffer, 0, reciveBuffer.Length);
                 }
-                    catch (IOException)
+                catch (IOException ex)
                 {
+                    Debug.WriteLine(ex);
                     ApiManager.SendMessageNewLine(string.Empty);
                     ApiManager.SendMessageNewLine("Lost connection to other host!", NotificationMessageType.Error);
                     break;
@@ -179,9 +184,9 @@ public class DownloadCommands
 
                 bytesInOneSecond += bytesRead;
 
-                    if (stopWatch.ElapsedMilliseconds >= 1000)
+                if (stopWatch.Elapsed.TotalSeconds >= 1)
                 {
-                        unitsPerSecond = (unitsPerSecond + bytesInOneSecond) / 2;
+                    unitsPerSecond = (int)(bytesInOneSecond * stopWatch.Elapsed.TotalSeconds);
                     if (unitsPerSecond > 125000)
                     {
                         unitsPerSecond /= 125000;
@@ -224,11 +229,6 @@ public class DownloadCommands
             hostsManager.SaveHosts();
             return;
         }
-            else
-            {
-                ApiManager.SendMessageNewLine(dataReceived, NotificationMessageType.Error);
-            }
-        }
         ApiManager.SendMessageNewLine("None of the available hosts have the requested file!", NotificationMessageType.Error);
         hostsManager.SaveHosts();
     }

HyperbolicDownloaderApi/Commands/FileCommands.cs

@@ -28,7 +28,7 @@ public class FileCommands
         }
         else
         {
-            ApiManager.SendMessageNewLine(message, NotificationMessageType.Error);
+            ApiManager.SendMessageNewLine(message!, NotificationMessageType.Error);
         }
     }
 

HyperbolicDownloaderApi/Commands/HostCommands.cs

@@ -108,9 +108,10 @@ public class HostCommands
 
         string ipAddressInput = parts[0];
         string portInput = parts[1];
-        IPAddress? ipAddress = null;
+        IPAddress? ipAddress;
 
         _ = int.TryParse(portInput, out int port);
+
         if (port < 1000 || port >= 6000)
         {
             ApiManager.SendMessageNewLine("Invalid port number!", NotificationMessageType.Error);

HyperbolicDownloaderApi/Networking/HostsManager.cs

@@ -58,7 +58,7 @@ public class HostsManager
 
             try
             {
-                tcpClient.ConnectAsync(host.IPAddress, host.Port).Wait(1000);
+                tcpClient.ConnectAsync(host.IPAddress, host.Port).Wait(500);
                 Console.CursorLeft = 0;
                 if (tcpClient.Connected)
                 {

HyperbolicDownloaderApi/Networking/NetworkClient.cs

@@ -167,6 +167,9 @@ namespace HyperbolicDownloaderApi.Networking
                     FileInfo fileInfo = new FileInfo(hyperFileInfo.FilePath);
 
                     bytesToSend = Encoding.ASCII.GetBytes($"{fileInfo.Length}/{Path.GetFileName(hyperFileInfo.FilePath)}");
+
+                    Array.Resize(ref bytesToSend, 1000);
+
                     await nwStream.WriteAsync(bytesToSend);
 
                     foreach (byte[]? chunk in FileCompressor.ReadChunks(hyperFileInfo.FilePath, 64000))
@@ -182,12 +185,15 @@ namespace HyperbolicDownloaderApi.Networking
                     bytesToSend = Encoding.ASCII.GetBytes("File not found!");
                     await nwStream.WriteAsync(bytesToSend);
                 }
-                client.Close();
             }
             catch (Exception ex)
             {
                 Debug.WriteLine(ex);
             }
+            finally
+            {
+                client.Close();
+            }
         }
 
         public void StopListening()