More settings, fixes, and improvements

Removed AForge dependency, created and added a simpler solution (MjpegClient)
Removed MjpegStreamManager (reworked to CameraStreamManager and will be used for other stream types)

Added DebugMode to config (show/hide the console window)
Added AlwaysOnTop to config (always appear above other windows)

WebUI properly supports custom camera URL (should support any protocol that works in the browser but needs testing)
Reworked a bunch of logic for the WebUI, moving to a WebSocket

Misc bug fixes

Author: GhostTypes

FlashForgeUI.csproj

@@ -34,18 +34,6 @@
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
     <ItemGroup>
-        <Reference Include="AForge, Version=2.2.5.0, Culture=neutral, PublicKeyToken=c1db6ff4eaa06aeb, processorArchitecture=MSIL">
-          <HintPath>packages\AForge.2.2.5\lib\AForge.dll</HintPath>
-        </Reference>
-        <Reference Include="AForge.Imaging, Version=2.2.5.0, Culture=neutral, PublicKeyToken=ba8ddea9676ca48b, processorArchitecture=MSIL">
-          <HintPath>packages\AForge.Imaging.2.2.5\lib\AForge.Imaging.dll</HintPath>
-        </Reference>
-        <Reference Include="AForge.Math, Version=2.2.5.0, Culture=neutral, PublicKeyToken=abba2e25397ee8c9, processorArchitecture=MSIL">
-          <HintPath>packages\AForge.Math.2.2.5\lib\AForge.Math.dll</HintPath>
-        </Reference>
-        <Reference Include="AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL">
-          <HintPath>packages\AForge.Video.2.2.5\lib\AForge.Video.dll</HintPath>
-        </Reference>
         <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
           <HintPath>packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
         </Reference>
@@ -115,10 +103,11 @@
           <DependentUpon>MainMenu.cs</DependentUpon>
         </Compile>
         <Compile Include="ui\main\manager\ButtonManager.cs" />
+        <Compile Include="ui\main\manager\CameraStreamManager.cs" />
         <Compile Include="ui\main\manager\ConnectionManager.cs" />
-        <Compile Include="ui\main\manager\MjpegStreamManager.cs" />
         <Compile Include="ui\main\manager\StatusTimerManager.cs" />
         <Compile Include="ui\main\util\Compat.cs" />
+        <Compile Include="ui\main\util\MjpegClient.cs" />
         <Compile Include="ui\main\util\UiHelper.cs" />
         <Compile Include="ui\window\PrinterPairingWindow.cs">
           <SubType>Form</SubType>
@@ -158,6 +147,7 @@
         </Compile>
         <Compile Include="webui\PrinterWebServer.cs" />
         <Compile Include="webui\WebServerBridge.cs" />
+        <Compile Include="webui\WebSocketHandler.cs" />
         <EmbeddedResource Include="Properties\Resources.resx">
             <Generator>ResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>

packages.config

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AForge" version="2.2.5" targetFramework="net48" />
-  <package id="AForge.Imaging" version="2.2.5" targetFramework="net48" />
-  <package id="AForge.Math" version="2.2.5" targetFramework="net48" />
-  <package id="AForge.Video" version="2.2.5" targetFramework="net48" />
   <package id="Costura.Fody" version="6.0.0" targetFramework="net48" developmentDependency="true" />
   <package id="Discord.Webhook" version="1.0.9" targetFramework="net48" />
   <package id="Fody" version="6.9.1" targetFramework="net48" developmentDependency="true" />

program/Program.cs

@@ -11,15 +11,15 @@ namespace FlashForgeUI
     static class Program
     {
         [DllImport("kernel32.dll")]
-        private static extern bool AllocConsole();
+        public static extern bool AllocConsole();
 
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
-            AllocConsole();
+            //AllocConsole();
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false); 
             Application.Run(new ui.main.MainMenu());

program/util/Config.cs

@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using Newtonsoft.Json;
@@ -10,6 +11,16 @@ public class Config
 
         public bool WebUi { get; set; }
         public bool DiscordSync { get; set; }
+        
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [DefaultValue(false)]
+        public bool AlwaysOnTop { get; set; }
+        
+        
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        [DefaultValue(false)]
+        public bool DebugMode { get; set; }
+        
         public string WebhookUrl { get; set; }
 
         public bool CustomCamera { get; set; }
@@ -31,6 +42,8 @@ public Config Load()
                 Debug.WriteLine("config.json not found, creating & loading default settings.");
                 WebUi = false;
                 DiscordSync = false;
+                AlwaysOnTop = false;
+                DebugMode = false;
                 WebhookUrl = "";
                 CustomCamera = false;
                 CustomCameraUrl = "";

program/util/WebhookHelper.cs

@@ -79,7 +79,7 @@ private async Task<Embed> CreatePrinterStatusEmbed(FiveMClient printerClient)
 
             var embed = new EmbedBuilder().WithTitle(printerClient.PrinterName + " status").WithColor(Colors.Orange);
 
-            var img = await mainMenu.GetMjpegStreamManager().GetSingleFrameAsync();
+            var img = await mainMenu.GetCameraStreamManager().GetSingleFrameAsync();
 
 
             var webcamPreview = await ImgBB.Upload(img, "preview.png");

ui/main/MainMenu.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using AForge.Video;
+
 using FiveMApi.api;
 using FlashForgeUI.manager;
 using FlashForgeUI.program.util;
@@ -24,7 +24,7 @@ public partial class MainMenu : Form
         // and theme accordingly if we cannot get the scroll to bottom to work
         // it does look nicer though.
 
-        internal MJPEGStream mjpegStream;
+        //internal MJPEGStream mjpegStream;
 
         public FiveMClient printerClient;
 
@@ -37,17 +37,19 @@ public partial class MainMenu : Form
 
         // Managers
         private ConnectionManager _connectionManager;
-        internal MjpegStreamManager StreamManager;
+        internal CameraStreamManager StreamManager;
         private StatusTimerManager _statusTimerManager;
-        private ButtonManager _buttonManager;
+        internal ButtonManager ButtonManager;
+
+        private UiHelper _uiHelper;
 
 
-        public MjpegStreamManager GetMjpegStreamManager()
+        public CameraStreamManager GetCameraStreamManager()
         { // for WebhookHelper (sending preview image to discord)
             return StreamManager;
         }
 
-        internal bool isConnected = false;
+        internal bool IsConnected;
         internal bool WebcamOn;
 
         public MainMenu()
@@ -56,7 +58,8 @@ public MainMenu()
 
             // hook form events
             Shown += MainMenu_Shown;
-            Closing += MainMenu_Closing;
+            //Closing += MainMenu_Closing;
+            FormClosing += MainMenu_Closing;
 
             // hook timer events
             timerStatusUpdate.Tick += timerStatusUpdate_Tick;
@@ -75,15 +78,14 @@ private void InitWebhook()
             webhook = new WebhookHelper(config.WebhookUrl, this);
         }
 
-        private async Task StartTimers()
+        private void StartTimers()
         {
             timerStatusUpdate_Tick(null, null); // 'kick start' before first timer elapses
             timerSyncInfo_Tick(null, null);
             timerStatusUpdate.Start();
             timerSyncInfo.Start();
             if (config.DiscordSync) timerSyncDiscord.Start();
-            // todo better way to check for webcam availability
-            if (await printerClient.Info.IsPrinting() && printerClient.IsPro) {
+            if (printerClient.IsPro || config.CustomCamera && !string.IsNullOrEmpty(config.CustomCameraUrl)) {
                 StreamManager.Start();
                 WebcamOn = true;
                 toggleWebcamButton.Text = "Preview off";
@@ -92,7 +94,7 @@ private async Task StartTimers()
 
         private void StartWebUi()
         {
-            webServer = new PrinterWebServer(this);
+            webServer = new PrinterWebServer(this, config);
             webServer.Start();
         }
 
@@ -320,18 +322,23 @@ public dynamic GetPrinterStatus()
 
         internal async void MainMenu_Shown(object sender, EventArgs e)
         {
+            // load config
+            config = new Config().Load();
+            
+            _uiHelper = new UiHelper(this);
+            if (config.AlwaysOnTop) _uiHelper.SetOnTop();
+
             // init managers
-            // todo all of these have to be updated or refactored to use this
-            // they are expecting the old UI (Form1.cs)
             _connectionManager = new ConnectionManager(this);
-            StreamManager = new MjpegStreamManager(this);
-            _statusTimerManager = new StatusTimerManager(this);
-            _buttonManager = new ButtonManager(this);
+            StreamManager = new CameraStreamManager(this);
+            _statusTimerManager = new StatusTimerManager(this, _uiHelper);
+            ButtonManager = new ButtonManager(this);
 
-            // load config
-            config = new Config().Load();
+            
+            // only show console window if in debug mode
+            if (config.DebugMode) Program.AllocConsole();
 
-            isConnected = await Connect();
+            IsConnected = await Connect();
         }
 
         internal async Task<bool> Connect()
@@ -345,7 +352,7 @@ internal async Task<bool> Connect()
                 CheckFeatures();
 
                 if (config.DiscordSync) InitWebhook(); // only check/enable the webhook if the user actually enabled it.
-                await StartTimers();
+                StartTimers();
                 if (config.WebUi) StartWebUi();
 
                 return true;
@@ -356,45 +363,32 @@ internal async Task<bool> Connect()
 
         internal void MainMenu_Closing(object sender, CancelEventArgs cancelEventArgs)
         {
-            // shutdown Web UI
-            if (config.WebUi) webServer.Stop();
-            try
-            {
-                timerStatusUpdate.Stop(); // stop requesting status updates from printer
-                timerSyncInfo.Stop();
-                StreamManager.Stop(); // dispose of webcam stream
-                printerClient.Dispose(); // end TcpClient control, shutdown keep alive
-                printerClient = null;
-            }
-            catch
-            {
-                // not ideal but
-            }
+            Application.Exit();
         }
 
         private async void ledOnButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.LedOn();
+            await ButtonManager.LedOn();
         }
 
         private async void ledOffButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.LedOff();
+            await ButtonManager.LedOff();
         }
 
         private async void pauseJobButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.PauseJob();
+            await ButtonManager.PauseJob();
         }
 
         private async void resumeJobButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.ResumeJob();
+            await ButtonManager.ResumeJob();
         }
 
         private async void stopJobButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.StopJob();
+            await ButtonManager.StopJob();
         }
 
         private async void swapFilamentButton_Click(object sender, EventArgs e)
@@ -421,19 +415,19 @@ private async void homeAxesButton_Click(object sender, EventArgs e)
         private async void uploadJobButton_Click(object sender, EventArgs e)
         {
             if (!await CheckJobReady()) return; // make sure the printer is ready for a new job
-            if (!await _buttonManager.SelectAndUploadGCodeFile()) AppendLog("Uploading new job cancelled.");
+            if (!await ButtonManager.SelectAndUploadGCodeFile()) AppendLog("Uploading new job cancelled.");
         }
 
         private async void startRecentJobButton_Click(object sender, EventArgs e)
         {
             if (!await CheckJobReady()) return;
-            await _buttonManager.SelectRecentJob();
+            await ButtonManager.SelectRecentJob();
         }
 
         private async void startLocalJobButton_Click(object sender, EventArgs e)
         {
             if (!await CheckJobReady()) return;
-            await _buttonManager.SelectLocalJob();
+            await ButtonManager.SelectLocalJob();
         }
 
         private void sendCmdButton_Click(object sender, EventArgs e)
@@ -443,7 +437,7 @@ private void sendCmdButton_Click(object sender, EventArgs e)
 
         private void toggleWebcamButton_Click(object sender, EventArgs e)
         {
-            _buttonManager.TogglePreview();
+            ButtonManager.TogglePreview();
         }
 
         private async void setBedTempButton_Click(object sender, EventArgs e)
@@ -528,27 +522,27 @@ private async void disableExtruderHeatButton_Click(object sender, EventArgs e)
 
         private async void externalFiltrationButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.ExternalFilterOn();
+            await ButtonManager.ExternalFilterOn();
         }
 
         private async void internalFiltrationButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.InternalFilterOn();
+            await ButtonManager.InternalFilterOn();
         }
 
         private async void disableFiltrationButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.FilteringOff();
+            await ButtonManager.FilteringOff();
         }
 
         private async void setCoolingFanButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.SetCoolingFanSpeed();
+            await ButtonManager.SetCoolingFanSpeed();
         }
 
         private async void setChamberFanButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.SetChamberFanSpeed();
+            await ButtonManager.SetChamberFanSpeed();
         }
 
         private async void setSpeedOffsetButton_Click(object sender, EventArgs e)
@@ -563,17 +557,24 @@ private async void setZaxisOffsetButton_Click(object sender, EventArgs e)
 
         private async void clearPlatformButton_Click(object sender, EventArgs e)
         {
-            await _buttonManager.ClearPlatform();
+            await ButtonManager.ClearPlatform();
         }
 
         private void settingsButton_Click(object sender, EventArgs e)
         {
-            _buttonManager.OpenSettings();
+            ButtonManager.OpenSettings();
         }
 
+        // todo disconnect button?
+        
         private async void connectButton_Click(object sender, EventArgs e)
         {
-            isConnected = await Connect();
+            if (IsConnected)
+            {
+                MessageBox.Show("You're already connected to a printer!", "Already connected!");
+                return;
+            }
+            IsConnected = await Connect();
         }
     }
 }