Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc.

code/modules/tgui/modules/crew_monitor.dm

@@ -35,7 +35,7 @@
 
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		ui = new(user, src, tgui_id)
+		ui = new(user, src, tgui_id, name)
 		ui.autoupdate = TRUE
 		ui.open()
 

code/modules/tgui/tgui.dm

@@ -34,8 +34,6 @@
 	var/status = STATUS_INTERACTIVE
 	/// Topic state used to determine status/interactability.
 	var/datum/tgui_state/state = null
-	/// Asset data to be sent with every update
-	var/list/asset_data
 	// The map z-level to display.
 	var/map_z_level = 1
 
@@ -84,11 +82,14 @@
 	opened_at = world.time
 	window.acquire_lock(src)
 	if(!window.is_ready())
-		window.initialize()
+		window.initialize(inline_assets = list(
+			get_asset_datum(/datum/asset/simple/tgui)
+		))
 	else
 		window.send_message("ping")
+	window.send_asset(get_asset_datum(/datum/asset/simple/fontawesome))
 	for(var/datum/asset/asset in src_object.ui_assets(user))
-		send_asset(asset)
+		window.send_asset(asset)
 	window.send_message("update", get_payload(
 		with_data = TRUE,
 		with_static_data = TRUE))
@@ -143,14 +144,10 @@
  *
  * required asset datum/asset
  */
-/datum/tgui/proc/send_asset(var/datum/asset/asset)
-	if(!user.client)
-		return
-	// if(istype(asset, /datum/asset/spritesheet))
-	// 	var/datum/asset/spritesheet/spritesheet = asset
-	// 	LAZYINITLIST(asset_data)
-	// 	LAZYADD(asset_data["styles"], list(spritesheet.css_filename()))
-	asset.send(user)
+/datum/tgui/proc/send_asset(datum/asset/asset)
+	if(!window)
+		CRASH("send_asset() can only be called after open().")
+	window.send_asset(asset)
 
 /**
  * public
@@ -218,8 +215,6 @@
 	var/static_data = with_static_data && src_object.tgui_static_data(user)
 	if(static_data)
 		json_data["static_data"] = static_data
-	if(asset_data)
-		json_data["assets"] = asset_data
 	if(src_object.tgui_shared_states)
 		json_data["shared"] = src_object.tgui_shared_states
 	return json_data

code/modules/tgui/tgui_window.dm

@@ -13,6 +13,7 @@
 	var/datum/tgui/locked_by
 	var/fatally_errored = FALSE
 	var/message_queue
+	var/sent_assets = list()
 
 /**
  * public
@@ -36,8 +37,10 @@
  * Initializes the window with a fresh page. Puts window into the "loading"
  * state. You can begin sending messages right after initializing. Messages
  * will be put into the queue until the window finishes loading.
+ *
+ * optional inline_assets list List of assets to inline into the html.
  */
-/datum/tgui_window/proc/initialize()
+/datum/tgui_window/proc/initialize(inline_assets = list())
 	log_tgui(client, "[id]/initialize")
 	if(!client)
 		return
@@ -52,15 +55,23 @@
 	else
 		options += "titlebar=1;can_resize=1;"
 	// Generate page html
-	// TODO: Make this static
 	var/html = SStgui.basehtml
 	html = replacetextEx(html, "\[tgui:windowId]", id)
-	// Send required assets
-	var/datum/asset/asset
-	asset = get_asset_datum(/datum/asset/simple/tgui)
-	asset.send(client)
-	asset = get_asset_datum(/datum/asset/simple/fontawesome)
-	asset.send(client)
+	// Process inline assets
+	var/inline_styles = ""
+	var/inline_scripts = ""
+	for(var/datum/asset/asset in inline_assets)
+		var/mappings = asset.get_url_mappings()
+		for(var/name in mappings)
+			var/url = mappings[name]
+			// Not urlencoding since asset strings are considered safe
+			if(copytext(name, -4) == ".css")
+				inline_styles += "<link rel=\"stylesheet\" type=\"text/css\" href=\"[url]\">\n"
+			else if(copytext(name, -3) == ".js")
+				inline_scripts += "<script type=\"text/javascript\" defer src=\"[url]\"></script>\n"
+		asset.send()
+	html = replacetextEx(html, "<!-- tgui:styles -->\n", inline_styles)
+	html = replacetextEx(html, "<!-- tgui:scripts -->\n", inline_scripts)
 	// Open the window
 	client << browse(html, "window=[id];[options]")
 	// Instruct the client to signal UI when the window is closed.
@@ -88,7 +99,7 @@
 		&& pooled \
 		&& pool_index > 0 \
 		&& pool_index <= TGUI_WINDOW_SOFT_LIMIT \
-		&& status >= TGUI_WINDOW_READY
+		&& status == TGUI_WINDOW_READY
 
 /**
  * public
@@ -109,6 +120,9 @@
  * Release the window lock.
  */
 /datum/tgui_window/proc/release_lock()
+	// Clean up assets sent by tgui datum which requested the lock
+	if(locked)
+		sent_assets = list()
 	locked = FALSE
 	locked_by = null
 
@@ -128,8 +142,7 @@
 		send_message("suspend")
 		return
 	log_tgui(client, "[id]/close")
-	locked = FALSE
-	locked_by = null
+	release_lock()
 	status = TGUI_WINDOW_CLOSED
 	message_queue = null
 	// Do not close the window to give user some time
@@ -159,13 +172,30 @@
 	// Pack for sending via output()
 	message = url_encode(message)
 	// Place into queue if window is still loading
-	if(!force && status == TGUI_WINDOW_LOADING)
+	if(!force && status != TGUI_WINDOW_READY)
 		if(!message_queue)
 			message_queue = list()
 		message_queue += list(message)
 		return
 	client << output(message, "[id].browser:update")
 
+/**
+ * public
+ *
+ * Makes an asset available to use in tgui.
+ *
+ * required asset datum/asset
+ */
+/datum/tgui_window/proc/send_asset(datum/asset/asset)
+	if(!client || !asset)
+		return
+	// if(istype(asset, /datum/asset/spritesheet))
+	// 	var/datum/asset/spritesheet/spritesheet = asset
+	// 	send_message("asset/stylesheet", spritesheet.css_filename())
+	send_message("asset/mappings", asset.get_url_mappings())
+	sent_assets += list(asset)
+	asset.send(client)
+
 /**
  * private
  *
@@ -186,6 +216,11 @@
 /datum/tgui_window/proc/on_message(type, list/payload, list/href_list)
 	switch(type)
 		if("ready")
+			// Status can be READY if user has refreshed the window.
+			if(status == TGUI_WINDOW_READY)
+				// Resend the assets
+				for(var/asset in sent_assets)
+					send_asset(asset)
 			status = TGUI_WINDOW_READY
 		if("log")
 			if(href_list["fatal"])