1 files changed, 19 insertions, 16 deletions
diff --git a/services/docker/mail-server/aws-sendmail/delivers/aws.ts b/services/docker/mail-server/aws-sendmail/delivers/aws.ts
index 85d86ec..9fe7bec 100644
--- a/services/docker/mail-server/aws-sendmail/delivers/aws.ts
+++ b/services/docker/mail-server/aws-sendmail/delivers/aws.ts
@@ -1,28 +1,31 @@
-import { SESv2Client } from "@aws-sdk/client-sesv2";
+import { SendEmailCommand, SESv2Client } from "@aws-sdk/client-sesv2";
 
 import { AwsContext } from "../aws.ts";
-import { MailDeliverer, MailDeliverContext } from "../deliver.ts";
+import { Mail } from "../mail.ts";
+import { MailDeliverer } from "../deliver.ts";
 
-export class AwsMailDeliverContext extends MailDeliverContext {
-  awsMessageId: string | null = null;
-
-  constructor(rawMail: string) {
-    super(rawMail);
-  }
-}
-
-class AwsMailDeliverer extends MailDeliverer<AwsMailDeliverContext> {
+export class AwsMailDeliverer extends MailDeliverer {
   private _ses;
 
   constructor(readonly aws: AwsContext) {
     super("aws");
-    this._ses = new SESv2Client({ credentials: aws.awsCredentialsProvider });
-  }
 
-  protected override doPrepare(rawMail: string): Promise<AwsMailDeliverContext> {
-    return Promise.resolve(new AwsMailDeliverContext(rawMail))
+    const { region, credentials } = aws;
+
+    this._ses = new SESv2Client({ region, credentials });
   }
 
-  protected override async doDeliver(context: AwsContext): Promise<void> {
+  protected override async doDeliver(mail: Mail): Promise<void> {
+    const sendCommand = new SendEmailCommand({
+      Content: {
+        Raw: { Data: mail.encodeUtf8() },
+      },
+    });
+
+    const res = await this._ses.send(sendCommand);
+    if (res.MessageId == null) {
+      throw Error("No message id is returned from aws.");
+    }
+    mail.aws_message_id = res.MessageId;
   }
 }