Merge pull request #13 from drifting-in-space/paulgb/switch-to-axum

Switch server implementation to Axum (WIP)

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 exclude = [
     "examples",

stateroom-cli/Cargo.toml

@@ -15,7 +15,7 @@ clap = { version = "4.1.6", features = ["derive"] }
 fs_extra = "1.2.0"
 serde = { version = "1.0.127", features = ["derive"] }
 stateroom = { path="../stateroom", version="0.2.8" }
-stateroom-server = { path="../stateroom-server", version="0.2.8", features=["serve-static"] }
+stateroom-server = { path="../stateroom-server", version="0.3.0" }
 stateroom-stdio = { path="../stateroom-stdio", version="0.2.8" }
 stateroom-wasm-host = { path="../stateroom-wasm-host", version="0.2.8" }
 toml = "0.8.12"

stateroom-cli/src/cli_opts.rs

@@ -14,7 +14,7 @@ pub enum SubCommand {
     Build,
     Dev {
         #[clap(default_value = "8080")]
-        port: u32,
+        port: u16,
     },
 }
 
@@ -34,7 +34,7 @@ pub struct ServeCommand {
 
     /// The port to serve on.
     #[clap(short, long, default_value = "8080")]
-    pub port: u32,
+    pub port: u16,
 
     /// The time interval (in seconds) between WebSocket heartbeat pings.
     #[clap(short = 'i', long, default_value = "30")]

stateroom-cli/src/commands/dev.rs

@@ -2,7 +2,7 @@ use crate::build_util::{do_build, locate_config};
 use stateroom_server::Server;
 use stateroom_wasm_host::WasmHostFactory;
 
-pub fn dev(port: u32) -> anyhow::Result<()> {
+pub fn dev(port: u16) -> anyhow::Result<()> {
     let config = locate_config()?; // TODO: default to a configuration if file not found.
 
     let build_result = do_build(&config)?;

stateroom-cli/src/commands/serve.rs

@@ -1,9 +1,8 @@
-use std::{ffi::OsStr, path::Path, time::Duration};
-
 use crate::cli_opts::ServeCommand;
 use stateroom_server::Server;
 use stateroom_stdio::StdioProcessServiceFactory;
 use stateroom_wasm_host::WasmHostFactory;
+use std::{ffi::OsStr, path::Path, time::Duration};
 
 pub fn serve(serve_opts: ServeCommand) -> anyhow::Result<()> {
     let ServeCommand {

stateroom-server/Cargo.toml

@@ -1,23 +1,16 @@
 [package]
 name = "stateroom-server"
-version = "0.2.9"
-edition = "2018"
+version = "0.3.0"
+edition = "2021"
 readme = "README.md"
 repository = "https://github.com/drifting-in-space/stateroom"
 license = "MIT OR Apache-2.0"
 keywords = ["websocket"]
-description = "Actix server actor implementation of Stateroom services"
-
-[features]
-default = []
-serve-static = ["actix-files"]
+description = "Server for Stateroom services over WebSockets"
 
 [dependencies]
-actix = "0.13.0"
-actix-files = { version = "0.6.0", optional=true }
-actix-web = "4.0.1"
-actix-web-actors = "4.1.0"
+axum = { version = "0.7.5", features = ["ws"] }
+dashmap = "5.5.3"
+futures-util = "0.3.30"
 stateroom = {path="../stateroom", version="0.2.8"}
-serde = { version = "1.0.126", features = ["derive"] }
-serde_json = "1.0.68"
-tracing = "0.1.28"
+tokio = { version = "1.37.0", features = ["rt-multi-thread"] }