Aneri, take 2

.gitignore

@@ -244,3 +244,8 @@ config/dbconfig.txt
 
 # Running OpenDream locally
 tgstation.json
+
+meowtonin*
+
+# TODO: REMOVE BEFORE FULL MERGE!!! (this is so CI works)
+!/libaneri.so

Dockerfile

@@ -5,17 +5,17 @@ RUN dpkg --add-architecture i386 \
     && apt-get upgrade -y \
     && apt-get dist-upgrade -y \
     && apt-get install -y --no-install-recommends \
-        ca-certificates
+    ca-certificates
 
 # byond = base + byond installed globally
 FROM base AS byond
 WORKDIR /byond
 
 RUN apt-get install -y --no-install-recommends \
-        curl \
-        unzip \
-        make \
-        libstdc++6:i386
+    curl \
+    unzip \
+    make \
+    libstdc++6:i386
 
 COPY dependencies.sh .
 
@@ -35,7 +35,7 @@ FROM byond AS build
 WORKDIR /tgstation
 
 RUN apt-get install -y --no-install-recommends \
-        curl
+    curl
 
 COPY . .
 
@@ -45,7 +45,7 @@ RUN env TG_BOOTSTRAP_NODE_LINUX=1 tools/build/build \
 # rust = base + rustc and i686 target
 FROM base AS rust
 RUN apt-get install -y --no-install-recommends \
-        curl && \
+    curl && \
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal \
     && ~/.cargo/bin/rustup target add i686-unknown-linux-gnu
 
@@ -54,10 +54,10 @@ FROM rust AS rust_g
 WORKDIR /rust_g
 
 RUN apt-get install -y --no-install-recommends \
-        pkg-config:i386 \
-        libssl-dev:i386 \
-        gcc-multilib \
-        git \
+    pkg-config:i386 \
+    libssl-dev:i386 \
+    gcc-multilib \
+    git \
     && git init \
     && git remote add origin https://github.com/tgstation/rust-g
 
@@ -68,16 +68,37 @@ RUN . ./dependencies.sh \
     && git checkout FETCH_HEAD \
     && env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target i686-unknown-linux-gnu
 
-# final = byond + runtime deps + rust_g + build
+# aneri = base + aneri compiled to /aneri
+FROM rust AS aneri
+WORKDIR /aneri
+
+RUN apt-get install -y --no-install-recommends \
+    pkg-config:i386 \
+    libssl-dev:i386 \
+    gcc-multilib \
+    clang \
+    git \
+    && git init \
+    && git remote add origin https://github.com/Absolucy/aneri
+
+COPY dependencies.sh .
+
+RUN . ./dependencies.sh \
+    && git fetch --depth 1 origin "${ANERI_VERSION}" \
+    && git checkout FETCH_HEAD \
+    && env PKG_CONFIG_ALLOW_CROSS=1 ~/.cargo/bin/cargo build --release --target i686-unknown-linux-gnu
+
+# final = byond + runtime deps + rust_g + aneri + build
 FROM byond
 WORKDIR /tgstation
 
 RUN apt-get install -y --no-install-recommends \
-        libssl1.0.0:i386 \
-        zlib1g:i386
+    libssl1.0.0:i386 \
+    zlib1g:i386
 
 COPY --from=build /deploy ./
 COPY --from=rust_g /rust_g/target/i686-unknown-linux-gnu/release/librust_g.so ./librust_g.so
+COPY --from=aneri /aneri/target/i686-unknown-linux-gnu/release/libaneri.so ./libaneri.so
 
 VOLUME [ "/tgstation/config", "/tgstation/data" ]
 ENTRYPOINT [ "DreamDaemon", "tgstation.dmb", "-port", "1337", "-trusted", "-close", "-verbose" ]

code/__DEFINES/aneri.dm

@@ -0,0 +1,118 @@
+#ifndef ANERI
+
+//#define ANERI_OVERRIDE_PICK
+#define ANERI_OVERRIDE_PICK_WEIGHT
+//#define ANERI_OVERRIDE_SORT
+#define ANERI_OVERRIDE_RAND
+
+/* This comment bypasses grep checks */ /var/__aneri
+
+/proc/__detect_aneri()
+	if(world.system_type == UNIX)
+		return __aneri = "libaneri"
+	else
+		return __aneri = "aneri"
+
+#define ANERI (__aneri || __detect_aneri())
+#define ANERI_CALL(name, args...) call_ext(ANERI, "byond:" + name)(args)
+
+/proc/aneri_version()	return ANERI_CALL("aneri_version")
+/proc/aneri_features()	return ANERI_CALL("aneri_features")
+/proc/aneri_cleanup()	return ANERI_CALL("cleanup")
+
+#define aneri_log_write(fname, text, format)	ANERI_CALL("log_write", "[fname]", text, format)
+/proc/aneri_log_close_all()						return ANERI_CALL("log_close_all")
+
+#define aneri_json_is_valid(text)		ANERI_CALL("json_is_valid", text)
+
+/proc/aneri_hex_encode(input, upper = FALSE)
+	return ANERI_CALL("hex_encode", input, upper)
+
+#define aneri_hex_decode(input)			ANERI_CALL("hex_decode", input)
+
+#define aneri_url_encode(input) 		ANERI_CALL("url_encode", input)
+#define aneri_url_decode(input) 		ANERI_CALL("url_decode", input)
+
+#define url_encode(text) aneri_url_encode("[text]")
+#define url_decode(text) aneri_url_decode("[text]")
+
+#define aneri_base64_encode(input)		ANERI_CALL("base64_encode", input)
+#define aneri_base64_decode(input)		ANERI_CALL("base64_decode", input)
+#define aneri_base64url_encode(input)	ANERI_CALL("base64url_encode", input)
+#define aneri_base64url_decode(input)	ANERI_CALL("base64url_decode", input)
+
+/proc/aneri_uuid()						return ANERI_CALL("uuid")
+/proc/aneri_cuid2(len = null)			return ANERI_CALL("cuid2", len)
+/proc/aneri_unix_timestamp()			return ANERI_CALL("unix_timestamp")
+
+#define aneri_sort(value, sorter)			ANERI_CALL("sort", value, sorter)
+
+#define aneri_file_exists(file)				ANERI_CALL("file_exists", "[file]")
+#define aneri_file_read(file)				ANERI_CALL("file_read", "[file]")
+#define aneri_file_write(data, file)		ANERI_CALL("file_write", "[file]", "[data]")
+#define aneri_file_append(data, file)		ANERI_CALL("file_append", "[file]", "[data]")
+#define aneri_file_get_line_count(file)		ANERI_CALL("file_get_line_count", "[file]")
+#define aneri_file_seek_line(file, line)	ANERI_CALL("file_seek", "[file]", line)
+#define aneri_file_delete(file)				ANERI_CALL("file_delete", "[file]")
+#define aneri_mkdir(path)					ANERI_CALL("mkdir", "[path]")
+#define aneri_rmdir(path)					ANERI_CALL("rmdir", "[path]")
+
+#define aneri_toml_is_valid(toml)			ANERI_CALL("aneri_toml_is_valid", "[toml]")
+#define aneri_toml_decode(toml)				ANERI_CALL("toml_decode", "[toml]")
+#define aneri_toml_decode_file(file)		ANERI_CALL("toml_decode_file", "[file]")
+
+/// Use instead of REGEX_QUOTE for aneri regex
+#define aneri_regex_escape(pattern)			ANERI_CALL("regex_escape", "[pattern]")
+#define aneri_regex_combine_list(patterns)	ANERI_CALL("regex_combine_list", islist(patterns) ? patterns : list(patterns))
+
+//#define file2text(fname)		aneri_file_read("[fname]")
+//#define text2file(text, fname)	aneri_file_append(text, "[fname]")
+
+#define aneri_md5(input)		ANERI_CALL("hash", "md5", input)
+#define aneri_md5_file(fname)	ANERI_CALL("hash_file", "md5", fname)
+
+/proc/aneri_replace_chars_prob(input, replacement, probability = 25, skip_whitespace = FALSE) as text
+	return ANERI_CALL("replace_chars_prob", input, replacement, probability, skip_whitespace)
+
+#if defined(ANERI_OVERRIDE_PICK) || defined(ANERI_OVERRIDE_PICK_WEIGHT)
+#define pick_weight(list)		_aneri_pick_weighted(list)
+#endif
+
+#ifdef ANERI_OVERRIDE_PICK
+#define pick(list...)			_apick(list)
+
+/proc/_apick(...)
+	switch(length(args))
+		if(0)
+			CRASH("pick() called with no arguments")
+		if(1)
+			var/list/arg = args[1]
+			if(!islist(arg))
+				CRASH("pick() called with non-list argument")
+			return _aneri_pick(arg)
+		else
+			return _aneri_pick(args)
+#endif
+
+#ifdef ANERI_OVERRIDE_RAND
+/proc/_arand(...)
+	switch(length(args))
+		if(0)
+			return ANERI_CALL("random_float")
+		if(1)
+			return ANERI_CALL("random_range_int_unsigned", 0, args[1])
+		if(2)
+			return ANERI_CALL("random_range_int_signed", args[1], args[2])
+		else
+			CRASH("arand() takes 0-2 arguments")
+
+#define rand(args...)	_arand(args)
+#define prob(val)		ANERI_CALL("prob", val)
+#endif
+
+/world/New()
+	aneri_startup_log()
+	aneri_cleanup()
+	..()
+
+#endif

code/__DEFINES/logging.dm

@@ -183,6 +183,6 @@
 #define SEND_TEXT(target, text) DIRECT_OUTPUT(target, text)
 #define WRITE_FILE(file, text) DIRECT_OUTPUT(file, text)
 #define READ_FILE(file, text) DIRECT_INPUT(file, text)
-//This is an external call, "true" and "false" are how rust parses out booleans
-#define WRITE_LOG(log, text) rustg_log_write(log, text, "true")
-#define WRITE_LOG_NO_FORMAT(log, text) rustg_log_write(log, text, "false")
+
+#define WRITE_LOG(log, text) aneri_log_write(log, text, TRUE)
+#define WRITE_LOG_NO_FORMAT(log, text) aneri_log_write(log, text, FALSE)

code/__DEFINES/rust_g.dm

@@ -132,11 +132,11 @@
 #define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname)
 
 #define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname)
-#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true")
+//#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true")
 #define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname)
-#define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname)
+/*#define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname)
 #define rustg_file_get_line_count(fname) text2num(RUSTG_CALL(RUST_G, "file_get_line_count")(fname))
-#define rustg_file_seek_line(fname, line) RUSTG_CALL(RUST_G, "file_seek_line")(fname, "[line]")
+#define rustg_file_seek_line(fname, line) RUSTG_CALL(RUST_G, "file_seek_line")(fname, "[line]")*/
 
 #ifdef RUSTG_OVERRIDE_BUILTINS
 	#define file2text(fname) rustg_file_read("[fname]")
@@ -166,10 +166,10 @@
 #define RUSTG_JOB_NO_SUCH_JOB "NO SUCH JOB"
 #define RUSTG_JOB_ERROR "JOB PANICKED"
 
-#define rustg_json_is_valid(text) (RUSTG_CALL(RUST_G, "json_is_valid")(text) == "true")
+//#define rustg_json_is_valid(text) (RUSTG_CALL(RUST_G, "json_is_valid")(text) == "true")
 
-#define rustg_log_write(fname, text, format) RUSTG_CALL(RUST_G, "log_write")(fname, text, format)
-/proc/rustg_log_close_all() return RUSTG_CALL(RUST_G, "log_close_all")()
+/*#define rustg_log_write(fname, text, format) RUSTG_CALL(RUST_G, "log_write")(fname, text, format)
+/proc/rustg_log_close_all() return RUSTG_CALL(RUST_G, "log_close_all")()*/
 
 #define rustg_noise_get_at_coordinates(seed, x, y) RUSTG_CALL(RUST_G, "noise_get_at_coordinates")(seed, x, y)
 
@@ -190,13 +190,14 @@
 #define rustg_sql_disconnect_pool(handle) RUSTG_CALL(RUST_G, "sql_disconnect_pool")(handle)
 #define rustg_sql_check_query(job_id) RUSTG_CALL(RUST_G, "sql_check_query")("[job_id]")
 
-#define rustg_time_microseconds(id) text2num(RUSTG_CALL(RUST_G, "time_microseconds")(id))
+/*#define rustg_time_microseconds(id) text2num(RUSTG_CALL(RUST_G, "time_microseconds")(id))
 #define rustg_time_milliseconds(id) text2num(RUSTG_CALL(RUST_G, "time_milliseconds")(id))
-#define rustg_time_reset(id) RUSTG_CALL(RUST_G, "time_reset")(id)
+#define rustg_time_reset(id) RUSTG_CALL(RUST_G, "time_reset")(id)*/
+
 
 /// Returns the timestamp as a string
-/proc/rustg_unix_timestamp()
-	return RUSTG_CALL(RUST_G, "unix_timestamp")()
+/*/proc/rustg_unix_timestamp()
+	return RUSTG_CALL(RUST_G, "unix_timestamp")()*/
 
 #define rustg_raw_read_toml_file(path) json_decode(RUSTG_CALL(RUST_G, "toml_file_to_json")(path) || "null")
 
@@ -216,11 +217,10 @@
 	else
 		CRASH(output["content"])
 
-#define rustg_url_encode(text) RUSTG_CALL(RUST_G, "url_encode")("[text]")
+/*#define rustg_url_encode(text) RUSTG_CALL(RUST_G, "url_encode")("[text]")
 #define rustg_url_decode(text) RUSTG_CALL(RUST_G, "url_decode")(text)
 
 #ifdef RUSTG_OVERRIDE_BUILTINS
 	#define url_encode(text) rustg_url_encode(text)
 	#define url_decode(text) rustg_url_decode(text)
-#endif
-
+#endif*/

code/__DEFINES/rust_g_overrides.dm

@@ -1,3 +1,3 @@
 // RUSTG_OVERRIDE_BUILTINS is not used since the file APIs don't work well over Linux.
-#define url_encode(text) rustg_url_encode("[text]")
-#define url_decode(text) rustg_url_decode("[text]")
+/*#define url_encode(text) rustg_url_encode("[text]")
+#define url_decode(text) rustg_url_decode("[text]")*/

code/__HELPERS/_lists.dm

@@ -426,6 +426,7 @@
 		result = first ^ second
 	return result
 
+#if !defined(ANERI_OVERRIDE_PICK) && !defined(ANERI_OVERRIDE_PICK_WEIGHT)
 /**
  * Picks a random element from a list based on a weighting system.
  * For example, given the following list:
@@ -448,6 +449,7 @@
 		if(total <= 0)
 			return item
 	return null
+#endif
 
 /**
  * Like pick_weight, but allowing for nested lists.

code/__HELPERS/aneri.dm

@@ -0,0 +1,39 @@
+/datum/aneri
+	var/__aneri_key_low
+	var/__aneri_key_high
+
+/datum/aneri/vv_edit_var(var_name, var_value)
+	if(var_name == NAMEOF(src, __aneri_key_low) || var_name == NAMEOF(src, __aneri_key_high))
+		return FALSE // DO. NOT. TOUCH.
+	return ..()
+
+// contained in its own proc to prevent runtime shittery
+/proc/aneri_startup_log()
+	log_world("Aneri version [aneri_version()] loaded")
+	log_world("Aneri features: [aneri_features()]")
+
+/proc/assoc_to_weights(list/list_to_pick) as /list
+	. = list()
+	for(var/item in list_to_pick)
+		. += list_to_pick[item]
+
+/proc/_aneri_pick(list/choices, secure = FALSE)
+	var/choices_len = length(choices)
+	switch(choices_len)
+		if(0)
+			return null
+		if(1)
+			return choices[1]
+		else
+			var/idx = ANERI_CALL("random_range_int_unsigned", 1, choices_len, secure)
+			return choices[idx]
+
+/proc/_aneri_pick_weighted(list/list_to_pick, secure = FALSE)
+	if(!islist(list_to_pick))
+		stack_trace("Attempted to do a weighted pick from a non-list")
+		return null
+	if(!length(list_to_pick))
+		return null
+	var/chosen_idx = ANERI_CALL("pick_weighted", assoc_to_weights(list_to_pick), secure)
+	return list_to_pick[chosen_idx]
+

code/__HELPERS/colors.dm

@@ -21,11 +21,9 @@
 /proc/random_colour(mode = 0)
 	switch(mode)
 		if(0)
-			return pick("white","black","gray","red","green","blue","brown","yellow","orange","darkred",
-						"crimson","lime","darkgreen","cyan","navy","teal","purple","indigo")
+			return pick("white","black","gray","red","green","blue","brown","yellow","orange","darkred","crimson","lime","darkgreen","cyan","navy","teal","purple","indigo")
 		if(1)
-			return pick("red","green","blue","brown","yellow","orange","darkred","crimson",
-						"lime","darkgreen","cyan","navy","teal","purple","indigo")
+			return pick("red","green","blue","brown","yellow","orange","darkred","crimson", "lime","darkgreen","cyan","navy","teal","purple","indigo")
 		else
 			return "white"
 

code/__HELPERS/files.dm

@@ -92,19 +92,13 @@ GLOBAL_VAR_INIT(fileaccess_timer, 0)
 /proc/pathflatten(path)
 	return replacetext(path, "/", "_")
 
-/// Returns the md5 of a file at a given path.
-/proc/md5filepath(path)
-	. = md5(file(path))
-
 /// Save file as an external file then md5 it.
 /// Used because md5ing files stored in the rsc sometimes gives incorrect md5 results.
 /proc/md5asfile(file)
-	var/static/notch = 0
 	// its importaint this code can handle md5filepath sleeping instead of hard blocking, if it's converted to use rust_g.
-	var/filename = "tmp/md5asfile.[world.realtime].[world.timeofday].[world.time].[world.tick_usage].[notch]"
-	notch = WRAP(notch+1, 0, 2**15)
+	var/filename = "tmp/md5asfile.[aneri_uuid()]"
 	fcopy(file, filename)
-	. = md5filepath(filename)
+	. = aneri_md5_file(filename)
 	fdel(filename)
 
 /**