Push updates, final changes

Author: SocksTheWolf

.github/workflows/build.yml

@@ -35,6 +35,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: CrowControl
+        retention-days: 10
         path: |
           everest.yaml
           bin
@@ -43,3 +44,14 @@ jobs:
           Dialog/**/*
           Graphics/**/*
           Loenn/**/*
+    - name: Make Draft Release
+      uses: ncipollo/release-action@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        artifacts: "CrowControl.zip"
+        allowUpdates: true
+        generateReleaseNotes: true
+        makeLatest: "latest"
+        draft: true
+
+

README.md

@@ -1,3 +1,23 @@
 # CrowControl
 
-Twitch in Celeste.
+Twitch Integration in Celeste without CrowdControl.
+
+## What does this fork change?
+
+This is the same as original CrowControl with the following fixes:
+
+* Update version.
+* Update to the current API/SDK.
+* Update plugin layout layout.
+* Requests properly count up.
+* Option: Commands can require unique user, allowing you to prevent the scenario of one user be able to spam `!die` a bunch of times.
+* Option: Spawned enemy AI is cleaned up properly on death.
+* Fix `!die` to work properly when already dead.
+* Exit the application cleanly, when connected.
+* Fix high CPU usage (because of inf. loop).
+* Fix websocket connection options so they do not crash the application.
+* Adds github runners.
+
+I do not play Celeste, I just made these fixes for [ffoxes](https://twitch.tv/ffoxes).
+
+You can download this from the releases tab, so long as the github actions decide to work.

Source/CrowControlModule.cs

@@ -519,6 +519,7 @@ private void Player_Added(On.Celeste.Player.orig_Added orig, Player self, Monocl
         static private void Engine_OnExiting(Engine.orig_OnExiting orig, Monocle.Engine self, object sender, EventArgs args)
         {
             Settings.ReconnectOnDisconnect = false;
+            Settings.IsExiting = true;
             Settings.StopThread();
             orig(self, sender, args);
         }

Source/CrowControlSettings.cs

@@ -131,6 +131,11 @@ public class CrowControlSettings : EverestModuleSettings
         private Thread webSocketThread;
         private Random rand = new Random();
 
+        // better handle socket disconnections
+        public bool IsExiting = false;
+        private CancellationTokenSource cancelToken;
+        private bool clickedDisconnect = false;
+
         [YamlIgnore] public Dictionary<MessageType, List<string>> currentVoteCounts = new Dictionary<MessageType, List<string>>();
 
         public CrowControlSettings() 
@@ -150,11 +155,6 @@ public void EffectTimeChange()
             CrowControlModule.GetTimerHelper().ChangeTimerIntervals();
         }
 
-        public void ClearAllVotes()
-        {
-            
-        }
-
         public void CreateChannelNameEntry(TextMenu textMenu, bool inGame) 
         {
             if (!inGame)
@@ -176,6 +176,9 @@ public void CreateConnectEntry(TextMenu textMenu, bool inGame)
             {
                 if (webSocketThread == null && Enabled)
                 {
+                    IsReconnecting = false;
+                    clickedDisconnect = false;
+                    cancelToken = new CancellationTokenSource();
                     webSocketThread = new Thread(StartWebSocket);
                     webSocketThread.Start();
                 }
@@ -188,6 +191,8 @@ public void CreateDisconnectEntry(TextMenu textMenu, bool inGame)
             {
                 if (webSocketThread != null && webSocketThread.IsAlive)
                 {
+                    IsReconnecting = false;
+                    clickedDisconnect = true;
                     StopThread();
                 }
             }));
@@ -203,7 +208,7 @@ public void StopThread()
         {
             if (webSocketThread != null && webSocketThread.IsAlive)
             {
-                Enabled = false;
+                cancelToken.Cancel();
                 webSocketThread.Join();
                 webSocketThread = null;
             }
@@ -233,17 +238,13 @@ public void StartWebSocket()
                 Console.WriteLine("JOINING");
 
                 IsReconnecting = false;
-
-                while (Enabled)
-                {
-
-                }
+                cancelToken.Token.WaitHandle.WaitOne();
             }
         }
 
         private void ReconnectIfDisconnected() 
         {
-            if (ReconnectOnDisconnect)
+            if (ReconnectOnDisconnect && !IsExiting && !clickedDisconnect)
             {
                 if (Connected == false)
                 {
@@ -254,7 +255,7 @@ private void ReconnectIfDisconnected()
 
                     if (webSocketThread == null)
                     {
-                        Enabled = true;
+                        cancelToken = new CancellationTokenSource();
                         webSocketThread = new Thread(StartWebSocket);
                         webSocketThread.Start();
                     }
@@ -279,7 +280,10 @@ private void Ws_OnClose(object sender, CloseEventArgs e)
 
             CrowControlModule.OnDisconnect();
             Connected = false;
-            ReconnectIfDisconnected();
+            if (!clickedDisconnect)
+                ReconnectIfDisconnected();
+            // Reset this flag
+            clickedDisconnect = false;
         }
 
         private void Ws_OnOpen(object sender, EventArgs e)
@@ -303,10 +307,8 @@ private void Ws_OnMessage(object sender, MessageEventArgs e)
             if (chatMsg.Bits >= MinimumBitsToSkip && MinimumBitsToSkip > 0)
             {
                 CrowControlModule.OnMessageWithBits(chatMsg);
-                return;
             }
-
-            if ((chatMsg.IsCustomReward && RequireChannelPoints) || !RequireChannelPoints)
+            else if ((chatMsg.IsCustomReward && RequireChannelPoints) || !RequireChannelPoints)
             {
                 CrowControlModule.OnCustomRewardMessage(chatMsg);
             }