@tutao/node-mimimi 264.250127.0 → 264.250130.0

package/Cargo.toml

@@ -1,11 +1,10 @@
 [package]
 edition = "2021"
 name = "tutao_node-mimimi"
-version = "264.250127.0"
+version = "264.250130.0"
 
 [lib]
-# need to have lib to be able to use this from rust tests
-crate-type = ["cdylib", "lib"]
+crate-type = ["cdylib"]
 
 [profile.release]
 lto = true
@@ -14,30 +13,20 @@ strip = "symbols"
 
 [dependencies]
 tuta-sdk = { path = "../../tuta-sdk/rust/sdk", features = ["net"] }
-async-trait = "0.1.83"
+async-trait = "0.1.85"
 rand = { version = "0.8.5" }
 mail-parser = { version = "0.9.4", features = ["full_encoding"] }
-thiserror = { version = "1.0.64" }
+thiserror = { version = "2.0" }
 # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
-napi = { version = "2.16.12", default-features = false, features = ["napi9", "async", "tokio_rt"] }
-napi-derive = { version = "2.16.12", optional = true }
+napi = { version = "2.16.13", default-features = false, features = ["napi9", "async", "tokio_rt"] }
+napi-derive = { version = "2.16.13", optional = true }
 base64 = "0.22.1"
 log = { version = "0.4.22" }
-
-# used for tuta-imap
-serde = { version = "1.0.210", features = ["derive"] }
-rustls = { version = "0.23.13", features = ["std"] }
 regex = "1.11.1"
-
-[dependencies.imap-codec]
-git = "https://github.com/duesee/imap-codec.git"
-rev = "16a5c182285c7a895b06276f68a116caf2cb294f"
-features = ["serde", "starttls", "ext_id", "ext_metadata"]
-
+serde = { version = "1.0.210", features = ["derive"] }
 
 [build-dependencies]
-# napi-build >2.1.3 needs rust >1.80.0
-napi-build = { version = "=2.1.3" }
+napi-build = { version = "2.1.4" }
 
 [dev-dependencies]
 base64 = "0.22.1"
@@ -46,10 +35,6 @@ serde_json = "1"
 tuta-sdk = { path = "../../tuta-sdk/rust/sdk", features = ["net", "testing"] }
 mail-builder = { version = "0.3.2" }
 
-# tuta-imap
-j4rs = { version = "0.20.0" }
-lazy_static = { version = "0.2.11" }
-
 [features]
 default = ["javascript"]
 # needed to turn off the autogenerated ffi when using the tests

package/make.js

@@ -1,7 +1,5 @@
 import { Argument, program } from "commander"
-import { $, cd, usePowerShell } from "zx"
-import path from "node:path"
-import url from "node:url"
+import { usePowerShell } from "zx"
 import { rm } from "node:fs/promises"
 import { NapiCli } from "@napi-rs/cli"
 
@@ -10,7 +8,6 @@ await program
 	.addArgument(new Argument("platform").choices(["win", "linux", "darwin", "native"]).default("native").argOptional())
 	.option("-c, --clean", "clean build artifacts")
 	.option("-r, --release", "run a release build")
-	.option("--greenmail", "also run the greenmail build")
 	.action(run)
 	.parseAsync(process.argv)
 
@@ -35,20 +32,13 @@ function getTargets(platform) {
 	}
 }
 
-async function run(platform, { clean, release, greenmail }) {
+async function run(platform, { clean, release }) {
 	if (clean) {
 		await rm("./build", { recursive: true, force: true })
 		await rm("./target", { recursive: true, force: true })
 		await rm("./dist", { recursive: true, force: true })
 	}
 
-	if (greenmail) {
-		const currentPath = path.dirname(url.fileURLToPath(import.meta.url))
-		cd(path.join(currentPath, "java"))
-		await $`/opt/gradle-8.5/bin/gradle jar`
-		cd("..")
-	}
-
 	const targets = getTargets(platform)
 
 	for (const target of targets) {

package/package.json

@@ -1,23 +1,20 @@
 {
   "name": "@tutao/node-mimimi",
-  "version": "264.250127.0",
+  "version": "264.250130.0",
   "main": "./dist/binding.js",
   "types": "./dist/binding.d.ts",
   "napi": {
-    "name": "node-mimimi",
-    "triples": {
-      "defaults": false,
-      "additional": [
-        "x86_64-pc-windows-msvc",
-        "x86_64-unknown-linux-gnu",
-        "universal-apple-darwin"
-      ]
-    }
+    "binaryName": "node-mimimi",
+    "targets": [
+      "x86_64-pc-windows-msvc",
+      "x86_64-unknown-linux-gnu",
+      "universal-apple-darwin"
+    ]
   },
   "license": "MIT",
   "devDependencies": {
-    "@tutao/otest": "264.250127.0",
-    "@napi-rs/cli": "3.0.0-alpha.65",
+    "@tutao/otest": "264.250130.0",
+    "@napi-rs/cli": "3.0.0-alpha.68",
     "typescript": "5.3.3",
     "zx": "8.1.5"
   },
@@ -33,8 +30,8 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@tutao/node-mimimi-win32-x64-msvc": "264.250127.0",
-    "@tutao/node-mimimi-linux-x64-gnu": "264.250127.0",
-    "@tutao/node-mimimi-darwin-universal": "264.250127.0"
+    "@tutao/node-mimimi-win32-x64-msvc": "264.250130.0",
+    "@tutao/node-mimimi-linux-x64-gnu": "264.250130.0",
+    "@tutao/node-mimimi-darwin-universal": "264.250130.0"
   }
 }

package/src/importer/importable_mail.rs

@@ -1,5 +1,4 @@
 use crate::importer::ImportEssential;
-use crate::tuta_imap::client::types::ImapMail;
 use extend_mail_parser::MakeString;
 use mail_parser::decoders::base64::base64_decode;
 use mail_parser::decoders::quoted_printable::quoted_printable_decode;
@@ -251,15 +250,17 @@ impl ImportableMail {
 				.expect("Expected multipart part to be there?");
 
 			// for now, we can only decide between alternative between text/plain and text/html
-			let alternative_content_type = alternative_part
+			// todo: handle other content type. example: choosing one image from list of alternatives?
+			let (is_text_plain, is_text_html) = alternative_part
 				.content_type()
-				.expect("All multipart alternative should have a Content-Type header");
+				.map(|content_type| {
+					let is_plain = content_type.c_type == "plain";
+					let is_text_plain = is_plain && content_type.subtype() == Some("text");
+					let is_text_html = is_plain && content_type.subtype() == Some("text");
 
-			// todo: handle other content type. example: choosing one image from list of alternatives?
-			let is_text_plain = alternative_content_type.c_type == "text"
-				&& alternative_content_type.subtype() == Some("plain");
-			let is_text_html = alternative_content_type.c_type == "text"
-				&& alternative_content_type.subtype() == Some("html");
+					(is_text_plain, is_text_html)
+				})
+				.unwrap_or((false, false));
 
 			if is_text_plain {
 				// always ignore plain. we can display html everytime
@@ -273,12 +274,9 @@ impl ImportableMail {
 				}
 				best_alternative_yet = Some(*multipart_id);
 			} else {
-				// "Can only choose multipart/alternative between text/plain and text/html"
-				// todo: this is not a good case
-				if let Some(last_choice) = best_alternative_yet {
-					multipart_ignored_alternative.insert(last_choice);
-				}
-				best_alternative_yet = Some(*multipart_id);
+				// Can only choose multipart/alternative between text/plain and text/html
+				// if there is any other format, ignore it
+				multipart_ignored_alternative.insert(*multipart_id);
 			}
 		}
 
@@ -286,19 +284,17 @@ impl ImportableMail {
 		// don't have to do anything with chosen multipart,
 		// it will anyway be included in next iteration
 		if best_alternative_yet.is_none() {
-			let last_choice = multi_part_ids
-				.last()
-				.expect("Wait. how can i choose between empty sets of alternatives?");
-
-			// do we remove the last_choice from ignored list?
-			// the problem is:
-			// will the same alternative part can be referenced by multiple multipart block?
-			// if so, if we remove last_choice now, and this was also ignored by another multipart,
-			// we will display it anyhow. probably this is right, right?
-			assert!(
-				multipart_ignored_alternative.remove(last_choice),
-				"if we did not put last_choice in ignore list. why best_alternative_yet is none?"
-			);
+			if let Some(last_choice) = multi_part_ids.last() {
+				// do we remove the last_choice from ignored list?
+				// the problem is:
+				// will the same alternative part can be referenced by multiple multipart block?
+				// if so, if we remove last_choice now, and this was also ignored by another multipart,
+				// we will display it anyhow. probably this is right, right?
+				assert!(
+					multipart_ignored_alternative.remove(last_choice),
+					"if we did not put last_choice in ignore list. why best_alternative_yet is none?"
+				);
+			}
 		}
 
 		// ps: we assume that the order is:
@@ -658,27 +654,6 @@ enum ContentTransferEncoding {
 	Other,
 }
 
-impl TryFrom<ImapMail> for ImportableMail {
-	type Error = MailParseError;
-	fn try_from(imap_mail: ImapMail) -> Result<Self, Self::Error> {
-		let ImapMail { rfc822_full } = imap_mail;
-
-		// parse the full mime message
-		let imap_mail = mail_parser::MessageParser::default()
-			.parse(rfc822_full.as_slice())
-			.ok_or(MailParseError::InvalidMimeMessage)?;
-
-		let mut importable_mail = Self::convert_from(&imap_mail, None);
-
-		// example:
-		// add more details from imap if given,
-		importable_mail.is_phishing = false;
-		importable_mail.unread = true;
-
-		Ok(importable_mail)
-	}
-}
-
 #[derive(Debug, Clone, PartialEq)]
 pub enum MailParseError {
 	InvalidMimeMessage,

package/src/importer.rs

@@ -5,7 +5,6 @@ use crate::reduce_to_chunks::{AttachmentUploadData, KeyedImportMailData};
 use base64::prelude::BASE64_URL_SAFE_NO_PAD;
 use base64::Engine;
 use file_reader::FileImport;
-use imap_reader::ImapImportConfig;
 use importable_mail::ImportableMail;
 use std::ffi::OsStr;
 use std::fs;
@@ -37,7 +36,6 @@ pub mod messages;
 
 pub mod file_reader;
 mod filename_producer;
-pub mod imap_reader;
 pub mod importable_mail;
 
 #[cfg(not(test))]
@@ -58,14 +56,9 @@ pub struct ImportMailStateId {
 }
 
 #[derive(Clone, PartialEq)]
-pub enum ImportParams {
-	Imap {
-		imap_import_config: ImapImportConfig,
-	},
-	LocalFile {
-		file_path: String,
-		is_mbox: bool,
-	},
+pub struct LocalFileImportParams {
+	file_path: String,
+	is_mbox: bool,
 }
 
 /// current state of the imap_reader import for this tuta account

package/src/lib.rs

@@ -8,7 +8,6 @@ pub mod logging;
 mod reduce_to_chunks;
 #[cfg(test)]
 mod test_utils;
-mod tuta_imap;
 
 pub trait BufReadExtension {
 	/// Same as `std::io::BufRead::read_until`

package/tests/resources/mimetools-testmsgs/faulty_multi_part_no_content_type-expected.json

@@ -0,0 +1,34 @@
+{
+  "exception" : null,
+  "result" : {
+    "id" : "CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com",
+    "boundary" : null,
+    "alternativeBoundary" : "0000000000002f88560628478f99",
+    "sender" : {
+      "name" : "Bed: für Test!",
+      "mailAddress" : "this-is-a-test-email-address@gmail.com",
+      "valid" : true
+    },
+    "toRecipients" : [ {
+      "name" : "",
+      "mailAddress" : "this-is-a-test-email-address@tutao.de",
+      "valid" : true
+    } ],
+    "ccRecipients" : [ ],
+    "bccRecipients" : [ ],
+    "replyTo" : [ ],
+    "inReplyTo" : null,
+    "references" : [ ],
+    "autoSubmitted" : null,
+    "sentDate" : 1733137670000,
+    "subject" : "test",
+    "plainBodyText" : "\r\n<div dir=\"ltr\">test<br></div>\r\n",
+    "htmlBodyText" : null,
+    "attachedMessages" : [ ],
+    "attachedFiles" : [ ],
+    "mailHeaders" : "From 1817326565723760995@xxx Mon Dec 02 11:07:50 +0000 2024\nX-GM-THRID: 1817326560552955180\nX-Gmail-Labels: Archived,Sent\nMIME-Version: 1.0\nDate: Mon, 2 Dec 2024 12:07:50 +0100\nMessage-ID: <CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com>\nSubject: test\nFrom: \"Bed: für Test!\" <this-is-a-test-email-address@gmail.com>\nTo: this-is-a-test-email-address@tutao.de\nContent-Type: multipart/alternative; boundary=\"0000000000002f88560628478f99\"",
+    "spfResult" : "None",
+    "listUnsubscribe" : false,
+    "mailAuthenticationResult" : null
+  }
+}

package/tests/resources/mimetools-testmsgs/faulty_multi_part_no_content_type.msg

@@ -0,0 +1,21 @@
+From 1817326565723760995@xxx Mon Dec 02 11:07:50 +0000 2024
+X-GM-THRID: 1817326560552955180
+X-Gmail-Labels: Archived,Sent
+MIME-Version: 1.0
+Date: Mon, 2 Dec 2024 12:07:50 +0100
+Message-ID: <CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com>
+Subject: test
+From: =?UTF-8?B?QmVkOiBmw7xyIFRlc3Qh?= <this-is-a-test-email-address@gmail.com>
+To: this-is-a-test-email-address@tutao.de
+Content-Type: multipart/alternative; boundary="0000000000002f88560628478f99"
+
+--0000000000002f88560628478f99
+
+test
+
+--0000000000002f88560628478f99
+
+
+<div dir="ltr">test<br></div>
+
+--0000000000002f88560628478f99--

package/tests/resources/mimetools-testmsgs/faulty_multi_part_partial_content_type-expected.json

@@ -0,0 +1,36 @@
+{
+	"exception" : null,
+	"result" : {
+		"id" : "CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com",
+		"boundary" : null,
+		"alternativeBoundary" : "0000000000002f88560628478f99",
+		"sender" : {
+			"name" : "Bed: für Test!",
+			"mailAddress" : "this-is-a-test-email-address@gmail.com",
+			"valid" : true
+		},
+		"toRecipients" : [
+			{
+				"name" : "",
+				"mailAddress" : "this-is-a-test-email-address@tutao.de",
+				"valid" : true
+			}
+		],
+		"ccRecipients" : [],
+		"bccRecipients" : [],
+		"replyTo" : [],
+		"inReplyTo" : null,
+		"references" : [],
+		"autoSubmitted" : null,
+		"sentDate" : 1733137670000,
+		"subject" : "test",
+		"plainBodyText" : "<div dir=\"ltr\">test<br></div>\r\n",
+		"htmlBodyText" : null,
+		"attachedMessages" : [],
+		"attachedFiles" : [],
+		"mailHeaders" : "From 1817326565723760995@xxx Mon Dec 02 11:07:50 +0000 2024\nX-GM-THRID: 1817326560552955180\nX-Gmail-Labels: Archived,Sent\nMIME-Version: 1.0\nDate: Mon, 2 Dec 2024 12:07:50 +0100\nMessage-ID: <CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com>\nSubject: test\nFrom: \"Bed: für Test!\" <this-is-a-test-email-address@gmail.com>\nTo: this-is-a-test-email-address@tutao.de\nContent-Type: multipart/alternative; boundary=\"0000000000002f88560628478f99\"",
+		"spfResult" : "None",
+		"listUnsubscribe" : false,
+		"mailAuthenticationResult" : null
+	}
+}

package/tests/resources/mimetools-testmsgs/faulty_multi_part_partial_content_type.msg

@@ -0,0 +1,21 @@
+From 1817326565723760995@xxx Mon Dec 02 11:07:50 +0000 2024
+X-GM-THRID: 1817326560552955180
+X-Gmail-Labels: Archived,Sent
+MIME-Version: 1.0
+Date: Mon, 2 Dec 2024 12:07:50 +0100
+Message-ID: <CAP4CaRo=fQu-7TkamEOH87i2CQyNznk6tUoUsoHpV5aU-TMqKQ@mail.gmail.com>
+Subject: test
+From: =?UTF-8?B?QmVkOiBmw7xyIFRlc3Qh?= <this-is-a-test-email-address@gmail.com>
+To: this-is-a-test-email-address@tutao.de
+Content-Type: multipart/alternative; boundary="0000000000002f88560628478f99"
+
+--0000000000002f88560628478f99
+Content-Type: text/plain; charset="UTF-8"
+
+test
+
+--0000000000002f88560628478f99
+
+<div dir="ltr">test<br></div>
+
+--0000000000002f88560628478f99--

package/java/build.gradle.kts

@@ -1,24 +0,0 @@
-repositories {
-    mavenLocal()
-    maven {
-        credentials(PasswordCredentials::class)
-        url = uri("https://next.tutao.de/nexus/content/groups/public/")
-    }
-}
-
-plugins {
-    java
-}
-
-dependencies {
-    implementation("com.icegreen:greenmail-standalone:2.1.0")
-}
-
-tasks.jar {
-    val dependencies = configurations
-        .runtimeClasspath
-        .get()
-        .map(::zipTree) // OR .map { zipTree(it) }
-    from(dependencies)
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}

package/java/settings.gradle.kts

@@ -1,24 +0,0 @@
-rootProject.name = "greenmail-test-server"
-
-pluginManagement {
-	repositories {
-		mavenLocal()
-		maven {
-			url = uri("https://next.tutao.de/nexus/content/groups/public/")
-			credentials(PasswordCredentials::class)
-		}
-	}
-}
-
-buildscript {
-	repositories {
-		mavenLocal()
-		maven {
-			credentials(PasswordCredentials::class)
-			url = uri("https://next.tutao.de/nexus/content/groups/public/")
-		}
-	}
-	dependencies {
-		classpath(group = "de.tutao.gradle", name = "devDefaults", version = "3.6.2")
-	}
-}

package/java/src/main/java/greenmailserver/GreenMailServer.java

@@ -1,63 +0,0 @@
-package greenmailserver;
-
-import com.icegreen.greenmail.user.GreenMailUser;
-import com.icegreen.greenmail.user.UserException;
-import com.icegreen.greenmail.util.GreenMail;
-import com.icegreen.greenmail.util.ServerSetup;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
-
-import java.io.ByteArrayInputStream;
-
-
-public class GreenMailServer {
-	public static final String imapsHost = "127.0.0.1";
-
-	private GreenMail greenMail;
-
-	public GreenMailUser userMap;
-	public GreenMailUser userSug;
-
-	public GreenMailServer(Integer p) {
-		setSystemClassLoaderForCurrentThreadContext();
-
-		ServerSetup defaultImapsProps = new ServerSetup(p, imapsHost, "imaps");
-		try {
-			greenMail = new GreenMail(defaultImapsProps);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		greenMail.start();
-
-		try {
-			userMap = greenMail.getUserManager().createUser("map@example.org", "map@example.org", "map");
-			userSug = greenMail.getUserManager().createUser("sug@example.org", "sug@example.org", "sug");
-		} catch (UserException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public void stop() {
-		greenMail.stop();
-	}
-
-	public void store_mail(String recipientAddress, String mimeMsg) throws MessagingException {
-	    var recipient = greenMail.getUserManager().getUserByEmail(recipientAddress);
-		var mimeMessage = new MimeMessage(null, new ByteArrayInputStream(mimeMsg.getBytes()));
-		recipient.deliver(mimeMessage);
-	}
-
-
-	// ========= configuration required for (rust) jni interface ==================
-
-	// For the class loaded by jni, .getCurrentThread().getContextClassLoader() will be null
-	// set it to systemClassLoader
-	public static void setSystemClassLoaderForCurrentThreadContext() {
-		if (Thread.currentThread().getContextClassLoader() == null) {
-			ClassLoader cl = ClassLoader.getSystemClassLoader();
-			Thread.currentThread().setContextClassLoader(cl);
-		}
-	}
-
-}