wahoo!

Author: JohnFulpWillard

code/__HELPERS/verbs.dm

@@ -45,7 +45,7 @@
 		output_list[++output_list.len] = list(verb_to_add.category, verb_to_add.name)
 	output_list = url_encode(json_encode(output_list))
 
-	target << output("[output_list];", "statbrowser:add_verb_list")
+	target.stat_panel.send_message("add_verb_list", output_list)
 
 /**
   * handles removing verb and sending it to browser to update, use this for removing verbs
@@ -93,4 +93,4 @@
 		output_list[++output_list.len] = list(verb_to_remove.category, verb_to_remove.name)
 	output_list = url_encode(json_encode(output_list))
 
-	target << output("[output_list];", "statbrowser:remove_verb_list")
+	target.stat_panel.send_message("remove_verb_list", output_list)

code/_onclick/click.dm

@@ -364,14 +364,14 @@
 	var/turf/T = get_turf(src)
 	if(T && user.TurfAdjacent(T))
 		user.listed_turf = T
-		user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
+		user.client.stat_panel.send_message("create_listedturf", T.name)
 
 // Use this instead of /mob/proc/AltClickOn(atom/A) where you only want turf content listing without additional atom alt-click interaction
 /atom/proc/AltClickNoInteract(mob/user, atom/A)
 	var/turf/T = get_turf(A)
 	if(T && user.TurfAdjacent(T))
 		user.listed_turf = T
-		user.client << output("[url_encode(json_encode(T.name))];", "statbrowser:create_listedturf")
+		user.client.stat_panel.send_message("create_listedturf", T.name)
 
 /mob/proc/TurfAdjacent(turf/T)
 	return T.Adjacent(src)

code/controllers/subsystem/statpanel.dm

@@ -6,24 +6,25 @@ SUBSYSTEM_DEF(statpanels)
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 	flags = SS_NO_INIT
 	var/list/currentrun = list()
-	var/encoded_global_data
-	var/mc_data_encoded
-	var/list/cached_images = list()
+	var/list/global_data
+	var/list/mc_data
 
+	var/list/cached_images = list()
 	///how many subsystem fires between most tab updates
 	var/default_wait = 10
 	///how many subsystem fires between updates of the status tab
 	var/status_wait = 2
 	///how many subsystem fires between updates of the MC tab
 	var/mc_wait = 5
+	/// how many subsystem fires between updates of the turf examine tab
+	var/turf_wait = 2
 	///how many full runs this subsystem has completed. used for variable rate refreshes.
 	var/num_fires = 0
 
 /datum/controller/subsystem/statpanels/fire(resumed = FALSE)
 	if (!resumed)
 		num_fires++
 		var/datum/map_config/cached = SSmapping.next_map_config
-		var/round_time = world.time - SSticker.round_start_time
 
 		var/storyteller = "Not Set"
 		if(SSgamemode.storyteller)
@@ -35,13 +36,13 @@ SUBSYSTEM_DEF(statpanels)
 		if(SSgamemode.secret_storyteller)
 			storyteller = "Secret"
 
-		var/list/global_data = list(
+		global_data = list(
 			"Map: [SSmapping.config?.map_name || "Loading..."]",
 			cached ? "Next Map: [cached.map_name]" : null,
 			"Storyteller: [storyteller]",
 			"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
 			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
-			"Round Time: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]",
+			"Round Time: [ROUND_TIME()]",
 			"Station Time: [station_time_timestamp()]",
 			"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)"
 		)
@@ -50,38 +51,43 @@ SUBSYSTEM_DEF(statpanels)
 			var/ETA = SSshuttle.emergency.getModeStr()
 			if(ETA)
 				global_data += "[ETA] [SSshuttle.emergency.getTimerStr()]"
-		encoded_global_data = url_encode(json_encode(global_data))
+
 		src.currentrun = GLOB.clients.Copy()
-		mc_data_encoded = null
+		mc_data = null
+
 	var/list/currentrun = src.currentrun
 	while(length(currentrun))
 		var/client/target = currentrun[length(currentrun)]
 		currentrun.len--
-		if(!target)
-			continue
-		if(!target.statbrowser_ready)
+
+		if(!target.stat_panel.is_ready())
 			continue
+
 		if(target.stat_tab == "Status" && num_fires % status_wait == 0)
 			set_status_tab(target)
+
 		if(!target.holder)
-			target << output("", "statbrowser:remove_admin_tabs")
+			target.stat_panel.send_message("remove_admin_tabs")
 		else
-			target << output("[!!(target.prefs.extra_toggles & SPLIT_ADMIN_TABS)]", "statbrowser:update_split_admin_tabs")
+			target.stat_panel.send_message("update_split_admin_tabs", !!(target.prefs.extra_toggles & SPLIT_ADMIN_TABS))
+
 			if(!("MC" in target.panel_tabs))
-				target << output("[url_encode(target.holder.href_token)]", "statbrowser:add_admin_tabs")
-			
-			//if(target.stat_tab == "MC" && (num_fires % mc_wait == 0))
-			if(target.stat_tab == "MC" && ((num_fires % mc_wait == 0) || (target?.prefs.extra_toggles & FAST_MC_REFRESH)))
+				target.stat_panel.send_message("add_admin_tabs", target.holder.href_token)
+
+			if(target.stat_tab == "MC" && ((num_fires % mc_wait == 0)))
 				set_MC_tab(target)
 
 			if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs))
-				target << output("", "statbrowser:remove_sdql2")
+				target.stat_panel.send_message("remove_sdql2")
+
 			else if(length(GLOB.sdql2_queries) && (target.stat_tab == "SDQL2" || !("SDQL2" in target.panel_tabs)) && num_fires % default_wait == 0)
 				set_SDQL2_tab(target)
+
 		if(target.mob)
 			var/mob/target_mob = target.mob
 
 			// Handle the action panels of the stat panel
+
 			var/update_actions = FALSE
 			// We're on a spell tab, update the tab so we can see cooldowns progressing and such
 			if(target.stat_tab in target.spell_tabs)
@@ -95,30 +101,35 @@ SUBSYSTEM_DEF(statpanels)
 				set_action_tabs(target, target_mob)
 
 			// Handle the examined turf of the stat panel
-
-			if(target_mob?.listed_turf && num_fires % default_wait == 0)
-				if(!target_mob.TurfAdjacent(target_mob.listed_turf))
-					target << output("", "statbrowser:remove_listedturf")
+			if(target_mob?.listed_turf && num_fires % turf_wait == 0)
+				if(!target_mob.TurfAdjacent(target_mob.listed_turf) || isnull(target_mob.listed_turf))
+					target.stat_panel.send_message("remove_listedturf")
 					target_mob.listed_turf = null
 				else if(target.stat_tab == target_mob?.listed_turf.name || !(target_mob?.listed_turf.name in target.panel_tabs))
 					set_turf_examine_tab(target, target_mob)
+
 		if(MC_TICK_CHECK)
 			return
 
 /datum/controller/subsystem/statpanels/proc/set_status_tab(client/target)
-	if(!encoded_global_data)//statbrowser hasnt fired yet and we were called from immediate_send_stat_data()
+#if MIN_COMPILER_VERSION > 515
+	#warn 516 is most certainly out of beta, remove this beta notice if you haven't already
+#endif
+	var/static/list/beta_notice = list("", "You are on the BYOND 516 beta, various UIs and such may be broken!", "Please report issues, and switch back to BYOND 515 if things are causing too many issues for you.")
+	if(!global_data)//statbrowser hasnt fired yet and we were called from immediate_send_stat_data()
 		return
-
-	var/ping_str = url_encode("Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)")
-	var/other_str = url_encode(json_encode(target.mob?.get_status_tab_items()))
-	target << output("[encoded_global_data];[ping_str];[other_str]", "statbrowser:update")
+	target.stat_panel.send_message("update_stat", list(
+		"global_data" = (target.byond_version < 516) ? global_data : (global_data + beta_notice),
+		"ping_str" = "Ping: [round(target.lastping, 1)]ms (Average: [round(target.avgping, 1)]ms)",
+		"other_str" = target.mob?.get_status_tab_items(),
+	))
 
 /datum/controller/subsystem/statpanels/proc/set_MC_tab(client/target)
 	var/turf/eye_turf = get_turf(target.eye)
-	var/coord_entry = url_encode(COORD(eye_turf))
-	if(!mc_data_encoded)
+	var/coord_entry = COORD(eye_turf)
+	if(!mc_data)
 		generate_mc_data()
-	target << output("[mc_data_encoded];[coord_entry]", "statbrowser:update_mc")
+	target.stat_panel.send_message("update_mc", list("mc_data" = mc_data, "coord_entry" = coord_entry))
 
 /datum/controller/subsystem/statpanels/proc/set_SDQL2_tab(client/target)
 	var/list/sdql2A = list()
@@ -128,7 +139,7 @@ SUBSYSTEM_DEF(statpanels)
 		sdql2B = query.generate_stat()
 
 	sdql2A += sdql2B
-	target << output(url_encode(json_encode(sdql2A)), "statbrowser:update_sdql2")
+	target.stat_panel.send_message("update_sdql2", sdql2A)
 
 /// Set up the various action tabs.
 /datum/controller/subsystem/statpanels/proc/set_action_tabs(client/target, mob/target_mob)
@@ -138,7 +149,7 @@ SUBSYSTEM_DEF(statpanels)
 	for(var/action_data in actions)
 		target.spell_tabs |= action_data[1]
 
-	target << output("[url_encode(json_encode(target.spell_tabs))];[url_encode(json_encode(actions))]", "statbrowser:update_spells")
+	target.stat_panel.send_message("update_spells", list(spell_tabs = target.spell_tabs, actions = actions))
 
 /datum/controller/subsystem/statpanels/proc/set_turf_examine_tab(client/target, mob/target_mob)
 	var/list/overrides = list()
@@ -175,37 +186,54 @@ SUBSYSTEM_DEF(statpanels)
 		else
 			turfitems[++turfitems.len] = list("[turf_content.name]", REF(turf_content))
 
-	turfitems = url_encode(json_encode(turfitems))
-	target << output("[turfitems];", "statbrowser:update_listedturf")
+	turfitems = turfitems
+	target.stat_panel.send_message("update_listedturf", turfitems)
 
 /datum/controller/subsystem/statpanels/proc/generate_mc_data()
-	var/list/mc_data = list(
+	mc_data = list(
 		list("CPU:", world.cpu),
 		list("Instances:", "[num2text(world.contents.len, 10)]"),
 		list("World Time:", "[world.time]"),
-		list("Globals:", GLOB.stat_entry(), "\ref[GLOB]"),
-		list("[config]:", config.stat_entry(), "\ref[config]"),
+		list("Globals:", GLOB.stat_entry(), text_ref(GLOB)),
+		list("[config]:", config.stat_entry(), text_ref(config)),
 		list("Byond:", "(FPS:[world.fps]) (TickCount:[world.time/world.tick_lag]) (TickDrift:[round(Master.tickdrift,1)]([round((Master.tickdrift/(world.time/world.tick_lag))*100,0.1)]%)) (Internal Tick Usage: [round(MAPTICK_LAST_INTERNAL_TICK_USAGE,0.1)]%)"),
-		list("Master Controller:", Master.stat_entry(), "\ref[Master]"),
-		list("Failsafe Controller:", Failsafe.stat_entry(), "\ref[Failsafe]"),
+		list("Master Controller:", Master.stat_entry(), text_ref(Master)),
+		list("Failsafe Controller:", Failsafe.stat_entry(), text_ref(Failsafe)),
 		list("","")
 	)
+#if defined(MC_TAB_TRACY_INFO) || defined(SPACEMAN_DMM)
+	var/static/tracy_dll
+	var/static/tracy_present
+	if(isnull(tracy_dll))
+		tracy_dll = TRACY_DLL_PATH
+		tracy_present = fexists(tracy_dll)
+	if(tracy_present)
+		if(GLOB.tracy_initialized)
+			mc_data.Insert(2, list(list("byond-tracy:", "Active (reason: [GLOB.tracy_init_reason || "N/A"])")))
+		else if(GLOB.tracy_init_error)
+			mc_data.Insert(2, list(list("byond-tracy:", "Errored ([GLOB.tracy_init_error])")))
+		else if(fexists(TRACY_ENABLE_PATH))
+			mc_data.Insert(2, list(list("byond-tracy:", "Queued for next round")))
+		else
+			mc_data.Insert(2, list(list("byond-tracy:", "Inactive")))
+	else
+		mc_data.Insert(2, list(list("byond-tracy:", "[tracy_dll] not present")))
+#endif
 	for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems)
-		mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), "\ref[sub_system]")
-	mc_data[++mc_data.len] = list("Camera Net", "Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]", "\ref[GLOB.cameranet]")
-	mc_data_encoded = url_encode(json_encode(mc_data))
+		mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), text_ref(sub_system))
+	mc_data[++mc_data.len] = list("Camera Net", "Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]", text_ref(GLOB.cameranet))
 
 ///immediately update the active statpanel tab of the target client
 /datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target)
-	if(!target.statbrowser_ready)
+	if(!target.stat_panel.is_ready())
 		return FALSE
 
 	if(target.stat_tab == "Status")
 		set_status_tab(target)
 		return TRUE
 
 	var/mob/target_mob = target.mob
-	
+
 	// Handle actions
 
 	var/update_actions = FALSE
@@ -220,10 +248,9 @@ SUBSYSTEM_DEF(statpanels)
 		return TRUE
 
 	// Handle turfs
-
 	if(target_mob?.listed_turf)
 		if(!target_mob.TurfAdjacent(target_mob.listed_turf))
-			target << output("", "statbrowser:remove_listedturf")
+			target.stat_panel.send_message("removed_listedturf")
 			target_mob.listed_turf = null
 
 		else if(target.stat_tab == target_mob?.listed_turf.name || !(target_mob?.listed_turf.name in target.panel_tabs))
@@ -238,48 +265,13 @@ SUBSYSTEM_DEF(statpanels)
 		return TRUE
 
 	if(!length(GLOB.sdql2_queries) && ("SDQL2" in target.panel_tabs))
-		target << output("", "statbrowser:remove_sdql2")
+		target.stat_panel.send_message("remove_sdql2")
 
 	else if(length(GLOB.sdql2_queries) && target.stat_tab == "SDQL2")
 		set_SDQL2_tab(target)
 
+/// Stat panel window declaration
+/client/var/datum/tgui_window/stat_panel
+
 /atom/proc/remove_from_cache()
 	SSstatpanels.cached_images -= REF(src)
-
-/// verbs that send information from the browser UI
-/client/verb/set_tab(tab as text|null)
-	set name = "Set Tab"
-	set hidden = TRUE
-
-	stat_tab = tab
-	SSstatpanels.immediate_send_stat_data(src)
-
-/client/verb/send_tabs(tabs as text|null)
-	set name = "Send Tabs"
-	set hidden = TRUE
-
-	panel_tabs |= tabs
-
-/client/verb/remove_tabs(tabs as text|null)
-	set name = "Remove Tabs"
-	set hidden = TRUE
-
-	panel_tabs -= tabs
-
-/client/verb/reset_tabs()
-	set name = "Reset Tabs"
-	set hidden = TRUE
-
-	panel_tabs = list()
-
-/client/verb/panel_ready()
-	set name = "Panel Ready"
-	set hidden = TRUE
-
-	init_verbs()
-
-/client/verb/update_verbs()
-	set name = "Update Verbs"
-	set hidden = TRUE
-
-	init_verbs()

code/modules/admin/admin_verbs.dm

@@ -851,7 +851,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
 	set name = "Debug Stat Panel"
 	set category = "Misc.Server Debug"
 
-	src << output("", "statbrowser:create_debug")
+	src.stat_panel.send_message("create_debug")
 
 /// Debug verb for seeing at a glance what all spells have as set requirements
 /client/proc/debug_spell_requirements()

code/modules/client/client_defines.dm

@@ -130,9 +130,6 @@
 	/// our current tab
 	var/stat_tab
 
-	/// whether our browser is ready or not yet
-	var/statbrowser_ready = FALSE
-
 	/// list of all tabs
 	var/list/panel_tabs = list()