@remit/mailbox-service 0.0.106 → 0.0.108

package/package.json

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

package/src/body-sync-calendar-suggestion.test.ts

@@ -150,6 +150,7 @@ class MemorySuggestions implements ICalendarSuggestionRepository {
 			suggestionId,
 			state: existing?.state ?? CalendarSuggestionState.Pending,
 			acceptedCalendarObjectId: existing?.acceptedCalendarObjectId ?? "",
+			supersededByMessageId: existing?.supersededByMessageId ?? "",
 			createdAt: existing?.createdAt ?? 1,
 			updatedAt: 1,
 		};
@@ -201,6 +202,7 @@ class MemorySuggestions implements ICalendarSuggestionRepository {
 	async supersedeIfPending(
 		_accountConfigId: string,
 		suggestionId: string,
+		supersededByMessageId: string,
 	): Promise<CalendarSuggestionItem | null> {
 		const row = this.rows.get(suggestionId);
 		if (!row || row.state !== CalendarSuggestionState.Pending) return null;
@@ -208,10 +210,23 @@ class MemorySuggestions implements ICalendarSuggestionRepository {
 			...row,
 			state: CalendarSuggestionState.Superseded,
 			acceptedCalendarObjectId: "",
+			supersededByMessageId,
 		};
 		this.rows.set(suggestionId, retired);
 		return retired;
 	}
+
+	async repointSuperseded(
+		_accountConfigId: string,
+		suggestionId: string,
+		supersededByMessageId: string,
+	): Promise<CalendarSuggestionItem | null> {
+		const row = this.rows.get(suggestionId);
+		if (!row || row.state !== CalendarSuggestionState.Superseded) return null;
+		const repointed = { ...row, supersededByMessageId };
+		this.rows.set(suggestionId, repointed);
+		return repointed;
+	}
 }
 
 interface Harness {

package/src/outbox-attachment-content.test.ts

@@ -70,6 +70,14 @@ describe("loadOutboxAttachmentContents", () => {
 		);
 	});
 
+	it("gives each file the content-id its reservation handed out", async () => {
+		const deps = await setup([row("shot")], ["shot"]);
+
+		const [content] = await loadOutboxAttachmentContents(deps, OWNER, NOW);
+
+		assert.equal(content.cid, "shot@remit");
+	});
+
 	it("leaves out a reservation that lapsed without its bytes", async () => {
 		const deps = await setup(
 			[

package/src/outbox-attachment-content.ts

@@ -6,8 +6,12 @@ export interface OutboxAttachmentContent {
 	filename: string;
 	contentType: string;
 	content: Buffer;
+	cid: string;
 }
 
+export const outboxAttachmentContentId = (outboxAttachmentId: string): string =>
+	`${outboxAttachmentId}@remit`;
+
 /**
  * A file on a message that cannot be put into it. Carries the file's name so
  * whoever settles the message can tell the sender which file to fix.
@@ -93,6 +97,7 @@ export const loadOutboxAttachmentContents = async (
 				filename: item.filename,
 				contentType: item.contentType,
 				content,
+				cid: outboxAttachmentContentId(item.outboxAttachmentId),
 			};
 		}),
 	);

package/src/outbox-attachment.test.ts

@@ -224,6 +224,23 @@ describe("reserving room on a draft", () => {
 		assert.ok(row?.storageKey.endsWith(result.reservation.outboxAttachmentId));
 	});
 
+	it("names the content-id a body can refer to the file by", async () => {
+		const { service } = build();
+
+		const result = await mint(service, {
+			filename: "shot.png",
+			contentType: "image/png",
+			sizeBytes: 64,
+		});
+
+		assert.equal(result.outcome, "Minted");
+		if (result.outcome !== "Minted") return;
+		assert.equal(
+			result.reservation.contentId,
+			`${result.reservation.outboxAttachmentId}@remit`,
+		);
+	});
+
 	it("refuses a declared size over the cap", async () => {
 		const { service } = build();
 

package/src/outbox-attachment.ts

@@ -16,6 +16,7 @@ import {
 import {
 	loadOutboxAttachmentContents,
 	type OutboxAttachmentContent,
+	outboxAttachmentContentId,
 } from "./outbox-attachment-content.js";
 import {
 	normalizeAttachmentContentType,
@@ -45,6 +46,7 @@ export interface OutboxAttachmentReservation {
 	filename: string;
 	contentType: string;
 	sizeBytes: number;
+	contentId: string;
 	uploadUrl: string;
 	uploadExpiresAt: number;
 }
@@ -271,6 +273,7 @@ export class OutboxAttachmentService {
 				filename: reserved.item.filename,
 				contentType: reserved.item.contentType,
 				sizeBytes: reserved.item.sizeBytes,
+				contentId: outboxAttachmentContentId(reserved.item.outboxAttachmentId),
 				uploadUrl: target.uploadUrl,
 				uploadExpiresAt: reservationExpiresAt,
 			},