Compare commits

...

37 commits

Author SHA1 Message Date
d8c6ce3ee8 smol 2024-04-03 12:54:30 -04:00
b6a75f8d91 enh chat 2024-04-02 23:35:20 -04:00
e3718688a7 async botnotif 2024-04-02 18:44:10 -04:00
e73bd75de9 enh chat 2024-04-02 09:12:03 -04:00
8ed672fb3a comment issue with fix 2024-03-31 20:13:02 -04:00
e711c6454d ExecBodyParams curr_act 2024-03-31 20:09:21 -04:00
fa5de03bae used blocking instead of async in some calls 2024-03-31 16:38:11 -04:00
000094e9c4 attempt blocking at getchannel failed 2024-03-31 14:13:20 -04:00
4719b93ce5 addl debug 2024-03-30 19:25:07 -04:00
745ac91522 addl debug 2024-03-30 14:26:39 -04:00
0625e7f091 adding tokio-console 2024-03-30 14:26:06 -04:00
a38c84b8f4 smol 2024-03-29 23:51:41 -04:00
fcf4f3f7cf add debug implementations that helped (kinda) 2024-03-29 21:06:48 +01:00
9d94328cd6 mark call that locks execbody from using that routine 2024-03-29 21:05:21 +01:00
b5e95668a5 ISSUE - potential lock issue
All checks were successful
ci/woodpecker/pr/cargo-checks Pipeline was successful
2024-03-29 09:03:16 -04:00
66195138f8 corrected error with validate_attr 2024-03-28 20:21:49 -04:00
5c35ad114a ISSUE - commented out problem code? 2024-03-28 17:52:43 -04:00
26f67787d7 addl debugging 2024-03-28 15:07:24 -04:00
1b534ebeb7 fixed routine attr validation logic 2024-03-28 13:46:02 -04:00
c27dd3b86f custom countdown 2024-03-28 13:18:02 -04:00
6d3b5eee41 routine assigns self reference at construct 2024-03-28 11:50:08 -04:00
2a1a7f8503 ExecBody & routine addl references 2024-03-28 04:39:03 -04:00
ca9361cc93 routine methods 2024-03-28 03:18:41 -04:00
4637312da9 impl stop 2024-03-28 02:13:38 -04:00
6c3a151668 impl other routine attr 2024-03-27 23:56:34 -04:00
e963ae250d (cont) routine methods 2024-03-27 23:00:04 -04:00
60fae25419 comments 2024-03-27 20:47:56 -04:00
537c3565a2 custom start test fn 2024-03-27 17:28:47 -04:00
669b2da871 cleanup start impl 2024-03-27 17:03:58 -04:00
226da4362a comments cleanup 2024-03-27 16:04:15 -04:00
8da8460e47 proper join handling at custom
All checks were successful
ci/woodpecker/pr/cargo-checks Pipeline was successful
2024-03-27 14:51:56 -04:00
b08d91af5d (cont) start runonce
All checks were successful
ci/woodpecker/pr/cargo-checks Pipeline was successful
2024-03-27 10:18:13 -04:00
3f8e798050 (cont) routine start
All checks were successful
ci/woodpecker/pr/cargo-checks Pipeline was successful
2024-03-27 02:35:31 -04:00
5249c3af25 smol debug in identity 2024-03-27 01:29:09 -04:00
4e9316ad49 (init) experiment test module
All checks were successful
ci/woodpecker/pr/cargo-checks Pipeline was successful
2024-03-26 16:56:30 -04:00
2ba92388a2 runonce implementation 2024-03-26 14:30:13 -04:00
6c7290883f (init) routine methods 2024-03-26 11:29:47 -04:00
14 changed files with 4213 additions and 217 deletions

View file

@ -1,4 +1,7 @@
[build]
rustflags = ["--cfg", "tokio_unstable"]
[env] [env]
# Based on https://doc.rust-lang.org/cargo/reference/config.html # Based on https://doc.rust-lang.org/cargo/reference/config.html
OtherBots = "Supibot,buttsbot,PotatBotat,StreamElements,yuumeibot" OtherBots = "Supibot,buttsbot,PotatBotat,StreamElements,yuumeibot"

1172
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -7,7 +7,7 @@ edition = "2021"
[dependencies] [dependencies]
dotenv = "0.15.0" dotenv = "0.15.0"
tokio = { version = "1.33.0", features = ["full"] } tokio = { version = "1.33.0", features = ["full", "tracing"] }
twitch-irc = "5.0.1" twitch-irc = "5.0.1"
rand = { version = "0.8.5", features = [] } rand = { version = "0.8.5", features = [] }
futures = "0.3" futures = "0.3"
@ -15,6 +15,9 @@ async-trait = "0.1.77"
async-recursion = "1.1.0" async-recursion = "1.1.0"
casual_logger = "0.6.5" casual_logger = "0.6.5"
chrono = "0.4.35" chrono = "0.4.35"
tokio-console = "0.1.10"
console-subscriber = "0.2.0"
async-channel = "2.2.0"
[lib] [lib]

View file

@ -5,40 +5,143 @@ use tokio::sync::RwLock;
use crate::core::botinstance::BotInstance; use crate::core::botinstance::BotInstance;
use super::{botmodules::{BotAction, BotModule}, identity::ChatBadge}; use super::{botinstance::Channel, botmodules::{BotAction, BotModule, Routine}, identity::ChatBadge};
pub type BotAR = Arc<RwLock<BotInstance>>; pub type BotAR = Arc<RwLock<BotInstance>>;
pub type ActAR = Arc<RwLock<BotAction>>; pub type ActAR = Arc<RwLock<BotAction>>;
pub type RoutineAR = Arc<RwLock<Routine>>;
#[derive(Clone)] #[derive(Clone, Debug)]
pub struct ExecBodyParams { pub struct ExecBodyParams {
pub bot : BotAR, pub bot : BotAR,
pub msg : PrivmsgMessage, pub msg : PrivmsgMessage,
pub parent_act : ActAR , pub parent_act : Option<ActAR> ,
pub curr_act : Option<ActAR> ,
}
#[derive(Debug,Eq,PartialEq,Hash)]
pub enum ParamLevel {
Parent,
Current,
} }
impl ExecBodyParams { impl ExecBodyParams {
pub async fn get_parent_module(&self) -> Option<BotModule> { // pub async fn get_parent_module(&self) -> Option<BotModule> {
// pub async fn get_parent_module(&self) -> BotModule {
pub async fn get_module(&self) -> BotModule {
let parent_act = Arc::clone(&self.parent_act); let curr_acta = Arc::clone(&(self.curr_act.clone().unwrap()));
let parent_act_lock = parent_act.read().await; let parent_act_lock = curr_acta.read().await;
let act = &(*parent_act_lock); let act = &(*parent_act_lock);
match act { match act {
BotAction::C(c) => { BotAction::C(c) => {
let temp = c.module.clone(); // let temp = c.module.clone();
Some(temp) // Some(temp)
c.module.clone()
}, },
BotAction::L(l) => { BotAction::L(l) => {
let temp = l.module.clone(); // let temp = l.module.clone();
Some(temp) // Some(temp)
l.module.clone()
}, },
_ => None BotAction::R(r) => {
// let temp = r.module.clone();
// Some(temp)
r.read().await.module.clone()
}
// _ => None
} }
} }
// pub async fn get_channel(&self) -> Option<Channel> {
pub fn get_channel(&self) -> Option<Channel> {
dbg!("Core > ExecBodyParams > GetChannels START");
dbg!("!! [x] Document - After SUCCESS message was sent to chat");
dbg!(">> BotActionAR - RwLock from botmodules.rs::929:46 - current_readers = 1 ");
dbg!(">> RoutineAR - RwLock from botmodules.rs::1261:32 - current_readers = 1 ");
dbg!(">> join_handle - RwLock from botmodules.rs::1226:46 - current_readers = 0 ");
dbg!(">> BotInstanceAR - RwLock from botinstance.rs::150:28 - current_readers = 2");
let curr_act = Arc::clone(&self.curr_act.clone().unwrap());
// let curr_act_lock = curr_act.read().await;
// Note : The below `curr_act.blocking_read()` is not possible. I get the following
// during runtime in this areas
/*
thread 'tokio-runtime-worker' panicked at src\core\bot_actions.rs:66:38:
Cannot block the current thread from within a runtime. This happens because a function attempted to block the current thread while the thread is being used to drive asynchronous tasks.
*/
let curr_act_lock = curr_act.blocking_read();
dbg!("Core > ExecBodyParams > After Creating ExecBodyParams.current_act.read() Guard ");
dbg!("!! [x] Document - After SUCCESS message was sent to chat");
dbg!(">> BotActionAR - RwLock from botmodules.rs::929:46 - current_readers = 1 ");
dbg!(">> RoutineAR - RwLock from botmodules.rs::1261:32 - current_readers = 1 ");
dbg!(">> join_handle - RwLock from botmodules.rs::1226:46 - current_readers = 0 ");
dbg!(">> BotInstanceAR - RwLock from botinstance.rs::150:28 - current_readers = 2");
let act = &(*curr_act_lock);
dbg!("Core > ExecBodyParams > Using the Read Guard ");
dbg!("!! [x] Document - After SUCCESS message was sent to chat");
dbg!(">> BotActionAR - RwLock from botmodules.rs::929:46 - current_readers = 1 ");
dbg!(">> RoutineAR - RwLock from botmodules.rs::1261:32 - current_readers = 1");
dbg!(">> join_handle - RwLock from botmodules.rs::1226:46 - current_readers = Not Listed ");
dbg!(">> BotInstanceAR - RwLock from botinstance.rs::150:28 - current_readers = 2");
let out = match act {
BotAction::C(_) => {
// let temp = c.module.clone();
// Some(temp)
Some(Channel(self.msg.channel_login.clone()))
},
BotAction::L(_) => {
// let temp = l.module.clone();
// Some(temp)
// l.module.clone()
Some(Channel(self.msg.channel_login.clone()))
},
BotAction::R(r) => {
// let temp = r.module.clone();
// Some(temp)
dbg!("Core > ExecBodyParams > GetChannels - routine identified");
dbg!("!! [x] Document");
dbg!(">> BotActionAR - RwLock from botmodules.rs::930:46 - current_readers = 2");
dbg!(">> RoutineAR - RwLock from botmodules.rs::1262:32 - current_readers = 1");
dbg!(">> join_handle - RwLock from botmodules.rs::1226:46 - current_readers = 0");
dbg!(">> BotInstanceAR - RwLock from botinstance.rs::150:28 - current_readers = 1");
// => 03.30 - Just before deadlock
// dbg!("ISSUE : RoutineAR - RwLock from botmodules.rs::1261:32 - current_readers = 1");
// let out = Some(r.read().await.channel.clone());
dbg!("ISSUE > Never makes it after the following read guard");
// let guard = r.read().await;
let guard = r.blocking_read();
dbg!("ISSUE RESOLVED > If passed htis point");
let channel = guard.channel.clone();
drop(guard);
let out = Some(channel);
// => 03.30 - This isn't reached because of the Deadlock
dbg!(">> Just after Potential Deadlock Lock");
out
}
// _ => None
};
out
}
pub fn get_sender(&self) -> String { pub fn get_sender(&self) -> String {
self.msg.sender.name.clone() self.msg.sender.name.clone()
} }

View file

@ -40,15 +40,15 @@ pub struct Channel(pub String);
use super::bot_actions::ExecBodyParams; use super::bot_actions::ExecBodyParams;
use super::botmodules::StatusType; use super::botmodules::StatusType;
#[derive(Clone)] #[derive(Clone, Debug)]
pub struct BotManagers { pub struct BotManagers {
pub identity: Arc<RwLock<IdentityManager>>, pub identity: Arc<RwLock<IdentityManager>>,
pub chat: Chat, pub chat: Arc<RwLock<Chat>>,
} }
impl BotManagers { impl BotManagers {
pub fn init( pub fn init(
ratelimiters: HashMap<Channel, RateLimiter>, ratelimiters: HashMap<Channel, Arc<RwLock<RateLimiter>>>,
client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>, client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
) -> BotManagers { ) -> BotManagers {
BotManagers { BotManagers {
@ -70,6 +70,7 @@ impl<T: Clone> ArcBox<T> {
} }
} }
#[derive(Debug)]
pub struct BotInstance { pub struct BotInstance {
pub prefix: char, pub prefix: char,
pub bot_channel: Channel, pub bot_channel: Channel,
@ -115,7 +116,7 @@ impl BotInstance {
client.join(chnl.to_owned()).unwrap(); client.join(chnl.to_owned()).unwrap();
let n = RateLimiter::new(); let n = Arc::new(RwLock::new(RateLimiter::new()));
ratelimiters.insert(Channel(String::from(chnl)), n); ratelimiters.insert(Channel(String::from(chnl)), n);
} }
@ -168,6 +169,7 @@ impl BotInstance {
match message { match message {
ServerMessage::Notice(msg) => { ServerMessage::Notice(msg) => {
dbg!("NOTICE TRIGGERED",msg.clone());
botlog::notice( botlog::notice(
format!("NOTICE : (#{:?}) {}", msg.channel_login, msg.message_text) format!("NOTICE : (#{:?}) {}", msg.channel_login, msg.message_text)
.as_str(), .as_str(),
@ -200,7 +202,18 @@ impl BotInstance {
); );
Log::flush(); Log::flush();
BotInstance::listener_main_prvmsg(Arc::clone(&bot), &msg).await; let botarc = Arc::clone(&bot);
// let msgarc = Arc::new(RwLock::new(msg.clone()));
let msgtext = msg.message_text.clone();
dbg!("will spawn listener_main_prvmsg from runner",chrono::offset::Local::now(),msgtext.clone());
tokio::spawn( async move {
// let msgarc_c = msgarc.clone();
BotInstance::listener_main_prvmsg(botarc, &msg.clone()).await;
});
// BotInstance::listener_main_prvmsg(Arc::clone(&bot), &msg).await;
dbg!("completed spawn listener_main_prvmsg from runner",chrono::offset::Local::now(), msgtext);
} }
ServerMessage::Whisper(msg) => { ServerMessage::Whisper(msg) => {
botlog::debug( botlog::debug(
@ -366,13 +379,13 @@ impl BotInstance {
Channel(msg.channel_login.to_string())).await; Channel(msg.channel_login.to_string())).await;
if let StatusType::Disabled(a) = modstatus { if let StatusType::Disabled(statuslvl) = modstatus {
// [x] Should only respond if a BotAdmin , Mod , SupMod , BroadCaster // [x] Should only respond if a BotAdmin , Mod , SupMod , BroadCaster
// - Specifically it should respond only to those who may be able to enable the module // - Specifically it should respond only to those who may be able to enable the module
botlog::trace( botlog::trace(
&format!("Identified cmd is associated with Disabled Module : StatusLvl = {:?}", a), &format!("Identified cmd is associated with Disabled Module : StatusLvl = {:?}", statuslvl),
Some("BotInstance > listener_main_prvmsg()".to_string()), Some("BotInstance > listener_main_prvmsg()".to_string()),
Some(msg), Some(msg),
); );
@ -396,20 +409,24 @@ impl BotInstance {
); );
// Only respond to those with th ebelow User Roles // Only respond to those with th ebelow User Roles
// [x] Need to add in Module as well
let outstr = let outstr =
format!("sadg Module is disabled : {:?}",a); format!("sadg Module is disabled : {:?} {:?}",c.module.clone(),statuslvl);
let params = ExecBodyParams { let params = ExecBodyParams {
bot : Arc::clone(&bot), bot : Arc::clone(&bot),
msg : (*msg).clone(), msg : (*msg).clone(),
parent_act : Arc::clone(&act_clone), parent_act : None,
curr_act : Some(Arc::clone(&act_clone)),
}; };
let params = Arc::new(RwLock::new(params));
// When sending a BotMsgTypeNotif, send_botmsg does Roles related validation as required // When sending a BotMsgTypeNotif, send_botmsg does Roles related validation as required
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif( botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outstr outstr
), ),
params, params,
@ -461,11 +478,15 @@ impl BotInstance {
let params = ExecBodyParams { let params = ExecBodyParams {
bot : Arc::clone(&bot), bot : Arc::clone(&bot),
msg : (*msg).clone(), msg : (*msg).clone(),
parent_act : Arc::clone(&act_clone), parent_act : None,
curr_act : Some(Arc::clone(&act_clone)),
}; };
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
let params = Arc::new(RwLock::new(params));
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outstr.to_string() outstr.to_string()
), ),
params.clone(), params.clone(),
@ -491,11 +512,15 @@ impl BotInstance {
let params = ExecBodyParams { let params = ExecBodyParams {
bot : Arc::clone(&bot), bot : Arc::clone(&bot),
msg : (*msg).clone(), msg : (*msg).clone(),
parent_act : Arc::clone(&act_clone), parent_act : None,
curr_act : Some(Arc::clone(&act_clone)),
}; };
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif(
let params = Arc::new(RwLock::new(params));
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outstr.to_string() outstr.to_string()
), ),
params.clone(), params.clone(),
@ -512,11 +537,14 @@ impl BotInstance {
Some(msg), Some(msg),
); );
dbg!("Running botcommand");
let a = Arc::clone(&bot); let a = Arc::clone(&bot);
c.execute(ExecBodyParams { c.execute(ExecBodyParams {
bot : a, bot : a,
msg : msg.clone() , msg : msg.clone() ,
parent_act : Arc::clone(&act_clone), parent_act : None,
curr_act : Some(Arc::clone(&act_clone)),
}).await; }).await;
botlog::trace( botlog::trace(
@ -564,7 +592,8 @@ impl BotInstance {
l.execute(ExecBodyParams { l.execute(ExecBodyParams {
bot : a, bot : a,
msg : msg.clone() , msg : msg.clone() ,
parent_act : Arc::clone(&act_clone), parent_act : None,
curr_act : Some(Arc::clone(&act_clone)),
} ).await; } ).await;
} }

File diff suppressed because it is too large Load diff

View file

@ -1,8 +1,13 @@
use std::collections::HashMap; use std::collections::HashMap;
use std::i8;
use std::sync::Arc; use std::sync::Arc;
use std::num::{self, Saturating, Wrapping};
use std::time::Instant;
use tokio::sync::Mutex; use chrono::NaiveDateTime;
use tokio::sync::{Mutex, RwLock};
use tokio::task::yield_now;
use twitch_irc::login::StaticLoginCredentials; use twitch_irc::login::StaticLoginCredentials;
use twitch_irc::message::PrivmsgMessage; use twitch_irc::message::PrivmsgMessage;
use twitch_irc::transport::tcp::{TCPTransport, TLS}; use twitch_irc::transport::tcp::{TCPTransport, TLS};
@ -27,16 +32,54 @@ use super::identity;
use async_recursion::async_recursion; use async_recursion::async_recursion;
#[derive(Clone)] use async_channel::{self, bounded, Receiver, Sender};
// pub mod chat_util {
// use super::*;
// use std::boxed::Box;
// use std::future::Future;
// use std::pin::Pin;
// // pub type MsgFuture = Box<
// // dyn Fn(BotMsgType,ExecBodyParams) -> Pin<Box<dyn Future<Output = ()> + Send>> + Send + Sync,
// // >;
// // pub fn msgbox<T>(f: fn(BotMsgType,ExecBodyParams) -> T) -> MsgFuture
// // where
// // T: Future<Output = ()> + Send + 'static,
// // {
// // Box::new(move |a,b| Box::pin(f(a,b)))
// // }
// pub type MsgFuture = Pin<Box<dyn Future<Output =()> + Send + 'static>>;
// }
#[derive(Clone, Debug)]
pub struct Chat { pub struct Chat {
pub ratelimiters: Arc<Mutex<HashMap<Channel, RateLimiter>>>, // used to limit messages sent per channel // pub ratelimiters: Arc<Mutex<HashMap<Channel, RateLimiter>>>, // used to limit messages sent per channel
pub ratelimiters: Arc<RwLock<HashMap<Channel,
Arc<RwLock<RateLimiter>>>>>, // used to limit messages sent per channel
pub client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>, pub client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
// outqueue : Arc<RwLock<Vec<(BotMsgType,ExecBodyParams)>>>
outqueue : (Sender<(BotMsgType,ExecBodyParams)>,
Arc<RwLock<Receiver<(BotMsgType,ExecBodyParams)>>>),
// https://doc.rust-lang.org/std/num/struct.Saturating.html
// spaceiter : Arc<Mutex<Wrapping<i64>>>,
spaceiter : Arc<Mutex<bool>>,
} }
#[derive(Clone,Debug)] #[derive(Clone,Debug)]
pub enum BotMsgType<'a> { pub enum BotMsgType {
SayInReplyTo(&'a PrivmsgMessage,String), // SayInReplyTo(&'a PrivmsgMessage,String),
SayInReplyTo(Arc<PrivmsgMessage>,String),
Say(String,String), Say(String,String),
Notif(String), // For Bot Sent Notifications Notif(String), // For Bot Sent Notifications
} }
@ -44,22 +87,139 @@ pub enum BotMsgType<'a> {
impl Chat { impl Chat {
pub fn init( pub fn init(
ratelimiters: HashMap<Channel, RateLimiter>, ratelimiters: HashMap<Channel, Arc<RwLock<RateLimiter>>>,
client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>, client: TwitchIRCClient<TCPTransport<TLS>, StaticLoginCredentials>,
) -> Chat { ) -> Arc<RwLock<Chat>> {
Chat {
ratelimiters: Arc::new(Mutex::new(ratelimiters)), let (s,r) = bounded(100);
let r = Arc::new(RwLock::new(r));
let spaceiter = Arc::new(Mutex::new(true));
let chat = Chat {
ratelimiters: Arc::new(RwLock::new(ratelimiters)),
client, client,
// outqueue : Arc::new(RwLock::new(vec![])),
outqueue : (s,r.clone()),
spaceiter ,
};
let chat_ar = Arc::new(RwLock::new(chat));
let r_clone = r.clone();
// let chat_ar = Arc::new(RwLock::new(chat_clone));
let chat_ar_clone = chat_ar.clone();
// Spawning a Task that will process the Chat.outqueue
tokio::spawn(async move {
// loop {
// // tokio::spawn(async move {
// // let r_clone = r_clone.clone();
// let r_clone = r_clone.clone();
// let guard1 = r_clone.read().await;
// match guard1.recv().await {
// Ok(a) => {
// // [ ] This should spawn it's own ideally, so it does not lock other messages
// // chat_clone.send_botmsg(a.0, Arc::new(RwLock::new(a.1))).await
// let params_ar = Arc::new(RwLock::new(a.1));
// let chat_clone = chat_clone.clone();
// dbg!(chrono::offset::Local::now(),"Message Spawned > Starting");
// tokio::spawn( async move {
// chat_clone.send_botmsg_inner(a.0, params_ar).await
// });
// dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
// } ,
// Err(err) => {
// dbg!("ISSUE processing Receiver",err);
// sleep(Duration::from_millis(10)).await;
// }
// }
// // });
// }
let r_cc = r_clone.clone();
// loop {
// Spawn x helper threads to process messages in the outqueue
for _ in 1..5 {
dbg!("Chat queue Helper thread generated");
let r_ccc = r_cc.clone();
let chat_c = chat_ar.clone();
tokio::spawn(async move {
let r_cc = r_ccc.clone();
// let chat_cc = chat_c.clone();
let guard1 = r_cc.read().await;
while let Ok(a) = guard1.recv().await {
// let r_cc = r_ccc.clone();
let chat_cc = chat_c.clone();
// let guard2 = r_cc.read().await;
// Ok(a) => {
// [ ] This should spawn it's own ideally, so it does not lock other messages
// chat_clone.send_botmsg(a.0, Arc::new(RwLock::new(a.1))).await
let params_ar = Arc::new(RwLock::new(a.1));
// let chat_clone = chat_cc.clone();
dbg!(chrono::offset::Local::now(),"Message Spawned > Starting");
tokio::spawn( async move {
dbg!("Message from Chat Queue > Sending");
chat_cc.read().await.send_botmsg_inner(a.0, params_ar).await;
dbg!("Message from Chat Queue > Sent");
});
dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
// } ,
// Err(err) => {
// dbg!("ISSUE processing Receiver",err);
// sleep(Duration::from_millis(10)).await;
// }
} }
dbg!("ISSUE : Helper thread observed an Err");
// match guard1.recv().await {
// Ok(a) => {
// // [ ] This should spawn it's own ideally, so it does not lock other messages
// // chat_clone.send_botmsg(a.0, Arc::new(RwLock::new(a.1))).await
// let params_ar = Arc::new(RwLock::new(a.1));
// // let chat_clone = chat_cc.clone();
// dbg!(chrono::offset::Local::now(),"Message Spawned > Starting");
// tokio::spawn( async move {
// chat_cc.read().await.send_botmsg_inner(a.0, params_ar).await
// });
// dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
// } ,
// Err(err) => {
// dbg!("ISSUE processing Receiver",err);
// sleep(Duration::from_millis(10)).await;
// }
// }
}
);
yield_now().await;
}
});
// chat
chat_ar_clone
} }
pub async fn init_channel(&mut self, chnl: Channel) { pub async fn init_channel(&mut self, chnl: Channel) {
let n = RateLimiter::new(); let n = Arc::new(RwLock::new(RateLimiter::new()));
self.ratelimiters.lock().await.insert(chnl, n);
let mut rguard = self.ratelimiters.write().await;
rguard.insert(chnl, n);
drop(rguard);
} }
#[async_recursion] #[async_recursion]
pub async fn send_botmsg(&self, msginput: BotMsgType<'async_recursion>, params : ExecBodyParams) { // pub async fn send_botmsg(&self, msginput: BotMsgType<'async_recursion>, params : ExecBodyParams) {
pub async fn send_botmsg_inner(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
@ -72,15 +232,17 @@ impl Chat {
*/ */
let chat_ar = Arc::new(RwLock::new((*self).clone()));
botlog::trace( botlog::trace(
format!("send_bot_msg params : {:?}",msginput).as_str(), format!("send_bot_msg params : {:?}",msginput).as_str(),
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
Log::flush(); Log::flush();
let (channel_login,mut outmsg) = match msginput.clone() { let (channel_login,outmsg) = match msginput.clone() {
BotMsgType::SayInReplyTo(msg, outmsg) => { BotMsgType::SayInReplyTo(msg, outmsg) => {
(msg.channel_login.clone(),outmsg) (msg.channel_login.clone(),outmsg)
}, },
@ -88,7 +250,7 @@ impl Chat {
(a.clone(),b.clone()) (a.clone(),b.clone())
}, },
BotMsgType::Notif(outmsg) => { BotMsgType::Notif(outmsg) => {
(params.msg.channel_login.clone(),outmsg) (params.read().await.msg.channel_login.clone(),outmsg)
} }
}; };
@ -98,21 +260,22 @@ impl Chat {
botlog::trace( botlog::trace(
"BEFORE parent_module call", "BEFORE parent_module call",
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
let parent_module = params.get_parent_module().await; let parent_module = params.read().await.get_module().await;
let params_clone = params.clone(); let params_clone = params.clone();
let botclone = Arc::clone(&params_clone.bot); let botclone = Arc::clone(&params_clone.read().await.bot);
let botlock = botclone.read().await; let botlock = botclone.read().await;
let modmgr = Arc::clone(&botlock.botmodules); let modmgr = Arc::clone(&botlock.botmodules);
let modstatus = (*modmgr).modstatus( let modstatus = (*modmgr).modstatus(
parent_module.clone().expect("ERROR - Expected a module"), // parent_module.clone().expect("ERROR - Expected a module"),
parent_module.clone(),
Channel(channel_login.clone()) Channel(channel_login.clone())
).await; ).await;
if !params.bot.read().await.bot_channels.contains(&Channel(channel_login.clone())) { if !params.read().await.bot.read().await.bot_channels.contains(&Channel(channel_login.clone())) {
botlog::warn( botlog::warn(
&format!("A message attempted to send for a Non-Joined Channel : {}",channel_login.clone()), &format!("A message attempted to send for a Non-Joined Channel : {}",channel_login.clone()),
Some("Chat > send_botmsg".to_string()), Some("Chat > send_botmsg".to_string()),
@ -121,7 +284,7 @@ impl Chat {
if let BotMsgType::SayInReplyTo(_prvmsg,_outmsg) = msginput { if let BotMsgType::SayInReplyTo(_prvmsg,_outmsg) = msginput {
self.send_botmsg(BotMsgType::Notif( chat_ar.read().await.send_botmsg(BotMsgType::Notif(
"uuh Bot can't send to a channel it isn't joined".to_string(), "uuh Bot can't send to a channel it isn't joined".to_string(),
), ),
params).await; params).await;
@ -146,7 +309,7 @@ impl Chat {
botlog::trace( botlog::trace(
format!("BEFORE modstatus check : modstatus = {:?}",modstatus).as_str(), format!("BEFORE modstatus check : modstatus = {:?}",modstatus).as_str(),
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
@ -160,7 +323,7 @@ impl Chat {
botlog::trace( botlog::trace(
"BEFORE msginput check", "BEFORE msginput check",
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
Log::flush(); Log::flush();
@ -172,7 +335,7 @@ impl Chat {
botlog::trace( botlog::trace(
"BEFORE potential Async recursion", "BEFORE potential Async recursion",
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.clone().msg), Some(&params.read().await.clone().msg),
); );
Log::flush(); Log::flush();
@ -180,7 +343,8 @@ impl Chat {
self.send_botmsg(BotMsgType::Notif( self.send_botmsg(BotMsgType::Notif(
format!("uuh {:?} is disabled on {} : {:?}", format!("uuh {:?} is disabled on {} : {:?}",
parent_module.clone().unwrap(), // parent_module.clone().unwrap(),
parent_module.clone(),
channel_login.clone(), channel_login.clone(),
lvl lvl
), ),
@ -191,7 +355,7 @@ impl Chat {
botlog::trace( botlog::trace(
"AFTER potential Async recursion", "AFTER potential Async recursion",
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
@ -228,22 +392,26 @@ impl Chat {
// let params_clone = params.clone(); // let params_clone = params.clone();
let botclone = Arc::clone(&params.bot); dbg!("Send_botmsg_inner > Checking user roles first");
let botclone = Arc::clone(&params.read().await.bot);
let botlock = botclone.read().await; let botlock = botclone.read().await;
let id = botlock.get_identity(); let id = botlock.get_identity();
let id = Arc::clone(&id); let id = Arc::clone(&id);
let idlock = id.read().await; // <-- [x] 03.24 - seems to work let idlock = id.read().await; // <-- [x] 03.24 - seems to work
let user_roles = idlock.getspecialuserroles( let user_roles = idlock.getspecialuserroles(
params.get_sender(), params.read().await.get_sender(),
Some(Channel(channel_login.clone())) Some(Channel(channel_login.clone()))
).await; ).await;
botlog::trace( botlog::trace(
format!("BEFORE user roles check check : userroles = {:?}",user_roles).as_str(), format!("BEFORE user roles check check : userroles = {:?}",user_roles).as_str(),
Some("chat.rs > send_botmsg ".to_string()), Some("chat.rs > send_botmsg ".to_string()),
Some(&params.msg), Some(&params.read().await.msg),
); );
dbg!("Send_botmsg_inner > Checking user roles first > Prepared to check for roles");
Log::flush(); Log::flush();
// [x] If user has any of the following target roles, they will be allowed - otherwise, they will not be allowed to send // [x] If user has any of the following target roles, they will be allowed - otherwise, they will not be allowed to send
@ -286,6 +454,8 @@ impl Chat {
} }
dbg!("Send_botmsg_inner > Roles Checked");
/* /*
At this stage from the above Validations : At this stage from the above Validations :
msginput would be : msginput would be :
@ -310,8 +480,11 @@ impl Chat {
*/ */
let rl = Arc::clone(&self.ratelimiters); // let rl = chat_ar.read().await.ratelimiters.clone();
let mut rllock = rl.lock().await; // // let rl = Arc::clone(&chat_ar.clone().read().await.ratelimiters);
// // let mut rllock = rl.read().await;
// let rllock = rl.write().await;
// // let mut hmap = (*rllock).clone();
botlog::debug( botlog::debug(
&format!("Ratelimiter being checked for channel : {}",channel_login.clone()), &format!("Ratelimiter being checked for channel : {}",channel_login.clone()),
@ -319,49 +492,266 @@ impl Chat {
None, None,
); );
let contextratelimiter = rllock // let rllock_clone = Arc::new(RwLock::new((*rllock).clone()));
// .get_mut() // let guard = rllock_clone.read().await;
// let contextratelimiter = (*guard).clone()
// // .get_mut()
// .get_mut(&Channel(channel_login.to_lowercase().clone()))
// .expect("ERROR: Issue with Rate limiters");
// // drop(guard);
// let a = rllock.get_mut(&Channel(channel_login.to_lowercase().clone())).expect("ERROR: Issue with Rate limiters");
let ratelimiters = chat_ar.read().await.ratelimiters.clone();
// let contextratelimiter = Arc::new(RwLock::new(contextratelimiter));
// // Continue to check the limiter and sleep if required if the minimum is not reached
// while let ratelimiter::LimiterResp::Sleep(sleeptime) = contextratelimiter.check_limiter(outmsg.clone()) {
// sleep(Duration::from_secs_f64(sleeptime)).await;
// }
// match contextratelimiter.check_limiter(outmsg.clone()) {
// ratelimiter::LimiterResp::Allow => {
// // let maxblanks = rand::thread_rng().gen_range(1..=20);
// // let mut blanks_to_add_lock = self.spaceiter.lock().await;
// // (*blanks_to_add_lock).0 += 1;
// // for _i in 1..(*blanks_to_add_lock).0 {
// // // let blankspace: &str = " 󠀀";
// // // let blankspace: &str = " .";
// // let blankspace: &str = ".";
// // outmsg.push_str(blankspace);
// // }
// // drop(blanks_to_add_lock);
// dbg!("[ ] PROBLEM AREA - If notificaiton triggered, need this checked");
// dbg!(outmsg.clone());
// botlog::trace(
// &format!("Out Message TO {} >> {}",channel_login.clone(),outmsg.clone()),
// Some("Chat > send_botmsg".to_string()),
// None,
// );
// match msginput.clone() {
// BotMsgType::SayInReplyTo(msg, _) => {
// self.client.say_in_reply_to(&(*msg), outmsg.clone()).await.unwrap();
// },
// BotMsgType::Say(a, _) => {
// self.client.say(a, outmsg.clone()).await.unwrap();
// }
// BotMsgType::Notif(outmsg) => {
// self.client.say_in_reply_to(&params.read().await.msg, outmsg.clone()).await.unwrap();
// }
// }
// // contextratelimiter.increment_counter();
// contextratelimiter.sent_msg(outmsg.clone());
// let logstr = format!(
// "(#{}) > {} ; contextratelimiter : {:?}",
// channel_login.clone(), "rate limit counter increase", contextratelimiter
// );
// if let BotMsgType::SayInReplyTo(msg,_ ) = msginput {
// botlog::trace(
// logstr.as_str(),
// Some("Chat > send_botmsg".to_string()),
// Some(&(*msg)),
// );
// } else {
// botlog::trace(
// logstr.as_str(),
// Some("Chat > send_botmsg".to_string()),
// None,
// );
// }
// }
// ratelimiter::LimiterResp::Skip => {
// // (); // do nothing otherwise
// }
// ratelimiter::LimiterResp::Sleep(err_passed_sleep_time) => {
// dbg!(err_passed_sleep_time);
// // panic!("ISSUE : sleep was already awaited - Should not happen?");
// botlog::warn(
// format!(
// "Warning : RATE LIMITERS returned Sleep Unexpectedly . This should not occur often . Rate Limiter passed Sleep({})",
// err_passed_sleep_time
// ).as_str(),
// Some("Chat > send_botmsg".to_string()),
// None,
// );
// }
// }
// => [x] 04.02 - Q. Why are we spawning here? => A. Believe this was to try to ensure not blocked
tokio::spawn(async move {
dbg!("Send_botmsg_inner > Within Spawn");
let chat_clone = chat_ar.clone();
let ratelimiters_clone = ratelimiters.clone();
let rguard = ratelimiters_clone.read().await;
let mut rclone = (*rguard).clone();
drop(rguard);
let contextratelimiter = (rclone
.get_mut(&Channel(channel_login.to_lowercase().clone())) .get_mut(&Channel(channel_login.to_lowercase().clone()))
.expect("ERROR: Issue with Rate limiters"); .expect("ERROR: Issue with Rate limiters")).clone();
// let mut contextlimiter_guard = contextratelimiter.write().await;
// Continue to check the limiter and sleep if required if the minimum is not reached // Continue to check the limiter and sleep if required if the minimum is not reached
while let ratelimiter::LimiterResp::Sleep(sleeptime) = contextratelimiter.check_limiter() {
loop {
// Check first if need to sleep, then sleep if required
dbg!("Send_botmsg_inner > Within Spawn > Before a Write Guard");
let mut crl_lock = contextratelimiter.write().await;
let sleeptime = if let ratelimiter::LimiterResp::Sleep(sleeptime) = crl_lock.check_limiter(outmsg.clone()).await {
// dbg!("Send_botmsg_inner > Within Spawn > Drop a Write Guard");
// drop(crl_lock);
// dbg!("determined to sleep > Sleeping now - ",chrono::offset::Local::now());
// sleep(Duration::from_secs_f64(sleeptime)).await;
sleeptime
} else { 0.0 };
drop(crl_lock);
if sleeptime > 0.0 {
dbg!("determined to sleep > Sleeping now - ",chrono::offset::Local::now());
sleep(Duration::from_secs_f64(sleeptime)).await; sleep(Duration::from_secs_f64(sleeptime)).await;
} }
match contextratelimiter.check_limiter() { // if told to sleep again, check again before looping for another check
ratelimiter::LimiterResp::Allow => { dbg!("Send_botmsg_inner > Within Spawn > Before a Write Guard");
let maxblanks = rand::thread_rng().gen_range(1..=20); let mut crl_lock = contextratelimiter.write().await;
if let ratelimiter::LimiterResp::Sleep(_) = crl_lock.check_limiter(outmsg.clone()).await {
for _i in 1..maxblanks { // do nothing here
let blankspace: &str = "󠀀"; } else {
outmsg.push_str(blankspace); break; // break out if no longer sleep LimiterResp
};
dbg!("Send_botmsg_inner > Within Spawn > Drop a Write Guard");
drop(crl_lock);
} }
/*
// Original Logic
dbg!("Send_botmsg_inner > Within Spawn > Before a Write Guard");
let mut crl_lock = contextratelimiter.write().await;
// dbg!("Send_botmsg_inner > Within Spawn > Reading Guard / Before a Write Guard");
// let mut crl_lock = contextratelimiter.read().await;
// let rslt = crl_lock.check_limiter(outmsg.clone()).await;
dbg!("before checklimiter sleep",&crl_lock);
// Assign the message here to rate limiter - or just during
// let a = *(contextratelimiter.read().await);
// let b = Arc::new(a);
// let c = b.check_limiter(inmsg).await;
while let ratelimiter::LimiterResp::Sleep(sleeptime) = crl_lock.check_limiter(outmsg.clone()).await {
// while let ratelimiter::LimiterResp::Sleep(sleeptime) = crl_lock.check_limiter(outmsg.clone()).await {
dbg!("within checklimiter sleep",&crl_lock);
// dbg!(chrono::offset::Local::now(),"Message Spawned > Completed");
// drop(crl_lock); //dropping the lock first
dbg!("sleep loop start",chrono::offset::Local::now(), sleeptime);
yield_now().await;
dbg!("yield in just after loop start",chrono::offset::Local::now());
sleep(Duration::from_secs_f64(sleeptime)).await;
}
*/
let mut crl_lock = contextratelimiter.write().await;
dbg!("after checklimiter sleep",&crl_lock);
match crl_lock.clone().check_limiter(outmsg.clone()).await {
ratelimiter::LimiterResp::Allow => {
// let maxblanks = rand::thread_rng().gen_range(1..=20);
let chat_guard = chat_clone.read().await;
let mut blanks_to_add_lock = chat_guard.spaceiter.lock().await;
dbg!("Before blanks to add adjusted",*blanks_to_add_lock);
// *blanks_to_add_lock += 1;
*blanks_to_add_lock = if *blanks_to_add_lock { false } else { true };
dbg!("After blanks to add adjusted",*blanks_to_add_lock);
let mut outmsg = outmsg;
// for i in 0..*blanks_to_add_lock+1 {
// dbg!("Processing blank spaces : ",i,*blanks_to_add_lock);
// // let blankspace: &str = " 󠀀";
// // let blankspace: &str = " .";
// if i > 0 {
// // let blankspace: &str = " \u{e0000}";
// let blankspace: &str = " ";
// outmsg.push_str(blankspace);
// dbg!("Added 'blank' string",outmsg.clone(),blankspace);
// }
// };
// let blankspace: &str = " ";
// let (firstword,restofstr) = outmsg.split_once(' ');
outmsg = if let Some((firstword,restofstr)) = outmsg.split_once(' ') {
if *blanks_to_add_lock { format!("{} {}\u{e0000}",firstword,restofstr,) }
else { format!("{} {}",firstword,restofstr) }
} else { outmsg.clone() } ;
drop(blanks_to_add_lock);
dbg!("Area that used to add blanks to out message");
dbg!("OUT MESSAGE TO CHAT > ", chrono::offset::Local::now(), outmsg.clone());
botlog::trace(
&format!("Out Message TO {} >> {}",channel_login.clone(),outmsg.clone()),
Some("Chat > send_botmsg".to_string()),
None,
);
match msginput.clone() { match msginput.clone() {
BotMsgType::SayInReplyTo(msg, _) => { BotMsgType::SayInReplyTo(msg, _) => {
self.client.say_in_reply_to(msg, outmsg).await.unwrap(); chat_clone.read().await.client.say_in_reply_to(&(*msg), outmsg.clone()).await.unwrap();
}, },
BotMsgType::Say(a, _) => { BotMsgType::Say(a, _) => {
self.client.say(a, outmsg).await.unwrap(); chat_clone.read().await.client.say(a, outmsg.clone()).await.unwrap();
} }
BotMsgType::Notif(outmsg) => { BotMsgType::Notif(_) => {
self.client.say_in_reply_to(&params.msg, outmsg).await.unwrap(); chat_clone.read().await.client.say_in_reply_to(&params.read().await.msg, outmsg.clone()).await.unwrap();
} }
} }
contextratelimiter.increment_counter(); // contextratelimiter.increment_counter();
crl_lock.sent_msg(outmsg.clone()).await;
let logstr = format!( let logstr = format!(
"(#{}) > {} ; contextratelimiter : {:?}", "(#{}) > {} ; contextratelimiter : {:?}",
channel_login.clone(), "rate limit counter increase", contextratelimiter channel_login.clone(), "rate limit counter increase", crl_lock
); );
if let BotMsgType::SayInReplyTo(msg,_ ) = msginput { if let BotMsgType::SayInReplyTo(msg,_ ) = msginput {
botlog::trace( botlog::trace(
logstr.as_str(), logstr.as_str(),
Some("Chat > send_botmsg".to_string()), Some("Chat > send_botmsg".to_string()),
Some(msg), Some(&(*msg)),
); );
} else { } else {
botlog::trace( botlog::trace(
@ -377,20 +767,149 @@ impl Chat {
ratelimiter::LimiterResp::Skip => { ratelimiter::LimiterResp::Skip => {
// (); // do nothing otherwise // (); // do nothing otherwise
} }
ratelimiter::LimiterResp::Sleep(_) => { ratelimiter::LimiterResp::Sleep(err_passed_sleep_time) => {
panic!("ISSUE : sleep was already awaited - Should not happen?"); dbg!("Rate Limiter returned Sleep unexpetedly",err_passed_sleep_time);
// panic!("ISSUE : sleep was already awaited - Should not happen?");
botlog::warn(
format!(
"Warning : RATE LIMITERS returned Sleep Unexpectedly . This should not occur often . Rate Limiter passed Sleep({})",
err_passed_sleep_time
).as_str(),
Some("Chat > send_botmsg".to_string()),
None,
);
dbg!("Rate Limiter returned Sleep unexpetedly > Re-enqueueing message");
// [x] Need to Re-Enqueue the message , but needs to be controlled
chat_clone.read().await.send_botmsg_inner(msginput.clone(),params).await;
} }
} }
drop(crl_lock);
dbg!("Send_botmsg_inner > Within Spawn > After Dropping a Write Guard");
});
Log::flush(); Log::flush();
} }
pub async fn send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
// pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String) { self.send_botmsg_inner(msginput, params).await;
// #[async_recursion]
pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : ExecBodyParams) { // let chat = Arc::new(RwLock::new((*self).clone()));
// let chat_clone = chat.clone();
// let cguard = chat_clone.read().await;
// let outguard = cguard.outqueue.1.read().await;
// // let r = (*outguard).clone();
// match outguard.recv().await {
// Ok(a) => {
// },
// Err(err) => {
// dbg!("ISSUE processing Receiver",err);
// sleep(Duration::from_millis(10)).await;
// }
// }
// let msg_clone = Arc::new(msg.clone());
// let blockingspawn = tokio::task::spawn_blocking( move || {
// // let paramsguard = params.blocking_read();
// // let params = (*paramsguard).clone();
// // drop(paramsguard);
// // chat_clone.blocking_read().outqueue.0.send_blocking((
// // BotMsgType::SayInReplyTo(msg_clone, outmsg),
// // params
// // )).unwrap();
// chat_clone.blocking_read().blocking_send_botmsg(
// msginput,
// params,
// );
// });
// blockingspawn.await.unwrap();
}
pub fn blocking_send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
// let msg_clone = Arc::new(msg.clone());
let paramsguard = params.blocking_read();
let params = (*paramsguard).clone();
drop(paramsguard);
dbg!("Called blocking_send_botmsg",msginput.clone());
chat_clone.blocking_read().outqueue.0.send_blocking((
msginput,
params
)).unwrap();
}
pub async fn blocking_async_send_botmsg(&self, msginput: BotMsgType, params : Arc<RwLock<ExecBodyParams>>) {
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
// let msg_clone = Arc::new(msg.clone());
let blockingspawn = tokio::task::spawn_blocking( move || {
// let paramsguard = params.blocking_read();
// let params = (*paramsguard).clone();
// drop(paramsguard);
// chat_clone.blocking_read().outqueue.0.send_blocking((
// BotMsgType::SayInReplyTo(msg_clone, outmsg),
// params
// )).unwrap();
chat_clone.blocking_read().blocking_send_botmsg(
msginput,
params,
);
});
blockingspawn.await.unwrap();
}
pub async fn say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
// let a = Arc::new(RwLock::new(self));
// let a_clone = a.clone();
self.send_botmsg(
BotMsgType::SayInReplyTo(
Arc::new((*msg).clone()),
outmsg) ,
params
).await;
}
pub fn blocking_say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
let msg_clone = Arc::new(msg.clone());
let paramsguard = params.blocking_read();
let params = (*paramsguard).clone();
drop(paramsguard);
chat_clone.blocking_read().outqueue.0.send_blocking((
BotMsgType::SayInReplyTo(msg_clone, outmsg),
params
)).unwrap();
}
pub async fn blocking_async_say_in_reply_to(&self, msg: &PrivmsgMessage, outmsg: String , params : Arc<RwLock<ExecBodyParams>>) {
// let params_clone = params.clone(); // let params_clone = params.clone();
@ -443,17 +962,130 @@ impl Chat {
// Log::flush(); // Log::flush();
self.send_botmsg(BotMsgType::SayInReplyTo(msg, outmsg) , params).await; // self.send_botmsg(BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg) , params).await;
// self.outqueue.write().await.push((
// BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg),
// params
// ));
// let paramsguard = params.blocking_read();
// let a = (*paramsguard).clone();
// drop(paramsguard);
// self.outqueue.0.send_blocking((
// BotMsgType::SayInReplyTo(Arc::new(msg.clone()), outmsg),
// a
// )).unwrap();
// let a = Arc::new(RwLock::new(*self));
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
let msg_clone = Arc::new(msg.clone());
let blockingspawn = tokio::task::spawn_blocking( move || {
// let paramsguard = params.blocking_read();
// let params = (*paramsguard).clone();
// drop(paramsguard);
// chat_clone.blocking_read().outqueue.0.send_blocking((
// BotMsgType::SayInReplyTo(msg_clone, outmsg),
// params
// )).unwrap();
chat_clone.blocking_read().blocking_say_in_reply_to(
&(*msg_clone),
outmsg,
params,
);
});
blockingspawn.await.unwrap();
// let a = Arc::new(RwLock::new(self));
// let a_clone = a.clone();
// let b = self.send_botmsg(BotMsgType::SayInReplyTo(msg, outmsg) , params);
// struct Tester {
// queue : Vec<chat_util::MsgFuture>,
// }
// let mut q = vec![];
// q.push(b);
// let inst = Tester {
// queue : q,
// };
} }
// pub async fn say(&self, channel_login: String, message: String) {
pub async fn say(&self, channel_login: String, message: String , params : ExecBodyParams) { pub async fn say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
self.send_botmsg(
BotMsgType::Say(
channel_login,
message),
params
).await;
}
pub fn blocking_say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
let paramsguard = params.blocking_read();
let params = (*paramsguard).clone();
drop(paramsguard);
chat_clone.blocking_read().outqueue.0.send_blocking((
BotMsgType::Say(channel_login.to_lowercase(), message),
params
)).unwrap();
}
pub async fn blocking_async_say(&self, channel_login: String, message: String , params : Arc<RwLock<ExecBodyParams>>) {
// more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say // more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say
self.send_botmsg(BotMsgType::Say(channel_login.to_lowercase(), message), params).await; // self.send_botmsg(BotMsgType::Say(channel_login.to_lowercase(), message), params).await;
// let paramguard = params.blocking_read();
// let a = (*paramguard).clone();
// drop(paramguard);
// self.outqueue.0.send_blocking((
// BotMsgType::Say(channel_login.to_lowercase(), message),
// a
// )).unwrap();
let chat = Arc::new(RwLock::new((*self).clone()));
let chat_clone = chat.clone();
// let msg_clone = Arc::new(msg.clone());
let blockingspawn = tokio::task::spawn_blocking( move || {
// let paramsguard = params.blocking_read();
// let params = (*paramsguard).clone();
// drop(paramsguard);
// chat_clone.blocking_read().outqueue.0.send_blocking((
// BotMsgType::Say(channel_login.to_lowercase(), message),
// params
// )).unwrap();
chat_clone.blocking_read().blocking_say(
channel_login,
message,
params,
);
});
blockingspawn.await.unwrap();
} }
async fn _me(&self, _: String, _: String) { async fn _me(&self, _: String, _: String) {
// more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say // more info https://docs.rs/twitch-irc/latest/twitch_irc/client/struct.TwitchIRCClient.html#method.say

View file

@ -214,11 +214,11 @@ async fn cmd_promote(params : ExecBodyParams) {
{ arg2 } { arg2 }
else if let Some(a) = arg1 { else if let Some(a) = arg1 {
if a.starts_with('-') { if a.starts_with('-') {
botlock.botmgrs.chat.send_botmsg( botlock.botmgrs.chat.read().await.send_botmsg(
super::chat::BotMsgType::Notif( super::chat::BotMsgType::Notif(
"Invalid Argument Flag".to_string() "Invalid Argument Flag".to_string()
), ),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
return return
} else { arg1 } } else { arg1 }
@ -294,10 +294,10 @@ async fn cmd_promote(params : ExecBodyParams) {
// We should call a notification around here // We should call a notification around here
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif( botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outmsg.to_string() outmsg.to_string()
), ),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
@ -432,11 +432,11 @@ async fn cmd_demote(params : ExecBodyParams) {
{ arg2 } { arg2 }
else if let Some(a) = arg1 { else if let Some(a) = arg1 {
if a.starts_with('-') { if a.starts_with('-') {
botlock.botmgrs.chat.send_botmsg( botlock.botmgrs.chat.read().await.send_botmsg(
super::chat::BotMsgType::Notif( super::chat::BotMsgType::Notif(
"Invalid Argument Flag".to_string() "Invalid Argument Flag".to_string()
), ),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
return return
} else { arg1 } } else { arg1 }
@ -519,10 +519,10 @@ async fn cmd_demote(params : ExecBodyParams) {
Some(&params.msg), Some(&params.msg),
); );
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif( botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outmsg.to_string() outmsg.to_string()
), ),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
@ -545,6 +545,8 @@ async fn getroles(params : ExecBodyParams) {
*/ */
dbg!("In getroles command");
let mut argv = params.msg.message_text.split(' '); let mut argv = params.msg.message_text.split(' ');
@ -553,7 +555,28 @@ async fn getroles(params : ExecBodyParams) {
let arg1 = argv.next(); let arg1 = argv.next();
let targetuser = match arg1 { let targetuser = match arg1 {
None => return, // exit if no arguments None => {
dbg!("Expected Exit");
botlog::debug(
"Exitting cmd getroles - Invalid arguments ",
Some("identity.rs > init > getroles()".to_string()),
Some(&params.msg),
);
let botlock = params.bot.read().await;
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
"Invalid Arguments".to_string()
),
Arc::new(RwLock::new(params.clone())),
).await;
drop(botlock);
return
}, // exit if no arguments
Some(arg) => arg, Some(arg) => arg,
}; };
@ -561,12 +584,15 @@ async fn getroles(params : ExecBodyParams) {
let targetchnl = arg2; let targetchnl = arg2;
dbg!("In prior to bot read guard command");
let botlock = params.bot.read().await; let botlock = params.bot.read().await;
let id = botlock.get_identity(); let id = botlock.get_identity();
let idlock = id.read().await; let idlock = id.read().await;
dbg!("Pror to getspecialuserroles()");
let sproles = match targetchnl { let sproles = match targetchnl {
None => { None => {
// [ ] If targetchnl is not provided, default to pulling the current channel // [ ] If targetchnl is not provided, default to pulling the current channel
@ -660,14 +686,19 @@ async fn getroles(params : ExecBodyParams) {
Some(&params.msg), Some(&params.msg),
); );
botlock.botmgrs.chat.send_botmsg(super::chat::BotMsgType::Notif( dbg!("Pror to getroles send_botmsg");
botlock.botmgrs.chat.read().await.send_botmsg(super::chat::BotMsgType::Notif(
outmsg.to_string() outmsg.to_string()
), ),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
// [ ] NOTE : After the above, I should receive only the roles in the context of the current channel I received this ideally and maybe BotAdmin ; not outside // [ ] NOTE : After the above, I should receive only the roles in the context of the current channel I received this ideally and maybe BotAdmin ; not outside
dbg!("End of getroles command");
} }
@ -689,7 +720,7 @@ pub enum Permissible {
type UserRolesDB = HashMap<String, Arc<RwLock<Vec<UserRole>>>>; type UserRolesDB = HashMap<String, Arc<RwLock<Vec<UserRole>>>>;
#[derive(Clone)] #[derive(Clone, Debug)]
pub struct IdentityManager { pub struct IdentityManager {
special_roles_users: Arc<RwLock<UserRolesDB>>, special_roles_users: Arc<RwLock<UserRolesDB>>,
} }
@ -1535,6 +1566,8 @@ impl IdentityManager {
Note : Ideally this be called for a given chatter name ? Note : Ideally this be called for a given chatter name ?
*/ */
dbg!("In getspecialuserroles()");
// [ ] !!! TODO: I don't think below is evaluating by given channel // [ ] !!! TODO: I don't think below is evaluating by given channel
botlog::debug( botlog::debug(
&format!( &format!(
@ -1566,6 +1599,9 @@ impl IdentityManager {
}; };
dbg!("Before reading Vector Roles");
let rolesdb = Arc::clone(&self.special_roles_users); let rolesdb = Arc::clone(&self.special_roles_users);
let rolesdb_lock = rolesdb.read().await; let rolesdb_lock = rolesdb.read().await;
@ -1621,6 +1657,8 @@ impl IdentityManager {
} }
} }
dbg!("exit getspecialusreroles with",&evalsproles);
botlog::debug( botlog::debug(
&format!("OUT > evalsproles {:?}", &evalsproles), &format!("OUT > evalsproles {:?}", &evalsproles),
Some("IdentityManager > getspecialuserroles()".to_string()), Some("IdentityManager > getspecialuserroles()".to_string()),

View file

@ -1,8 +1,14 @@
// Related : https://dev.twitch.tv/docs/irc/#rate-limits
const TIME_THRESHOLD_S: u64 = 30; const TIME_THRESHOLD_S: u64 = 30;
const TIME_MIN_S_F64: f64 = 1.0; const TIME_MIN_S_F64: f64 = 1.0;
const MSG_THRESHOLD: u32 = 20; const MSG_THRESHOLD: u32 = 20;
const DUPMSG_MIN_SEND_S: f64 = 30.0;
use std::{sync::Arc, time::Instant};
use tokio::sync::RwLock;
use std::time::Instant;
use crate::core::botlog; use crate::core::botlog;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -10,9 +16,10 @@ pub struct RateLimiter {
timer: Instant, timer: Instant,
msgcounter: u32, msgcounter: u32,
lastmsgtimer : Instant, lastmsgtimer : Instant,
lastmsgdup : String,
} }
#[derive(Debug)] #[derive(Debug,Clone)]
pub enum LimiterResp { pub enum LimiterResp {
Allow, // when it's evaluated to be within limits Allow, // when it's evaluated to be within limits
Skip, // as outside of rate limits Skip, // as outside of rate limits
@ -32,10 +39,20 @@ impl RateLimiter {
timer: Instant::now(), timer: Instant::now(),
msgcounter: 0, msgcounter: 0,
lastmsgtimer: Instant::now(), lastmsgtimer: Instant::now(),
lastmsgdup : String::new(),
} }
} }
pub fn check_limiter(&mut self) -> LimiterResp { fn dupmsg(&self,inmsg : String) -> bool {
dbg!("dubmsg()",&inmsg,&self.lastmsgdup);
if self.lastmsgdup == inmsg && self.lastmsgtimer.elapsed().as_secs_f64() < DUPMSG_MIN_SEND_S {
// duplicate detected
// self.lastmsgdup = String::new(); // update it as no longer duplicate
return true;
} else { return false; };
}
pub async fn check_limiter(&mut self,inmsg : String) -> LimiterResp {
let logstr = format!( let logstr = format!(
@ -49,32 +66,104 @@ impl RateLimiter {
); );
let rsp = if self.timer.elapsed().as_secs() >= TIME_THRESHOLD_S { /*
self.timer = Instant::now(); Documented Thesholds from https://dev.twitch.tv/docs/irc/#rate-limits
self.msgcounter = 0; - [x] self.timer.elapsed().as_secs() >= TIME_THRESHOLD_S
>> initialize with LimiterResp::Allow
- [x] self.msgcounter < MSG_THRESHOLD &&
self.lastmsgtimer.elapsed().as_secs_f64() >= TIME_MIN_S_F64
>> LimiterResp::Allow
- [x] else
>> LimiterResp::Sleep(TIME_MIN_S_F64 - self.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
*/
// let ratelimiter_ar = Arc::new(RwLock::new((*self).clone()));
let ratelimiter_ar = Arc::new(RwLock::new(self));
let mut rl_guard = ratelimiter_ar.write().await;
let rsp = if rl_guard.timer.elapsed().as_secs() >= TIME_THRESHOLD_S {
rl_guard.timer = Instant::now();
rl_guard.msgcounter = 0;
LimiterResp::Allow LimiterResp::Allow
} else if self.msgcounter < MSG_THRESHOLD && } else if rl_guard.msgcounter < MSG_THRESHOLD &&
self.lastmsgtimer.elapsed().as_secs_f64() >= TIME_MIN_S_F64 { rl_guard.lastmsgtimer.elapsed().as_secs_f64() >= TIME_MIN_S_F64 {
LimiterResp::Allow LimiterResp::Allow
} else { } else {
// when elapsed() < TIME_THRESHOLD_S && msgcounter >= MSG_THRESHOLD // when elapsed() < TIME_THRESHOLD_S && msgcounter >= MSG_THRESHOLD
// LimiterResp::Skip // LimiterResp::Skip
LimiterResp::Sleep(TIME_MIN_S_F64 - self.lastmsgtimer.elapsed().as_secs_f64() + 0.1) LimiterResp::Sleep(TIME_MIN_S_F64 - rl_guard.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
}; };
// [ ] If rsp is still allow at this point, also do a dupcheck to adjust rsp to a sleep
dbg!(inmsg.clone());
dbg!(rl_guard.dupmsg(inmsg.clone()));
dbg!("Before Dup test",rsp.clone());
dbg!(matches!(rsp.clone(),LimiterResp::Allow));
// [-] Comment this area if removing Duplicate checking functionality
/* */
let rsp = if rl_guard.dupmsg(inmsg.clone()) && matches!(rsp,LimiterResp::Allow) {
//self.lastmsgdup = String::new();
// LimiterResp::Sleep(DUPMSG_MIN_SEND_S)
dbg!("Duplicate detected");
LimiterResp::Sleep(DUPMSG_MIN_SEND_S - rl_guard.lastmsgtimer.elapsed().as_secs_f64() + 0.1)
} else { rsp.clone() };
/* */
// => 04.02 - Don't update here
// // After Dup is checked, Set the lastmsgdup to latest message
// dbg!("Before Assigning Lastmsgdup",rl_guard.lastmsgdup.clone(),inmsg.clone(),rsp.clone());
// rl_guard.lastmsgdup = inmsg.clone();
// dbg!("After Assigning Lastmsgdup",rl_guard.lastmsgdup.clone(),inmsg.clone());
// [ ] Allows if sleep came up as negative
let rsp = match rsp {
LimiterResp::Sleep(sleeptime) if sleeptime < 0.0 => LimiterResp::Allow , // allow is sleeptime evaluated is negative
_ => rsp.clone(),
} ;
dbg!(rsp.clone());
botlog::trace( botlog::trace(
&format!("Limiter Response : {:?} ; Elapsed (as_sec_f64) : {}", &format!("Limiter Response : {:?} ; Elapsed (as_sec_f64) : {}",
rsp, self.lastmsgtimer.elapsed().as_secs_f64()), rsp, rl_guard.lastmsgtimer.elapsed().as_secs_f64()),
Some("Rate Limiter Inner".to_string()), Some("Rate Limiter Inner".to_string()),
None, None,
); );
dbg!("check_limiter() > ratelimiter guard",rl_guard.clone());
drop(rl_guard);
rsp rsp
} }
pub fn increment_counter(&mut self) { // pub fn increment_counter(&mut self) {
// self.msgcounter += 1;
// self.lastmsgtimer = Instant::now();
// }
pub async fn sent_msg(&mut self,msgstr : String) {
dbg!("sent_msg triggered",&msgstr);
// let ratelimiter_ar = Arc::new(RwLock::new((*self).clone()));
// let mut rl_guard = ratelimiter_ar.write().await;
dbg!("sent_msg > lastmsg before update",&self.lastmsgdup);
self.lastmsgdup = msgstr;
self.msgcounter += 1; self.msgcounter += 1;
self.lastmsgtimer = Instant::now(); self.lastmsgtimer = Instant::now();
dbg!("sent_msg > lastmsg after update",&self.lastmsgdup);
// drop(rl_guard);
} }
} }

View file

@ -12,6 +12,7 @@ pub use crate::core::botmodules::ModulesManager;
mod experiment001; mod experiment001;
mod experiment002; mod experiment002;
mod experiment003;
// [ ] init() function that accepts bot instance - this is passed to init() on submodules // [ ] init() function that accepts bot instance - this is passed to init() on submodules
@ -21,4 +22,5 @@ pub async fn init(mgr: Arc<ModulesManager>) {
experiment001::init(Arc::clone(&mgr)).await; experiment001::init(Arc::clone(&mgr)).await;
experiment002::init(Arc::clone(&mgr)).await; experiment002::init(Arc::clone(&mgr)).await;
experiment003::init(Arc::clone(&mgr)).await;
} }

View file

@ -15,6 +15,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
use rand::Rng; use rand::Rng;
use tokio::sync::RwLock;
use std::sync::Arc; use std::sync::Arc;
use crate::core::bot_actions::ExecBodyParams; use crate::core::bot_actions::ExecBodyParams;
@ -130,10 +131,11 @@ async fn good_girl(params : ExecBodyParams) {
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say_in_reply_to( .say_in_reply_to(
&params.msg, &params.msg,
String::from("GoodGirl xdd "), String::from("GoodGirl xdd "),
params.clone() Arc::new(RwLock::new(params.clone()))
).await; ).await;
@ -170,22 +172,25 @@ async fn babygirl(params : ExecBodyParams) {
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say_in_reply_to( .say_in_reply_to(
&params.msg, &params.msg,
String::from("16:13 notohh: cafdk"), String::from("16:13 notohh: cafdk"),
params.clone() Arc::new(RwLock::new(params.clone()))
).await; ).await;
sleep(Duration::from_secs_f64(0.5)).await; sleep(Duration::from_secs_f64(0.5)).await;
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say_in_reply_to( .say_in_reply_to(
&params.msg, &params.msg,
String::from("16:13 notohh: have fun eating princess"), String::from("16:13 notohh: have fun eating princess"),
params.clone() Arc::new(RwLock::new(params.clone()))
).await; ).await;
@ -194,10 +199,11 @@ async fn babygirl(params : ExecBodyParams) {
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say_in_reply_to( .say_in_reply_to(
&params.msg, &params.msg,
String::from("16:13 notohh: baby girl"), String::from("16:13 notohh: baby girl"),
params.clone() Arc::new(RwLock::new(params.clone()))
).await; ).await;
@ -225,5 +231,39 @@ async fn routinelike(params : ExecBodyParams) {
// lines are executed after in conjunction to the spawn // lines are executed after in conjunction to the spawn
// spawn 5 independent spawns
let bot = Arc::clone(&params.bot);
let params_ar = Arc::new(RwLock::new(params.clone()));
let params_c = params_ar.clone();
for _ in 0..5 {
let bot_clone = bot.clone();
let params_cc = params_c.clone();
tokio::spawn( async move {
println!(">> SPAWNED Innterroutine triggered!");
sleep(Duration::from_secs_f64(5.0)).await;
let botlock = bot_clone.read().await;
let params_ccc = params_cc.clone();
let paramsguard = params_ccc.read().await;
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&paramsguard.msg,
String::from("SPAWNED GoodGirl xdd "),
params_cc,
).await;
drop(botlock);
drop(paramsguard);
});
};
} }

View file

@ -17,6 +17,7 @@ const OF_CMD_CHANNEL:Channel = Channel(String::new());
use std::sync::Arc; use std::sync::Arc;
use chrono::{TimeZone,Local}; use chrono::{TimeZone,Local};
use tokio::sync::RwLock;
use crate::core::bot_actions::ExecBodyParams; use crate::core::bot_actions::ExecBodyParams;
@ -116,7 +117,7 @@ async fn sayout(params : ExecBodyParams) {
botlog::trace( botlog::trace(
&format!("[TRACE] Evaluated status of {} : {:?}", &format!("[TRACE] Evaluated status of {} : {:?}",
trgchnl.to_string().clone(),botlock.botmgrs.chat.client.get_channel_status(trgchnl.to_string().clone()).await), trgchnl.to_string().clone(),botlock.botmgrs.chat.read().await.client.get_channel_status(trgchnl.to_string().clone()).await),
Some("Chat > send_botmsg".to_string()), Some("Chat > send_botmsg".to_string()),
None, None,
); );
@ -156,10 +157,11 @@ async fn sayout(params : ExecBodyParams) {
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say( .say(
trgchnl.to_string(), trgchnl.to_string(),
newoutmsg.to_string(), newoutmsg.to_string(),
params.clone(), Arc::new(RwLock::new(params.clone())),
).await; ).await;
@ -179,10 +181,11 @@ async fn sayout(params : ExecBodyParams) {
botlock botlock
.botmgrs .botmgrs
.chat .chat
.read().await
.say_in_reply_to( .say_in_reply_to(
&params.msg, &params.msg,
String::from("Invalid arguments"), String::from("Invalid arguments"),
params.clone() Arc::new(RwLock::new(params.clone()))
).await; ).await;

View file

@ -0,0 +1,830 @@
/*
Custom Modules -
Usage :
[ ] within the file's init(), define BotActions & Load them into the ModulesManager
[ ] Define Execution Bodies for these BotActions
[ ] Afterwards, add the following to parent modules.rs file
- mod <modulename>;
- within init(), <modulename>::init(mgr).await
*/
const OF_CMD_CHANNEL:Channel = Channel(String::new());
use casual_logger::Log;
use rand::Rng;
use rand::thread_rng;
use rand::rngs::StdRng;
use rand::seq::SliceRandom;
use tokio::sync::RwLock;
use std::borrow::Borrow;
use std::borrow::BorrowMut;
use std::sync::Arc;
use crate::core::bot_actions::ExecBodyParams;
use crate::core::botinstance::Channel;
use crate::core::botlog;
use crate::core::bot_actions::actions_util;
use crate::core::botmodules::{BotAction, BotActionTrait, BotCommand, BotModule, Listener, ModulesManager, Routine, RoutineAttr};
use crate::core::identity::UserRole::*;
use tokio::time::{sleep, Duration};
pub async fn init(mgr: Arc<ModulesManager>) {
// 1. Define the BotAction
let botc1 = BotCommand {
module: BotModule(String::from("experiments003")),
command: String::from("test3"), // command call name
alias: vec![], // String of alternative names
exec_body: actions_util::asyncbox(test3_body),
help: String::from("Test Command tester"),
required_roles: vec![
BotAdmin,
Mod(OF_CMD_CHANNEL),
],
};
// 2. Add the BotAction to ModulesManager
botc1.add_to_modmgr(Arc::clone(&mgr)).await;
// 1. Define the BotAction
let botc1 = BotCommand {
module: BotModule(String::from("experiments003")),
command: String::from("countdown"), // command call name
alias: vec![], // String of alternative names
exec_body: actions_util::asyncbox(countdown_chnl_v1),
help: String::from("Test Command tester"),
required_roles: vec![
BotAdmin,
Mod(OF_CMD_CHANNEL),
],
};
// 2. Add the BotAction to ModulesManager
botc1.add_to_modmgr(Arc::clone(&mgr)).await;
}
async fn countdown_chnl_v1(params : ExecBodyParams) {
botlog::debug(
"[CHILDFN] countdown_chnl() triggered!",
Some("Experiments003 > countdown_chnl()".to_string()),
Some(&params.msg),
);
/*
create a fun countdown BotCommand that allows an Elevated Chatter to
-a add channels to target a routine message
-start to start the routine with an input String, that sends a number
of messages to the targeted channels with a countdown, until it
reaches 0 when it sends a cute or funny message
NOTE : At the moment, I don't have customizable persistence, so I would just use
counters from the Routine itself
*/
/*
Because of some bot core features are not available, v1.0 of this could be :
[x] 1. Create a Routine & start a routine
[x] 2. Have the routine go through each joined channel randomly and countdown
[x] 3. At the end, say "0, I love you uwu~" in the last chosen channel
*/
/*
Usage => 03.28 - skipping arguments as functinoality isn't enhanced
-a <channel> => 03.28 - Not sure if this is possible at the moment?
-start
-stop => 03.28 - Not sure if this is possible at the moment?
*/
/*
[ ] Functional Use Case
1. -a <channel> adds targetted channels
*/
// [-] Unwraps arguments from message
// let (arg1, arg2) = {
// let mut argv = params.msg.message_text.split(' ');
// argv.next(); // Skip the command name
// let arg1 = argv.next();
// let arg2 = argv.next();
// (arg1, arg2)
// };
// [ ] 1. Create a Routine & start a routine
let params_ar = Arc::new(RwLock::new(params));
// let parentmodule = params.get_parent_module().await;
let module = params_ar.read().await.get_module().await;
// let channel = params.get_channel().await;
// let channel = params.get_channel().await;
// let channel = params.get_channel();
let channel_task_grabber = tokio::task::spawn_blocking( move || {
let params_clone = params_ar.clone();
let channel = params_clone.blocking_read().get_channel();
drop(params_clone);
(channel,params_ar)
});
let (channel,params_ar) = channel_task_grabber.await.unwrap();
let routine_attr = vec![
// RoutineAttr::RunOnce
RoutineAttr::MaxIterations(5),
RoutineAttr::LoopDuration(Duration::from_secs(1))
];
// let exec_body = actions_util::asyncbox(rtestbody);
// let exec_body = actions_util::asyncbox(innertester); // <-- 03.27 - when below is uncommented, this is throwing an issue
let exec_body = innertester;
// async fn innertester(params : ExecBodyParams) {
fn innertester(params : Arc<RwLock<ExecBodyParams>>) {
{
// let curract_guard = params.curr_act.read().await;
let paramguard1 = params.blocking_read();
let curract = paramguard1.curr_act.clone().unwrap();
let curract_guard = curract.blocking_read();
// let logmsg_botact = match *params.curr_act.read().await {
let logmsg_botact = match *curract_guard {
BotAction::C(_) => "command",
BotAction::R(_) => "routine",
BotAction::L(_) => "listener",
} ;
botlog::trace(
format!("Params > Curr_act type : {:?}", logmsg_botact).as_str(),
Some("Experiments003 > countdown_chnl()".to_string()),
Some(&params.blocking_read().msg),
);
Log::flush();
}
{
let bot = Arc::clone(&params.blocking_read().bot);
// let botlock = bot.read().await;
let botlock = bot.blocking_read();
// let curract_guard = params.curr_act.write().await;
let paramguard1 = params.blocking_read();
let curract = paramguard1.curr_act.clone().unwrap();
let curract_guard = curract.blocking_write();
// let routine_lock = arr.write().await;
if let BotAction::R(arr) = &*curract_guard {
// if let BotAction::R(arr) = &*params.curr_act.read().await {
botlog::trace(
"Before loading remaining iterations",
Some("Experiments003 > countdown_chnl()".to_string()),
None,
);
Log::flush();
// let iterleft = arr.read().await.remaining_iterations.unwrap_or(0);
// // let iterleft = if arr.read().await.remaining_iterations.is_none() { 0i64 }
// // else { arr.read().await.remaining_iterations.unwrap() };
// let iterleft = match arr.read().await.remaining_iterations {
// None => 0,
// Some(a) => a,
// };
// let routine_lock = arr.read().await;
// if let Some(a) = routine_lock.remaining_iterations.clone() {
// println!("Remaining iterations > {}",a)
// }
let iterleft;
{
// let routine_lock = arr.write().await;
// let routine_lock = arr.blocking_write();
let routine_lock = arr.blocking_read();
iterleft = routine_lock.remaining_iterations.unwrap_or(0);
println!("remaining iterations : {:?}", iterleft);
}
botlog::trace(
"after loading remaining iterations",
Some("Experiments003 > countdown_chnl()".to_string()),
None,
);
Log::flush();
// [ ] get joined channels
let joinedchannels = botlock.bot_channels.clone();
fn pick_a_channel(chnlvec : Vec<Channel>) -> Channel {
botlog::trace(
"In Pick_a_Channel()",
Some("Experiments003 > countdown_chnl()".to_string()),
None,
);
Log::flush();
// More Information : https://docs.rs/rand/0.7.2/rand/seq/trait.SliceRandom.html#tymethod.choose
let mut rng = thread_rng();
// let joinedchannels = botlock.bot_channels.clone();
(*chnlvec.choose(&mut rng).unwrap()).clone()
}
let chosen_channel = pick_a_channel(joinedchannels);
dbg!("SUCCESS", chosen_channel.clone());
botlog::trace(
format!("Picked a channel: {:?}", chosen_channel).as_str(),
Some("Experiments003 > countdown_chnl()".to_string()),
Some(&params.blocking_read().msg),
);
Log::flush();
// [ ] !! ISSUE : With this fix though, the custom fn is no longer
// async. This is an issue because chat module is async
// - There should be no need to change chat , as async allows
// us to multitask with messages
// let a = || {
// let chosen_channel_ar = Arc::new(RwLock::new(chosen_channel));
// let params_clone = params.clone();
// // let bot = Arc::clone(&params.blocking_read().bot);
// // dbg!("in chat async function");
// // let botlock = bot.blocking_read();
// let channel_ar_clone = chosen_channel_ar.clone();
// let outmsg = if iterleft <= 1 {
// format!("{} I love you uwu~",iterleft)
// } else { format!("{}",iterleft) };
// botlock.botmgrs.chat
// .say(
// channel_ar_clone.blocking_read().0.clone(),
// outmsg,
// params_clone,
// );
let outmsg = if iterleft <= 1 {
// format!("{} I love you uwu~",iterleft)
let msgtxt = params.blocking_read().msg.message_text.clone();
// format!("{} {} I love you uwu~",iterleft,msgtxt)
format!("{} {}",iterleft,msgtxt)
} else { format!("{} Tomfoolery Clap",iterleft) };
botlock.botmgrs.chat.blocking_read()
.blocking_say(
chosen_channel.0.clone(),
outmsg,
Arc::new(RwLock::new(params.blocking_read().clone())),
);
}
}
}
// [ ] setup the routine
if let Ok(newr) = Routine::from(
"Routine Test".to_string(),
module,
channel.unwrap(),
routine_attr,
// Arc::new(RwLock::new(exec_body)),
exec_body,
Arc::new(RwLock::new(params_ar.clone().read().await.clone())),
).await {
let newr_ar = newr.clone();
// [ ] start the routine
if let Ok(_) = Routine::start(newr_ar.clone()).await {
botlog::debug(
"Successfully started",
Some("experiment003 > countdown_chnl()".to_string()),
Some(&params_ar.read().await.msg),
);
Log::flush();
let bot = Arc::clone(&params_ar.read().await.bot);
// let botlock = bot.read().await;
// uses chat.say_in_reply_to() for the bot controls for messages
// [ ] 04.01 - in an ASYNC context, ensure to raise a Blocking Spawn
// botlock
// .botmgrs
// .chat
// .say_in_reply_to(
// &params_ar.read().await.msg,
// "Started Routine!".to_string(),
// Arc::new(RwLock::new(params_ar.read().await.clone()))
// );
// let jhandle = newr.clone().read().await.join_handle.clone().unwrap();
// let a = jhandle.write().await;
// a.
// sleep(Duration::from_secs(300)).await;
// let loopbodyspawn = tokio::task::spawn_blocking( move || {
// let botlock = bot.blocking_read();
// botlock
// .botmgrs
// .chat
// .say_in_reply_to(
// &params_ar.blocking_read().msg,
// "Started Routine!".to_string(),
// Arc::new(RwLock::new(params_ar.blocking_read().clone()))
// );
// });
// loopbodyspawn.await.unwrap();
// let botlock = bot.read().await;
// botlock
// .botmgrs
// .chat
// .say_in_reply_to(
// &params_ar.blocking_read().msg,
// "Started Routine!".to_string(),
// Arc::new(RwLock::new(params_ar.blocking_read().clone()))
// ).await;
// drop(botlock);
let botlock = bot.read().await;
let params_guard = params_ar.read().await;
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
// &params_ar.blocking_read().msg,
&params_guard.msg,
"Started Routine!".to_string(),
Arc::new(RwLock::new(params_guard.clone()))
).await;
drop(botlock);
drop(params_guard);
}
}
// botlock
// .botmgrs
// .chat
// .say_in_reply_to(
// &params.msg,
// format!("{:?}",),
// params.clone()
// ).await;
}
async fn test3_body(params : ExecBodyParams) {
// println!("testy triggered!"); // NOTE : This test function intends to print (e.g., to stdout) at fn call
botlog::debug(
"testy triggered!",
Some("Experiments003 > test3 command body".to_string()),
Some(&params.msg),
);
/*
Test Routine Start() by :
1. In this single exec body , create a Routine
2. Create a Routine Execution Body
3. Pass the Execution Body & Routine Attributes to create the Routine
4. Start the Routine
5. For RunOnce , we should see it only trigger once, and then complete in the logs
*/
// [x] Get the module from params
let params_ar = Arc::new(RwLock::new(params));
// let parentmodule = params.get_parent_module().await;
let module = params_ar.read().await.get_module().await;
// let channel = params.get_channel().await;
// let channel = params.get_channel().await;
// let channel = params.get_channel();
let routine_attr = vec![
RoutineAttr::RunOnce
];
// let exec_body = actions_util::asyncbox(rtestbody);
// let exec_body = actions_util::asyncbox(rtestbody); // <-- 03.27 - when below is uncommented, this is throwing an issue
// let channel = params.get_channel();
let channel_task_grabber = tokio::task::spawn_blocking( move || {
let params_clone = params_ar.clone();
let channel = params_clone.blocking_read().get_channel();
drop(params_clone);
(channel,params_ar)
});
let (channel,params_ar) = channel_task_grabber.await.unwrap();
let exec_body = rtestbody;
// let parent_params = params.clone();
// let params_clone = params.clone();
// async fn rtestbody(params : ExecBodyParams) {
fn rtestbody(params : Arc<RwLock<ExecBodyParams>>) {
// let guard1 = params.curr_act.read().await;
let paramguard1 = params.blocking_read();
let curract = paramguard1.curr_act.clone().unwrap();
let guard1 = curract.blocking_read();
{
let logmsg_botact = match *guard1 {
BotAction::C(_) => "command",
BotAction::R(_) => "routine",
BotAction::L(_) => "listener",
} ;
botlog::trace(
format!("Params > Curr_act type : {:?}", logmsg_botact).as_str(),
Some("Experiments003 > test3 command body".to_string()),
Some(&params.blocking_read().msg),
);
Log::flush();
}
{
let logmsg_botact = match &*guard1 {
BotAction::C(_) => "command 2",
BotAction::R(_) => "routine 2",
BotAction::L(_) => "listener 2",
} ;
botlog::trace(
format!("Params > Curr_act type : {:?}", logmsg_botact).as_str(),
Some("Experiments003 > test3 command body".to_string()),
Some(&params.blocking_read().msg),
);
Log::flush();
}
// drop(guard1);
{
dbg!("Custom > within Child Custom fn - Before Critical area");
println!("Critical code area start"); // <= 03.29 - This is printed
// if let BotAction::R(c) = &*guard {
// println!("{:?}",c.read().await.channel);
// }
// let routine_channel = if let BotAction::R(c) = &*guard1 {
// dbg!("Custom > within Child Custom fn - During Critical area > Routine Guard ");
// let routineguard = c.read().await;
// Some(routineguard.channel.clone());
// } else {
// None
// };
// let chnl = match &*guard1 {
// BotAction::R(arr) => {
// dbg!("Custom > within Child Custom fn - During Critical area > Before Routine Guard ");
// let routineguard = arr.read().await;
// dbg!("Custom > within Child Custom fn - During Critical area > After Routine Guard ");
// Some(routineguard.channel.clone())
// },
// BotAction::C(_) | BotAction::L(_) => None ,
// } ;
// let chnl = params.get_channel().await;
// let chnl = params.get_channel().await;
let chnl = params.blocking_read().get_channel();
dbg!("Custom > within Child Custom fn - after GetChannel");
println!("{:?}",chnl);
println!("Critical code area end"); // <= 03.29 - ISSUE This is NOT printed
dbg!("Custom > within Child Custom fn - Before Critical area");
// if let BotAction::R(arr) = &*params.curr_act.read().await {
// for curriter in 0..5 {
// println!("tester - Routine - Completed Iterations : {}",
// arr.read().await.complete_iterations);
// println!("tester - Custom Loop - Completed Iterations : {}",
// curriter);
// sleep(Duration::from_secs_f64(0.5)).await;
// }
// }
}
}
let params_clone = params_ar.clone();
botlog::debug(
format!("RTESTBODY : module - {:?} ; channel - {:?}",
module,channel
).as_str(),
Some("experiment003 > test3_body".to_string()),
Some(&params_clone.read().await.msg),
);
let a = Routine::from(
"Routine Test".to_string(),
module,
channel.unwrap(),
routine_attr,
// Arc::new(RwLock::new(exec_body)),
exec_body,
Arc::new(RwLock::new(params_clone.read().await.clone()))
).await;
if let Ok(newr) = a {
// NOTE : The below is a "Playing aound" feature
// In the below, we're unnecessarily adjusting the ExecBodyParams of the parent
// To get the reference to the Routine or the BotAction there are now refernces to itself
// [ ] before execute , be sure to adjust curr_act
// let mut params_mut = params;
let newr_ar = newr.clone();
// params_mut.curr_act = Arc::new(RwLock::new(
// BotAction::R(newr_ar.clone())
// ));
// {
// newr_ar.write().await.parent_params = params_mut.clone();
// }
let rslt = Routine::start(newr_ar.clone()).await;
// let rslt = newr_ar.read().await.start().await;
let rsltstr = match rslt {
Ok(_) => "successful".to_string(),
Err(a) => a,
};
botlog::debug(
format!("TEST3_BODY RESULT : {:?}",
rsltstr
).as_str(),
Some("experiment003 > test3_body".to_string()),
Some(&(params_ar.clone()).read().await.msg),
);
Log::flush();
let bot = Arc::clone(&params_ar.read().await.bot);
let botlock = bot.read().await;
// uses chat.say_in_reply_to() for the bot controls for messages
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&params_ar.read().await.msg,
format!("Routine Result : {:?}",rsltstr),
Arc::new(RwLock::new(params_clone.read().await.clone()))
).await;
// [x] Will not be handling JoinHandles here . If immediate abort() handling is required, below is an example that works
/*
let a = newr.clone().read().await.join_handle.clone();
match a {
Some(b) => {
b.read().await.borrow().abort(); // [x] <-- This aborts if wanting to abort immediately
//()
},
None => (),
}
*/
}
Log::flush();
}
async fn good_girl(params : ExecBodyParams) {
// [ ] Uses gen_ratio() to output bool based on a ratio probability .
// - For example gen_ratio(2,3) is 2 out of 3 or 0.67% (numerator,denomitator)
// - More Info : https://rust-random.github.io/rand/rand/trait.Rng.html#method.gen_ratio
if params.msg.sender.name.to_lowercase() == "ModulatingForce".to_lowercase()
|| params.msg.sender.name.to_lowercase() == "mzNToRi".to_lowercase()
{
botlog::debug(
"Good Girl Detected > Pausechamp",
Some("experiments > goodgirl()".to_string()),
Some(&params.msg),
);
let rollwin = rand::thread_rng().gen_ratio(1, 10);
if rollwin {
botlog::debug(
"Oh that's a good girl!",
Some("experiments > goodgirl()".to_string()),
Some(&params.msg),
);
let bot = Arc::clone(&params.bot);
let botlock = bot.read().await;
// uses chat.say_in_reply_to() for the bot controls for messages
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&params.msg,
String::from("GoodGirl xdd "),
Arc::new(RwLock::new(params.clone()))
).await;
}
}
}
async fn testy(params : ExecBodyParams) {
println!("testy triggered!"); // NOTE : This test function intends to print (e.g., to stdout) at fn call
botlog::debug(
"testy triggered!",
Some("experiments > testy()".to_string()),
Some(&params.msg),
);
}
async fn babygirl(params : ExecBodyParams) {
println!("babygirl triggered!"); // NOTE : This test function intends to print (e.g., to stdout) at fn call
botlog::debug(
"babygirl triggered!",
Some("experiments > babygirl()".to_string()),
Some(&params.msg),
);
let bot = Arc::clone(&params.bot);
let botlock = bot.read().await;
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&params.msg,
String::from("16:13 notohh: cafdk"),
Arc::new(RwLock::new(params.clone()))
).await;
sleep(Duration::from_secs_f64(0.5)).await;
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&params.msg,
String::from("16:13 notohh: have fun eating princess"),
Arc::new(RwLock::new(params.clone()))
).await;
sleep(Duration::from_secs_f64(2.0)).await;
botlock
.botmgrs
.chat
.read().await
.say_in_reply_to(
&params.msg,
String::from("16:13 notohh: baby girl"),
Arc::new(RwLock::new(params.clone()))
).await;
}
async fn routinelike(params : ExecBodyParams) {
println!("routinelike triggered!"); // NOTE : This test function intends to print (e.g., to stdout) at fn call
botlog::debug(
"routinelike triggered!",
Some("experiments > routinelike()".to_string()),
Some(&params.msg),
);
// spawn an async block that runs independently from others
tokio::spawn( async {
for _ in 0..5 {
println!(">> Innterroutine triggered!");
sleep(Duration::from_secs_f64(5.0)).await;
}
}
);
// lines are executed after in conjunction to the spawn
}

View file

@ -14,11 +14,21 @@ pub type BotAR = Arc<RwLock<BotInstance>>;
#[tokio::main] #[tokio::main]
pub async fn main() { pub async fn main() {
console_subscriber::init();
Log::set_file_ext(Extension::Log); Log::set_file_ext(Extension::Log);
Log::set_level(Level::Trace); Log::set_level(Level::Trace);
Log::set_retention_days(2); Log::set_retention_days(2);
// Log::set_level(Level::Notice); // Log::set_level(Level::Notice);
// fn innerbody() -> i64 {
// println!("hello");
// 64
// }
// let exec_body:fn() -> i64 = innerbody;