Big ABI refactor (#19)

jamsocket · May 3, 2024 · 59e8371 · 59e8371
1 parent 6e865d1
commit 59e8371
Show file tree

Hide file tree

Showing 22 changed files with 423 additions and 286 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/binary-echo/Cargo.lock b/examples/binary-echo/Cargo.lock
diff --git a/examples/binary-echo/src/lib.rs b/examples/binary-echo/src/lib.rs
@@ -1,20 +1,17 @@
 use stateroom_wasm::{
-    stateroom_wasm, ClientId, MessageRecipient, StateroomContext, StateroomService,
+    stateroom_wasm, ClientId, MessageRecipient, StateroomContext, StateroomService, MessagePayload
 };
 
 #[stateroom_wasm]
 #[derive(Default)]
 struct BinaryEcho;
 
 impl StateroomService for BinaryEcho {
-    fn message(&mut self, _: ClientId, message: &str, ctx: &impl StateroomContext) {
-        ctx.send_binary(MessageRecipient::Broadcast, message.as_bytes());
-    }
-
-    fn binary(&mut self, _: ClientId, message: &[u8], ctx: &impl StateroomContext) {
-        ctx.send_message(
-            MessageRecipient::Broadcast,
-            &format!("Received binary data: {:?}", &message),
-        );
+    fn message(&mut self, _: ClientId, message: MessagePayload, ctx: &impl StateroomContext) {
+        let message = match message {
+            MessagePayload::Text(s) => MessagePayload::Bytes(s.as_bytes().to_vec()),
+            MessagePayload::Bytes(b) => MessagePayload::Text(format!("{:?}", b)),
+        };
+        ctx.send_message(MessageRecipient::Broadcast, message);
     }
 }
diff --git a/examples/clock/Cargo.lock b/examples/clock/Cargo.lock
diff --git a/examples/clock/src/lib.rs b/examples/clock/src/lib.rs
@@ -10,7 +10,7 @@ impl StateroomService for ClockServer {
     }
 
     fn timer(&mut self, ctx: &impl StateroomContext) {
-        ctx.send_message(MessageRecipient::Broadcast, &format!("Timer @ {}", self.0));
+        ctx.send_message(MessageRecipient::Broadcast, format!("Timer @ {}", self.0));
         self.0 += 1;
         ctx.set_timer(4000);
     }

diff --git a/examples/counter-service/Cargo.lock b/examples/counter-service/Cargo.lock
diff --git a/examples/counter-service/src/lib.rs b/examples/counter-service/src/lib.rs
@@ -1,22 +1,27 @@
 use stateroom_wasm::{
-    stateroom_wasm, ClientId, MessageRecipient, StateroomContext, StateroomService,
+    stateroom_wasm, ClientId, MessageRecipient, StateroomContext, StateroomService, MessagePayload
 };
 
 #[stateroom_wasm]
 #[derive(Default)]
 struct SharedCounterServer(i32);
 
 impl StateroomService for SharedCounterServer {
-    fn message(&mut self, _: ClientId, message: &str, ctx: &impl StateroomContext) {
-        match message {
+    fn message(&mut self, _: ClientId, message: MessagePayload, ctx: &impl StateroomContext) {
+        let message = match message {
+            MessagePayload::Text(s) => s,
+            MessagePayload::Bytes(_) => return,
+        };
+
+        match &message[..] {
             "increment" => self.0 += 1,
             "decrement" => self.0 -= 1,
             _ => (),
         }
 
         ctx.send_message(
             MessageRecipient::Broadcast,
-            &format!("new value: {}", self.0),
+            format!("new value: {}", self.0),
         );
     }
 }
diff --git a/examples/cpu-hog/Cargo.lock b/examples/cpu-hog/Cargo.lock
diff --git a/examples/cpu-hog/src/lib.rs b/examples/cpu-hog/src/lib.rs
@@ -15,7 +15,7 @@ fn get_time() -> u64 {
 
 impl StateroomService for CpuHog {
     fn connect(&mut self, _: ClientId, ctx: &impl StateroomContext) {
-        ctx.send_message(MessageRecipient::Broadcast, &format!("Connected."));
+        ctx.send_message(MessageRecipient::Broadcast, format!("Connected."));
 
         let init_time = get_time();
         loop {
@@ -25,6 +25,6 @@ impl StateroomService for CpuHog {
             }
         }
 
-        ctx.send_message(MessageRecipient::Broadcast, &format!("Finished."));
+        ctx.send_message(MessageRecipient::Broadcast, format!("Finished."));
     }
 }
diff --git a/examples/echo-server/Cargo.lock b/examples/echo-server/Cargo.lock
diff --git a/examples/echo-server/dist/server.wasm b/examples/echo-server/dist/server.wasm