piyushxcoder
/
lupt
mirror of https://github.com/PiyushXCoder/lupt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

till non_connected_users

This commit is contained in:
Piyush मिश्रः 2021-02-19 21:22:30 +05:30
parent 18afc8bad7
commit e03a51dc23
9 changed files with 393 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
src/chat_pinnd.rs
View File

@ -1,24 +1,30 @@
//! Chat Pinnd(पिण्ड) is Actor to manage Websocket Chat related action //! Chat Pinnd(पिण्ड) is Actor to manage Websocket Chat related action
use std::collections::HashMap; use std::{collections::HashMap, vec};
use actix::prelude::*; use actix::prelude::*;
use actix_broker::BrokerSubscribe; use actix_broker::BrokerSubscribe;
use vecmap::VecMap; use vecmap::VecMap;
use ws_sansad::WsSansad;
use crate::{errors, ws_sansad, messages as ms}; use crate::{errors, ws_sansad, messages as ms};
#[allow(dead_code)] #[allow(dead_code)]
pub struct ChatPinnd { pub struct ChatPinnd {
grih: HashMap<String, Grih>, // id, Grih grih: HashMap<String, Grih>, // kunjika, Grih
vyaktigat_waitlist: Vec<VyaktiWatchlist>, vyaktigat_waitlist: Vec<VyaktiWatchlist>,
vyakti: VecMap<String, Vyakti> // id, vayakti non_connected_vyakti: VecMap<String, Vyakti>, // kunjika, vayakti
} }
pub struct Grih { pub struct Grih {
length: Option<usize>, length: Option<usize>,
loog: Vec<Addr<ws_sansad::WsSansad>> loog: Vec<Loog>
}
pub struct Loog {
addr: Addr<ws_sansad::WsSansad>,
kunjika: String,
name: String,
_tags: Vec<String>
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -48,12 +54,22 @@ impl Handler<ms::SetInfoVyakti> for ChatPinnd {
fn handle(&mut self, msg: ms::SetInfoVyakti, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, msg: ms::SetInfoVyakti, _: &mut Self::Context) -> Self::Result {
// check if vayakti info is not modified and do key exist // check if vayakti info is not modified and do key exist
if !msg.modify { if !msg.modify {
if self.vyakti.key_exist(&msg.kunjika) { if self.non_connected_vyakti.key_exist(&msg.kunjika) {
return Some("Kunjika Exists".to_owned());
}
if let Some(_) = self.grih.iter().position(|a| {
match a.1.loog.iter().position(|b| {
b.kunjika == msg.kunjika
}) {
Some(_) => true,
None => false
}
}) {
return Some("Kunjika Exists".to_owned()); return Some("Kunjika Exists".to_owned());
} }
} }
// change value // change value
self.vyakti.insert(msg.kunjika, Vyakti { self.non_connected_vyakti.insert(msg.kunjika, Vyakti {
name: msg.name, name: msg.name,
tags: msg.tags tags: msg.tags
}); });
@ -76,25 +92,34 @@ impl Handler<ms::JoinGrih> for ChatPinnd {
} }
} }
grih.loog.push(msg.addr); let vayakti = self.non_connected_vyakti.get(&msg.kunjika).unwrap();
let username = self.vyakti.get(&msg.kunjika).unwrap().name.to_owned(); let name = vayakti.name.to_owned();
let kunjika = msg.kunjika.clone(); let tags = vayakti.tags.to_owned();
grih.loog.iter().for_each(move |a: &Addr<WsSansad>| {
a.do_send(ms::WsConnected { let name_tmp = name.clone();
name: username.clone(), let kunjika_tmp = msg.kunjika.clone();
kunjika: kunjika.clone() grih.loog.iter().for_each(move |a: &Loog| {
a.addr.do_send(ms::WsConnected {
name: name_tmp.clone(),
kunjika: kunjika_tmp.clone()
}) })
}); });
self.non_connected_vyakti.remove(&msg.kunjika).unwrap_or(());
grih.loog.push(Loog::new(msg.addr, msg.kunjika,name,tags));
}, None => { // don't exist }, None => { // don't exist
// add group and notify // add group and notify
self.grih.insert(msg.grih_kunjika, Grih { let vayakti = self.non_connected_vyakti.get(&msg.kunjika).unwrap();
length: msg.length,
loog: vec![msg.addr.clone()]
});
msg.addr.do_send(ms::WsConnected { msg.addr.do_send(ms::WsConnected {
name: self.vyakti.get(&msg.kunjika).unwrap().name.to_owned(), name: vayakti.name.clone(),
kunjika: msg.kunjika.clone() kunjika: msg.kunjika.clone()
}); });
self.grih.insert(msg.grih_kunjika, Grih {
length: msg.length,
loog: vec![Loog::new(msg.addr,msg.kunjika.clone(),vayakti.name.clone(),vayakti.tags.clone())]
});
self.non_connected_vyakti.remove(&msg.kunjika).unwrap_or(());
} }
} }
@ -120,24 +145,34 @@ impl Handler<ms::JoinRandom> for ChatPinnd {
// connect 0th person // connect 0th person
let vayakti_watchlist = self.vyaktigat_waitlist.remove(0); let vayakti_watchlist = self.vyaktigat_waitlist.remove(0);
let vayakti1 = self.vyakti.get(&msg.kunjika).unwrap(); let vayakti1_name: String;
let vayakti2 = self.vyakti.get(&vayakti_watchlist.kunjika).unwrap(); let vayakti2_name: String;
let group_kunjika = format!("gupt_{}>{}",msg.kunjika, vayakti_watchlist.kunjika); let group_kunjika: String;
self.grih.insert(group_kunjika.clone(), Grih { {
length: Some(2), let vayakti1 = self.non_connected_vyakti.get(&msg.kunjika).unwrap();
loog: vec![msg.addr.clone(), vayakti_watchlist.addr.clone()] let vayakti2 = self.non_connected_vyakti.get(&vayakti_watchlist.kunjika).unwrap();
}); vayakti1_name = vayakti1.name.clone();
vayakti2_name = vayakti2.name.clone();
group_kunjika = format!("gupt_{}>{}",msg.kunjika.clone(), vayakti_watchlist.kunjika);
self.grih.insert(group_kunjika.clone(), Grih {
length: Some(2),
loog: vec![Loog::new(msg.addr.clone(), msg.kunjika.clone(), vayakti1.name.clone(), vayakti1.tags.clone()),
Loog::new(vayakti_watchlist.addr.clone(), vayakti_watchlist.kunjika.clone(), vayakti2.name.clone(), vayakti2.tags.clone())]
});
}
self.non_connected_vyakti.remove(&msg.kunjika).unwrap_or(());
self.non_connected_vyakti.remove(&vayakti_watchlist.kunjika).unwrap_or(());
// notify about connection // notify about connection
msg.addr.do_send(ms::WsConnectedRandom { msg.addr.do_send(ms::WsConnectedRandom {
ajnyat_name: vayakti2.name.clone(), ajnyat_name: vayakti2_name,
grih_kunjika: group_kunjika.clone() grih_kunjika: group_kunjika.clone()
}); });
vayakti_watchlist.addr.do_send(ms::WsConnectedRandom { vayakti_watchlist.addr.do_send(ms::WsConnectedRandom {
ajnyat_name: vayakti1.name.clone(), ajnyat_name: vayakti1_name,
grih_kunjika: group_kunjika.clone() grih_kunjika: group_kunjika
}); });
Some(()) Some(())
@ -151,7 +186,7 @@ impl Handler<ms::SendText> for ChatPinnd {
fn handle(&mut self, msg: ms::SendText, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, msg: ms::SendText, _: &mut Self::Context) -> Self::Result {
if let Some(grih) = self.grih.get(&msg.grih_kunjika) { if let Some(grih) = self.grih.get(&msg.grih_kunjika) {
grih.loog.iter().for_each(|c| { grih.loog.iter().for_each(|c| {
c.do_send(ms::WsText { c.addr.do_send(ms::WsText {
sender_kunjika: msg.kunjika.clone(), sender_kunjika: msg.kunjika.clone(),
text: msg.text.clone(), text: msg.text.clone(),
reply: msg.reply.clone() reply: msg.reply.clone()
@ -168,7 +203,7 @@ impl Handler<ms::SendStatus> for ChatPinnd {
fn handle(&mut self, msg: ms::SendStatus, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, msg: ms::SendStatus, _: &mut Self::Context) -> Self::Result {
if let Some(grih) = self.grih.get(&msg.grih_kunjika) { if let Some(grih) = self.grih.get(&msg.grih_kunjika) {
grih.loog.iter().for_each(|c| { grih.loog.iter().for_each(|c| {
c.do_send(ms::WsStatus { c.addr.do_send(ms::WsStatus {
sender_kunjika: msg.kunjika.clone(), sender_kunjika: msg.kunjika.clone(),
status: msg.status.clone(), status: msg.status.clone(),
}); });
@ -177,6 +212,23 @@ impl Handler<ms::SendStatus> for ChatPinnd {
} }
} }
/// send list of users
impl Handler<ms::List> for ChatPinnd {
type Result = String;
fn handle(&mut self, msg: ms::List, _: &mut Self::Context) -> Self::Result {
if let Some(grih) = self.grih.get(&msg.grih_kunjika) {
let mut list = Vec::new();
for x in grih.loog.iter() {
list.push((x.kunjika.clone(),x.name.clone()));
}
serde_json::json!(list).to_string()
} else {
"".to_string()
}
}
}
/// Notifiy a user disconnected and trim grih /// Notifiy a user disconnected and trim grih
impl Handler<ms::LeaveUser> for ChatPinnd { impl Handler<ms::LeaveUser> for ChatPinnd {
type Result = (); type Result = ();
@ -184,7 +236,7 @@ impl Handler<ms::LeaveUser> for ChatPinnd {
fn handle(&mut self, msg: ms::LeaveUser, _: &mut Self::Context) -> Self::Result { fn handle(&mut self, msg: ms::LeaveUser, _: &mut Self::Context) -> Self::Result {
if let Some(grih_kunjika) = &msg.grih_kunjika { if let Some(grih_kunjika) = &msg.grih_kunjika {
if let Some(grih) = self.grih.get_mut(grih_kunjika) { if let Some(grih) = self.grih.get_mut(grih_kunjika) {
if let Some(i) = grih.loog.iter().position(|x| x == &msg.addr) { if let Some(i) = grih.loog.iter().position(|x| x.addr == msg.addr) {
grih.loog.remove(i); grih.loog.remove(i);
} }
@ -192,7 +244,7 @@ impl Handler<ms::LeaveUser> for ChatPinnd {
self.grih.remove(grih_kunjika); self.grih.remove(grih_kunjika);
} else { } else {
grih.loog.iter().for_each(|a| { grih.loog.iter().for_each(|a| {
a.do_send(ms::WsDisconnected { a.addr.do_send(ms::WsDisconnected {
kunjika: msg.kunjika.clone() kunjika: msg.kunjika.clone()
}) })
}); });
@ -200,7 +252,7 @@ impl Handler<ms::LeaveUser> for ChatPinnd {
} }
} }
self.vyakti.remove(&msg.kunjika).unwrap_or(()); self.non_connected_vyakti.remove(&msg.kunjika).unwrap_or(());
if let Some(i) = self.vyaktigat_waitlist.iter().position(|a| a.kunjika == msg.kunjika) { if let Some(i) = self.vyaktigat_waitlist.iter().position(|a| a.kunjika == msg.kunjika) {
self.vyaktigat_waitlist.remove(i); self.vyaktigat_waitlist.remove(i);
} }
@ -212,7 +264,21 @@ impl Default for ChatPinnd {
ChatPinnd { ChatPinnd {
grih: HashMap::new(), grih: HashMap::new(),
vyaktigat_waitlist: Vec::new(), vyaktigat_waitlist: Vec::new(),
vyakti: VecMap::new() non_connected_vyakti: VecMap::new()
}
}
}
impl Loog {
fn new(addr: Addr<ws_sansad::WsSansad>,
kunjika: String,
name: String,
tags: Vec<String>) -> Self {
Loog {
addr,
kunjika,
name,
_tags:tags
} }
} }
} }

2
src/main.rs
View File

@ -19,7 +19,7 @@ mod errors;
mod messages; mod messages;
mod ws_sansad; mod ws_sansad;
mod chat_pinnd; mod chat_pinnd;
mod validator;
#[actix_web::main] #[actix_web::main]
async fn main() -> std::io::Result<()> { async fn main() -> std::io::Result<()> {
let config = config::Config::new(); let config = config::Config::new();

14
src/messages.rs
View File

@ -52,6 +52,13 @@ pub struct SendStatus {
pub status: String pub status: String
} }
// Request to send text t
#[derive(Clone, Message)]
#[rtype(result = "String")]
pub struct List {
pub grih_kunjika: String
}
/// Request to leave grih /// Request to leave grih
#[derive(Clone, Message)] #[derive(Clone, Message)]
#[rtype(result = "()")] #[rtype(result = "()")]
@ -79,6 +86,13 @@ pub struct WsStatus {
pub sender_kunjika: String pub sender_kunjika: String
} }
// Request to send transfer text
#[derive(Clone, Message)]
#[rtype(result = "()")]
pub struct WsList {
pub json: String
}
// Notify Someone connected // Notify Someone connected
#[derive(Clone, Message)] #[derive(Clone, Message)]

55
src/validator.rs Normal file
View File

@ -0,0 +1,55 @@
pub enum Validation {
NonEmpty,
NoGupt,
NoSpace,
NoHashtag,
}
pub fn validate(val: Vec<Validation>, dat: &str, entry_name: &str) -> Option<String> {
for v in val {
let out = match v {
Validation::NonEmpty => non_empty(dat, entry_name),
Validation::NoGupt => is_gupt(dat),
Validation::NoSpace => no_space(dat, entry_name),
Validation::NoHashtag => no_hashtag(dat, entry_name)
};
if out != None {
return out;
}
}
None
}
fn non_empty(dat: &str, entry_name: &str) -> Option<String> {
if dat.len() > 0 {
None
} else {
Some(format!("{} is Required", entry_name))
}
}
fn is_gupt(dat: &str) -> Option<String> {
if !dat.starts_with("gupt_") {
None
} else {
Some(format!("Restricted group"))
}
}
fn no_space(dat: &str, entry_name: &str) -> Option<String> {
if dat.contains(" ") {
Some(format!("{} shounld not have space", entry_name))
} else {
None
}
}
fn no_hashtag(dat: &str, entry_name: &str) -> Option<String> {
if dat.contains("#") {
Some(format!("{} shounld not have Hashtag(#)", entry_name))
} else {
None
}
}

74
src/ws_sansad.rs
View File

@ -4,7 +4,7 @@ use actix_broker::{Broker, SystemBroker};
use actix_web_actors::ws; use actix_web_actors::ws;
use serde_json::{json, Value}; use serde_json::{json, Value};
use crate::{chat_pinnd::ChatPinnd, messages as ms}; use crate::{chat_pinnd::ChatPinnd, messages as ms, validator::{Validation as vl, validate}};
use crate::errors; use crate::errors;
pub struct WsSansad { pub struct WsSansad {
@ -77,6 +77,18 @@ impl Handler<ms::WsStatus> for WsSansad {
} }
} }
/// List Vayakti
impl Handler<ms::WsList> for WsSansad {
type Result = ();
fn handle(&mut self, msg: ms::WsList, ctx: &mut Self::Context) -> Self::Result {
let json = json!({
"cmd": "list",
"vayakti": msg.json
});
ctx.text(json.to_string());
}
}
/// send response ok, error /// send response ok, error
impl Handler<ms::WsResponse> for WsSansad { impl Handler<ms::WsResponse> for WsSansad {
type Result = (); type Result = ();
@ -139,6 +151,7 @@ impl WsSansad {
/// parse the request text from client /// parse the request text from client
async fn parse_text_handle(&mut self, msg: String) { async fn parse_text_handle(&mut self, msg: String) {
println!("{:?}", msg);
if let Ok(val) = serde_json::from_str::<Value>(&msg) { if let Ok(val) = serde_json::from_str::<Value>(&msg) {
match val.get("cmd").unwrap().as_str().unwrap() { match val.get("cmd").unwrap().as_str().unwrap() {
"seinfo" => { self.set_info(val).await }, "seinfo" => { self.set_info(val).await },
@ -146,6 +159,7 @@ impl WsSansad {
"rand" => { self.join_random().await }, "rand" => { self.join_random().await },
"text" => { self.send_text(val).await }, "text" => { self.send_text(val).await },
"status" => { self.send_status(val).await }, "status" => { self.send_status(val).await },
"list" => { self.list().await },
"leave" => { self.leave_grih().await }, "leave" => { self.leave_grih().await },
_ => () _ => ()
} }
@ -198,6 +212,16 @@ impl WsSansad {
} }
}; };
// Validate
if let Some(val ) = validate(vec![vl::NonEmpty, vl::NoSpace, vl::NoHashtag], &kunjika, "Kunjika") {
self.send_err_response(&val);
return;
}
if let Some(val ) = validate(vec![vl::NonEmpty], &name, "Name") {
self.send_err_response(&val);
return;
}
// check if eing modified // check if eing modified
let modify = self.kunjika == Some(kunjika.clone()); let modify = self.kunjika == Some(kunjika.clone());
@ -246,12 +270,13 @@ impl WsSansad {
/// Request to join to grih /// Request to join to grih
async fn join_grih(&mut self, val: Value) { async fn join_grih(&mut self, val: Value) {
//echeck user exist //check user exist
if let None = self.kunjika { if let None = self.kunjika {
self.send_err_response("No vayakti kunjika set"); self.send_err_response("No vayakti kunjika set");
return; return;
} }
// Check is already joined
match self.isthiti { match self.isthiti {
Isthiti::None => (), Isthiti::None => (),
_ => { _ => {
@ -267,19 +292,25 @@ impl WsSansad {
return; return;
} }
}.as_str().unwrap().to_owned(); }.as_str().unwrap().to_owned();
println!("about to validate");
// restrict place for vaktigat chat // Validate
if grih_kunjika.starts_with("gupt_") { if let Some(val ) = validate(vec![vl::NonEmpty, vl::NoGupt, vl::NoSpace], &grih_kunjika, "Grih Kunjika") {
self.send_err_response("Such grih kunjika is restricted"); println!("{}", val);
self.send_err_response(&val);
return; return;
} }
let length: Option<usize> = match val.get("length") { let length: Option<usize> = match val.get("length") {
Some(val) => Some(val.as_i64().unwrap() as usize), Some(val) => match val.as_i64(){
Some(val) => Some(val as usize),
None => None
},
None => None None => None
}; };
// requesy println!("{:?} {:?} {:?}", grih_kunjika, self.kunjika, length);
// request
let result: Result<(), errors::GrihFullError> = ChatPinnd::from_registry().send(ms::JoinGrih { let result: Result<(), errors::GrihFullError> = ChatPinnd::from_registry().send(ms::JoinGrih {
grih_kunjika: grih_kunjika.clone(), grih_kunjika: grih_kunjika.clone(),
length, length,
@ -296,6 +327,32 @@ impl WsSansad {
} }
} }
/// Request to join to grih
async fn list(&mut self) {
// check if vayakti exist
if let None = self.kunjika {
self.send_err_response("No vayakti kunjika set");
return;
}
// check if connected to any grih
match &self.isthiti {
Isthiti::Grih(kunjika) => {
let json: String = ChatPinnd::from_registry().send(ms::List {
grih_kunjika: kunjika.clone()
}).await.unwrap();
self.addr.clone().unwrap().do_send(ms::WsList {
json
})
},
_ => {
self.send_err_response("Grih not connected");
return;
}
}
}
/// send text to vayakti in grih /// send text to vayakti in grih
async fn send_text(&mut self, val: Value) { async fn send_text(&mut self, val: Value) {
// check if vayakti exist // check if vayakti exist
@ -397,6 +454,7 @@ impl WsSansad {
}); });
} }
self.isthiti = Isthiti::None;
self.send_ok_response("left"); self.send_ok_response("left");
} }
} }

37
static/css/style.css
View File

@ -1,5 +1,13 @@
pre { pre {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: 0.9em;
margin-top: 0;
margin-bottom: 0;
}
textarea {
font-family: Arial, Helvetica, sans-serif;
font-size: 0.9em;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
@ -28,22 +36,45 @@ pre {
} }
.chatpanel-left { .chatpanel-left {
position: fixed;
display: inline; display: inline;
width: 34px; width: 34px;
bottom: 0;
left: 0;
} }
.chatpanel-mid { .chatpanel-mid {
position: fixed;
display: inline; display: inline;
width: calc(100% - 54px - 34px); width: calc(100% - 54px - 34px);
bottom: 3px;
left: 34px;
} }
.chatpanel-right { .chatpanel-right {
position: fixed;
display: inline; display: inline;
width: 44px; width: 44px;
bottom: 5px;
right: 5px;
}
#send_box {
width: 100%;
height: 40px;
min-height: 40px;
word-wrap: break-word;
resize: none;
}
.status {
width: calc(100% - 6);
padding: 3px;
text-align: center;
} }
.message { .message {
padding: 0px 8px 5px 8px; padding: 0px 8px 3px 8px;
margin: 2px; margin: 2px;
word-wrap: break-word;; word-wrap: break-word;;
} }
@ -64,10 +95,10 @@ pre {
} }
.message .message-by { .message .message-by {
font-size: 0.9rem; font-size: 0.7rem;
font-style: italic; font-style: italic;
text-decoration: underline; text-decoration: underline;
padding-bottom: 2px; padding-bottom: 1px;
} }
.message-me.active { .message-me.active {

53
static/index.html
View File

@ -14,7 +14,7 @@
</div> </div>
<!-- Connect Screen --> <!-- Connect Screen -->
<div class="siimple-content siimple-content--extra-small"> <div id="connect_panel" class="siimple-content siimple-content--extra-small">
<div class="siimple--px-5 siimple--py-5"> <div class="siimple--px-5 siimple--py-5">
<tabs> <tabs>
<div class="siimple-jumbotron siimple--text-center siimple--py-4"> <div class="siimple-jumbotron siimple--text-center siimple--py-4">
@ -27,20 +27,28 @@
</div> </div>
<form name="grih_sec" cmd="join" class="siimple-form"> <form name="grih_sec" cmd="join" class="siimple-form">
<div class="siimple-form-detail">Connect Grih(group) with kunjika.</div> <div name="error_area" class="siimple-content siimple--py-1 siimple--text-small siimple--color-primary siimple-content--fluid"></div>
<div class="siimple-form-detail">Connect Grih(home) with kunjika.</div>
<div class="siimple-form-field"> <div class="siimple-form-field">
<div class="siimple-form-field-label">Grih kunjika</div> <div class="siimple-form-field-label">Grih kunjika(id)</div>
<input name="grih_kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Grih kunjika"> <input name="grih_kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Grih kunjika">
<div class="siimple-form-field-helper">New group is created if no such group exists</div>
</div> </div>
<div class="siimple-form-field"> <div class="siimple-form-field">
<div class="siimple-form-field-label">Your kunjika</div> <div class="siimple-form-field-label">Your kunjika(id)</div>
<input name="kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Your kunjika"> <input name="kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Your kunjika">
</div> </div>
<div class="siimple-form-field"> <div class="siimple-form-field">
<div class="siimple-form-field-label">Your name</div> <div class="siimple-form-field-label">Your name</div>
<input name="name" type="text" class="siimple-input siimple-input--fluid" placeholder="Your name"> <input name="name" type="text" class="siimple-input siimple-input--fluid" placeholder="Your name">
</div> </div>
<div class="siimple-form-field siimple--float-right"> <div class="siimple-form-field">
<div class="siimple-form-field-label">Size of Home</div>
<input name="length" type="number" class="siimple-input siimple-input--fluid" placeholder="Size">
<div class="siimple-form-field-helper">Number of perople allowed in home. Leave empty for infinite</div>
</div>
<div class="siimple-form-field siimple--text-right" style="width: 100%;">
<div><span name="error_msg" class="siimple-tag siimple-tag--error siimple--my-2 hidden"></span></div>
<div id="grih_connect" class="siimple-btn siimple-btn--success" onclick="connect($(this).parents('form').first())">Connect</div> <div id="grih_connect" class="siimple-btn siimple-btn--success" onclick="connect($(this).parents('form').first())">Connect</div>
</div> </div>
</form> </form>
@ -48,7 +56,7 @@
<form name="stranger_sec" cmd="rand" class="siimple-form hidden"> <form name="stranger_sec" cmd="rand" class="siimple-form hidden">
<div class="siimple-form-detail">Connect random stranger</div> <div class="siimple-form-detail">Connect random stranger</div>
<div class="siimple-form-field"> <div class="siimple-form-field">
<div class="siimple-form-field-label">Your kunjika</div> <div class="siimple-form-field-label">Your kunjika(id)</div>
<input name="kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Your kunjika"> <input name="kunjika" type="text" class="siimple-input siimple-input--fluid" placeholder="Your kunjika">
</div> </div>
<div class="siimple-form-field"> <div class="siimple-form-field">
@ -60,7 +68,8 @@
<input name="tags" type="text" class="siimple-input siimple-input--fluid" placeholder="Tags"> <input name="tags" type="text" class="siimple-input siimple-input--fluid" placeholder="Tags">
<div class="siimple-form-field-helper">Seperated by space</div> <div class="siimple-form-field-helper">Seperated by space</div>
</div> </div>
<div class="siimple-form-field siimple--float-right"> <div class="siimple-form-field siimple--text-right" style="width: 100%;">
<div><span name="error_msg" class="siimple-tag siimple-tag--error siimple--my-2 hidden"></span></div>
<div id="str_connect" class="siimple-btn siimple-btn--success" onclick="connect($(this).parents('form').first())">Connect</div> <div id="str_connect" class="siimple-btn siimple-btn--success" onclick="connect($(this).parents('form').first())">Connect</div>
</div> </div>
</form> </form>
@ -79,31 +88,23 @@
<a class="siimple-navbar-item">Next &rightarrow;</a> <a class="siimple-navbar-item">Next &rightarrow;</a>
</div> </div>
</div> </div>
<div style="height: calc(100% - 2*44px - 2*5px); padding: 5px; overflow-y: scroll;" class="siimple--bg-light"> <div id="message_area_scroll" style="height: calc(100% - 2*44px - 2*5px); padding: 5px; overflow-y: scroll;" class="siimple--bg-light">
<div id="message_area" class="siimple--my-1"> <div id="message_area" class="siimple--my-1">
<div class="message message-other">
<div class="message-by">Ram_1_5</div> </div>
<pre>huh</pre> <div id="message_area" class="siimple--my-1">
</div>
<div class="message message-other">
<div class="message-by">Ram_1_5</div>
<pre>haha</pre>
</div>
<div class="message message-me">
<div class="message-by">you</div>
<pre>ya</pre>
</div>
</div> </div>
</div> </div>
<div class="siimple--bg-light chatpanel"> <div class="siimple--bg-light chatpanel">
<div class="chatpanel-left siimple--mx-1 siimple--my-1"> <div class="chatpanel-left">
<div onclick="$('#action_clip').toggleClass('hidden')" class="siimple-btn siimple-btn--grey siimple--px-1"><img src="img/clip.svg" alt="send" width="24"></div> <div onclick="$('#action_clip').toggleClass('hidden')" class="siimple-btn siimple-btn--grey siimple--px-1"><img src="img/clip.svg" alt="send" width="24"></div>
</div> </div>
<div class="chatpanel-mid siimple--mx-1 siimple--my-1"> <div class="chatpanel-mid">
<textarea id="send_box" class="siimple-textarea siimple-textarea--fluid" style="height: calc(2em + 10px); overflow-y: hidden;"></textarea> <textarea id="send_box" class="siimple-textarea"></textarea>
</div> </div>
<div class="chatpanel-right siimple--mx-1 siimple--my-1"> <div class="chatpanel-right">
<div onclick="send()" class="siimple-btn siimple-btn--blue siimple--px-2" style="height: 24px;"><img src="img/send.svg" alt="Send" width="24"></div> <div onclick="send()" class="siimple-btn siimple-btn--blue siimple-btn--rounded siimple--px-2" style="height: 24px;"><img src="img/send.svg" alt="Send" width="24"></div>
</div> </div>
</div> </div>
</div> </div>
@ -132,7 +133,7 @@
</div> </div>
</div> </div>
<div> <div>
<a class="siimple-btn siimple-btn--blue">Clear</a> <a onclick="cleanMessage()" class="siimple-btn siimple-btn--blue">Clear</a>
<a class="siimple-btn siimple-btn--blue">List Users</a> <a class="siimple-btn siimple-btn--blue">List Users</a>
</div> </div>
</div> </div>

92
static/js/app.js
View File

@ -26,15 +26,42 @@ $(document).ready(() => {
$('#selected_clip > .siimple-close').click(function() { $('#selected_clip > .siimple-close').click(function() {
deactivateMessages(); deactivateMessages();
}); });
$('#send_box').keypress(function(e) {
if(e.originalEvent.charCode == 13 && !e.shiftKey) {
send();
e.preventDefault();
}
});
$('#send_box').bind('input propertychange keyup', function() {
var height = ($(window).height()*0.0165).toFixed(0)*20;
var sheight = this.scrollHeight;
if(sheight < height) {
$(this).height(0);
height = this.scrollHeight;
$(this).height(height - 20);
$('#reply_clip').css('bottom', (this.scrollHeight + 10) + 'px');
$('#selected_clip').css('bottom', (this.scrollHeight + 10) + 'px');
}
});
}); });
function calcHeight(value) {
let numberOfLineBreaks = (value.match(/\n/g) || []).length;
// min-height + lines x line-height + padding + border
let newHeight = 20 + numberOfLineBreaks * 20 + 12 + 2;
return newHeight;
}
// Create WebSocket connection. // Create WebSocket connection.
const socket = new WebSocket('ws://localhost:8080/ws/'); const socket = new WebSocket('ws://'+window.location.host+'/ws/');
var callbacks = []; var callbacks = [];
var myinfo = { var myinfo = {
kunjika: "", kunjika: "",
name: "" name: ""
}; };
var users = {};
// Connection opened // Connection opened
socket.addEventListener('open', function (event) { socket.addEventListener('open', function (event) {
@ -48,17 +75,31 @@ socket.addEventListener('message', function (event) {
switch(j.cmd) { switch(j.cmd) {
case 'resp': case 'resp':
if(j.result == 'Err') { if(j.result == 'Err') {
console.log('Error', j.message); if($('#chat_panel').hasClass('hidden')) {
} else { $('[name="error_msg"]').text(j.message);
$('[name="error_msg"]').removeClass('hidden');
callbacks = [];
} else {
pushStatus(j.message);
}
} else if(j.result == 'Ok'){
if(callbacks.length > 0) { if(callbacks.length > 0) {
callbacks[0](); callbacks[0]();
callbacks.splice(0); callbacks.shift();
} }
} }
break; break;
case 'text': case 'text':
pushMessage(j.kunjika, j.text, j.reply); pushMessage(j.kunjika, j.text, j.reply);
break; break;
case 'connected':
users[j.kunjika] = j.name;
pushStatus('Vyakti '+j.name+' connected as '+j.kunjika);
break;
case 'disconnected':
delete users[j.kunjika];
pushStatus('Vyakti '+j.name+' disconnected as '+j.kunjika);
break;
} }
}); });
@ -70,11 +111,20 @@ function connect(frm) {
frm.serializeArray().forEach(el => { frm.serializeArray().forEach(el => {
data[el.name] = el.value; data[el.name] = el.value;
}); });
if(data['length'] !== undefined) {
data['length'] = parseInt(data['length']);
}
callbacks.push(() => { callbacks.push(() => {
socket.send(JSON.stringify(Object.assign({cmd: frm.attr('cmd')}, data))); socket.send(JSON.stringify(Object.assign({cmd: frm.attr('cmd')}, data)));
});
callbacks.push(() => {
cleanMessage();
$('#progressbar').addClass('hidden'); $('#progressbar').addClass('hidden');
$('#send_box').text('');
$('#connect_panel').addClass('hidden');
$('[name="error_msg"]').addClass('hidden');
$('#chat_panel').removeClass('hidden'); $('#chat_panel').removeClass('hidden');
$('#send_box').focus();
myinfo.kunjika = data.kunjika; myinfo.kunjika = data.kunjika;
myinfo.name = data.name; myinfo.name = data.name;
}); });
@ -87,6 +137,9 @@ function leave() {
$('#reply_clip').addClass('hidden'); $('#reply_clip').addClass('hidden');
$('#selected_clip').addClass('hidden'); $('#selected_clip').addClass('hidden');
$('#action_clip').addClass('hidden'); $('#action_clip').addClass('hidden');
$('#connect_panel').removeClass('hidden');
myinfo.kunjika = "";
myinfo.name = "";
}); });
socket.send(JSON.stringify({ socket.send(JSON.stringify({
cmd: "leave" cmd: "leave"
@ -97,7 +150,7 @@ function pushMessage(sender, text, reply = null) {
var isMe = myinfo.kunjika == sender; var isMe = myinfo.kunjika == sender;
var area = $('#message_area'); var area = $('#message_area');
var elm = $('<div>', {class: 'message '+(isMe?'message-me':'message-other')}); var elm = $('<div>', {class: 'message '+(isMe?'message-me':'message-other')});
elm.append($('<div>', {class: 'message-by'}).append(sender)); elm.append($('<div>', {class: 'message-by'}).append(users[sender]));
if(reply != null && reply.length > 0) { if(reply != null && reply.length > 0) {
elm.append( elm.append(
$('<div>', {class: 'message message-reply'}) $('<div>', {class: 'message message-reply'})
@ -108,7 +161,23 @@ function pushMessage(sender, text, reply = null) {
elm.click(function() { elm.click(function() {
activateMessage(this); activateMessage(this);
}); });
area.append(elm) area.append(elm);
//to bottom
var scroll = $("#message_area_scroll");
scroll.scrollTop(scroll[0].scrollHeight);
}
function pushStatus(text) {
var area = $('#message_area');
var elm = $('<div>', {class: 'status'});
elm.append($('<span>', {class: 'siimple-tag siimple-tag--dark'}).append(text));
area.append(elm);
//to bottom
var scroll = $("#message_area_scroll");
scroll.scrollTop(scroll[0].scrollHeight);
} }
function deactivateMessages() { function deactivateMessages() {
@ -149,9 +218,11 @@ function prepareReply() {
} }
function send() { function send() {
var text = $('#send_box').val().trim();
if(text.length == 0) return;
socket.send(JSON.stringify({ socket.send(JSON.stringify({
cmd: "text", cmd: "text",
text: $('#send_box').val(), text: text,
reply: $('#reply_clip').attr('msg') reply: $('#reply_clip').attr('msg')
})); }));
$('#send_box').val(''); $('#send_box').val('');
@ -168,6 +239,11 @@ function copyMessagesToClipboard() {
$temp.remove(); $temp.remove();
deactivateMessages(); deactivateMessages();
} }
function cleanMessage() {
$('#message_area').empty();
$('#action_clip').addClass('hidden');
}
// function wsend(p) { // function wsend(p) {
// socket.send(p); // socket.send(p);
// } // }

6
static/js/autosize.min.js vendored Normal file
View File

@ -0,0 +1,6 @@
/*!
autosize 4.0.2
license: MIT
http://www.jacklmoore.com/autosize
*/
!function(e,t){if("function"==typeof define&&define.amd)define(["module","exports"],t);else if("undefined"!=typeof exports)t(module,exports);else{var n={exports:{}};t(n,n.exports),e.autosize=n.exports}}(this,function(e,t){"use strict";var n,o,p="function"==typeof Map?new Map:(n=[],o=[],{has:function(e){return-1<n.indexOf(e)},get:function(e){return o[n.indexOf(e)]},set:function(e,t){-1===n.indexOf(e)&&(n.push(e),o.push(t))},delete:function(e){var t=n.indexOf(e);-1<t&&(n.splice(t,1),o.splice(t,1))}}),c=function(e){return new Event(e,{bubbles:!0})};try{new Event("test")}catch(e){c=function(e){var t=document.createEvent("Event");return t.initEvent(e,!0,!1),t}}function r(r){if(r&&r.nodeName&&"TEXTAREA"===r.nodeName&&!p.has(r)){var e,n=null,o=null,i=null,d=function(){r.clientWidth!==o&&a()},l=function(t){window.removeEventListener("resize",d,!1),r.removeEventListener("input",a,!1),r.removeEventListener("keyup",a,!1),r.removeEventListener("autosize:destroy",l,!1),r.removeEventListener("autosize:update",a,!1),Object.keys(t).forEach(function(e){r.style[e]=t[e]}),p.delete(r)}.bind(r,{height:r.style.height,resize:r.style.resize,overflowY:r.style.overflowY,overflowX:r.style.overflowX,wordWrap:r.style.wordWrap});r.addEventListener("autosize:destroy",l,!1),"onpropertychange"in r&&"oninput"in r&&r.addEventListener("keyup",a,!1),window.addEventListener("resize",d,!1),r.addEventListener("input",a,!1),r.addEventListener("autosize:update",a,!1),r.style.overflowX="hidden",r.style.wordWrap="break-word",p.set(r,{destroy:l,update:a}),"vertical"===(e=window.getComputedStyle(r,null)).resize?r.style.resize="none":"both"===e.resize&&(r.style.resize="horizontal"),n="content-box"===e.boxSizing?-(parseFloat(e.paddingTop)+parseFloat(e.paddingBottom)):parseFloat(e.borderTopWidth)+parseFloat(e.borderBottomWidth),isNaN(n)&&(n=0),a()}function s(e){var t=r.style.width;r.style.width="0px",r.offsetWidth,r.style.width=t,r.style.overflowY=e}function u(){if(0!==r.scrollHeight){var e=function(e){for(var t=[];e&&e.parentNode&&e.parentNode instanceof Element;)e.parentNode.scrollTop&&t.push({node:e.parentNode,scrollTop:e.parentNode.scrollTop}),e=e.parentNode;return t}(r),t=document.documentElement&&document.documentElement.scrollTop;r.style.height="",r.style.height=r.scrollHeight+n+"px",o=r.clientWidth,e.forEach(function(e){e.node.scrollTop=e.scrollTop}),t&&(document.documentElement.scrollTop=t)}}function a(){u();var e=Math.round(parseFloat(r.style.height)),t=window.getComputedStyle(r,null),n="content-box"===t.boxSizing?Math.round(parseFloat(t.height)):r.offsetHeight;if(n<e?"hidden"===t.overflowY&&(s("scroll"),u(),n="content-box"===t.boxSizing?Math.round(parseFloat(window.getComputedStyle(r,null).height)):r.offsetHeight):"hidden"!==t.overflowY&&(s("hidden"),u(),n="content-box"===t.boxSizing?Math.round(parseFloat(window.getComputedStyle(r,null).height)):r.offsetHeight),i!==n){i=n;var o=c("autosize:resized");try{r.dispatchEvent(o)}catch(e){}}}}function i(e){var t=p.get(e);t&&t.destroy()}function d(e){var t=p.get(e);t&&t.update()}var l=null;"undefined"==typeof window||"function"!=typeof window.getComputedStyle?((l=function(e){return e}).destroy=function(e){return e},l.update=function(e){return e}):((l=function(e,t){return e&&Array.prototype.forEach.call(e.length?e:[e],function(e){return r(e)}),e}).destroy=function(e){return e&&Array.prototype.forEach.call(e.length?e:[e],i),e},l.update=function(e){return e&&Array.prototype.forEach.call(e.length?e:[e],d),e}),t.default=l,e.exports=t.default});