changes

Cargo.toml

@@ -18,4 +18,4 @@ clap = "2.33.3"
 serde = "1.0.123"
 serde_json = "1.0.62"
 rand = "0.8.3"
-futures = "0.3.12"
+futures = "0.3.12"

api.txt

@@ -0,0 +1,25 @@
+Set name:
+{
+    cmd: "name",
+    name: name
+}
+
+Join Grih: 
+{
+    cmd: "join",
+    kunjika: id,
+    length: number of members allowed (optional)
+}
+
+Leave:
+{
+    cmd: "leave"
+}
+
+Send Message:
+{
+    cmd: "text",
+    text: message
+}
+
+

src/chat_pinnd.rs

@@ -4,95 +4,92 @@ use std::collections::HashMap;
 
 use actix::prelude::*;
 use actix_broker::BrokerSubscribe;
+use ws_sansad::WsSansad;
 
-use crate::ws_sansad;
+use crate::{errors, ws_sansad, messages as ms};
-use crate::messages as ms;
 
 #[allow(dead_code)]
 pub struct ChatPinnd {
-    grih: HashMap<i32, Grih>,
+    grih: HashMap<String, Grih>, // id, Grih
-    vyaktigat_waitlist: Vec<Addr<ws_sansad::WsSansad>>
+    vyaktigat_waitlist: Vec<Addr<ws_sansad::WsSansad>>,
+    vyakti: Vec<Vyakti> // id, tags
 }
 
 pub struct Grih {
-    name: Option<String>,
     length: Option<usize>,
-    clients: Vec<Addr<ws_sansad::WsSansad>>
+    loog: Vec<Addr<ws_sansad::WsSansad>>
+}
+
+pub struct Vyakti {
+    kunjika: String,
+    tags: Vec<String>
 }
 
 impl Actor for ChatPinnd {
     type Context = Context<Self>;
 
     fn started(&mut self, ctx: &mut Self::Context) {
-        self.subscribe_system_async::<ms::ReciveText>(ctx);
+        self.subscribe_system_async::<ms::SendText>(ctx);
         self.subscribe_system_async::<ms::LeaveUser>(ctx);
     }
 }
 
-impl Handler<ms::JoinUser> for ChatPinnd {
+impl Handler<ms::SetKunjikaUser> for ChatPinnd {
-    type Result = Option<i32>;
+    type Result = Result<(), errors::AlreadyExistError>;
 
-    fn handle(&mut self, msg: ms::JoinUser, _: &mut Self::Context) -> Self::Result {
+    fn handle(&mut self, msg: ms::SetKunjikaUser, ctx: &mut Self::Context) -> Self::Result {
-        match msg.grih {
+        let kunjika = msg.kunjika;
-            ms::JoinUserGrihType::Name(name) => {
+        let vyakti = self.vyakti.iter().find(|a| a.kunjika == kunjika);
-                let mat = Some(name.clone());
+        Ok(())
-                if let Some((kunjika, grih)) = 
-                    self.grih.iter_mut().find(|(_, g)| g.name == mat) {
-                    if let Some(val) = grih.length {
-                        if grih.clients.len()+1 == val {
-                            return None;
-                        }
-                    }
-                    grih.clients.push(msg.addr.clone());
-                    return Some(*kunjika);
-                }
-
-                let mut kunjika: i32  = rand::random::<i32>();
-                while self.grih.contains_key(&kunjika) {
-                    kunjika = rand::random::<i32>();
-                }
-                self.grih.insert(kunjika, Grih {
-                    name: Some(name),
-                    length: msg.length, 
-                    clients: vec![msg.addr]
-                });
-
-                return Some(kunjika);
-            }, ms::JoinUserGrihType::Kunjika(kunjika) => {
-                match self.grih.get_mut(&kunjika) {
-                    Some(grih) => {
-                        if let Some(val) = grih.length {
-                            if grih.clients.len()+1 == val {
-                                return None;
-                            }
-                        }
-                        grih.clients.push(msg.addr.clone());
-                    }, None => {
-                        self.grih.insert(kunjika, Grih {
-                            name: None,
-                            length: msg.length, 
-                            clients: vec![msg.addr]
-                        });
-                    }
-                }
-                return Some(kunjika);
-            }
-        }
     }
 }
 
-impl Handler<ms::ReciveText> for ChatPinnd {
+impl Handler<ms::JoinUser> for ChatPinnd {
+    type Result = Result<(), errors::GrihFullError>;
+
+    fn handle(&mut self, msg: ms::JoinUser, _: &mut Self::Context) -> Self::Result {
+        match self.grih.get_mut(&msg.grih_kunjika) {
+            Some(grih) =>{
+                if let Some(n) = grih.length {
+                    println!("length check {}, {}, {}", grih.loog.len(), n,grih.loog.len() >= n);
+                    if grih.loog.len() >= n {
+                        return Err(errors::GrihFullError);
+                    } 
+                }
+
+                grih.loog.push(msg.addr);
+                let username = msg.name.clone();
+                grih.loog.iter().for_each(move |a: &Addr<WsSansad>| {
+                    a.do_send(ms::WsConnected {
+                        user: username.clone()
+                    })
+                });
+            }, None => {
+                self.grih.insert(msg.grih_kunjika, Grih {
+                    length: msg.length,
+                    loog: vec![msg.addr.clone()]
+                });
+                msg.addr.do_send(ms::WsConnected {
+                    user: msg.name
+                });
+            }
+        }
+
+        Ok(())
+    }
+}
+
+impl Handler<ms::SendText> for ChatPinnd {
     type Result = ();
 
-    fn handle(&mut self, msg: ms::ReciveText, _: &mut Self::Context) -> Self::Result {
+    fn handle(&mut self, msg: ms::SendText, _: &mut Self::Context) -> Self::Result {
-        println!("Here to text");
         if let Some(grih) = self.grih.get(&msg.grih_kunjika) {
-            for client in grih.clients.iter() {
+            grih.loog.iter().for_each(|c| {
-                client.do_send(ms::WsMessage {
+                c.do_send(ms::WsMessage {
                     sender: msg.sender_name.clone(),
                     text: msg.text.clone(),
                 });
-            }
+            });
         }
     }
 }
@@ -102,12 +99,18 @@ impl Handler<ms::LeaveUser> for ChatPinnd {
 
     fn handle(&mut self, msg: ms::LeaveUser, _: &mut Self::Context) -> Self::Result {
         if let Some(grih) = self.grih.get_mut(&msg.grih_kunjika) {
-            if let Some(i) = grih.clients.iter().position(|x| x == &msg.addr) {
+            if let Some(i) = grih.loog.iter().position(|x| x == &msg.addr) {
-                grih.clients.remove(i);
+                grih.loog.remove(i);
             }
 
-            if grih.clients.len() == 0 {
+            if grih.loog.len() == 0 {
                 self.grih.remove(&msg.grih_kunjika);
+            } else {
+                grih.loog.iter().for_each(|a| {
+                    a.do_send(ms::WsDisconnected {
+                        user: "u".to_owned()
+                    })
+                });
             }
         }
     }
@@ -117,7 +120,8 @@ impl Default for ChatPinnd {
     fn default() -> Self {
         ChatPinnd {
             grih: HashMap::new(),
-            vyaktigat_waitlist: Vec::new()
+            vyaktigat_waitlist: Vec::new(),
+            vyakti: Vec::new()
         }
     }
 }

src/errors/grih_full_error.rs

@@ -0,0 +1,10 @@
+use std::fmt;
+#[derive(Debug, Clone)]
+pub struct GrihFullError;
+
+impl fmt::Display for GrihFullError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "No space left for more user!")
+    }
+}
+

src/errors/mod.rs

@@ -0,0 +1,6 @@
+mod grih_full_error;
+mod user_kunjika_error;
+pub mod vayakti_list_error;
+
+pub use grih_full_error::GrihFullError;
+pub use user_kunjika_error::AlreadyExistError;

src/errors/user_kunjika_error.rs

@@ -0,0 +1,10 @@
+use std::fmt;
+
+#[derive(Debug, Clone)]
+pub struct AlreadyExistError;
+
+impl fmt::Display for AlreadyExistError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "User kunjika already exist!")
+    }
+}

src/errors/vayakti_list_error.rs

@@ -0,0 +1,24 @@
+use std::fmt::{Display, Formatter, Result};
+use std::error::Error;
+
+#[derive(Debug)]
+pub struct ElementNotFount;
+
+#[derive(Debug)]
+pub struct KeyAlreadyExist;
+
+impl Display for ElementNotFount {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(f, "Element not found")
+    }
+}
+
+impl Error for ElementNotFount {}
+
+impl Display for KeyAlreadyExist {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        write!(f, "Key already do exist")
+    }
+}
+
+impl Error for KeyAlreadyExist {}

src/main.rs

@@ -4,9 +4,11 @@ use actix_web_actors::ws;
 use ws_sansad::WsSansad;
 
 mod config;
+mod errors;
 mod messages;
 mod ws_sansad;
 mod chat_pinnd;
+mod vyakti_list;
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {

src/messages.rs

@@ -2,27 +2,28 @@
 use actix::prelude::*;
 
 use crate::ws_sansad::WsSansad;
+use crate::errors;
 
 // For ChatPinnd 
 #[derive(Clone, Message)]
-#[rtype(result = "Option<i32>")]
+#[rtype(result = "Result<(), errors::AlreadyExistError>")]
-pub struct JoinUser {
+pub struct SetKunjikaUser {
-    pub grih: JoinUserGrihType,
+    pub kunjika: String
-    pub length: Option<usize>,
-    pub addr: Addr<WsSansad>
 }
 
-#[allow(dead_code)]
+#[derive(Clone, Message)]
-#[derive(Clone)]
+#[rtype(result = "Result<(), errors::GrihFullError>")]
-pub enum JoinUserGrihType {
+pub struct JoinUser {
-    Name(String),
+    pub grih_kunjika: String,
-    Kunjika(i32)
+    pub length: Option<usize>,
+    pub addr: Addr<WsSansad>,
+    pub name: String
 }
 
 #[derive(Clone, Message)]
 #[rtype(result = "()")]
-pub struct ReciveText {
+pub struct SendText {
-    pub grih_kunjika: i32,
+    pub grih_kunjika: String,
     pub sender_name: String,
     pub text: String
 }
@@ -30,14 +31,40 @@ pub struct ReciveText {
 #[derive(Clone, Message)]
 #[rtype(result = "()")]
 pub struct  LeaveUser {
-    pub grih_kunjika: i32,
+    pub grih_kunjika: String,
     pub addr: Addr<WsSansad>
 }
 
+#[derive(Clone, Message)]
+#[rtype(result = "()")]
+pub struct  AddUserKunjika {
+    pub old_kunjika: Option<String>,
+    pub kunjika: String
+}
+
 // For WsSansad
 #[derive(Clone, Message)]
 #[rtype(result = "()")]
 pub struct WsMessage {
     pub text: String,
     pub sender: String
-} 
+}
+
+#[derive(Clone, Message)]
+#[rtype(result = "()")]
+pub struct WsConnected {
+    pub user: String
+}
+
+#[derive(Clone, Message)]
+#[rtype(result = "()")]
+pub struct WsDisconnected {
+    pub user: String
+}
+
+#[derive(Clone, Message)]
+#[rtype(result = "()")]
+pub struct WsResponse {
+    pub result: String,
+    pub message: String
+}

src/vyakti_list.rs

@@ -0,0 +1,98 @@
+use std::error::Error;
+
+use crate::errors::vayakti_list_error as er;
+
+#[derive(Debug, Clone)]
+pub struct VecMap<K: Clone + PartialEq,V: Clone>(Vec<VecMapElement<K,V>>);
+
+#[derive(Debug, Clone)]
+pub struct VecMapElement<K: PartialEq,V: Clone> {
+    key: K,
+    value: V
+}
+
+impl<K: Clone + PartialEq, V: Clone> IntoIterator for VecMap<K, V> {
+    type IntoIter = std::vec::IntoIter<VecMapElement<K,V>>;
+    type Item = VecMapElement<K, V>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<K: Clone + PartialEq,V: Clone> VecMap<K,V> {
+    pub fn new() -> VecMap<K,V> {
+        VecMap(Vec::new())
+    }
+
+    pub fn insert(&mut self, key: K, value: V) {
+        let key_tmp = key.clone();
+        match self.0.iter_mut().find(move |a| {
+            a.key == key_tmp
+        }) {
+            Some(i) => {
+                i.value = value.clone();
+            }
+            None => {
+                self.0.push(VecMapElement {
+                    key,
+                    value
+                });
+            }
+        }
+    }
+
+    pub fn get(&self, key: K) -> Option<&V> {
+        match self.0.iter().find(|a| {
+            a.key == key
+        }) {
+            Some(v) => Some(&v.value),
+            None => None
+        }
+    }
+
+    pub fn get_mut(&mut self, key: K) -> Option<&mut V> {
+        match self.0.iter_mut().find(move |a| {
+            a.key == key
+        }) {
+            Some(v) => Some(&mut v.value),
+            None => None
+        }
+    }
+
+    pub fn remove(&mut self, key: K) -> Result<(), er::ElementNotFount> {
+        match self.0.iter().position(move |a| {
+            a.key == key
+        }) {
+            Some(i) => {
+                self.0.remove(i);
+            }
+            None => {
+                return Err(er::ElementNotFount);
+            }
+        }
+        Ok(())
+    }
+
+    pub fn change_key(&mut self, key: K, new_key: K) -> Result<(), &dyn Error> {
+        let key_tmp = key.clone();
+        if let Some(_) = self.0.iter().position(move |a| {
+            a.key == key_tmp
+        }) {
+            return Err(&er::KeyAlreadyExist);
+        }
+        
+        
+        match self.0.iter_mut().find(move |a| {
+            a.key == key
+        }) {
+            Some(i) => {
+                i.key = new_key;
+            }
+            None => {
+                return Err(&er::ElementNotFount);
+            }
+        }
+        Ok(())
+    }
+}

src/ws_sansad.rs

@@ -4,27 +4,23 @@ use actix_broker::{Broker, SystemBroker};
 use actix_web_actors::ws;
 use serde_json::{json, Value};
 
-use crate::chat_pinnd::ChatPinnd;
+use crate::{chat_pinnd::ChatPinnd, messages as ms};
-use crate::messages as ms;
+use crate::errors;
 
 pub struct WsSansad {
     name: String,
+    kunjika: Option<String>,
     isthiti: Isthiti,
-    addr: Option<Addr<Self>>
+    addr: Option<Addr<Self>>,
 }
 
 #[allow(dead_code)]
 enum Isthiti {
     None,
-    Grih(Grih),
+    Grih(String),
     // VraktigatWaitlist
 }
 
-pub struct Grih {
-    kunjika: i32,
-    // name: String
-}
-
 impl Actor for WsSansad {
     type Context = ws::WebsocketContext<Self>;
     
@@ -33,7 +29,7 @@ impl Actor for WsSansad {
     }
 
     fn stopping(&mut self, _: &mut Self::Context) -> Running {
-        futures::executor::block_on(self.end());
+        futures::executor::block_on(self.leave_grih());
         Running::Stop
     }
 }
@@ -65,73 +61,153 @@ impl Handler<ms::WsMessage> for WsSansad {
     }
 }
 
+impl Handler<ms::WsResponse> for WsSansad {
+    type Result = ();
+    fn handle(&mut self, msg: ms::WsResponse, ctx: &mut Self::Context) -> Self::Result {
+        let json = json!({
+            "cmd": "resp",
+            "result": msg.result,
+            "message": msg.message
+        });
+        ctx.text(json.to_string());
+    }
+}
+
+impl Handler<ms::WsConnected> for WsSansad {
+    type Result = ();
+    fn handle(&mut self, msg: ms::WsConnected, ctx: &mut Self::Context) -> Self::Result {
+        let json = json!({
+            "cmd": "connected",
+            "user": msg.user
+        });
+        ctx.text(json.to_string());
+    }
+}
+
+impl Handler<ms::WsDisconnected> for WsSansad {
+    type Result = ();
+    fn handle(&mut self, msg: ms::WsDisconnected, ctx: &mut Self::Context) -> Self::Result {
+        let json = json!({
+            "cmd": "disconnected",
+            "user": msg.user
+        });
+        ctx.text(json.to_string());
+    }
+}
+
+
 impl WsSansad {
     pub fn new() -> Self {
         WsSansad {
             name: "()".to_owned(),
+            kunjika: None,
             isthiti: Isthiti::None,
-            addr: None
+            addr: None,
         }
     }
 
     async fn parse_text_handle(&mut self, msg: String) {
+        println!("{}", msg);
         if let Ok(val) = serde_json::from_str::<Value>(&msg) {
             match val.get("cmd").unwrap().as_str().unwrap() {
-                "name" => { self.name(val).await },
+                "name" => { self.set_name(val).await },
-                "join" => { self.join(val).await },
+                "kunjika" => { self.set_kunjika(val).await },
-                "text" => { self.text(val).await },
+                "join" => { self.join_grih(val).await },
-                "end" => { self.end().await },
+                "text" => { self.send_text(val).await },
+                "leave" => { self.leave_grih().await },
                 _ => ()
             }
         }
     }
 
-    async fn name(&mut self, val: Value) {
+    fn send_ok_response(&self) {
-        self.name = val.get("name").unwrap().as_str().unwrap().to_owned();
+        self.addr.clone().unwrap().do_send(ms::WsResponse {
+            result: "Ok".to_owned(),
+            message: "".to_owned()
+        });
     }
 
-    async fn text(&mut self, val: Value) {
+    fn send_err_response(&self, text: &str) {
-        let text = val.get("text").unwrap().as_str().unwrap().to_owned();
+        self.addr.clone().unwrap().do_send(ms::WsResponse {
+            result: "Err".to_owned(),
+            message: text.to_owned()
+        });
+    }
+
+    async fn set_name(&mut self, val: Value) {
+        self.name = val.get("name").unwrap().as_str().unwrap().to_owned();
+        self.send_ok_response();
+    }
+
+    async fn set_kunjika(&mut self, val: Value) {
+        self.name = val.get("name").unwrap().as_str().unwrap().to_owned();
+        self.send_ok_response();
+    }
+
+    async fn join_grih(&mut self, val: Value) {
+        if let None = self.kunjika {
+            self.send_err_response("No user kunjika set");
+            return;
+        }
+        
+        let kunjika = match val.get("kunjika") {
+            Some(val) => val,
+            None => {
+                self.send_err_response("Invalid request");
+                return;
+            }
+        }.as_str().unwrap().to_owned();
+        let length: Option<usize> = match val.get("length") {
+            Some(val) => Some(val.as_i64().unwrap() as usize),
+            None => None
+        };
+
+        let result: Result<(), errors::GrihFullError> = ChatPinnd::from_registry().send(ms::JoinUser {
+            grih_kunjika: kunjika.clone(),
+            length,
+            addr: self.addr.clone().unwrap(),
+            name: self.name.clone()
+        }).await.unwrap();
+
+        match result {
+            Ok(_) => {
+                self.isthiti = Isthiti::Grih(kunjika);
+                self.send_ok_response()
+            },
+            Err(e) => self.send_err_response(&format!("{}", e))
+        }
+    }
+
+    async fn send_text(&mut self, val: Value) {
+        let text = match val.get("text") {
+            Some(val) => val,
+            None => {
+                self.send_err_response("Invalid request");
+                return;
+            }
+        }.as_str().unwrap().to_owned();
         let grih_kunjika = match &self.isthiti {
             Isthiti::Grih(g) => {
-                g.kunjika
+                g.clone()
             }, Isthiti::None => {
                 return;
             }
         };
-
+        Broker::<SystemBroker>::issue_async(ms::SendText {
-        Broker::<SystemBroker>::issue_async(ms::ReciveText {
             grih_kunjika,
             sender_name: self.name.clone(),
             text
         });
     }
 
-    async fn join(&mut self, val: Value) {
+    async fn leave_grih(&mut self) {
-        let name = val.get("name").unwrap().as_str().unwrap().to_owned();
-        let length: Option<usize> = match val.get("length") {
-            Some(val) => Some(val.as_i64().unwrap() as usize),
-            None => None
-        };
-
-        let kunjika  = ChatPinnd::from_registry().send(ms::JoinUser{
-            grih: ms::JoinUserGrihType::Name(name.clone()),
-            length,
-            addr: self.addr.clone().unwrap()
-        }).await.unwrap().unwrap();
-
-        self.isthiti = Isthiti::Grih(Grih {
-            kunjika,
-            // name
-        })
-    }
-
-    async fn end(&mut self) {
         if let Isthiti::Grih(val) = &mut self.isthiti {
             Broker::<SystemBroker>::issue_async(ms::LeaveUser {
-                grih_kunjika: val.kunjika,
+                grih_kunjika: val.clone(),
                 addr: self.addr.clone().unwrap()
             });
+
+            self.send_ok_response();
         }
     }
 }

static/index.html

@@ -25,10 +25,17 @@ function wsend(p) {
     socket.send(p);
 }
 
-function join(r) {
+function join(r, l) {
     socket.send(JSON.stringify({
         cmd: "join",
-        name: r
+        kunjika: r,
+        length: l
+    }));
+}
+
+function leave() {
+    socket.send(JSON.stringify({
+        cmd: "leave"
     }));
 }