Add hive to main join!().

This commit is contained in:
Paul Makles
2020-12-29 23:25:52 +00:00
parent c704f13d72
commit af56f5e2d8
6 changed files with 78 additions and 23 deletions

View File

@@ -1,9 +1,29 @@
use serde::{Deserialize, Serialize};
use rauth::auth::Session;
use snafu::Snafu;
#[derive(Serialize, Deserialize, Debug, Clone)]
#[derive(Serialize, Deserialize, Debug, Snafu)]
#[serde(tag = "type")]
pub enum Notification {
MessageCreate {
pub enum WebSocketError {
#[snafu(display("This error has not been labelled."))]
LabelMe,
#[snafu(display("Internal server error."))]
InternalError,
}
#[derive(Deserialize, Debug)]
#[serde(tag = "type")]
pub enum ServerboundNotification {
Authenticate(Session)
}
#[derive(Serialize, Deserialize, Debug)]
#[serde(tag = "type")]
pub enum ClientboundNotification {
Error(WebSocketError),
/*MessageCreate {
id: String,
nonce: Option<String>,
channel: String,
@@ -57,7 +77,7 @@ pub enum Notification {
GuildDelete {
id: String,
},
},*/
UserRelationship {
id: String,

View File

@@ -1,14 +1,14 @@
use super::events::Notification;
// use super::websocket;
use super::events::ClientboundNotification;
use crate::database::get_collection;
use hive_pubsub::backend::mongo::MongodbPubSub;
use hive_pubsub::PubSub;
use once_cell::sync::OnceCell;
use serde_json::to_string;
use futures::FutureExt;
use log::{error, debug};
static HIVE: OnceCell<MongodbPubSub<String, String, Notification>> = OnceCell::new();
static HIVE: OnceCell<MongodbPubSub<String, String, ClientboundNotification>> = OnceCell::new();
pub async fn init_hive() {
let hive = MongodbPubSub::new(
@@ -20,7 +20,7 @@ pub async fn init_hive() {
error!("Failed to serialise notification.");
}
},
get_collection("hive"),
get_collection("pubsub"),
);
if HIVE.set(hive).is_err() {
@@ -28,7 +28,18 @@ pub async fn init_hive() {
}
}
pub fn publish(topic: &String, data: Notification) -> Result<(), String> {
pub async fn listen() {
HIVE.get()
.unwrap()
.listen()
.fuse()
.await
.expect("Hive hit an error");
dbg!("a");
}
pub fn publish(topic: &String, data: ClientboundNotification) -> Result<(), String> {
let hive = HIVE.get().unwrap();
hive.publish(topic, data)
}

View File

@@ -1,10 +1,25 @@
use crate::util::variables::WS_HOST;
use log::info;
use ulid::Ulid;
use async_std::task;
use futures::prelude::*;
use std::str::from_utf8;
use std::sync::{Arc, RwLock};
use many_to_many::ManyToMany;
use std::collections::HashMap;
use futures::stream::SplitSink;
use async_tungstenite::WebSocketStream;
use async_tungstenite::tungstenite::Message;
use async_std::net::{TcpListener, TcpStream};
lazy_static! {
static ref CONNECTIONS: Arc<RwLock<HashMap<String, SplitSink<WebSocketStream<TcpStream>, Message>>>> =
Arc::new(RwLock::new(HashMap::new()));
static ref USERS: Arc<RwLock<ManyToMany<String, String>>> =
Arc::new(RwLock::new(ManyToMany::new()));
}
pub async fn launch_server() {
let try_socket = TcpListener::bind(WS_HOST.to_string()).await;
let listener = try_socket.expect("Failed to bind");
@@ -23,6 +38,20 @@ async fn accept(stream: TcpStream) {
info!("User established WebSocket connection from {}.", addr);
let id = Ulid::new().to_string();
let (write, read) = ws_stream.split();
read.forward(write).await.expect("Failed to forward message")
CONNECTIONS
.write()
.unwrap()
.insert(id, write);
read
.for_each(|message| async {
let data = message.unwrap().into_data();
// if you mess with the data, you get the bazooki
let string = from_utf8(&data).unwrap();
println!("{}", string);
})
.await;
}