Maybe bad idea

Author: timon-schelling

editor/src/messages/frontend/frontend_message.rs

@@ -1,7 +1,7 @@
 use super::IconName;
 use super::utility_types::{MouseCursorIcon, PersistedState};
 use crate::messages::app_window::app_window_message_handler::AppWindowPlatform;
-use crate::messages::frontend::utility_types::{DocumentInfo, EyedropperPreviewImage};
+use crate::messages::frontend::utility_types::{DocumentInfo, EyedropperPreviewImage, FrontendMessageFuture};
 use crate::messages::input_mapper::utility_types::misc::ActionShortcut;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::utility_types::{
@@ -101,6 +101,12 @@ pub enum FrontendMessage {
 		folder: Option<PathBuf>,
 		content: serde_bytes::ByteBuf,
 	},
+	Await {
+		#[serde(skip, default)]
+		#[derivative(Debug = "ignore", PartialEq = "ignore")]
+		#[cfg_attr(feature = "wasm", tsify(type = "unknown"))]
+		future: FrontendMessageFuture,
+	},
 	TriggerExportImage {
 		svg: String,
 		name: String,

editor/src/messages/frontend/mod.rs

@@ -4,6 +4,7 @@ pub mod utility_types;
 
 #[doc(inline)]
 pub use frontend_message::{FrontendMessage, FrontendMessageDiscriminant};
+pub use utility_types::FrontendMessageFuture;
 
 // TODO: Make this an enum with the actual icon names, somehow derived from or tied to the frontend icon set.
 // TODO: Then remove `#[widget_builder(string)]` from all icon fields.

editor/src/messages/frontend/utility_types.rs

@@ -1,4 +1,7 @@
+use std::future::{Future, IntoFuture};
 use std::path::PathBuf;
+use std::pin::Pin;
+use std::sync::{Arc, Mutex};
 
 use graph_craft::application_io::ResourceHash;
 
@@ -82,3 +85,31 @@ pub struct EyedropperPreviewImage {
 	pub width: u32,
 	pub height: u32,
 }
+
+#[derive(Clone, Default)]
+pub struct FrontendMessageFuture {
+	inner: Arc<Mutex<Option<InnerFrontendMessageFuture>>>,
+}
+
+impl FrontendMessageFuture {
+	pub fn new(future: impl Future<Output = FrontendMessage> + Send + 'static) -> Self {
+		Self {
+			inner: Arc::new(Mutex::new(Some(Box::pin(future)))),
+		}
+	}
+}
+
+type InnerFrontendMessageFuture = Pin<Box<dyn Future<Output = FrontendMessage> + Send + 'static>>;
+
+impl IntoFuture for FrontendMessageFuture {
+	type Output = FrontendMessage;
+	type IntoFuture = InnerFrontendMessageFuture;
+
+	fn into_future(self) -> Self::IntoFuture {
+		self.inner
+			.lock()
+			.unwrap_or_else(|poisoned| poisoned.into_inner())
+			.take()
+			.expect("FrontendMessageFuture can only be awaited once")
+	}
+}

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -925,19 +925,25 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 				}
 				let folder = self.path.as_ref().and_then(|path| path.parent()).map(|parent| parent.to_path_buf());
 
-				let exported = resources.export(&Vec::from_iter(self.used_resources()));
-				self.embedded_resources = EmbeddedResources::from_iter(exported);
-				let content = self.serialize_document();
-
-				// Clear embedded resources after serialization to free memory.
-				let _ = std::mem::take(&mut self.embedded_resources);
-
-				responses.add(FrontendMessage::TriggerSaveDocument {
-					document_id,
-					name: format!("{}.{}", self.name.clone(), FILE_EXTENSION),
-					path,
-					folder,
-					content: content.into_bytes().into(),
+				let resource_hashes = Vec::from_iter(self.used_resources()).into_boxed_slice();
+				let resources = resources.resources();
+				let mut document = self.clone();
+				let name = format!("{}.{}", self.name.clone(), FILE_EXTENSION);
+
+				responses.add(FrontendMessage::Await {
+					future: FrontendMessageFuture::new(async move {
+						let exported = ResourceMessageHandler::export_async(resources, resource_hashes).await;
+						document.embedded_resources = EmbeddedResources::from_iter(exported);
+						let content = document.serialize_document();
+
+						FrontendMessage::TriggerSaveDocument {
+							document_id,
+							name,
+							path,
+							folder,
+							content: content.into_bytes().into(),
+						}
+					}),
 				});
 			}
 			DocumentMessage::SavedDocument { path } => {

editor/src/messages/prelude.rs

@@ -15,7 +15,7 @@ pub use crate::messages::dialog::export_dialog::{ExportDialogMessage, ExportDial
 pub use crate::messages::dialog::new_document_dialog::{NewDocumentDialogMessage, NewDocumentDialogMessageDiscriminant, NewDocumentDialogMessageHandler};
 pub use crate::messages::dialog::preferences_dialog::{PreferencesDialogMessage, PreferencesDialogMessageContext, PreferencesDialogMessageDiscriminant, PreferencesDialogMessageHandler};
 pub use crate::messages::dialog::{DialogMessage, DialogMessageContext, DialogMessageDiscriminant, DialogMessageHandler};
-pub use crate::messages::frontend::{FrontendMessage, FrontendMessageDiscriminant};
+pub use crate::messages::frontend::{FrontendMessage, FrontendMessageDiscriminant, FrontendMessageFuture};
 pub use crate::messages::input_mapper::key_mapping::{KeyMappingMessage, KeyMappingMessageContext, KeyMappingMessageDiscriminant, KeyMappingMessageHandler};
 pub use crate::messages::input_mapper::{InputMapperMessage, InputMapperMessageContext, InputMapperMessageDiscriminant, InputMapperMessageHandler};
 pub use crate::messages::input_preprocessor::{InputPreprocessorMessage, InputPreprocessorMessageContext, InputPreprocessorMessageDiscriminant, InputPreprocessorMessageHandler};

editor/src/messages/resource/resource_message_handler.rs

@@ -26,13 +26,17 @@ impl ResourceMessageHandler {
 		}
 	}
 
-	pub fn export(&self, resources: &[ResourceHash]) -> Box<[(ResourceHash, Resource)]> {
-		let Some(storage) = &self.storage else {
-			log::error!("Attempted to export resources but storage is not initialized");
-			return Box::new([]);
-		};
-		let mut storage = storage.write().unwrap();
-		resources.iter().filter_map(|hash| storage.read(hash).map(|resource| (*hash, resource))).collect()
+	pub async fn export_async(resources: Box<dyn Resources>, resource_hashes: Box<[ResourceHash]>) -> Box<[(ResourceHash, Resource)]> {
+		let loads = resource_hashes
+			.into_vec()
+			.into_iter()
+			.map(|hash| {
+				let resource = resources.load(hash);
+				async move { resource.await.map(|resource| (hash, resource)) }
+			})
+			.collect::<Vec<_>>();
+
+		futures::future::join_all(loads).await.into_iter().flatten().collect()
 	}
 
 	pub fn resources(&self) -> Box<dyn Resources> {

frontend/wrapper/src/editor_wrapper.rs

@@ -143,6 +143,14 @@ impl EditorWrapper {
 
 	// Sends a FrontendMessage to JavaScript
 	pub(crate) fn send_frontend_message_to_js(&self, message: FrontendMessage) {
+		if let FrontendMessage::Await { future } = message {
+			let wrapper = self.clone();
+			wasm_bindgen_futures::spawn_local(async move {
+				wrapper.send_frontend_message_to_js(future.await);
+			});
+			return;
+		}
+
 		if let FrontendMessage::UpdateImageData { ref image_data } = message {
 			let new_hash = calculate_hash(&CacheHashWrapper(image_data));
 			let prev_hash = IMAGE_DATA_HASH.load(Ordering::Relaxed);