update

server/rust/Cargo.toml

@@ -6,6 +6,6 @@ opt-level = 3
 
 [workspace]
 members = [
-    "cdylib",
+    "mobile", "rfv",
     "wasm"
 ]

server/rust/mobile/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "mobile"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[target.'cfg(target_os="android")'.dependencies]
+android_logger = "0.14.1"
+
+[lib]
+name = "mobile"
+crate-type = ["lib", "staticlib", "cdylib"]
+
+[dependencies]
+libc = "0.2"
+axum = "0.7.9"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0.73"
+futures = "0.3.17"
+tracing = "0.1.29"
+tracing-subscriber = "0.3"
+tokio = { version = "1.19", features = ["full"] }
+slog = "2.7"
+slog-stdlog = "4.1"
+slog-scope = "4.4"
+slog-term = "2.8"
+slog-async = "2.7"
+lazy_static = "1.4"
+once_cell = "1.9"
+log = "0.4"

server/rust/cdylib/src/export.rs → server/rust/mobile/src/export.rs

@@ -21,7 +21,7 @@ lazy_static! {
         let drain = slog_term::FullFormat::new(decorator).build().fuse();
         let drain = slog_async::Async::new(drain).build().fuse();
 
-        slog::Logger::root(drain, o!())
+        Logger::root(drain, o!())
         };
 }
 
@@ -90,12 +90,10 @@ pub async fn start(port: u16) {
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    let addr = SocketAddr::from(([127, 0, 0, 1], port));
+    let addr = format!("0.0.0.0:{port}");
     info!("listening on {}", addr);
-    axum::Server::bind(&addr)
-        .serve(app.into_make_service())
-        .await
-        .unwrap();
+    let listener =tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).await.unwrap();;
 }
 
 // basic handler that responds with a static string

server/rust/cdylib/src/main.rs → server/rust/mobile/src/main.rs

@@ -1,4 +1,4 @@
-use rust::export::start;
+use mobile::export::start;
 
 
 fn main() {

server/rust/rfv/src/main.rs

@@ -0,0 +1,14 @@
+use axum::{
+    routing::get,
+    Router,
+};
+
+#[tokio::main]
+async fn main() {
+    // build our application with a single route
+    let app = Router::new().route("/", get(|| async { "Hello, World!" }));
+
+    // run our app with hyper, listening globally on port 3000
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
+    axum::serve(listener, app).await.unwrap();
+}

server/rust/wasm/Cargo.toml

@@ -24,7 +24,7 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 # allocator, however.
 wee_alloc = { version = "0.4.5", optional = true }
 
-fixedbitset = "0.4.2"
+fixedbitset = "0.5"
 js-sys = "0.3.60"
 
 [dev-dependencies]