fix script stopping

Author: Elektryk-Andrzej

Code/ContextSystem/BaseContexts/LoopContext.cs

@@ -48,7 +48,6 @@ protected override IEnumerator<float> RunChildren()
     {
         foreach (var coro in Children
                      .TakeWhile(_ => !ReceivedBreak)
-                     .TakeWhile(_ => Script.IsRunning)
                      .Select(child => child.ExecuteBaseContext()))
         {
             while (coro.MoveNext())

Code/ContextSystem/BaseContexts/StatementContext.cs

@@ -22,7 +22,6 @@ protected virtual void OnReceivedControlMessageFromChild(ParentContextControlMes
     protected virtual IEnumerator<float> RunChildren()
     {
         foreach (var coro in Children
-                     .TakeWhile(_ => Script.IsRunning)
                      .Select(child => child.ExecuteBaseContext()))
         {
             while (coro.MoveNext())

Code/ContextSystem/Contexts/Control/ElifStatement.cs

@@ -82,28 +82,17 @@ protected override IEnumerator<float> Execute()
             var coro = enumerator();
             while (coro.MoveNext())
             {
-                if (!Script.IsRunning)
-                {
-                    yield break;
-                }
-                
                 yield return coro.Current;
             }
 
             yield break;
         }
 
         foreach (var coro in Children
-                     .TakeWhile(_ => Script.IsRunning)
                      .Select(child => child.ExecuteBaseContext()))
         {
             while (coro.MoveNext())
             {
-                if (!Script.IsRunning)
-                {
-                    yield break;
-                }
-                
                 yield return coro.Current;
             }
         }

Code/ContextSystem/Contexts/Control/StopKeyword.cs

@@ -3,6 +3,7 @@
 using SER.Code.ContextSystem.Interfaces;
 using SER.Code.ContextSystem.Structures;
 using SER.Code.Helpers.ResultSystem;
+using SER.Code.ScriptSystem.Structures;
 using SER.Code.TokenSystem.Tokens;
 
 namespace SER.Code.ContextSystem.Contexts.Control;
@@ -35,6 +36,6 @@ public override Result VerifyCurrentState()
 
     protected override void Execute()
     {
-        Script.Stop(true);
+        throw new StopScript();
     }
 }

Code/ContextSystem/Contexts/FunctionDefinitionContext.cs

@@ -137,13 +137,12 @@ protected override void OnReceivedControlMessageFromChild(ParentContextControlMe
     protected override IEnumerator<float> Execute()
     {
         foreach (var coro in Children
-             .TakeWhile(_ => Script.IsRunning)
              .Select(child => child.ExecuteBaseContext())
         )
         {
             while (coro.MoveNext())
             {
-                if (!Script.IsRunning || _end)
+                if (_end)
                 {
                     goto Exit;
                 }

Code/ContextSystem/Extensions/BaseContextExtensions.cs

@@ -18,16 +18,7 @@ public static IEnumerator<float> ExecuteBaseContext(this Context context)
 
             case YieldingContext yieldingContext:
                 var coro = yieldingContext.Run();
-                while (coro.MoveNext())
-                {
-                    if (!context.Script.IsRunning)
-                    {
-                        yield break;
-                    }
-                    
-                    yield return coro.Current;
-                }
-                
+                while (coro.MoveNext()) yield return coro.Current;
                 yield break;
 
             default:

Code/Helpers/BetterCoros.cs

@@ -1,7 +1,9 @@
 using MEC;
 using SER.Code.Exceptions;
 using SER.Code.Extensions;
+using SER.Code.Plugin;
 using SER.Code.ScriptSystem;
+using SER.Code.ScriptSystem.Structures;
 
 namespace SER.Code.Helpers;
 
@@ -31,10 +33,19 @@ private static IEnumerator<float> Wrapper(
     {
         while (true)
         {
+            if (MainPlugin.Instance.Config?.SafeScripts is true)
+            {
+                yield return Timing.WaitForOneFrame;
+            }
+            
             try
             {
                 if (!routine.MoveNext()) goto End;
             }
+            catch (StopScript)
+            {
+                goto End;
+            }
             catch (ScriptCompileError compErr)
             {
                 onException?.Invoke(compErr);
@@ -59,6 +70,11 @@ private static IEnumerator<float> Wrapper(
                 scr.Error($"Coroutine failed with {ex.GetType().AccurateName}: {ex.Message}\n{ex.StackTrace}");
                 goto End;
             }
+
+            if (scr.Killed)
+            {
+                goto End;
+            }
 
             yield return routine.Current;
         }

Code/MethodSystem/Methods/ScriptMethods/RunScriptAndWaitMethod.cs

@@ -3,7 +3,6 @@
 using SER.Code.ArgumentSystem.Arguments;
 using SER.Code.ArgumentSystem.BaseArguments;
 using SER.Code.MethodSystem.BaseMethods.Yielding;
-using SER.Code.ScriptSystem;
 using SER.Code.ScriptSystem.Structures;
 using SER.Code.VariableSystem.Bases;
 
@@ -33,8 +32,7 @@ public override IEnumerator<float> Execute()
         script.AddLocalVariables(variables);
         script.Run(RunReason.Script, Script);
 
-        // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-        while (script.IsRunning)
+        while (ScriptSystem.Script.RunningScripts.Contains(script))
         {
             yield return Timing.WaitForOneFrame;
         }

Code/MethodSystem/Methods/ScriptMethods/StopScriptMethod.cs

@@ -17,6 +17,6 @@ public class StopScriptMethod : SynchronousMethod
 
     public override void Execute()
     {
-        Args.GetRunningScript("running script").Stop();
+        Args.GetRunningScript("running script").ExternalStop();
     }
 }

Code/ScriptSystem/Script.cs

@@ -51,15 +51,15 @@ public required ScriptExecutor Executor
     public Line[] Lines = [];
     public Context[] Contexts = [];
 
+    public bool Killed { get; private set; }
+    
     public Script? Caller { get; private set; }
 
     public Profile? Profile { get; private set; }
 
     public RunReason RunReason { get; private set; }
 
     public uint CurrentLine { get; set; } = 0;
-    
-    public bool IsRunning => RunningScripts.Contains(this);
 
     private static readonly List<Script> RunningScriptsList = [];
     public static readonly ReadOnlyCollection<Script> RunningScripts = RunningScriptsList.AsReadOnly();
@@ -69,9 +69,7 @@ public required ScriptExecutor Executor
 
     public DateTime StartTime { get; private set; }
 
-    public TimeSpan TimeRunning => IsRunning ? DateTime.Now - StartTime : TimeSpan.Zero;
-    
-    private CoroutineHandle _scriptCoroutine;
+    public TimeSpan TimeRunning => StartTime == DateTime.MinValue ? TimeSpan.Zero : DateTime.Now - StartTime;
 
     private bool? _isEventAllowed;
 
@@ -91,7 +89,6 @@ public void Warn(string message)
     public void Error(string message)
     {
         Executor.Error(message, this);
-        Stop();
     }
 
     public static TryGet<Script> CreateByScriptName(string dirtyName, ScriptExecutor? executor)
@@ -129,19 +126,24 @@ public static int StopAll()
         var count = RunningScripts.Count;
         foreach (var script in new List<Script>(RunningScripts))
         {
-            script.Stop();
+            script.ExternalStop();
         }
 
         return count;
     }
+
+    public void ExternalStop()
+    {
+        Killed = true;
+    }
 
     public static int StopByName(string name)
     {
         var matches = new List<Script>(RunningScripts)
             .Where(scr => string.Equals(scr.Name, name, StringComparison.CurrentCultureIgnoreCase))
             .ToArray();
 
-        matches.ForEachItem(scr => scr.Stop());
+        matches.ForEachItem(scr => scr.ExternalStop());
         return matches.Length;
     }
 
@@ -189,22 +191,15 @@ public void Run(RunReason reason = RunReason.Unknown, Script? caller = null)
 
         RunningScriptsList.Add(this);
         //Profile = new Profile(this);
-        _scriptCoroutine = InternalExecute().Run(
-            this, 
-            _ => _scriptCoroutine.Kill()
-            //() => Profile.LogResults()
+        InternalExecute().Run(
+            this,
+            null,
+            () => RunningScriptsList.Remove(this)
         );
 
         return _isEventAllowed;
     }
 
-    public void Stop(bool silent = false)
-    {
-        RunningScriptsList.Remove(this);
-        _scriptCoroutine.Kill();
-        if (!silent) Logger.Info($"Script {Name} was stopped");
-    }
-
     public void SendControlMessage(ScriptControlMessage msg)
     {
         if (msg == ScriptControlMessage.EventNotAllowed)
@@ -314,19 +309,9 @@ private IEnumerator<float> InternalExecute()
 
         foreach (var context in Contexts)
         {
-            if (!IsRunning)
-            {
-                break;
-            }
-
             var handle = context.ExecuteBaseContext();
             while (handle.MoveNext())
             {
-                if (!IsRunning)
-                {
-                    break;
-                }
-                
                 yield return handle.Current;
             }
         }