goofy ahh once cell function storage code

src/runner/runner.rs

@@ -33,7 +33,6 @@ fn init(lua:&mlua::Lua)->mlua::Result<()>{
 
 	#[cfg(feature="run-service")]
 	crate::scheduler::set_globals(lua,&globals)?;
-	super::script_signal::set_globals(lua,&globals)?;
 	super::r#enum::set_globals(lua,&globals)?;
 	super::color3::set_globals(lua,&globals)?;
 	super::vector3::set_globals(lua,&globals)?;

src/runner/script_signal.rs

@@ -1,7 +1,5 @@
 use std::{cell::RefCell,rc::Rc};
 
-use mlua::UserDataFields;
-
 #[derive(Clone)]
 struct FunctionList{
 	functions:Vec<mlua::Function>,
@@ -43,9 +41,10 @@ pub struct ScriptSignal{
 	// Emulate the garbage roblox api.
 	// ScriptConnection should not exist.
 	// :Disconnect should be a method on ScriptSignal, and this would be avoided entirely.
-	connections:RcFunctionList,
+	callbacks:RcFunctionList,
 	once:RcFunctionList,
 	wait:Rc<RefCell<Vec<mlua::Thread>>>,
+	wait_function:std::cell::OnceCell<mlua::Function>,
 }
 pub struct ScriptConnection{
 	connection:RcFunctionList,
@@ -54,13 +53,14 @@ pub struct ScriptConnection{
 impl ScriptSignal{
 	pub fn new()->Self{
 		Self{
-			connections:RcFunctionList::new(),
+			callbacks:RcFunctionList::new(),
 			once:RcFunctionList::new(),
 			wait:Rc::new(RefCell::new(Vec::new())),
+			wait_function:std::cell::OnceCell::new(),
 		}
 	}
 	pub fn fire(&self,args:&mlua::MultiValue){
-		self.connections.fire(args);
+		self.callbacks.fire(args);
 		//Replace the FunctionList with an empty one and drop the borrow
 		let once=std::mem::replace(&mut *self.once.functions.borrow_mut(),FunctionList::new());
 		once.fire(args);
@@ -73,9 +73,9 @@ impl ScriptSignal{
 		}
 	}
 	pub fn connect(&self,function:mlua::Function)->ScriptConnection{
-		self.connections.functions.borrow_mut().functions.push(function.clone());
+		self.callbacks.functions.borrow_mut().functions.push(function.clone());
 		ScriptConnection{
-			connection:self.connections.clone(),
+			connection:self.callbacks.clone(),
 			function,
 		}
 	}
@@ -109,29 +109,32 @@ return function()
 	return coroutine_yield()
 end";
 
-pub fn set_globals(lua:&mlua::Lua,globals:&mlua::Table)->Result<(),mlua::Error>{
-	let coroutine_table=globals.get::<mlua::Table>("coroutine")?;
-	let wait_thread=lua.create_function(wait_thread)?;
-
-	//create wait function environment
-	let wait_env=lua.create_table()?;
-	wait_env.raw_set("coroutine",coroutine_table)?;
-	wait_env.raw_set("wait_thread",wait_thread)?;
-
-	//construct wait function from Lua code
-	let wait=lua.load(LUA_WAIT)
-	.set_name("wait")
-	.set_environment(wait_env)
-	.call::<mlua::Function>(())?;
-
-	lua.register_userdata_type::<ScriptSignal>(|reg|{
-		reg.add_field("Wait",wait);
-	})?;
-
-	Ok(())
-}
-
 impl mlua::UserData for ScriptSignal{
+	fn add_fields<F:mlua::UserDataFields<Self>>(fields:&mut F){
+		fields.add_field_method_get("Wait",|lua,this|{
+			Ok(match this.wait_function.get(){
+				Some(f)=>f.clone(),
+				None=>{
+					let coroutine_table=lua.globals().get::<mlua::Table>("coroutine")?;
+					let wait_thread=lua.create_function(wait_thread)?;
+
+					//create wait function environment
+					let wait_env=lua.create_table()?;
+					wait_env.raw_set("coroutine",coroutine_table)?;
+					wait_env.raw_set("wait_thread",wait_thread)?;
+
+					//construct wait function from Lua code
+					let wait=lua.load(LUA_WAIT)
+					.set_name("wait")
+					.set_environment(wait_env)
+					.call::<mlua::Function>(())?;
+
+					this.wait_function.set(wait.clone()).unwrap();
+					wait
+				}
+			})
+		});
+	}
 	fn add_methods<M:mlua::UserDataMethods<Self>>(methods:&mut M){
 		methods.add_method("Connect",|_lua,this,f:mlua::Function|
 			Ok(this.connect(f))