Add source manipulation & Run hook.lua during autorun. Fixes #13

* Return a string in your hook.lua file to override the code being ran
* hook.lua will now run even if autorun.lua just ran (If you want to override init.lua completely for some reason)

Author: vurvdev

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "autorun"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Vurv78 <Vurv78@users.noreply.github.com>"]
 edition = "2018"
 

src/detours/mod.rs

@@ -14,6 +14,9 @@ use rglua::{
 
 use detour::static_detour;
 
+const LUA_BOOL: i32 = rglua::globals::Lua::Type::Bool as i32;
+const LUA_STRING: i32 = rglua::globals::Lua::Type::String as i32;
+
 static_detour! {
 	pub static luaL_newstate_h: extern "C" fn() -> LuaState;
 	pub static luaL_loadbufferx_h: extern "C" fn(LuaState, CharBuf, SizeT, CharBuf, CharBuf) -> CInt;
@@ -23,7 +26,7 @@ static_detour! {
 
 fn luaL_newstate() -> LuaState {
 	let state = luaL_newstate_h.call();
-	info!("Got client state through luaL_newstate");
+	debug!("Got client state through luaL_newstate");
 	setClientState(state);
 	state
 }
@@ -40,7 +43,6 @@ fn luaL_loadbufferx(state: LuaState, code: CharBuf, size: SizeT, identifier: Cha
 	let raw_path = &rstring!(identifier)[1 ..]; // Remove the @ from the beginning of the path.
 	let server_ip = CURRENT_SERVER_IP.load( Ordering::Relaxed );
 
-	let mut autoran = false;
 	let mut do_run = true;
 	if raw_path == "lua/includes/init.lua" {
 		if HAS_AUTORAN.compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed).is_ok() {
@@ -51,27 +53,30 @@ fn luaL_loadbufferx(state: LuaState, code: CharBuf, size: SizeT, identifier: Cha
 				if let Err(why) = runLuaEnv(&script, identifier, code, server_ip, true) {
 					error!("{}", why);
 				}
-				autoran = true;
 			} else {
 				error!( "Couldn't read your autorun script file at {}/{}", SAUTORUN_DIR.display(), AUTORUN_SCRIPT_PATH.display() );
 			}
 		}
 	}
 
-	if !autoran {
-		if let Ok(script) = fs::read_to_string(&*HOOK_SCRIPT_PATH) {
-			match runLuaEnv(&script, identifier, code, server_ip, false) {
-				Ok(_) => {
-					// If you return ``true`` in your sautorun/hook.lua file, then don't run the sautorun.CODE that is about to run.
-					if lua_type(state, 1) == rglua::globals::Lua::Type::Bool as i32 {
-						do_run = lua_toboolean(state, 1) == 0;
-						lua_pop(state, 1);
-					}
-				},
-				Err(why) => error!("{}", why)
-			}
+	let mut new_code = None;
+	if let Ok(script) = fs::read_to_string(&*HOOK_SCRIPT_PATH) {
+		match runLuaEnv(&script, identifier, code, server_ip, false) {
+			Ok(top) => {
+				// If you return ``true`` in your sautorun/hook.lua file, then don't run the sautorun.CODE that is about to run.
+				match lua_type(state, top + 1) {
+					LUA_BOOL => {
+						do_run = lua_toboolean(state, top + 1) == 0;
+					},
+					LUA_STRING => {
+						new_code = Some( lua_tostring(state, top + 1) );
+					},
+					_ => ()
+				}
+				lua_settop(state, top);
+			},
+			Err(_why) => ()
 		}
-
 	}
 
 	if let Some(mut file) = getAutorunHandle(raw_path, server_ip) {
@@ -82,7 +87,7 @@ fn luaL_loadbufferx(state: LuaState, code: CharBuf, size: SizeT, identifier: Cha
 
 	if do_run {
 		// Call the original function and return the value.
-		return luaL_loadbufferx_h.call( state, code, size, identifier, mode );
+		return luaL_loadbufferx_h.call( state, new_code.unwrap_or(code), size, identifier, mode );
 	}
 	0
 }
@@ -127,7 +132,7 @@ fn paint_traverse(this: &'static IPanel, panel_id: usize, force_repaint: bool, f
 			lua_pop(state, 1);
 			error!("{}", rstring!(err));
 		} else {
-			info!("Code [len {}] ran successfully.", script.len())
+			info!("Code [#{}] ran successfully.", script.len())
 		}
 	}
 }

src/input.rs

@@ -12,21 +12,19 @@ pub(crate) fn try_process_input() -> anyhow::Result<()> {
 	debug!("Command used: [{}], rest [{}]", word, rest);
 
 	match word {
-		"lua_run_cl" => match runLua(REALM_CLIENT, rest.to_owned()) {
-			Err(why) => error!("{}", why),
-			_ => () // We don't know if it was successful yet. The code will run later in painttraverse and print there.
+		"lua_run_cl" => if let Err(why) = runLua(REALM_CLIENT, rest.to_owned()) {
+			error!("{}", why);
+			// We don't know if it was successful yet. The code will run later in painttraverse and print there.
 		},
 		"lua_openscript_cl" => match std::fs::read_to_string( Path::new(rest_trim) ) {
 			Err(why) => error!("Errored on lua_openscript. [{}]", why),
-			Ok(contents) => match runLua( REALM_CLIENT, contents ) {
-				Err(why) => error!("{}", why),
-				_ => ()
+			Ok(contents) => if let Err(why) = runLua( REALM_CLIENT, contents ) {
+				error!("{}", why);
 			}
 		},
 
-		"lua_run_menu" => match runLua(REALM_MENU, rest.to_owned()) {
-			Err(why) => error!("{}", why),
-			_ => ()
+		"lua_run_menu" => if let Err(why) = runLua(REALM_MENU, rest.to_owned()) {
+			error!("{}", why);
 		},
 
 		"lua_openscript_menu" => match std::fs::read_to_string( Path::new( rest ) ) {

src/lib.rs

@@ -75,6 +75,7 @@ fn cleanup() {
 	unsafe {
 		FreeConsole();
 	};
+
 	if let Some(sender) = SENDER.get() {
 		sender.send(()).expect("Couldn't send mpsc kill message");
 	}

src/logging.rs

@@ -12,13 +12,13 @@ pub fn init() -> anyhow::Result<()> {
 	let log_file_handle = File::create( SAUTORUN_LOG_DIR.join( format!("{}.log", Local::now().format("%B %d, %Y %I-%M %P") ) ) )?;
 
 	let configs = ConfigBuilder::new()
-		.set_level_color( Level::Info, Some( Color::Cyan) )
-		.set_level_color( Level::Error, Some( Color::Red) )
-		.set_level_color( Level::Warn, Some( Color::Yellow) )
+		.set_level_color( Level::Info, Some( Color::Cyan ) )
+		.set_level_color( Level::Error, Some( Color::Red ) )
+		.set_level_color( Level::Warn, Some( Color::Yellow ) )
 		.build();
 
 	CombinedLogger::init(
-vec![
+		vec![
 			TermLogger::new(
 				// Logs that are level 'info' or above will be sent to the console.
 				LevelFilter::Info,

src/sys/runlua.rs

@@ -69,7 +69,7 @@ extern fn log(state: LuaState) -> i32 {
 }
 
 // Runs lua, but inside of the sautorun environment.
-pub fn runLuaEnv(script: &str, identifier: CharBuf, dumped_script: CharBuf, ip: &str, startup: bool) -> Result<(), String> {
+pub fn runLuaEnv(script: &str, identifier: CharBuf, dumped_script: CharBuf, ip: &str, startup: bool) -> Result<i32, String> {
 	let state = getClientState();
 
 	if state == std::ptr::null_mut() {
@@ -78,6 +78,8 @@ pub fn runLuaEnv(script: &str, identifier: CharBuf, dumped_script: CharBuf, ip:
 
 	let cscript = CString::new(script).map_err(|x| format!("Couldn't convert script to CString. [{}]", x))?;
 
+	let top = lua_gettop(state);
+
 	if luaL_loadbufferx_h.call(
 		state,
 		cscript.as_ptr(),
@@ -93,9 +95,9 @@ pub fn runLuaEnv(script: &str, identifier: CharBuf, dumped_script: CharBuf, ip:
 
 	lua_createtable( state, 0, 0 ); // Create our custom environment
 
-	lua_createtable( state, 0, 0 ); // Create the  'sautorun' table
+	lua_createtable( state, 0, 0 ); // Create the 'sautorun' table
 
-	lua_pushstring( state, identifier );
+		lua_pushstring( state, identifier );
 		lua_setfield( state, -2, "NAME\0".as_ptr() as CharBuf );
 
 		lua_pushstring( state, dumped_script );
@@ -130,5 +132,5 @@ pub fn runLuaEnv(script: &str, identifier: CharBuf, dumped_script: CharBuf, ip:
 		return Err( rstring!(err_runtime).to_owned() );
 	}
 
-	Ok(())
+	Ok(top)
 }