fix repl and ffi

Author: dignifiedquire

Cargo.lock

@@ -24,6 +24,7 @@ tokio = { version = "1", features = ["full"] }
 anyhow = "1"
 thiserror = "1"
 rand = "0.7"
+lazy_static = "1.4.0"
 
 [features]
 default = ["vendored"]

deltachat-ffi/Cargo.toml

@@ -15,6 +15,7 @@ extern crate human_panic;
 use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::fmt::Write;
+use std::future::Future;
 use std::ops::Deref;
 use std::ptr;
 use std::str::FromStr;
@@ -24,8 +25,9 @@ use anyhow::Context as _;
 use deltachat::qr_code_generator::get_securejoin_qr_svg;
 use num_traits::{FromPrimitive, ToPrimitive};
 use rand::Rng;
+use tokio::runtime::Runtime;
 use tokio::sync::RwLock;
-use tokio::task::{block_on, spawn};
+use tokio::task::spawn;
 
 use deltachat::chat::{ChatId, ChatVisibility, MuteDuration, ProtectionStatus};
 use deltachat::constants::DC_MSG_ID_LAST_SPECIAL;
@@ -61,6 +63,17 @@ use deltachat::chatlist::Chatlist;
 /// Struct representing the deltachat context.
 pub type dc_context_t = Context;
 
+lazy_static::lazy_static! {
+    static ref RT: Runtime = Runtime::new().expect("unable to create tokio runtime");
+}
+
+fn block_on<F, T>(fut: F) -> T
+where
+    F: Future<Output = T>,
+{
+    RT.block_on(fut)
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn dc_context_new(
     _os_name: *const libc::c_char,

deltachat-ffi/src/lib.rs

@@ -30,6 +30,7 @@ use rustyline::validate::Validator;
 use rustyline::{
     Cmd, CompletionType, Config, Context as RustyContext, EditMode, Editor, Helper, KeyEvent,
 };
+use tokio::runtime::Handle;
 
 mod cmdline;
 use self::cmdline::*;
@@ -316,7 +317,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         .output_stream(OutputStreamType::Stdout)
         .build();
     let mut selected_chat = ChatId::default();
-    let (reader_s, reader_r) = tokio::channel::bounded(100);
+    let (reader_s, reader_r) = async_channel::bounded(100);
     let input_loop = tokio::task::spawn_blocking(move || {
         let h = DcHelper {
             completer: FilenameCompleter::new(),
@@ -339,7 +340,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
                 Ok(line) => {
                     // TODO: ignore "set mail_pw"
                     rl.add_history_entry(line.as_str());
-                    tokio::task::block_on(reader_s.send(line)).unwrap();
+                    Handle::current().block_on(reader_s.send(line)).unwrap();
                 }
                 Err(ReadlineError::Interrupted) | Err(ReadlineError::Eof) => {
                     println!("Exiting...");
@@ -367,7 +368,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
         }
     }
     context.stop_io().await;
-    input_loop.await?;
+    input_loop.await??;
 
     Ok(())
 }
@@ -458,11 +459,12 @@ async fn handle_cmd(
     Ok(ExitResult::Continue)
 }
 
-fn main() -> Result<(), Error> {
+#[tokio::main]
+async fn main() -> Result<(), Error> {
     let _ = pretty_env_logger::try_init();
 
     let args = std::env::args().collect();
-    tokio::task::block_on(async move { start(args).await })?;
+    start(args).await?;
 
     Ok(())
 }