wip: hello_net

.vscode/settings.json

@@ -28,7 +28,7 @@
 	"rust-analyzer.files.excludeDirs": [
 		"crates/beet_esp"
 	],
-	// "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+	"rust-analyzer.cargo.target": "wasm32-unknown-unknown",
 	"search.exclude": {
 		"docs/deps/mermaid-init.js": true,
 		"docs/deps/mermaid.min.js": true,

Cargo.toml

@@ -155,7 +155,7 @@ strum_macros = "0.26.0"
 extend = "1.1.2"
 
 # channels
-parking_lot = "0.12" # fast alternative std::sync::Mutex/RwLock
+# parking_lot = {version = "0.12", features = ["wasm-bindgen"] } # fast alternative std::sync::Mutex/RwLock
 # flume = { version = "0.11", default-features = false, features = ["async"] }
 flume = "0.11"
 

crates/beet_ecs/src/lifecycle/actions/insert_on_trigger.rs

@@ -0,0 +1,71 @@
+use crate::prelude::*;
+use bevy::ecs::schedule::SystemConfigs;
+use bevy::prelude::*;
+use std::marker::PhantomData;
+use std::ops::Deref;
+use std::ops::DerefMut;
+
+/// Triggers the given event when this behavior starts Insertning.
+#[derive(Debug, Clone, PartialEq, Component, Reflect)]
+#[reflect(Component, ActionMeta)]
+pub struct InsertOnTrigger<E: GenericActionEvent, T: GenericActionComponent> {
+	pub value: T,
+	phantom: PhantomData<E>,
+}
+impl<E: GenericActionEvent, T: GenericActionComponent> Deref
+	for InsertOnTrigger<E, T>
+{
+	type Target = T;
+	fn deref(&self) -> &Self::Target { &self.value }
+}
+impl<E: GenericActionEvent, T: GenericActionComponent> DerefMut
+	for InsertOnTrigger<E, T>
+{
+	fn deref_mut(&mut self) -> &mut Self::Target { &mut self.value }
+}
+
+impl<E: GenericActionEvent, T: Default + GenericActionComponent> Default
+	for InsertOnTrigger<E, T>
+{
+	fn default() -> Self {
+		Self {
+			value: T::default(),
+			phantom: Default::default(),
+		}
+	}
+}
+
+impl<E: GenericActionEvent, T: GenericActionComponent> InsertOnTrigger<E, T> {
+	pub fn new(value: impl Into<T>) -> Self {
+		Self {
+			value: value.into(),
+			phantom: Default::default(),
+		}
+	}
+}
+
+impl<E: GenericActionEvent, T: GenericActionComponent> ActionMeta
+	for InsertOnTrigger<E, T>
+{
+	fn category(&self) -> ActionCategory { ActionCategory::World }
+}
+
+impl<E: GenericActionEvent, T: GenericActionComponent> ActionSystems
+	for InsertOnTrigger<E, T>
+{
+	fn systems() -> SystemConfigs { inset_on_trigger::<E, T>.in_set(TickSet) }
+}
+
+fn inset_on_trigger<E: GenericActionEvent, T: GenericActionComponent>(
+	mut commands: Commands,
+	mut reader: EventReader<E>,
+	query: Query<(Entity, &InsertOnTrigger<E, T>)>,
+) {
+	for _ev in reader.read() {
+		log::info!("EVENT");
+		for (entity, trigger) in query.iter() {
+			log::info!("RECEIVED");
+			commands.entity(entity).insert(trigger.value.clone());
+		}
+	}
+}

crates/beet_ecs/src/lifecycle/actions/mod.rs

@@ -22,6 +22,9 @@ pub use self::remove_agent_on_run::*;
 pub mod repeat;
 #[allow(unused_imports)]
 pub use self::repeat::*;
+pub mod insert_on_trigger;
+#[allow(unused_imports)]
+pub use self::insert_on_trigger::*;
 pub mod set_agent_on_run;
 #[allow(unused_imports)]
 pub use self::set_agent_on_run::*;

crates/beet_examples/examples/basics/export.rs

@@ -0,0 +1,17 @@
+use beet::prelude::*;
+use beet_examples::prelude::*;
+use bevy::prelude::*;
+mod scenes;
+
+fn main() {
+	let mut app = App::new();
+
+	app.add_plugins((
+		ExamplePluginText::default(),
+		DefaultBeetPlugins::default(),
+	))
+	// .add_systems(Startup, scenes::hello_world)
+	.add_systems(Startup, scenes::hello_net)
+	// .add_systems(PostStartup, save_scene("target/scenes/hello_world.ron"))
+	.run();
+}

crates/beet_examples/examples/basics/main.rs

@@ -12,8 +12,8 @@ fn main() {
 		ExamplePluginText::default(),
 		DefaultBeetPlugins::default(),
 	))
-	.add_systems(Startup, scenes::hello_world)
-	// .add_systems(Startup, scenes::hello_net)
-	.add_systems(PostStartup, save_scene("target/scenes/hello_world.ron"))
+	// .add_systems(Startup, scenes::hello_world)
+	.add_systems(Startup, scenes::hello_net)
+	// .add_systems(PostStartup, save_scene("target/scenes/hello_world.ron"))
 	.run();
 }

crates/beet_examples/examples/basics/scenes/hello_net.rs

@@ -1,14 +1,18 @@
-use beet_examples::prelude::*;
 use beet::prelude::*;
+use beet_examples::prelude::*;
 use bevy::prelude::*;
 
 pub fn hello_net(mut commands: Commands) {
 	commands
 		.spawn((SequenceSelector::default(), Running))
 		.with_children(|parent| {
 			parent.spawn((
-				LogOnRun("Message Sent: AppLoaded".into()),
+				LogOnRun::new("Send: AppLoaded"),
 				TriggerOnRun(AppLoaded),
 			));
 		});
+	commands.spawn((
+		InsertOnTrigger::<OnUserMessage, Running>::new(Running),
+		LogOnRun::new("Recv: Player Message"),
+	));
 }

crates/beet_examples/src/net/example_replicate_plugin.rs

@@ -10,6 +10,8 @@ impl Plugin for ExampleReplicatePlugin {
 		app.add_plugins((ReplicatePlugin, CommonEventsPlugin))
 			.add_event::<OnUserMessage>()
 			.replicate_event_incoming::<OnUserMessage>()
+			.add_plugins(ActionPlugin::<InsertOnTrigger<OnUserMessage,Running>>::default())
+
 			.add_event::<AppLoaded>()
 			.replicate_event_outgoing::<AppLoaded>()
 			.add_plugins(ActionPlugin::<TriggerOnRun<AppLoaded>>::default());

crates/beet_examples/src/plugins/example_plugin.rs

@@ -1,4 +1,6 @@
 use crate::prelude::*;
+#[cfg(any(target_arch = "wasm32", feature = "tokio"))]
+use beet::prelude::*;
 use bevy::asset::AssetMetaCheck;
 use bevy::prelude::*;
 use forky_bevy::systems::close_on_esc;
@@ -20,7 +22,8 @@ impl Plugin for ExamplePlugin {
 		#[cfg(feature = "tokio")]
 		app.add_transport(NativeWsClient::new(DEFAULT_SOCKET_URL).unwrap());
 
-		app.add_plugins(ExampleReplicatePlugin)
+		app
+			.add_plugins(ExampleReplicatePlugin)
 			.add_plugins(
 				DefaultPlugins
 					.set(WindowPlugin {

crates/beet_web/Cargo.toml

@@ -31,7 +31,7 @@ futures.workspace = true
 bincode.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-parking_lot.workspace = true
+# parking_lot.workspace = true
 ron.workspace = true
 
 bevy.workspace = true

index.html

@@ -19,6 +19,33 @@
 </head>
 
 <body>
+	<script>
+		function sendUserMessage(message) {
+			const detail = JSON.stringify([{
+				SendEvent: {
+					reg_id: 0,//the first registered id, OnUserMessage
+					payload: {
+						Json: JSON.stringify(message)
+					}
+				}
+			}])
+			window.dispatchEvent(new CustomEvent('js-message', { detail }))
+		}
+
+		window.addEventListener('wasm-message', (event) => {
+			const messages = JSON.parse(event.detail)
+			for (const message of messages) {
+				console.log(`message received: ${JSON.stringify(message)}`)
+				if (message?.SendEvent?.payload?.Json) {
+					const payload = JSON.parse(message.SendEvent.payload.Json)
+					console.log(`payload received: ${JSON.stringify(payload)}`)
+					sendUserMessage('loud and clear')
+				}
+			}
+		})
+	</script>
+
+
 	<script type="module">
 		import init from './target/static/wasm/basics.js'
 		init()