fix: add tolerant HTML-to-text extraction (#141)

This commit is contained in:
rustmailer
2026-01-28 13:19:33 +08:00
parent 01dba4f71b
commit fed28c3eca
3 changed files with 32 additions and 8 deletions
+3 -8
View File
@@ -21,6 +21,7 @@ use crate::modules::envelope::utils::normalize_subject;
use crate::modules::error::code::ErrorCode;
use crate::modules::error::BichonResult;
use crate::modules::utils::create_hash;
use crate::modules::utils::html::extract_text;
use crate::{calculate_hash, raise_error, utc_now};
use crate::{id, modules::indexer::envelope::Envelope};
use async_imap::types::Fetch;
@@ -48,10 +49,7 @@ pub fn extract_envelope(fetch: &Fetch, account_id: u64, mailbox_id: u64) -> Bich
let text = if let Some(text) = message.body_text(0).map(|cow| cow.into_owned()) {
text
} else if let Some(html) = message.body_html(0).map(|cow| cow.into_owned()) {
html2text::config::plain()
.allow_width_overflow()
.string_from_read(html.as_bytes(), 100)
.map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?
extract_text(html)
} else {
String::new()
};
@@ -150,10 +148,7 @@ pub fn extract_envelope_from_eml(
let text = if let Some(text) = message.body_text(0).map(|cow| cow.into_owned()) {
text
} else if let Some(html) = message.body_html(0).map(|cow| cow.into_owned()) {
html2text::config::plain()
.allow_width_overflow()
.string_from_read(html.as_bytes(), 100)
.map_err(|e| raise_error!(format!("{:#?}", e), ErrorCode::InternalError))?
extract_text(html)
} else {
String::new()
};
+28
View File
@@ -0,0 +1,28 @@
use std::panic;
use tracing::error;
pub fn extract_text(html: String) -> String {
let result = panic::catch_unwind(|| {
html2text::config::plain()
.allow_width_overflow()
.string_from_read(html.as_bytes(), 100)
});
match result {
Ok(Ok(text)) => text,
Ok(Err(err)) => {
error!("html2text error: {}", err);
html
}
Err(err) => {
if let Some(s) = err.downcast_ref::<&str>() {
error!("html2text panic: {}", s);
} else if let Some(s) = err.downcast_ref::<String>() {
error!("html2text panic: {}", s);
} else {
error!("html2text panic: unknown error");
}
html
}
}
}
+1
View File
@@ -26,6 +26,7 @@ use rand::{rng, Rng};
use super::error::code::ErrorCode;
pub mod encrypt;
pub mod html;
pub mod net;
pub mod rate_limit;
pub mod shutdown;