@tutao/node-mimimi 322.260120.0 → 324.260126.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tutao/node-mimimi",
-  "version": "322.260120.0",
+  "version": "324.260126.1",
   "main": "./dist/binding.js",
   "types": "./dist/binding.d.ts",
   "napi": {
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@tutao/otest": "322.260120.0",
+    "@tutao/otest": "324.260126.1",
     "@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": "322.260120.0",
-    "@tutao/node-mimimi-linux-x64-gnu": "322.260120.0",
-    "@tutao/node-mimimi-darwin-universal": "322.260120.0"
+    "@tutao/node-mimimi-win32-x64-msvc": "324.260126.1",
+    "@tutao/node-mimimi-linux-x64-gnu": "324.260126.1",
+    "@tutao/node-mimimi-darwin-universal": "324.260126.1"
   }
 }

package/src/importer/messages.rs

@@ -91,6 +91,8 @@ pub enum PreparationError {
 	NotAValidEmailFile,
 	/// Can not write eml file to import dir
 	EmlFileWriteFailure,
+	/// An import in a finalised state (Cancelled or Finished) cannot be resumed
+	FinalisedImportCannotBeResumed,
 }
 
 /// Unification of Imap & File IterationError
@@ -149,6 +151,7 @@ impl From<PreparationError> for napi::Error {
 			PreparationError::FileReadError => "FileReadError",
 			PreparationError::NotAValidEmailFile => "NotAValidEmailFile",
 			PreparationError::EmlFileWriteFailure => "EmlFileWriteFailure",
+			PreparationError::FinalisedImportCannotBeResumed => "FinalisedImportCannotBeResumed",
 		};
 
 		napi::Error::from_reason(code)

package/src/importer.rs

@@ -383,6 +383,14 @@ impl Importer {
 				PreparationError::CannotLoadRemoteState
 			})?;
 
+		// 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
+			|| remote_import_state.status == ImportStatus::Finished as i64;
+		if import_is_cancelled_or_finished {
+			return Err(PreparationError::FinalisedImportCannotBeResumed);
+		}
+
 		let target_mailset = remote_import_state.targetFolder;
 
 		let importer = Importer::initialize(

package/src/importer_api.rs

@@ -54,14 +54,22 @@ impl ImporterApi {
 			None => Ok(None),
 
 			Some(saved_id_tuple) => {
-				let importer = Importer::resume_file_importer(
+				let importer_result = Importer::resume_file_importer(
 					&mailbox_id,
 					config_directory,
 					target_owner_group,
 					tuta_credentials,
 					saved_id_tuple,
 				)
-				.await?;
+				.await;
+
+				let importer = match importer_result {
+					Ok(importer) => importer,
+					Err(preparation_error) => match preparation_error {
+						PreparationError::FinalisedImportCannotBeResumed => return Ok(None),
+						_ => return Err(preparation_error.into()),
+					},
+				};
 
 				Ok(Some(ImporterApi {
 					importer: Arc::new(importer),