Merge pull request #5 from tebexio/2.0.5

fix: cleanup log levels for certain errors

Author: WildBamaBoy

TebexOxide/BaseTebexAdapter.cs

@@ -60,11 +60,11 @@ public void DeleteExecutedCommands(bool ignoreWaitCheck = false)
                 ExecutedCommands.Clear();
             }, (error) =>
             {
-                LogError($"Failed to flush completed commands: {error.ErrorMessage}");
+                LogDebug($"Failed to flush completed commands: {error.ErrorMessage}");
             }, (code, body) =>
             {
-                LogError($"Unexpected error while flushing completed commands. API response code {code}. Response body follows:");
-                LogError(body);
+                LogDebug($"Unexpected error while flushing completed commands. API response code {code}. Response body follows:");
+                LogDebug(body);
             });
         }
 
@@ -94,7 +94,7 @@ public void OnUserConnected(string steam64Id, string ip)
             _eventQueue.Add(joinEvent);
 
             // If we're already over a threshold, go ahead and send the events.
-            if (_eventQueue.Count > 10) //TODO make configurable?
+            if (_eventQueue.Count > 10)
             {
                 ProcessJoinQueue();
             }
@@ -215,7 +215,8 @@ public void FetchStoreInfo(FetchStoreInfoResponse response)
                     var storeInfo = JsonConvert.DeserializeObject<TebexApi.TebexStoreInfo>(body);
                     if (storeInfo == null)
                     {
-                        LogError("Failed to parse fetched store information.");
+                        ReportAutoTriageEvent(new TebexTriage.AutoTriageEvent());
+                        LogError("Failed to parse fetched store information: ");
                         LogError(body);
                         return;
                     }
@@ -263,7 +264,7 @@ public void RefreshListings(TebexApi.ApiSuccessCallback onSuccess = null)
                 var response = JsonConvert.DeserializeObject<TebexApi.ListingsResponse>(body);
                 if (response == null)
                 {
-                    LogError("Could not get refresh all listings! Response body from API follows:");
+                    LogError("Could not get refresh all listings!:");
                     LogError(body);
                     return;
                 }
@@ -282,7 +283,7 @@ public void RefreshListings(TebexApi.ApiSuccessCallback onSuccess = null)
                 var response = JsonConvert.DeserializeObject<List<TebexApi.Package>>(body);
                 if (response == null)
                 {
-                    LogError("Could not get refresh package listings! Response body from API follows:");
+                    LogError("Could not get refresh package listings!");
                     LogError(body);
                     return;
                 }
@@ -356,15 +357,15 @@ public void GetPackages(GetPackagesResponse onSuccess,
                     });
                 }
             }
-            catch (Exception e) //FIXME reports of very infuriating NPE in this func
+            catch (Exception e)
             {
                 ReportAutoTriageEvent(TebexTriage.CreateAutoTriageEvent("Raised exception while refreshing packages", new Dictionary<string, string>
                 {
                     {"cacheHasValid", Cache.Instance.HasValid("packages").ToString()},
                     {"error", e.Message},
                     {"trace", e.StackTrace}
                 }));
-                LogError("An error occurred while getting your store's packages. This has been reported automatically.");
+                LogError("An error occurred while getting your store's packages.");
             }
         }
 
@@ -535,7 +536,7 @@ public void ProcessCommandQueue(bool ignoreWaitCheck = false)
                     LogDebug($"Processing online commands for player {duePlayer.Name}...");
                     if (!IsPlayerOnline(duePlayer.UUID))
                     {
-                        LogDebug($"Player {duePlayer.Name} has online commands but is not connected. Skipping.");
+                        LogDebug($"> Player {duePlayer.Name} has online commands but is not connected. Skipping.");
                         continue;
                     }
 

TebexOxide/Tebex.cs

@@ -7,7 +7,7 @@
 
 namespace Oxide.Plugins
 {
-    [Info("Tebex", "Tebex", "2.0.4")]
+    [Info("Tebex", "Tebex", "2.0.5")]
     [Description("Official support for the Tebex server monetization platform")]
     public class Tebex : CovalencePlugin
     {
@@ -17,7 +17,7 @@ public class Tebex : CovalencePlugin
 
         public static string GetPluginVersion()
         {
-            return "2.0.4";
+            return "2.0.5";
         }
 
         private void Init()

TebexOxide/TebexOxideAdapter.cs

@@ -80,8 +80,8 @@ public override void MakeWebRequest(string endpoint, string body, TebexApi.HttpV
             Enum.TryParse<RequestMethod>(verb.ToString(), true, out method);
             if (method == null)
             {
-                LogError($"Unknown HTTP method!: {verb.ToString()}");
-                LogError($"Failed to interpret HTTP method on request {verb} {endpoint}| {body}");
+                LogDebug($"Unknown HTTP method!: {verb.ToString()} {endpoint} | {body}");
+                return;
             }
 
             var headers = new Dictionary<string, string>
@@ -193,6 +193,12 @@ public override void MakeWebRequest(string endpoint, string body, TebexApi.HttpV
                     LogDebug(response);
                     onServerError?.Invoke(code, response);
                 }
+                else if (code == 530) // Cloudflare origin error
+                {
+                    LogDebug("CDN reported error code, web request not completed: " + code);
+                    LogDebug(response);
+                    onServerError?.Invoke(code, response);
+                }
                 else if (code == 0)
                 {
                     ReportAutoTriageEvent(TebexTriage.CreateAutoTriageEvent("Request timeout to Plugin API",
@@ -201,7 +207,7 @@ public override void MakeWebRequest(string endpoint, string body, TebexApi.HttpV
                             { "request", logOutStr },
                             { "response", logInStr },
                         }));
-                    LogError("Request Timeout from Tebex API. Please try again later.");
+                    LogDebug("Request Timeout from Tebex API. Please try again later.");
                 }
                 else // This should be a general failure error message with a JSON-formatted response from the API.
                 {
@@ -226,7 +232,7 @@ public override void MakeWebRequest(string endpoint, string body, TebexApi.HttpV
                                     { "request", logOutStr },
                                     { "response", logInStr },
                                 }));
-                            LogError($"Failed to unmarshal an expected error response from API.");
+                            LogDebug($"Failed to unmarshal an expected error response from API.");
                             onServerError?.Invoke(code, response);
                         }
 
@@ -316,13 +322,16 @@ private void ExecuteServerCommand(TebexApi.Command command, IPlayer player, stri
 
         public override bool IsPlayerOnline(string playerRefId)
         {
+            // Get a reference to the in-game player instance
             IPlayer iPlayer = GetPlayerRef(playerRefId) as IPlayer;
-            if (iPlayer == null) //Ensure the lookup worked
+            if (iPlayer == null) // Player is not connected
             {
-                LogError($"Attempted to look up online player, but no reference found: {playerRefId}");
                 return false;
             }
 
+            // IsConnected might indicate just a connection to the server, but unknown if it's possible to have an IPlayer
+            // reference and for the player to not actually be connected. This would create a case where we can't
+            // check inventory slots prior to package delivery.
             return iPlayer.IsConnected;
         }
 
@@ -411,6 +420,11 @@ public override string ExpandUsernameVariables(string input, object playerObj)
             if (iPlayer == null)
             {
                 LogError($"Could not cast player instance when expanding username variables: {playerObj}");
+                ReportAutoTriageEvent(TebexTriage.CreateAutoTriageEvent("Could not cast player instance when expanding username variables", new Dictionary<string, string>
+                {
+                    {"input", input},
+                    {"playerObj", playerObj?.ToString()},
+                }));
                 return input;
             }
 
@@ -419,6 +433,12 @@ public override string ExpandUsernameVariables(string input, object playerObj)
                 LogError($"Player ID or name is null while expanding username?!: {iPlayer}");
                 LogError($"Base player object: {playerObj}");
                 LogError($"Input command: {input}");
+                ReportAutoTriageEvent(TebexTriage.CreateAutoTriageEvent("Player ID or name is null while expanding username?!: ", new Dictionary<string, string>
+                {
+                    {"input", input},
+                    {"iPlayer.Id", iPlayer.Id},
+                    {"iPlayer.Name", iPlayer.Name}
+                }));
                 return input;
             }