Add hack to reset autorun block

1.0.0-beta2 stripped out the lua_newstate detour, which meant it'd only run autorun.lua the first server you joined. This adds a hacky reset using stored curtime. Hopefully It can be removed with further additions to rglua.

* Disable gui builds
* Bump to 1.0.0-beta3
* Add Debug trait to Realm

Author: vurvdev

.github/workflows/ci.yml

@@ -16,15 +16,15 @@ jobs:
         cd autorun
         cargo build --release --verbose
 
-  buildgui64:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build GUI
-      run: |
-        rustup default nightly
-        cd autorun-gui
-        cargo build --release --verbose
+  #buildgui64:
+  #  runs-on: windows-latest
+  #  steps:
+  #  - uses: actions/checkout@v2
+  #  - name: Build GUI
+  #    run: |
+  #      rustup default nightly
+  #      cd autorun-gui
+  #      cargo build --release --verbose
 
   # In the future make this run on an x86 machine https://github.com/actions/runner/issues/423
   build86:

.github/workflows/downloads.yml

@@ -23,22 +23,23 @@ jobs:
         name: 64 Bit
         path: target/release/Autorun.dll
 
-  buildgui64:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build GUI
-      run: |
-        rustup default nightly
-        cd autorun-gui
-        cargo build --release --verbose
-        cd ..
-
-    - name: Upload EXE
-      uses: actions/upload-artifact@v2
-      with:
-        name: 64 Bit
-        path: target/release/autorun-gui.exe
+  # Re-enable this when gui is ready.
+  #buildgui64:
+  #  runs-on: windows-latest
+  #  steps:
+  #  - uses: actions/checkout@v2
+  #  - name: Build GUI
+  #    run: |
+  #      rustup default nightly
+  #      cd autorun-gui
+  #      cargo build --release --verbose
+  #      cd ..
+
+  #  - name: Upload EXE
+  #    uses: actions/upload-artifact@v2
+  #    with:
+  #      name: 64 Bit
+  #      path: target/release/autorun-gui.exe
 
   # In the future make this run on an x86 machine https://github.com/actions/runner/issues/423
   build86:

autorun-shared/src/top.rs

@@ -2,7 +2,7 @@ use std::fmt;
 
 // I know this is a waste to contain 'server' but I want it to be able to be used with GetLuaInterface
 #[repr(u8)]
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub enum Realm {
 	Client = 0,
 	Server = 1,

autorun/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "autorun"
-version = "1.0.0-beta2"
+version = "1.0.0-beta3"
 authors = ["Vurv78 <Vurv78@users.noreply.github.com>"]
 edition = "2021"
 publish = false

autorun/src/global.rs

@@ -6,8 +6,6 @@ use once_cell::sync::Lazy;
 
 use autorun_shared::Realm;
 
-pub static HAS_AUTORAN: AtomicBool = AtomicBool::new(false); // Whether an autorun script has been run and detected already.
-
 type LuaScript = Vec<(Realm, String)>;
 // Scripts waiting to be ran in painttraverse
 pub static LUA_SCRIPTS: Lazy<Arc<Mutex<LuaScript>>> =

autorun/src/hooks/mod.rs

@@ -1,6 +1,7 @@
 use std::ffi::CStr;
 use std::io::Write;
 use std::{fs, sync::atomic::Ordering};
+use std::sync::atomic::AtomicU64;
 
 use crate::{configs, global, lua::{self, AutorunEnv}, util, logging};
 
@@ -27,6 +28,8 @@ lazy_detour! {
 	static PAINT_TRAVERSE_H: PaintTraverseFn;
 }
 
+static CONNECTED: AtomicU64 = AtomicU64::new(99999);
+
 fn loadbufferx_hook(l: LuaState, code: LuaString, len: usize, identifier: LuaString, mode: LuaString) -> Result<i32, interface::Error> {
 	let engine = iface!(EngineClient)?;
 
@@ -36,12 +39,25 @@ fn loadbufferx_hook(l: LuaState, code: LuaString, len: usize, identifier: LuaStr
 
 		if let Some(net) = unsafe { net.as_mut() } {
 			let ip = net.GetAddress();
+			let mut startup = false;
+
+			// TODO: It'd be great to hook net connections instead of doing this.
+			// However, this works fine for now.
+			let curtime = net.GetTimeConnected() as u64;
+			if curtime < CONNECTED.load(Ordering::Relaxed) {
+				debug!("Curtime is less than last time connected, assuming startup");
+				startup = true;
+				CONNECTED.store(curtime, Ordering::Relaxed);
+			} else {
+				// Awful
+				CONNECTED.store(curtime, Ordering::Relaxed);
+			}
 
 			let raw_path = unsafe { CStr::from_ptr(identifier) };
 			let path = &raw_path.to_string_lossy()[1..]; // Remove the @ from the beginning of the path
 
 			// There's way too many params here
-			do_run = dispatch(l, path, ip, code, len, identifier);
+			do_run = dispatch(l, startup, path, ip, code, len, identifier);
 			if !do_run {
 				return Ok(0);
 			}
@@ -72,23 +88,19 @@ extern "C" fn loadbufferx_h(
 	}
 }
 
-pub fn dispatch(l: LuaState, path: &str, server_ip: LuaString, mut code: LuaString, mut len: SizeT, identifier: LuaString) -> bool {
+pub fn dispatch(l: LuaState, startup: bool, path: &str, ip: LuaString, mut code: LuaString, mut len: SizeT, identifier: LuaString) -> bool {
 	let mut do_run = true;
 
-	let before_autorun = global::HAS_AUTORAN
-		.compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
-		.is_ok();
-
-	if before_autorun {
+	if startup {
 		let env = AutorunEnv {
 			is_autorun_file: true,
-			startup: before_autorun,
+			startup,
 
-			identifier: identifier,
-			code: code,
+			identifier,
+			code,
 			code_len: len,
 
-			ip: server_ip,
+			ip,
 		};
 		// This will only run once when HAS_AUTORAN is false, setting it to true.
 		// Will be reset by JoinServer.
@@ -97,7 +109,7 @@ pub fn dispatch(l: LuaState, path: &str, server_ip: LuaString, mut code: LuaStri
 		if let Ok(script) = fs::read_to_string(&ar_path) {
 			// Try to run here
 			if let Err(why) = lua::run_env(&script, env) {
-				error!("{}", why);
+				error!("{why}");
 			}
 		} else {
 			error!(
@@ -110,13 +122,13 @@ pub fn dispatch(l: LuaState, path: &str, server_ip: LuaString, mut code: LuaStri
 	if let Ok(script) = fs::read_to_string(configs::path(configs::HOOK_PATH)) {
 		let env = AutorunEnv {
 			is_autorun_file: false,
-			startup: before_autorun,
+			startup,
 
-			identifier: identifier,
-			code: code,
+			identifier,
+			code,
 			code_len: len,
 
-			ip: server_ip,
+			ip: ip,
 		};
 
 		match lua::run_env(&script, env) {
@@ -140,7 +152,7 @@ pub fn dispatch(l: LuaState, path: &str, server_ip: LuaString, mut code: LuaStri
 	}
 
 	if global::FILESTEAL_ENABLED.load(Ordering::Relaxed) {
-		let ip = unsafe { CStr::from_ptr(server_ip) };
+		let ip = unsafe { CStr::from_ptr(ip) };
 
 		if let Ok(mut file) = util::get_handle(path, ip.to_string_lossy()) {
 			if let Err(why) = file.write_all(unsafe { std::ffi::CStr::from_ptr(code) }.to_bytes()) {