Update deps, use consistent rkvm- prefix for crates

Cargo.toml

@@ -1,2 +1,2 @@
 [workspace]
-members = ["client", "server", "input", "net", "certificate-gen"]
+members = ["rkvm-client", "rkvm-server", "rkvm-input", "rkvm-net", "rkvm-certificate-gen"]

rkvm-client/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2018"
 
 [dependencies]
 tokio = { version = "1.0.1", features = ["macros", "time", "fs", "net", "signal", "rt-multi-thread", "sync"] }
-input = { path = "../input" }
+rkvm-input = { path = "../rkvm-input" }
-net = { path = "../net" }
+rkvm-net = { path = "../rkvm-net" }
 serde = { version = "1.0.117", features = ["derive"] }
 toml = "0.5.7"
 structopt = "0.3.20"

rkvm-client/src/main.rs

@@ -2,9 +2,9 @@ mod config;
 
 use anyhow::{Context, Error};
 use config::Config;
-use input::EventWriter;
+use rkvm_input::EventWriter;
 use log::LevelFilter;
-use net::{self, Message, PROTOCOL_VERSION};
+use rkvm_net::{self, Message, PROTOCOL_VERSION};
 use std::convert::Infallible;
 use std::path::{Path, PathBuf};
 use std::process;
@@ -38,9 +38,9 @@ async fn run(server: &str, port: u16, certificate_path: &Path) -> Result<Infalli
 
     log::info!("Connected to {}:{}", server, port);
 
-    net::write_version(&mut stream, PROTOCOL_VERSION).await?;
+    rkvm_net::write_version(&mut stream, PROTOCOL_VERSION).await?;
 
-    let version = net::read_version(&mut stream).await?;
+    let version = rkvm_net::read_version(&mut stream).await?;
     if version != PROTOCOL_VERSION {
         return Err(anyhow::anyhow!(
             "Incompatible protocol version (got {}, expecting {})",
@@ -51,7 +51,7 @@ async fn run(server: &str, port: u16, certificate_path: &Path) -> Result<Infalli
 
     let mut writer = EventWriter::new().await?;
     loop {
-        let message = time::timeout(net::MESSAGE_TIMEOUT, net::read_message(&mut stream))
+        let message = time::timeout(rkvm_net::MESSAGE_TIMEOUT, rkvm_net::read_message(&mut stream))
             .await
             .context("Read timed out")??;
         match message {

rkvm-input/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "input"
+name = "rkvm-input"
 version = "0.2.0"
 authors = ["Jan Trefil <8711792+htrefil@users.noreply.github.com>"]
 edition = "2018"

rkvm-net/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "net"
+name = "rkvm-net"
 version = "0.2.0"
 authors = ["Jan Trefil <8711792+htrefil@users.noreply.github.com>"]
 edition = "2018"
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-input = { path = "../input" }
+rkvm-input = { path = "../rkvm-input" }
 serde = { version = "1.0.117", features = ["derive"] }
 bincode = "1.3.1"
 tokio = { version = "1.0.1", features = ["io-util"] }

rkvm-net/src/lib.rs

@@ -1,4 +1,4 @@
-use input::Event;
+use rkvm_input::Event;
 use serde::{Deserialize, Serialize};
 use std::convert::TryInto;
 use std::io::{Error, ErrorKind};

rkvm-server/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2018"
 
 [dependencies]
 tokio = { version = "1.0.1", features = ["macros", "time", "fs", "net", "signal", "rt-multi-thread", "sync"] }
-input = { path = "../input" }
+rkvm-input = { path = "../rkvm-input" }
-net = { path = "../net" }
+rkvm-net = { path = "../rkvm-net" }
 serde = { version = "1.0.117", features = ["derive"] }
 toml = "0.5.7"
 structopt = "0.3.20"

rkvm-server/src/config.rs

@@ -1,4 +1,4 @@
-use input::Key;
+use rkvm_input::Key;
 use serde::Deserialize;
 use std::collections::HashSet;
 use std::net::SocketAddr;

rkvm-server/src/main.rs

@@ -2,9 +2,9 @@ mod config;
 
 use anyhow::{Context, Error};
 use config::Config;
-use input::{Direction, Event, EventManager, Key, KeyKind};
+use rkvm_input::{Direction, Event, EventManager, Key, KeyKind};
 use log::LevelFilter;
-use net::{self, Message, PROTOCOL_VERSION};
+use rkvm_net::{self, Message, PROTOCOL_VERSION};
 use std::collections::{HashMap, HashSet};
 use std::convert::Infallible;
 use std::net::SocketAddr;
@@ -25,9 +25,9 @@ async fn handle_connection<T>(
 where
     T: AsyncRead + AsyncWrite + Unpin,
 {
-    net::write_version(&mut stream, PROTOCOL_VERSION).await?;
+    rkvm_net::write_version(&mut stream, PROTOCOL_VERSION).await?;
 
-    let version = net::read_version(&mut stream).await?;
+    let version = rkvm_net::read_version(&mut stream).await?;
     if version != PROTOCOL_VERSION {
         return Err(anyhow::anyhow!(
             "Incompatible protocol version (got {}, expecting {})",
@@ -38,15 +38,15 @@ where
 
     loop {
         // Send a keep alive message in intervals of half of the timeout just to be on the safe side.
-        let message = match time::timeout(net::MESSAGE_TIMEOUT / 2, receiver.recv()).await {
+        let message = match time::timeout(rkvm_net::MESSAGE_TIMEOUT / 2, receiver.recv()).await {
             Ok(Some(message)) => Message::Event(message),
             Ok(None) => return Ok(()),
             Err(_) => Message::KeepAlive,
         };
 
         time::timeout(
-            net::MESSAGE_TIMEOUT,
+            rkvm_net::MESSAGE_TIMEOUT,
-            net::write_message(&mut stream, &message),
+            rkvm_net::write_message(&mut stream, &message),
         )
         .await
         .context("Write timeout")??;