Compare commits
3 Commits
d1b6d153d4
...
d174ee7bc7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d174ee7bc7 | ||
|
|
ca2e661a0e | ||
|
|
c33c67044a |
@ -479,7 +479,7 @@ impl Runner {
|
||||
let val = self.run_script(content)?;
|
||||
|
||||
// let rc: RunnerConfig = from_js(unsafe { self.context.context_raw() }, &val)?;
|
||||
let rc: RunnerConfig = val.js_into()?;
|
||||
let rc: RunnerConfig = DeserializerJS::deserialize_js(&val)?;
|
||||
|
||||
Ok(rc)
|
||||
}
|
||||
@ -521,16 +521,6 @@ mod tests {
|
||||
println!("Val: {:?}", val.to_string());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_deserialization_main() {
|
||||
let runner = Runner::init().unwrap();
|
||||
let val = runner.run_script(include_str!("../mainbot.js")).unwrap();
|
||||
let s: RunnerConfig = from_js(unsafe { runner.context.context_raw() }, &val).unwrap();
|
||||
println!("deser: {:#?}", s);
|
||||
let o = val.try_into_object().unwrap();
|
||||
println!("o: {:?}", recursive_format(o));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_func_deserialization_main() {
|
||||
let runner = Runner::init().unwrap();
|
||||
|
||||
11
src/main.rs
11
src/main.rs
@ -105,6 +105,7 @@ pub struct BotController {
|
||||
pub bot: Bot,
|
||||
pub db: DB,
|
||||
pub rc: RunnerConfig,
|
||||
pub runner: Runner,
|
||||
}
|
||||
|
||||
impl BotController {
|
||||
@ -112,9 +113,15 @@ impl BotController {
|
||||
let bot = Bot::new(&config.bot_token);
|
||||
let db = DB::init(&config.db_url).await?;
|
||||
|
||||
let rc = Runner::init()?.init_config(include_str!("../mainbot.js"))?;
|
||||
let runner = Runner::init()?;
|
||||
let rc = runner.init_config(include_str!("../mainbot.js"))?;
|
||||
|
||||
Ok(Self { bot, db, rc })
|
||||
Ok(Self {
|
||||
bot,
|
||||
db,
|
||||
rc,
|
||||
runner,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user