Round-robin mail details calls when exporting

src/common/api/worker/facades/lazy/MailExportFacade.ts

@@ -50,8 +50,8 @@ export class MailExportFacade {
 		)
 	}
 
-	async loadMailDetails(mails: readonly Mail[]): Promise<MailWithMailDetails[]> {
-		return this.mailExportTokenFacade.loadWithToken((token) => this.bulkMailLoader.loadMailDetails(mails, this.options(token)))
+	async loadMailDetails(mails: readonly Mail[], baseUrl: string): Promise<MailWithMailDetails[]> {
+		return this.mailExportTokenFacade.loadWithToken((token) => this.bulkMailLoader.loadMailDetails(mails, { baseUrl, ...this.options(token) }))
 	}
 
 	async loadAttachments(mails: readonly Mail[], baseUrl: string): Promise<TutanotaFile[]> {

src/common/api/worker/rest/EntityRestClient.ts

@@ -1,4 +1,4 @@
-import { RestClient, SuspensionBehavior } from "./RestClient"
+import type { RestClient, SuspensionBehavior } from "./RestClient"
 import type { CryptoFacade } from "../crypto/CryptoFacade"
 import { _verifyType, HttpMethod, MediaType, resolveTypeReference } from "../../common/EntityFunctions"
 import { SessionKeyNotFoundError } from "../../common/error/SessionKeyNotFoundError"
@@ -287,7 +287,7 @@ export class EntityRestClient implements EntityRestInterface {
 			}
 			let json: string
 			if (typeModel.type === Type.BlobElement) {
-				json = await this.loadMultipleBlobElements(listId, queryParams, headers, path, typeRef, opts.suspensionBehavior)
+				json = await this.loadMultipleBlobElements(listId, queryParams, headers, path, typeRef, opts)
 			} else {
 				json = await this.restClient.request(path, HttpMethod.GET, {
 					queryParams,
@@ -308,7 +308,7 @@ export class EntityRestClient implements EntityRestInterface {
 		headers: Dict | undefined,
 		path: string,
 		typeRef: TypeRef<any>,
-		suspensionBehavior?: SuspensionBehavior,
+		opts: EntityRestClientLoadOptions = {},
 	): Promise<string> {
 		if (archiveId == null) {
 			throw new Error("archiveId must be set to load BlobElementTypes")
@@ -321,16 +321,27 @@ export class EntityRestClient implements EntityRestInterface {
 				queryParams,
 			)
 			const allParams = await this.blobAccessTokenFacade.createQueryParams(blobServerAccessInfo, additionalRequestParams, typeRef)
+
+			let serversToTry = blobServerAccessInfo.servers
+			if (opts.baseUrl) {
+				const preferredServer = blobServerAccessInfo.servers.find((server) => server.url === opts.baseUrl)
+
+				if (preferredServer) {
+					// preferredServer takes precedence over the rest
+					serversToTry = [preferredServer, ...blobServerAccessInfo.servers.filter((server) => server.url !== opts.baseUrl)]
+				}
+			}
+
 			return tryServers(
-				blobServerAccessInfo.servers,
+				serversToTry,
 				async (serverUrl) =>
 					this.restClient.request(path, HttpMethod.GET, {
 						queryParams: allParams,
 						headers: {}, // prevent CORS request due to non standard header usage
 						responseType: MediaType.Json,
 						baseUrl: serverUrl,
 						noCORS: true,
-						suspensionBehavior,
+						suspensionBehavior: opts.suspensionBehavior,
 					}),
 				`can't load instances from server `,
 			)

src/mail-app/native/main/MailExportController.ts

@@ -163,7 +163,7 @@ export class MailExportController {
 					break
 				}
 
-				const downloadedMailDetails = await this.mailExportFacade.loadMailDetails(downloadedMails)
+				const downloadedMailDetails = await this.mailExportFacade.loadMailDetails(downloadedMails, this.getServerUrl())
 				const attachmentInfo = await this.mailExportFacade.loadAttachments(downloadedMails, this.getServerUrl())
 				for (const { mail, mailDetails } of downloadedMailDetails) {
 					if (this._state().type !== "exporting") {

src/mail-app/workerUtils/index/BulkMailLoader.ts

@@ -57,6 +57,7 @@ export class BulkMailLoader {
 	}
 
 	async loadMailDetails(mails: readonly Mail[], options: EntityRestClientLoadOptions = {}): Promise<MailWithMailDetails[]> {
+		const { baseUrl: _, ...optsWithoutBaseUrl } = options
 		const result: Array<MailWithMailDetails> = []
 		// mailDetails stored as blob
 		let mailDetailsBlobMails = mails.filter((m) => !isDraft(m))
@@ -96,7 +97,7 @@ export class BulkMailLoader {
 					encryptingKeyVersion: Number(mail._ownerKeyVersion ?? 0),
 				}
 			}
-			const mailDetailsDrafts = await this.loadInChunks(MailDetailsDraftTypeRef, listId, ids, ownerEncSessionKeyProvider, options)
+			const mailDetailsDrafts = await this.loadInChunks(MailDetailsDraftTypeRef, listId, ids, ownerEncSessionKeyProvider, optsWithoutBaseUrl)
 			result.push(
 				...mailDetailsDrafts.map((draftDetails) => {
 					const mail = assertNotNull(mailDetailsDraftMails.find((m) => isSameId(m.mailDetailsDraft, draftDetails._id)))

test/tests/api/worker/facades/MailExportFacadeTest.ts

@@ -57,9 +57,15 @@ o.spec("MailExportFacade", () => {
 			{ mail: mail1, mailDetails: details1 },
 			{ mail: mail2, mailDetails: details2 },
 		]
-		when(bulkMailLoader.loadMailDetails([mail1, mail2], { extraHeaders: tokenHeaders, suspensionBehavior: SuspensionBehavior.Throw })).thenResolve(expected)
+		when(
+			bulkMailLoader.loadMailDetails([mail1, mail2], {
+				baseUrl: "baseUrl",
+				extraHeaders: tokenHeaders,
+				suspensionBehavior: SuspensionBehavior.Throw,
+			}),
+		).thenResolve(expected)
 
-		const result = await facade.loadMailDetails([mail1, mail2])
+		const result = await facade.loadMailDetails([mail1, mail2], "baseUrl")
 
 		o(result).deepEquals(expected)
 	})

test/tests/native/main/MailExportControllerTest.ts

@@ -96,7 +96,7 @@ o.spec("MailExportController", function () {
 		const attachmentData = new Uint8Array([1, 2, 3])
 		const dataFile = createDataFile("test", "application/octet-stream", attachmentData)
 		when(mailExportFacade.loadFixedNumberOfMailsWithCache(mailBag.mails, startId, matchers.anything())).thenResolve([mail])
-		when(mailExportFacade.loadMailDetails([mail])).thenResolve([{ mail, mailDetails }])
+		when(mailExportFacade.loadMailDetails([mail], matchers.anything())).thenResolve([{ mail, mailDetails }])
 		when(mailExportFacade.loadAttachments([mail], matchers.anything())).thenResolve([attachmentInfo])
 		when(mailExportFacade.loadAttachmentData(mail, [attachmentInfo])).thenResolve([dataFile])
 
@@ -217,7 +217,13 @@ o.spec("MailExportController", function () {
 			const archivedMailBag2 = mailboxDetail.mailbox.archivedMailBags[1]
 			const { mail: mail3, mailBundle: mailBundle3 } = prepareMailData(archivedMailBag2, GENERATED_MAX_ID, 3)
 			when(mailExportFacade.loadFixedNumberOfMailsWithCache(archivedMailBag2.mails, getElementId(mail3), "baseUrl")).thenResolve([])
-			when(mailExportFacade.getExportServers(mailboxDetail.mailGroup)).thenResolve([{ _id: "id", url: "baseUrl", _type: BlobServerUrlTypeRef }])
+			when(mailExportFacade.getExportServers(mailboxDetail.mailGroup)).thenResolve([
+				{
+					_id: "id",
+					url: "baseUrl",
+					_type: BlobServerUrlTypeRef,
+				},
+			])
 
 			await controller.startExport(mailboxDetail)
 
@@ -241,14 +247,21 @@ o.spec("MailExportController", function () {
 			await controller.startExport(mailboxDetail)
 
 			verify(mailExportFacade.loadFixedNumberOfMailsWithCache(currentMailBag.mails, GENERATED_MAX_ID, "baseUrl2"))
-			verify(mailExportFacade.loadAttachments([mail1], "baseUrl3"))
+			verify(mailExportFacade.loadMailDetails([mail1], "baseUrl3"))
+			verify(mailExportFacade.loadAttachments([mail1], "baseUrl1"))
 			verify(mailExportFacade.loadAttachmentData(mail1, matchers.anything()))
 		})
 	})
 
 	o.spec("handle errors", function () {
 		o.test("SuspensionError", async () => {
-			when(mailExportFacade.getExportServers(mailboxDetail.mailGroup)).thenResolve([{ _id: "id", url: "baseUrl", _type: BlobServerUrlTypeRef }])
+			when(mailExportFacade.getExportServers(mailboxDetail.mailGroup)).thenResolve([
+				{
+					_id: "id",
+					url: "baseUrl",
+					_type: BlobServerUrlTypeRef,
+				},
+			])
 			let wasThrown = false
 			when(mailExportFacade.loadFixedNumberOfMailsWithCache(matchers.anything(), matchers.anything(), matchers.anything())).thenDo(() => {
 				if (wasThrown) {