api!: make log module private

Author: link2xt

deltachat-jsonrpc/src/api.rs

@@ -19,6 +19,7 @@ use deltachat::constants::DC_MSG_ID_DAYMARKER;
 use deltachat::contact::{may_be_valid_addr, Contact, ContactId, Origin};
 use deltachat::context::get_info;
 use deltachat::ephemeral::Timer;
+use deltachat::imex;
 use deltachat::location;
 use deltachat::message::get_msg_read_receipts;
 use deltachat::message::{
@@ -35,7 +36,6 @@ use deltachat::securejoin;
 use deltachat::stock_str::StockMessage;
 use deltachat::webxdc::StatusUpdateSerial;
 use deltachat::EventEmitter;
-use deltachat::{imex, info};
 use sanitize_filename::is_sanitized;
 use tokio::fs;
 use tokio::sync::{watch, Mutex, RwLock};
@@ -1919,12 +1919,10 @@ impl CommandApi {
         instance_msg_id: u32,
     ) -> Result<()> {
         let ctx = self.get_context(account_id).await?;
-        let fut = send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?;
-        if let Some(fut) = fut {
-            tokio::spawn(async move {
-                fut.await.ok();
-                info!(ctx, "send_webxdc_realtime_advertisement done")
-            });
+        if let Some(fut) =
+            send_webxdc_realtime_advertisement(&ctx, MsgId::new(instance_msg_id)).await?
+        {
+            tokio::spawn(fut);
         }
         Ok(())
     }
@@ -1955,7 +1953,9 @@ impl CommandApi {
         instance_msg_id: u32,
     ) -> Result<WebxdcMessageInfo> {
         let ctx = self.get_context(account_id).await?;
-        WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id)).await
+        WebxdcMessageInfo::get_for_message(&ctx, MsgId::new(instance_msg_id))
+            .await
+            .context("No webxdc info available")?
     }
 
     /// Get href from a WebxdcInfoMessage which might include a hash holding

deltachat-jsonrpc/src/api/types/webxdc.rs

@@ -49,8 +49,12 @@ impl WebxdcMessageInfo {
     pub async fn get_for_message(
         context: &Context,
         instance_message_id: MsgId,
-    ) -> anyhow::Result<Self> {
+    ) -> anyhow::Result<Option<Self>> {
         let message = Message::load_from_db(context, instance_message_id).await?;
+        let Some(webxdc_info) = message.get_webxdc_info_or_log_err(context).await else {
+            return Ok(None);
+        };
+
         let WebxdcInfo {
             name,
             icon,
@@ -62,9 +66,9 @@ impl WebxdcMessageInfo {
             self_addr,
             send_update_interval,
             send_update_max_size,
-        } = message.get_webxdc_info(context).await?;
+        } = webxdc_info;
 
-        Ok(Self {
+        Ok(Some(Self {
             name,
             icon,
             document: maybe_empty_string_to_option(document),
@@ -74,6 +78,6 @@ impl WebxdcMessageInfo {
             self_addr,
             send_update_interval,
             send_update_max_size,
-        })
+        }))
     }
 }

deltachat-repl/src/cmdline.rs

@@ -16,7 +16,6 @@ use deltachat::context::*;
 use deltachat::download::DownloadState;
 use deltachat::imex::*;
 use deltachat::location;
-use deltachat::log::LogExt;
 use deltachat::message::{self, Message, MessageState, MsgId, Viewtype};
 use deltachat::mimeparser::SystemMessage;
 use deltachat::peer_channels::{send_webxdc_realtime_advertisement, send_webxdc_realtime_data};
@@ -555,7 +554,7 @@ pub async fn cmdline(context: Context, line: &str, chat_id: &mut ChatId) -> Resu
             context.maybe_network().await;
         }
         "housekeeping" => {
-            sql::housekeeping(&context).await.log_err(&context).ok();
+            sql::housekeeping(&context).await?;
         }
         "listchats" | "listarchived" | "chats" => {
             let listflags = if arg0 == "listarchived" {

src/lib.rs

@@ -37,7 +37,7 @@ extern crate rusqlite;
 extern crate strum_macros;
 
 #[macro_use]
-pub mod log;
+mod log;
 
 #[cfg(feature = "internals")]
 #[macro_use]

src/webxdc.rs

@@ -40,6 +40,7 @@ use crate::contact::ContactId;
 use crate::context::Context;
 use crate::events::EventType;
 use crate::key::{load_self_public_key, DcKey};
+use crate::log::LogExt as _;
 use crate::message::{Message, MessageState, MsgId, Viewtype};
 use crate::mimefactory::RECOMMENDED_FILE_SIZE;
 use crate::mimeparser::SystemMessage;
@@ -898,7 +899,10 @@ impl Message {
     /// Return info from manifest.toml or from fallbacks.
     pub async fn get_webxdc_info(&self, context: &Context) -> Result<WebxdcInfo> {
         ensure!(self.viewtype == Viewtype::Webxdc, "No webxdc instance.");
-        let mut archive = self.get_webxdc_archive(context).await?;
+        let mut archive = self
+            .get_webxdc_archive(context)
+            .await
+            .context("Failed to open Webxdc archive")?;
 
         let mut manifest = get_blob(&mut archive, "manifest.toml")
             .await
@@ -961,6 +965,14 @@ impl Message {
         })
     }
 
+    /// Return info from manifest.toml, ignoring errors.
+    ///
+    /// If there is an error during reading the file,
+    /// returns `None` and logs the error.
+    pub async fn get_webxdc_info_or_log_err(&self, context: &Context) -> Option<WebxdcInfo> {
+        self.get_webxdc_info(context).await.log_err(context).ok()
+    }
+
     async fn get_webxdc_self_addr(&self, context: &Context) -> Result<String> {
         let fingerprint = load_self_public_key(context).await?.dc_fingerprint().hex();
         let data = format!("{}-{}", fingerprint, self.rfc724_mid);

src/webxdc/webxdc_tests.rs

@@ -137,7 +137,12 @@ async fn test_set_draft_invalid_webxdc() -> Result<()> {
 
     // draft should not fail
     chat_id.set_draft(&t, Some(&mut instance)).await?;
-    chat_id.get_draft(&t).await.unwrap();
+    let draft_msg = chat_id.get_draft(&t).await?.expect("draft should exist");
+
+    // Loading info fails because webxdc is invalid.
+    assert!(draft_msg.get_webxdc_info(&t).await.is_err());
+    assert!(draft_msg.get_webxdc_info_or_log_err(&t).await.is_none());
+
     Ok(())
 }