Re-implement the ws client
This commit is contained in:
@ -14,6 +14,7 @@ path = "worker.rs"
|
||||
|
||||
[dependencies]
|
||||
tungstenite = { version = "0.24.0", default-features = true, features = ["native-tls"] }
|
||||
rocket_ws = { git = "https://github.com/rwf2/Rocket/", rev = "3bf9ef02d6e803fe9f753777f5a829dda6d2453d", default-features = true}
|
||||
log2 = "0.1.11"
|
||||
diesel = { version = "2", default-features = false, features = [] }
|
||||
dns-ptr-resolver = {git = "https://github.com/wdes/dns-ptr-resolver.git"}
|
||||
|
@ -1,6 +1,7 @@
|
||||
use std::{net::IpAddr, str::FromStr};
|
||||
|
||||
use cidr::IpCidr;
|
||||
use rocket_ws::Message as RocketMessage;
|
||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq)]
|
||||
@ -66,6 +67,20 @@ impl Into<WorkerMessages> for String {
|
||||
}
|
||||
}
|
||||
|
||||
impl TryInto<WorkerMessages> for RocketMessage {
|
||||
type Error = String;
|
||||
|
||||
fn try_into(self) -> Result<WorkerMessages, Self::Error> {
|
||||
match self {
|
||||
RocketMessage::Text(data) => {
|
||||
let data: WorkerMessages = data.into();
|
||||
Ok(data)
|
||||
}
|
||||
_ => Err("Only text is supported".to_string()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use cidr::IpCidr;
|
||||
|
@ -190,24 +190,6 @@ impl Worker {
|
||||
}
|
||||
}
|
||||
|
||||
/*impl ws2::Handler for Worker {
|
||||
fn on_open(&mut self, ws: &WebSocket) -> Pod {
|
||||
info!("Connected to: {ws}, starting to work");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn on_close(&mut self, ws: &WebSocket) -> Pod {
|
||||
info!("End of the work day: {ws}");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn on_message(&mut self, ws: &WebSocket, msg: String) -> Pod {
|
||||
let server_request: WorkerMessages = msg.clone().into();
|
||||
self.receive_request(ws, server_request);
|
||||
Ok(())
|
||||
}
|
||||
}*/
|
||||
|
||||
fn main() -> () {
|
||||
let _log2 = log2::stdout()
|
||||
.module(true)
|
||||
|
Reference in New Issue
Block a user