Merge pull request #11 from DJDaemonix/hotfix/0.1.3

0.1.3 Hotfix - Update PingModule

src/Nodsoft.YumeChan.ConsoleRunner/Nodsoft.YumeChan.ConsoleRunner.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
-    <Version>0.1.2</Version>
+    <Version>0.1.3</Version>
     <Authors>DJ Daemonix</Authors>
     <Company>Nodsoft ES</Company>
     <Product>YumeChan</Product>

src/Nodsoft.YumeChan.Core/Nodsoft.YumeChan.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.2</Version>
+    <Version>0.1.3</Version>
     <Authors>DJ Daemonix</Authors>
     <Company>Nodsoft ES</Company>
     <Product>YumeChan</Product>

src/Nodsoft.YumeChan.Modules/Network/PingModule.cs

@@ -2,9 +2,11 @@
 using Discord.Commands;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -13,12 +15,6 @@ namespace Nodsoft.YumeChan.Modules.Network
 	[Group("ping")]
 	public class PingModule : ModuleBase<SocketCommandContext>
 	{
-		//[Command]
-		public async Task SimplePingCommand()
-		{
-			await ReplyAsync("Pong !");
-		}
-
 		[Command("")]
 		public async Task NetworkPingCommand(string host)
 		{
@@ -36,7 +32,7 @@ public async Task NetworkPingCommand(string host)
 
 			// 2. Ping the IP
 			int pingCount = 4;
-			PingReply[] pingReplies = ComplexPing(hostResolved, pingCount).Result;
+			PingModuleReply[] pingReplies = TcpPing(hostResolved, 80, pingCount).Result;
 
 			// 3. Retrieve statistics			// 4. Return results to user with ReplyAsync(); (Perhaps Embed ?)
 			List<long> roundTripTimings = new List<long>();
@@ -67,10 +63,10 @@ public async Task NetworkPingCommand(string host)
 			await ReplyAsync(message: contextUser, embed: embedBuilder.Build()); //Quote user in main message, and attach Embed.
 		}
 
-		internal static async Task<PingReply[]> ComplexPing(IPAddress host, int count) => await ComplexPing(host, count, 2000, new PingOptions(64, true)).ConfigureAwait(false);
-		internal static async Task<PingReply[]> ComplexPing(IPAddress host, int count, int timeout, PingOptions options)
+		internal static async Task<PingModuleReply[]> ComplexPing(IPAddress host, int count) => await ComplexPing(host, count, 2000, new PingOptions(64, true)).ConfigureAwait(false);
+		internal static async Task<PingModuleReply[]> ComplexPing(IPAddress host, int count, int timeout, PingOptions options)
 		{
-			PingReply[] pingReplies = new PingReply[count];
+			PingModuleReply[] pingReplies = new PingModuleReply[count];
 
 			// Create a buffer of 32 bytes of data to be transmitted.
 			byte[] buffer = Encoding.ASCII.GetBytes("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -79,12 +75,59 @@ internal static async Task<PingReply[]> ComplexPing(IPAddress host, int count, i
 			for (int i = 0; i < count; i++)
 			{
 				Ping ping = new Ping();
-				pingReplies[i] = await ping.SendPingAsync(host, timeout, buffer, options).ConfigureAwait(false);
+				pingReplies[i] = new PingModuleReply(await ping.SendPingAsync(host, timeout, buffer, options).ConfigureAwait(false));
 				ping.Dispose();
 			}
 
 			return pingReplies;
 		}
 
+		// See : https://stackoverflow.com/questions/26067342/how-to-implement-psping-tcp-ping-in-c-sharp
+		internal static Task<PingModuleReply[]> TcpPing(IPAddress host, int port, int count) 
+		{
+			PingModuleReply[] pingReplies = new PingModuleReply[count];
+			for (int i = 0; i < count; i++)
+			{
+				Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+				socket.Blocking = true;
+
+				Stopwatch latencyMeasurement = new Stopwatch();
+				IPStatus? status = null;
+				try
+				{
+					latencyMeasurement.Start();
+					socket.Connect(host, port);
+					latencyMeasurement.Stop();
+				}
+				catch (Exception)
+				{
+					status = IPStatus.TimedOut;
+				}
+
+				pingReplies[i] = new PingModuleReply(host, latencyMeasurement.ElapsedMilliseconds, status ?? IPStatus.Success );
+			}
+
+			return Task.FromResult(pingReplies);
+		}
+
+		internal struct PingModuleReply
+		{
+			internal IPAddress Host { get; }
+			internal long RoundtripTime { get; }
+			internal IPStatus Status { get; }
+
+			public PingModuleReply(IPAddress host, long roundtripTime, IPStatus status)
+			{
+				Host = host;
+				RoundtripTime = roundtripTime;
+				Status = status;
+			}
+			public PingModuleReply(PingReply reply)
+			{
+				Host = reply.Address;
+				RoundtripTime = reply.RoundtripTime;
+				Status = reply.Status;
+			}
+		}
 	}
 }

src/Nodsoft.YumeChan.Modules/Nodsoft.YumeChan.Modules.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.2</Version>
+    <Version>0.1.3</Version>
     <Authors>DJ Daemonix</Authors>
     <Company>Nodsoft ES</Company>
     <Product>YumeChan Modules</Product>

src/Nodsoft.YumeChan.Modules/Status/Status.cs

@@ -16,6 +16,9 @@ public async Task DefaultAsync()
 				.WithDescription("Status : Online")
 				.AddField("Core", $"Version : {(CoreVersion != null ? CoreVersion.ToString() : MissingVersionSubstitute)}", true)
 				.AddField("Modules", $"Version : {ModulesVersion}", true);
+#if DEBUG
+				embed.AddField("Debug", "Debug Build Active.");			
+#endif
 
 			await ReplyAsync(embed: embed.Build());
 		}

src/Nodsoft.YumeChan.NetRunner/Nodsoft.YumeChan.NetRunner.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
-    <Version>0.1.2</Version>
+    <LangVersion>preview</LangVersion>
+    <Version>0.1.3</Version>
     <Authors>DJ Daemonix</Authors>
     <Company>Nodsoft ES</Company>
     <Product>YumeChan</Product>