@remit/mailbox-service 0.0.68 → 0.0.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/mailbox-service",
-  "version": "0.0.68",
+  "version": "0.0.70",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/message-sync-junk-harvest.test.ts

@@ -201,6 +201,15 @@ describe("what a mailbox says about the addresses on its messages", () => {
 		assert.deepEqual(emails(saved.envelopeAddresses), BOTH);
 	});
 
+	it("leaves the identity of an envelope address to the store", async () => {
+		const saved = await save(mailboxAt("INBOX"));
+
+		assert.ok(saved.envelopeAddresses.length > 0);
+		for (const envelopeAddress of saved.envelopeAddresses) {
+			assert.ok(!("envelopeAddressId" in envelopeAddress));
+		}
+	});
+
 	it("keeps a message in Trash from deciding either way", async () => {
 		const saved = await save(mailboxAt("Trash"), "Trash");
 

package/src/message-sync.ts

@@ -16,7 +16,6 @@ import { storedDisplayName } from "@remit/data-ports/display-name";
 import {
 	deriveAddressId,
 	deriveBodyPartId,
-	deriveEnvelopeAddressId,
 	deriveEnvelopeId,
 	deriveMessageIdFromSource,
 	deriveThreadId,
@@ -1506,8 +1505,6 @@ export class MessageSyncService {
 
 			const addressId = deriveAddressId(accountConfigId, normalizedEmail);
 
-			const envelopeAddressId = deriveEnvelopeAddressId(messageId, role, order);
-
 			const addressInput = {
 				addressId,
 				accountConfigId,
@@ -1526,7 +1523,6 @@ export class MessageSyncService {
 			}
 
 			await addressService.upsertEnvelopeAddress({
-				envelopeAddressId,
 				messageId,
 				addressId,
 				displayName,

package/src/outbox-queue.ts

@@ -231,7 +231,21 @@ export class OutboxQueueService {
 			OutboxMessageStatus.queued,
 		);
 
-		await this.enqueueSend(existing.accountId, outboxMessageId);
+		// `queued` is a dead end for a row the queue never accepted: `send` takes
+		// draft, failed and blocked, `deleteDraft` those three plus unfiled, so a
+		// row parked at `queued` by a failed enqueue is neither sendable nor
+		// discardable (#845.8). Put it back where it came from and let the enqueue
+		// failure surface — the row stays reachable, the caller still hears no.
+		await this.enqueueSend(existing.accountId, outboxMessageId).catch(
+			async (error: unknown) => {
+				await this.outboxMessageService.updateStatus(
+					accountConfigId,
+					outboxMessageId,
+					existing.status,
+				);
+				throw error;
+			},
+		);
 
 		this.log.info(
 			{ outboxMessageId, accountId: existing.accountId },