Check status

Author: Sleitnick

Runtime/Code/Luau/AirshipComponent.cs

@@ -125,15 +125,20 @@ public void Init() {
 			context = LuauContext.Protected;
 		}
 
-		// Load the component onto the thread:
-		thread = LuauScript.LoadAndExecuteScript(gameObject, context, LuauScriptCacheMode.Cached, script, true);
-		if (thread == IntPtr.Zero) {
-			Debug.LogError($"Component failed to load: {script.m_path}");
+		// Load the component onto the thread
+		thread = LuauScript.LoadAndExecuteScript(gameObject, context, LuauScriptCacheMode.Cached, script, out var status);
+		if (status != 0) {
+			thread = IntPtr.Zero;
+			if (status == 1) {
+				Debug.LogError($"AirshipComponent constructor cannot yield: {script.m_path}");
+			} else {
+				Debug.LogError($"Component failed to load: {script.m_path}");
+			}
 			return;
 		}
 
 		LuauCore.onResetInstance += OnLuauReset;
-		
+
 		AwakeAirshipComponent();
 	}
 
@@ -172,7 +177,7 @@ private void AwakeAirshipComponent() {
 		}
 
 		LuauPlugin.LuauInitializeAirshipComponent(context, thread, AirshipBehaviourRootV2.GetId(gameObject), _airshipComponentId, propertyDtos);
-		InvokeAirshipLifecycle(AirshipComponentUpdateType.AirshipAwake);
+		InvokeAirshipLifecycle(AirshipComponentUpdateType.AirshipAwake); // TODO: Maybe move this to the actual Awake method?
 	}
 
 	private void Start() {

Runtime/Code/Luau/LuauCoreUtilities.cs

@@ -5,12 +5,6 @@
 using UnityEngine;
 
 public partial class LuauCore : MonoBehaviour {
-    public int ResumeScript(LuauContext context, AirshipComponent binding) {
-        var retValue = LuauState.FromContext(context).ResumeScript(binding);
-
-        return retValue;
-    }
-
     public void AddThread(LuauContext context, IntPtr thread, AirshipComponent binding) {
         LuauState.FromContext(context).AddThread(thread, binding);
     }

Runtime/Code/Luau/LuauPluginRaw.cs

@@ -206,7 +206,22 @@ public static void Unref(IntPtr thread, int refVal) {
 	/// <summary>
 	/// Pushes the value referenced by "refVal" to the top of the thread's stack.
 	/// </summary>
-	public static void GerRef(IntPtr thread, int refVal) {
+	public static void GetRef(IntPtr thread, int refVal) {
 		ThrowIfNotNullPtr(LuaGetRef(thread, refVal));
 	}
+	
+#if UNITY_IPHONE
+    [DllImport("__Internal")]
+#else
+	[DllImport("LuauPlugin")]
+#endif
+	private static extern IntPtr LuaGetTop(IntPtr thread, ref int top);
+	/// <summary>
+	/// Gets the top index of the thread's stack (which can also be seen as the stack size).
+	/// </summary>
+	public static int GetTop(IntPtr thread) {
+		var top = 0;
+		ThrowIfNotNullPtr(LuaGetTop(thread, ref top));
+		return top;
+	}
 }

Runtime/Code/Luau/LuauScript.cs

@@ -102,7 +102,7 @@ private void Awake() {
 			context = LuauContext.Protected;
 		}
 
-		thread = LoadAndExecuteScript(gameObject, context, LuauScriptCacheMode.NotCached, script, false);
+		thread = LoadAndExecuteScript(gameObject, context, LuauScriptCacheMode.NotCached, script, out var status);
 	}
 
 	/// <summary>
@@ -137,18 +137,20 @@ public static IntPtr LoadScript(GameObject obj, LuauContext context, LuauScriptC
 	/// <summary>
 	/// Execute a thread. The thread must first be created with the LoadScript function.
 	/// </summary>
-	public static void ExecuteScript(IntPtr thread) {
+	public static int ExecuteScript(IntPtr thread) {
 		// Execute the new thread. We don't need to do anything after this. If the thread errors, the error will be
 		// outputted. If the thread yields, whoever yielded it owns responsibility for resuming it (e.g. the task
 		// scheduler):
-		LuauPlugin.LuauRunThread(thread);
+		return LuauPlugin.LuauRunThread(thread);
 	}
 
 	/// <summary>
 	/// Loads and executes the given script. The executed Luau thread is returned. If the thread is a nullptr, then
 	/// that indicates that Luau failed to load the script.
 	/// </summary>
-	public static IntPtr LoadAndExecuteScript(GameObject obj, LuauContext context, LuauScriptCacheMode cacheMode, AirshipScript script, bool pinThread) {
+	public static IntPtr LoadAndExecuteScript(GameObject obj, LuauContext context, LuauScriptCacheMode cacheMode, AirshipScript script, out int status) {
+		status = -1;
+		
 		var thread = LoadScript(obj, context, cacheMode, script);
 
 		var shouldCacheValue = thread == IntPtr.Zero && cacheMode == LuauScriptCacheMode.Cached;
@@ -163,16 +165,16 @@ public static IntPtr LoadAndExecuteScript(GameObject obj, LuauContext context, L
 			return thread;
 		}
 
-		if (shouldCacheValue) {
-			var requirePath = LuauCore.GetRequirePath(script.m_path, CleanupFilePath(script.m_path));
-			LuauPlugin.LuauCacheModuleOnThread(thread, requirePath);
+		if (!shouldCacheValue) {
+			status = 0;
+		} else {
+			status = ExecuteScript(thread);
 		}
 
-		if (pinThread) {
-			LuauPlugin.LuauPinThread(thread);
+		if (shouldCacheValue && status == 0) {
+			var requirePath = LuauCore.GetRequirePath(script.m_path, CleanupFilePath(script.m_path));
+			LuauPlugin.LuauCacheModuleOnThread(thread, requirePath);
 		}
-		
-		ExecuteScript(thread);
 
 		return thread;
 	}