@tutao/node-mimimi 328.260223.0 → 331.260224.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tutao/node-mimimi",
-  "version": "328.260223.0",
+  "version": "331.260224.0",
   "main": "./dist/binding.js",
   "types": "./dist/binding.d.ts",
   "napi": {
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@tutao/otest": "328.260223.0",
+    "@tutao/otest": "331.260224.0",
     "@napi-rs/cli": "3.0.0-alpha.68",
     "typescript": "5.8.3",
     "zx": "8.6.1"
@@ -30,8 +30,8 @@
     "version": "napi version"
   },
   "optionalDependencies": {
-    "@tutao/node-mimimi-win32-x64-msvc": "328.260223.0",
-    "@tutao/node-mimimi-linux-x64-gnu": "328.260223.0",
-    "@tutao/node-mimimi-darwin-universal": "328.260223.0"
+    "@tutao/node-mimimi-win32-x64-msvc": "331.260224.0",
+    "@tutao/node-mimimi-linux-x64-gnu": "331.260224.0",
+    "@tutao/node-mimimi-darwin-universal": "331.260224.0"
   }
 }

package/src/importer/messages.rs

@@ -10,16 +10,20 @@ pub enum ImportErrorKind {
 	SdkError,
 	/// No import feature on the server (it's disabled)
 	ImportFeatureDisabled,
-	/// Blob responded with empty server url list
+	/// Blob responded with an empty server url list
 	EmptyBlobServerList,
 	/// Some mail was too big
 	TooBigChunk,
-	/// Error that occured when deleting a file
+	/// Error that occurred when deleting a file
 	FileDeletionError,
 	/// The import was finished, but some files
 	/// were left behind and marked as failures.
 	/// the path is the directory where the failures can be inspected
 	SourceExhaustedSomeError,
+	/// This is returned when the server canceled an
+	/// ongoing import because the target MailSet is
+	/// deleted, and we therefore cannot continue the import.
+	ImportTargetFolderDeleted,
 }
 
 #[napi_derive::napi(string_enum)]
@@ -175,6 +179,12 @@ impl ImportErrorKind {
 			ImportFailureReason::ImportDisabled,
 		))),
 	};
+
+	pub const IMPORT_TARGET_FOLDER_DELETED: ApiCallError = ApiCallError::ServerResponseError {
+		source: HttpError::PreconditionFailedError(Some(ImportFailure(
+			ImportFailureReason::ImportTargetFolderDeleted,
+		))),
+	};
 }
 
 impl MailImportErrorMessage {
@@ -184,6 +194,8 @@ impl MailImportErrorMessage {
 
 		let kind = if error == ImportErrorKind::IMPORT_DISABLED_ERROR {
 			ImportErrorKind::ImportFeatureDisabled
+		} else if error == ImportErrorKind::IMPORT_TARGET_FOLDER_DELETED {
+			ImportErrorKind::ImportTargetFolderDeleted
 		} else {
 			ImportErrorKind::SdkError
 		};

package/src/importer.rs

@@ -18,6 +18,7 @@ use crate::importer::attachment_importer::PerChunkAttachmentImporter;
 use crate::importer::messages::{
 	ImportErrorKind, ImportOkKind, MailImportErrorMessage, PreparationError,
 };
+use crate::importer::ImportStatus::Canceled;
 use crate::importer_api::TutaCredentials;
 use tutasdk::bindings::native_file_client::NativeFileClient;
 use tutasdk::entities::generated::tutanota::{
@@ -131,7 +132,7 @@ impl ImportEssential {
 	}
 
 	/// updates the remote importMailState, if changes to importMailState are valid
-	/// @params updater: function updating the importMailState internally,
+	/// @params updater: function updating the importMailState internally
 	///                  and returning whether if it should be uploaded or not.
 	pub(super) async fn update_remote_state(
 		&self,
@@ -202,7 +203,6 @@ impl ImportEssential {
 	) -> Result<ImportMailPostOut, MailImportErrorMessage> {
 		let server_to_upload = self.get_server_url_to_upload().await?;
 		let import_mail_post_in = import_mail_data;
-
 		self.logged_in_sdk
 			.get_service_executor()
 			.post::<ImportMailService>(
@@ -384,8 +384,7 @@ impl Importer {
 			})?;
 
 		// Import cannot be resumed if it was already cancelled or finished.
-		let import_is_cancelled_or_finished = remote_import_state.status
-			== ImportStatus::Canceled as i64
+		let import_is_cancelled_or_finished = remote_import_state.status == Canceled as i64
 			|| remote_import_state.status == ImportStatus::Finished as i64;
 		if import_is_cancelled_or_finished {
 			return Err(PreparationError::FinalisedImportCannotBeResumed);
@@ -651,7 +650,7 @@ impl Importer {
 	) -> Result<(), MailImportErrorMessage> {
 		self.update_failed_mails_counter().await;
 		match import_error.kind {
-			// if the import is (temporary) disabled, we should give up and let user try again later
+			// if the import is (temporary) disabled, we should give up and let the user try again later
 			ImportErrorKind::ImportFeatureDisabled => Err(ImportErrorKind::ImportFeatureDisabled)?,
 
 			// If a server does not give any available blob storage client (which we also use to make service call),
@@ -688,6 +687,10 @@ impl Importer {
 			// this kind will not be created by import loop,
 			// exists only to pass over to api
 			ImportErrorKind::SourceExhaustedSomeError => unreachable!(),
+
+			ImportErrorKind::ImportTargetFolderDeleted => {
+				Err(ImportErrorKind::ImportTargetFolderDeleted)?
+			},
 		}
 	}
 
@@ -700,7 +703,7 @@ impl Importer {
 		self.essentials
 				.update_remote_state(|remote_state| {
 					match Importer::get_failed_mails_count(&self.essentials.import_directory) {
-						Ok(failed_mail_count) => {
+						Ok(failed_mail_count) if remote_state.failedMails != failed_mail_count as i64 => {
 							remote_state.failedMails = failed_mail_count as i64;
 							true
 						}
@@ -708,6 +711,7 @@ impl Importer {
 							log::error!("Not incrementing failedMails on import state. Can not count failed emails: {e:?}");
 							false
 						}
+						_ => false,
 					}
 				})
 				.await