Miscellanous fixes

Admin/Kayak.cs

@@ -76,6 +76,25 @@ namespace IW4MAdmin
             }
 
             catch (Exception e)
+            {
+                if (e.GetType() == typeof(FormatException))
+                {
+                    ApplicationManager.GetInstance().Logger.WriteWarning("Request parameter data format was incorrect");
+                    ApplicationManager.GetInstance().Logger.WriteDebug($"Request Path {request.Path}");
+                    ApplicationManager.GetInstance().Logger.WriteDebug($"Request Query String {request.QueryString}");
+
+                    response.OnResponse(new HttpResponseHead()
+                    {
+                        Status = "400 Bad Request",
+                        Headers = new Dictionary<string, string>()
+                        {
+                            { "Content-Type", "text/html" },
+                            { "Content-Length", "0"},
+                        }
+                    }, new BufferedProducer(""));
+                }
+
+                else
                 {
                     ApplicationManager.GetInstance().Logger.WriteError($"Webfront error during request");
                     ApplicationManager.GetInstance().Logger.WriteDebug($"Message: {e.Message}");
@@ -93,12 +112,13 @@ namespace IW4MAdmin
                 }
             }
         }
+    }
 
     class BufferedProducer : IDataProducer
     {
         ArraySegment<byte> data;
 
-        public BufferedProducer(string data) : this(data, Encoding.UTF8) { }
+        public BufferedProducer(string data) : this(data, Encoding.ASCII) { }
         public BufferedProducer(string data, Encoding encoding) : this(encoding.GetBytes(data)) { }
         public BufferedProducer(byte[] data) : this(new ArraySegment<byte>(data)) { }
 
@@ -108,9 +128,18 @@ namespace IW4MAdmin
         }
 
         public IDisposable Connect(IDataConsumer channel)
+        {
+            try
             {
                 channel?.OnData(data, null);
                 channel?.OnEnd();
+            }
+
+            catch (Exception)
+            {
+
+            }
+
             return null;
         }
     }
@@ -129,19 +158,20 @@ namespace IW4MAdmin
 
         public bool OnData(ArraySegment<byte> data, Action continuation)
         {
-            buffer?.Add(data);
+            // this should hopefully clean the non ascii characters out.
+            buffer?.Add(new ArraySegment<byte>(Encoding.ASCII.GetBytes(Encoding.ASCII.GetString(data.ToArray()))));
             return false;
         }
 
         public void OnError(Exception error)
         {
-            errorCallback?.Invoke(error);
+            //  errorCallback?.Invoke(error);
         }
 
         public void OnEnd()
         {
             var str = buffer
-                .Select(b => Encoding.UTF8.GetString(b.Array, b.Offset, b.Count))
+                .Select(b => Encoding.ASCII.GetString(b.Array, b.Offset, b.Count))
                 .Aggregate((result, next) => result + next);
 
             resultCallback(str);

Admin/Logger.cs

@@ -15,7 +15,8 @@ namespace IW4MAdmin
             Info,
             Debug,
             Warning,
-            Error
+            Error,
+            Assert
         }
 
         string FileName;
@@ -72,5 +73,11 @@ namespace IW4MAdmin
         {
             Write(msg, LogType.Warning);
         }
+
+        public void WriteAssert(bool condition, string msg)
+        {
+            if (!condition)
+                Write(msg, LogType.Assert);
+        }
     }
 }

Admin/Manager.cs

@@ -131,11 +131,14 @@ namespace IW4MAdmin
 
                     catch (ServerException e)
                     {
-                        Logger.WriteWarning($"Not monitoring server {Conf.IP}:{Conf.Port} due to uncorrectable errors");
+                        Logger.WriteError($"Not monitoring server {Conf.IP}:{Conf.Port} due to uncorrectable errors");
                         if (e.GetType() == typeof(DvarException))
-                            Logger.WriteError($"Could not get the dvar value for {(e as DvarException).Data["dvar_name"]} (ensure the server has a map loaded)");
+                            Logger.WriteDebug($"Could not get the dvar value for {(e as DvarException).Data["dvar_name"]} (ensure the server has a map loaded)");
                         else if (e.GetType() == typeof(NetworkException))
-                            Logger.WriteError(e.Message);
+                        {
+                            Logger.WriteDebug(e.Message);
+                            Logger.WriteDebug($"Internal Exception: {e.Data["internal_exception"]}");
+                        }
                     }
                 });
             }
@@ -148,7 +151,7 @@ namespace IW4MAdmin
             Commands.Add(new CQuit("quit", "quit IW4MAdmin", "q", Player.Permission.Owner, 0, false));
             Commands.Add(new CKick("kick", "kick a player by name. syntax: !kick <player> <reason>.", "k", Player.Permission.Trusted, 2, true));
             Commands.Add(new CSay("say", "broadcast message to all players. syntax: !say <message>.", "s", Player.Permission.Moderator, 1, false));
-            Commands.Add(new CTempBan("tempban", "temporarily ban a player for 1 hour. syntax: !tempban <player> <reason>.", "tb", Player.Permission.Moderator, 2, true));
+            Commands.Add(new CTempBan("tempban", "temporarily ban a player for for specified time (defaults to 1 hour). syntax: !tempban <player> <time>(m|h|d|w|y) <reason>.", "tb", Player.Permission.Moderator, 2, true));
             Commands.Add(new CBan("ban", "permanently ban a player from the server. syntax: !ban <player> <reason>", "b", Player.Permission.SeniorAdmin, 2, true));
             Commands.Add(new CWhoAmI("whoami", "give information about yourself. syntax: !whoami.", "who", Player.Permission.User, 0, false));
             Commands.Add(new CList("list", "list active clients syntax: !list.", "l", Player.Permission.Moderator, 0, false));
@@ -199,7 +202,7 @@ namespace IW4MAdmin
                     if (Status.RequestedTask == null || Status.RequestedTask.IsCompleted)
                     {
                         Status.Update(new Task(() => (Status.Dependant as Server).ProcessUpdatesAsync(Status.GetToken())));
-                        if (Status.RunAverage > 1000)
+                        if (Status.RunAverage > 1000 + UPDATE_FREQUENCY)
                             Logger.WriteWarning($"Update task average execution is longer than desired for {(Status.Dependant as Server).GetIP()}::{(Status.Dependant as Server).GetPort()} [{Status.RunAverage}ms]");
                     }
                 }

Admin/Server.cs

@@ -27,6 +27,12 @@ namespace IW4MAdmin
                 return true;
             }
 
+            if (P.Name.Length < 3)
+            {
+                await this.ExecuteCommandAsync($"clientkick {P.ClientID} \"Your name must contain atleast 3 characters.\"");
+                return false;
+            }
+
             Logger.WriteDebug($"Client slot #{P.ClientID} now reserved");
 
             try
@@ -332,7 +338,7 @@ namespace IW4MAdmin
 
                     if (ConnectionErrors > 0)
                     {
-                        Logger.WriteInfo($"Connection has been reestablished with {IP}:{Port}");
+                        Logger.WriteVerbose($"Connection has been reestablished with {IP}:{Port}");
                         Throttled = false;
                     }
                     ConnectionErrors = 0;
@@ -345,6 +351,7 @@ namespace IW4MAdmin
                     if (ConnectionErrors == 1)
                     {
                         Logger.WriteError($"{e.Message} {IP}:{Port}, reducing polling rate");
+                        Logger.WriteDebug($"Internal Exception: {e.Data["internal_exception"]}");
                         Throttled = true;
                     }
                     return;
@@ -478,7 +485,7 @@ namespace IW4MAdmin
             this.MaxClients = maxplayers.Value;
             this.FSGame = game.Value;
 
-            await this.SetDvarAsync("sv_kickbantime", 3600);
+            await this.SetDvarAsync("sv_kickbantime", 60);
             await this.SetDvarAsync("sv_network_fps", 1000);
             await this.SetDvarAsync("com_maxfps", 1000);
 
@@ -655,7 +662,7 @@ namespace IW4MAdmin
 
         public override async Task TempBan(String Reason, TimeSpan length, Player Target, Player Origin)
         {
-            await this.ExecuteCommandAsync($"tempbanclient {Target.ClientID } \"^1Player Temporarily Banned: ^5{ Reason }\"");
+            await this.ExecuteCommandAsync($"clientkick {Target.ClientID } \"^1Player Temporarily Banned: ^5{ Reason }\"");
             Penalty newPenalty = new Penalty(Penalty.Type.TempBan, Reason.StripColors(), Target.NetworkID, Origin.NetworkID, DateTime.Now, Target.IP, DateTime.Now + length);
             await Task.Run(() =>
             {
@@ -678,10 +685,10 @@ namespace IW4MAdmin
             {
                 if (server.GetPlayersAsList().Count > 0)
                 {
-                    var activeClient = server.GetPlayersAsList().Find(x => x.NetworkID == Target.NetworkID);
+                    var activeClient = server.GetPlayersAsList().SingleOrDefault(x => x.NetworkID == Target.NetworkID);
                     if (activeClient != null)
                     {
-                        await server.ExecuteCommandAsync($"tempbanclient {activeClient.ClientID}  \"{Message} ^7 ({Website}) ^7\"");
+                        await server.ExecuteCommandAsync($"clientkick {activeClient.ClientID}  \"{Message} ^7 ({Website}) ^7\"");
                         break;
                     }
                 }

Admin/webfront/chat.html

@@ -1,30 +1,47 @@
 <script src="/webfront/scripts/wordcloud2.js"></script>
-<div class="chat-history"></div>
+<div style="display:none;" class="chat-history">
-<canvas id="chat-word-cloud" width="625" height="625"></canvas>
+    <h2>Chat history </h2>
+    <br/>
+</div>
+<div id="word-cloud-wrapper" style="text-align: center; display: none;">
+    <canvas id="chat-word-cloud" width="750" height="750"></canvas>
+</div>
 <script>
     if (parseGet("clientid") == "undefined") {
+        $('#word-cloud-wrapper').show();
         $.getJSON("/_words", function (result) {
             var wordList = [];
+            var largestWord = 0;
             $.each(result, function (i, word) {
+                if (word.Count > largestWord)
+                    largestWord = word.Count;
                 wordList.push([word.Word, word.Count]);
             });
-
+            var _weightFactor = Math.min(1, (1 / largestWord) / 0.003599);
-            WordCloud(document.getElementById('chat-word-cloud'), { list: wordList, backgroundColor: "rgb(34,34,34)", minSize: "14pt", color: "rgb(0, 122, 204)", wait: 20, weightFactor: 2 });
+            WordCloud(document.getElementById('chat-word-cloud'), { list: wordList, backgroundColor: "rgb(34,34,34)", color: "rgb(0, 122, 204)", wait: 0, weightFactor: _weightFactor });
         });
-
     }
 
     else {
+        $('.chat-history').show();
         $.getJSON("/_clientchat?clientid=" + parseGet("clientid"), function (result) {
             result = result.sort(function (a, b) {
-                // Turn your strings into dates, and then subtract them
-                // to get a value that is either negative, positive, or zero.
                 return new Date(b.TimeSent) - new Date(a.TimeSent);
             });
 
+
+
+            if (result.length == 0) {
+                $('.chat-history h2').append('is empty.');
+            }
+
+            else {
+                $('.chat-history h2').append('for <b>' + result[0].ClientName + '</b> (' + result.length + ' messages)');
+            }
+
             $.each(result, function (i, chat) {
                 var date = new Date(chat.TimeSent);
-                $('.chat-history').append("<div><span>" + date.toLocaleString() + " &mdash; </span><span><b>" + chat.Client.Name + "</b></span>: <span>" + chat.Message + "</span></div>");
+                $('.chat-history').append("<div><span>" + date.toLocaleString() + " &mdash; </span><span><b>" + chat.ClientName + "</b></span>: <span>" + chat.Message + "</span></div>");
             });
         });
     }

Plugins/EventAPI/Plugin.cs

@@ -143,6 +143,11 @@ namespace EventAPI
                     AddRestEvent(new RestEvent(RestEvent.EventType.NOTIFICATION, RestEvent.EventVersion.IW4MAdmin, E.Data, "Chat", E.Origin.Name, ""));
             }
 
+            if (E.Type == Event.GType.Report)
+            {
+                AddRestEvent(new RestEvent(RestEvent.EventType.ALERT, RestEvent.EventVersion.IW4MAdmin, $"**{E.Origin.Name}** has reported **{E.Target.Name}** for: {E.Data.Trim()}", E.Target.Name, E.Origin.Name, ""));
+            }
+
             if (E.Type == Event.GType.Say && E.Origin.Level < Player.Permission.Moderator)
             {
                 string message = E.Data.ToLower();
@@ -153,7 +158,8 @@ namespace EventAPI
                     message.Contains("aim") ||
                     message.Contains("wall") ||
                     message.Contains("cheto") ||
-                    message.Contains("hak");
+                    message.Contains("hak") ||
+                    message.Contains("bot");
 
                 if (flagged)
                 {
@@ -181,7 +187,7 @@ namespace EventAPI
 
         public static void AddRestEvent(RestEvent E)
         {
-            if (APIEvents.Count > 10)
+            if (APIEvents.Count > 20)
                 APIEvents.Dequeue();
             APIEvents.Enqueue(E);
         }

Plugins/SimpleStats/Chat/ChatDatabase.cs

@@ -16,6 +16,8 @@ namespace StatsPlugin
 "with",
 "from",
 "about",
+"your",
+"just",
 "into",
 "over",
 "after",
@@ -26,6 +28,7 @@ namespace StatsPlugin
 "but",
 "his",
 "they",
+"then",
 "her",
 "she",
 "will",
@@ -45,6 +48,8 @@ namespace StatsPlugin
 "think",
 "look",
 "want",
+"can",
+"was",
 "give",
 "use",
 "find",
@@ -82,6 +87,7 @@ namespace StatsPlugin
 "the",
 "and",
 "that",
+"than",
 "have",
 "this",
 "one",
@@ -90,7 +96,9 @@ namespace StatsPlugin
         "yah",
         "why",
         "who" ,
-            "when"};
+            "when",
+        "where",
+        };
 
         public ChatDatabase(string FN) : base(FN)
         {

Plugins/SimpleStats/Chat/ChatHistoryPage.cs

@@ -78,7 +78,7 @@ namespace StatsPlugin.Chat
                     ServerID = c.ServerID,
                     Message = c.Message,
                     TimeSent = c.TimeSent,
-                    Client = client
+                    ClientName = client.Name,
                 }),
                 additionalHeaders = new Dictionary<string, string>()
             };

Plugins/SimpleStats/Plugin.cs

@@ -229,6 +229,8 @@ namespace StatsPlugin
         }
 
         public async Task OnEventAsync(Event E, Server S)
+        {
+            try
             {
                 if (E.Type == Event.GType.Start)
                 {
@@ -322,6 +324,9 @@ namespace StatsPlugin
                     StatTracking curServer = statLists.Find(x => x.Port == S.GetPort());
                     PlayerStats killerStats = curServer.playerStats.GetStats(Killer);
 
+                    if (killerStats == null)
+                        killerStats = new PlayerStats(0, 0, 0, 0, 0, 0);
+
                     curServer.lastKill[E.Origin.ClientID] = DateTime.Now;
                     curServer.Kills[E.Origin.ClientID]++;
 
@@ -349,6 +354,9 @@ namespace StatsPlugin
                     StatTracking curServer = statLists.Find(x => x.Port == S.GetPort());
                     PlayerStats victimStats = curServer.playerStats.GetStats(Victim);
 
+                    if (victimStats == null)
+                        victimStats = new PlayerStats(0, 0, 0, 0, 0, 0);
+
                     victimStats.Deaths++;
                     victimStats.KDR = Math.Round(victimStats.Kills / (double)victimStats.Deaths, 2);
 
@@ -366,6 +374,14 @@ namespace StatsPlugin
                 }
             }
 
+            catch (Exception e)
+            {
+                S.Logger.WriteWarning("StatsPlugin::OnEventAsync failed to complete");
+                S.Logger.WriteDebug($"Server:{S}\r\nOrigin:{E.Origin}\r\nTarget:{E.Target}");
+                S.Logger.WriteDebug($"Exception: {e.Message}");
+            }
+        }
+
         public static string GetTotalKills()
         {
             long Kills = 0;
@@ -388,7 +404,8 @@ namespace StatsPlugin
                 return;
 
             PlayerStats DisconnectingPlayerStats = curServer.playerStats.GetStats(P);
-            if (curServer.Kills[P.ClientID] == 0)
+
+            if (DisconnectingPlayerStats == null || curServer.Kills[P.ClientID] == 0)
                 return;
 
             else if (curServer.lastKill[P.ClientID] > curServer.connectionTime[P.ClientID])
@@ -430,6 +447,7 @@ namespace StatsPlugin
 
             if (selectedPlayers == null)
                 return;
+
             selectedPlayers.Kills[cID] = 0;
             selectedPlayers.connectionTime[cID] = DateTime.Now;
             selectedPlayers.inactiveMinutes[cID] = 0;

SharedLibrary/RCON.cs

@@ -23,8 +23,8 @@ namespace SharedLibrary.Network
         static string[] SendQuery(QueryType Type, Server QueryServer,  string Parameters = "")
         {
             var ServerOOBConnection = new UdpClient();
-            ServerOOBConnection.Client.SendTimeout = 1000;
+            ServerOOBConnection.Client.SendTimeout = 5000;
-            ServerOOBConnection.Client.ReceiveTimeout = 1000;
+            ServerOOBConnection.Client.ReceiveTimeout = 5000;
             var Endpoint = new IPEndPoint(IPAddress.Parse(QueryServer.GetIP()), QueryServer.GetPort());
 
             string QueryString = String.Empty;
@@ -76,15 +76,16 @@ namespace SharedLibrary.Network
                 throw e;
             }
 
-            catch (Exception)
+            catch (Exception e)
             {
                 attempts++;
-                if (attempts > 5)
+                if (attempts > 2)
                 {
-                    var e = new Exceptions.NetworkException("Could not communicate with the server");
+                    var ne = new Exceptions.NetworkException("Could not communicate with the server");
-                    e.Data["server_address"] = ServerOOBConnection.Client.RemoteEndPoint.ToString();
+                    ne.Data["internal_exception"] = e.Message;
+                    ne.Data["server_address"] = ServerOOBConnection.Client.RemoteEndPoint.ToString();
                     ServerOOBConnection.Close();
-                    throw e;
+                    throw ne;
                 }
 
                 Thread.Sleep(1000);