3 files changed, 35 insertions, 44 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;
   }
 }
diff --git a/services/docker/mail-server/aws-sendmail/delivers/dovecot.ts b/services/docker/mail-server/aws-sendmail/delivers/dovecot.ts
index e30c558..2b35872 100644
--- a/services/docker/mail-server/aws-sendmail/delivers/dovecot.ts
+++ b/services/docker/mail-server/aws-sendmail/delivers/dovecot.ts
@@ -1,31 +1,20 @@
-import { Logger } from "../logger.ts";
-import { MailDeliverContext, MailDeliverer } from "../deliver.ts";
+import { getLogger } from "../logger.ts";
+import { MailDeliverer } from "../deliver.ts";
+import { Mail } from "../mail.ts";
 
 export class DovecotMailDeliverer extends MailDeliverer {
-  constructor(private readonly logger: Logger) {
+  constructor() {
     super("dovecot");
   }
 
   readonly ldaBin = "dovecot-lda";
 
-  protected override doPrepare(
-    rawMail: string,
-  ): Promise<MailDeliverContext> {
-    return Promise.resolve(new MailDeliverContext(rawMail));
-  }
-
-  protected override async doDeliver(
-    context: MailDeliverContext,
-  ): Promise<void> {
-    const { logger, ldaBin } = this;
-    const { rawMail } = context;
+  protected override async doDeliver(mail: Mail): Promise<void> {
+    const { ldaBin } = this;
     let status;
 
     try {
-      const utf8Encoder = new TextEncoder();
-      // TODO: A problem here is if mail is VERY long, this will block for a long time.
-      // Maybe some task queue can be used.
-      const utf8Stream = utf8Encoder.encode(rawMail);
+      const utf8Stream = mail.encodeUtf8();
 
       const ldaCommand = new Deno.Command(ldaBin, {
         stdin: "piped",
@@ -33,7 +22,7 @@ export class DovecotMailDeliverer extends MailDeliverer {
         stderr: "piped",
       });
       const ldaProcess = ldaCommand.spawn();
-      logger.logProgramOutput(ldaProcess, ldaBin);
+      getLogger().logProgramOutput(ldaProcess, ldaBin);
 
       const stdinWriter = ldaProcess.stdin.getWriter();
       await stdinWriter.ready;
@@ -42,15 +31,11 @@ export class DovecotMailDeliverer extends MailDeliverer {
 
       status = await ldaProcess.status;
     } catch (cause) {
-      this.throwError(
-        "external error.",
-        rawMail,
-        cause,
-      );
+      this.throwError("external error.", mail, cause);
     }
 
     if (!status.success) {
-      this.throwError(`${ldaBin} exited with non-zero.`, rawMail);
+      this.throwError(`${ldaBin} exited with non-zero.`, mail);
     }
   }
 }
diff --git a/services/docker/mail-server/aws-sendmail/delivers/traffic.ts b/services/docker/mail-server/aws-sendmail/delivers/traffic.ts
index a3ff52b..3d567f9 100644
--- a/services/docker/mail-server/aws-sendmail/delivers/traffic.ts
+++ b/services/docker/mail-server/aws-sendmail/delivers/traffic.ts
@@ -1,11 +1,14 @@
-import { Logger } from "../logger.ts";
 import { MailDeliverer } from "../deliver.ts";
 import { DovecotMailDeliverer } from "./dovecot.ts";
+import { AwsContext } from "../aws.ts";
+import { AwsMailDeliverer } from "./aws.ts";
 
 export class MailTrafficDeliverer {
   receiver: MailDeliverer;
+  sender: MailDeliverer;
 
-  constructor(logger: Logger) {
-    this.receiver = new DovecotMailDeliverer(logger);
+  constructor(aws: AwsContext) {
+    this.receiver = new DovecotMailDeliverer();
+    this.sender = new AwsMailDeliverer(aws);
   }
 }