Prevent IRC nipping on Discord Failures (#20)

Author: Headline

Diff for: IRC-Relay/Discord.cs

@@ -85,11 +85,20 @@ public async Task OnDiscordDisconnect(Exception ex)
         {
             /* Create a new thread to kill the session. We cannot block
              * this Disconnect call */
-            new System.Threading.Thread(() => { session.Kill(); }).Start();
+            new System.Threading.Thread(async() => { await session.Kill(Session.TargetBot.Discord); }).Start();
 
             await Log(new LogMessage(LogSeverity.Critical, "OnDiscordDisconnect", ex.Message));
         }
 
+        public void Kill()
+        {
+            try
+            {
+                this.Dispose();
+            }
+            catch { }
+        }
+
         public async Task OnDiscordMessage(SocketMessage messageParam)
         {
             if (!(messageParam is SocketUserMessage message)) return;
@@ -164,21 +173,24 @@ await messageParam.Author.SendMessageAsync("To prevent you from having to re-typ
 
             foreach (var attachment in message.Attachments)
             {
-                session.SendMessage(Session.MessageDestination.IRC, attachment.Url, username);
+                session.SendMessage(Session.TargetBot.IRC, attachment.Url, username);
             }
 
             foreach (String part in parts) // we're going to send each line indpependently instead of letting irc clients handle it.
             {
                 if (part.Trim().Length != 0) // if the string is not empty or just spaces
                 {
-                    session.SendMessage(Session.MessageDestination.IRC, part, username);
+                    session.SendMessage(Session.TargetBot.IRC, part, username);
                 }
             }
         }
 
         public static Task Log(LogMessage msg)
         {
-            return Task.Run(() => Console.WriteLine(msg.ToString()));
+            return Task.Run(() => {
+                Console.ForegroundColor = ConsoleColor.White;
+                Console.WriteLine(msg.ToString());
+            });
         }
 
         public void Dispose()
@@ -270,7 +282,7 @@ private void Hastebin_UploadCompleted(object sender, UploadDataCompletedEventArg
                 if (config.IRCLogMessages)
                     LogManager.WriteLog(MsgSendType.DiscordToIRC, msg.Author.Username, result, "log.txt");
 
-                session.SendMessage(Session.MessageDestination.IRC, result, msg.Author.Username);
+                session.SendMessage(Session.TargetBot.IRC, result, msg.Author.Username);
             }
         }
 

Diff for: IRC-Relay/IRC-Relay.csproj

@@ -65,6 +65,7 @@
     <Reference Include="Meebey.SmartIrc4net, Version=0.4.5.0, Culture=neutral, PublicKeyToken=7868485fbf407e0f, processorArchitecture=MSIL">
       <HintPath>..\packages\SmartIrc4net.1.1\lib\Meebey.SmartIrc4net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.1\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
@@ -90,7 +91,6 @@
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />

Diff for: IRC-Relay/IRC.cs

@@ -92,7 +92,7 @@ private void OnError(object sender, ErrorEventArgs e)
         {
             /* Create a new thread to kill the session. We cannot block
              * this Disconnect call */
-            new Thread(() => { session.Kill(); }).Start();
+            new Thread(async() => await session.Kill(Session.TargetBot.Both)).Start();
 
             Discord.Log(new LogMessage(LogSeverity.Critical, "IRCOnError", e.ErrorMessage));
         }
@@ -150,7 +150,7 @@ private void OnChannelMessage(object sender, IrcEventArgs e)
                 }
             }
 
-            session.SendMessage(Session.MessageDestination.Discord, "**<" + prefix + Regex.Escape(e.Data.Nick) + ">** " + msg);
+            session.SendMessage(Session.TargetBot.Discord, "**<" + prefix + Regex.Escape(e.Data.Nick) + ">** " + msg);
         }
     }
 }

Diff for: IRC-Relay/Program.cs

@@ -28,9 +28,17 @@ public class Program
     {
         public static void Main(string[] args)
         {
+            dynamic config = null;
             Console.Title = "Discord IRC Relay (c) Michael Flaherty 2018";
-            var config = Config.ApplyJson(new StreamReader("settings.json").ReadToEnd(), new ConfigObject());
-
+            try
+            {
+                config = Config.ApplyJson(new StreamReader("settings.json").ReadToEnd(), new ConfigObject());
+            }
+            catch (FileNotFoundException ex)
+            {
+                Console.WriteLine("Startup failure: {0}", ex.Message);
+                Environment.Exit(0);
+            }
             StartSessions(config).GetAwaiter().GetResult();
         }
 

Diff for: IRC-Relay/Session.cs

@@ -15,16 +15,18 @@
  * this program. If not, see http://www.gnu.org/licenses/.
  */
 
+using System.Threading;
 using System.Threading.Tasks;
 using Discord;
 
 namespace IRCRelay
 {
     public class Session
     {
-        public enum MessageDestination {
+        public enum TargetBot {
             Discord,
-            IRC
+            IRC,
+            Both
         };
 
         private Discord discord;
@@ -42,12 +44,33 @@ public Session(dynamic config)
             alive = true;
         }
 
-        public void Kill()
+        public async Task Kill(TargetBot bot)
         {
-            discord.Dispose();
-            irc.Client.RfcQuit();
+            switch (bot)
+            {
+                case TargetBot.Discord:
+                    discord.Kill();
+                    await Discord.Log(new LogMessage(LogSeverity.Critical, "KillSesh", "Discord connection closed."));
+                    new Thread(async() =>
+                    {
+                        Thread.Sleep(System.TimeSpan.FromSeconds(1).Milliseconds);
+                        this.discord = new Discord(config, this);
+                        await discord.SpawnBot();
+                    }).Start();
+                    break;
+                case TargetBot.IRC:
+                    irc.Client.RfcQuit();
+                    await irc.SpawnBot();
+                    await Discord.Log(new LogMessage(LogSeverity.Critical, "KillSesh", "IRC connection closed."));
+                    break;
+                case TargetBot.Both: // if we kill both, let main loop recover
+                    discord.Kill();
+                    irc.Client.RfcQuit();
+                    this.alive = false;
+                    await Discord.Log(new LogMessage(LogSeverity.Critical, "KillSesh", "Discord connection closed."));
+                    break;
+            }
 
-            Discord.Log(new LogMessage(LogSeverity.Critical, "KillSesh", "Session killed."));
             this.alive = false;
         }
 
@@ -61,14 +84,14 @@ public async Task StartSession()
             await irc.SpawnBot();
         }
 
-        public void SendMessage(MessageDestination dest, string message, string username = "")
+        public void SendMessage(TargetBot dest, string message, string username = "")
         {
             switch (dest)
             {
-                case MessageDestination.Discord:
+                case TargetBot.Discord:
                     discord.SendMessageAllToTarget(config.DiscordGuildName, message, config.DiscordChannelName);
                     break;
-                case MessageDestination.IRC:
+                case TargetBot.IRC:
                     irc.SendMessage(username, message);
                     break;
             }