diff options
Diffstat (limited to 'services/docker/mail-server/relay')
22 files changed, 1291 insertions, 1028 deletions
diff --git a/services/docker/mail-server/relay/.gitignore b/services/docker/mail-server/relay/.gitignore index 2eb12ee..6129c3d 100644 --- a/services/docker/mail-server/relay/.gitignore +++ b/services/docker/mail-server/relay/.gitignore @@ -1,2 +1,4 @@ +out .env.local db.sqlite +test-mail.txt diff --git a/services/docker/mail-server/relay/app.ts b/services/docker/mail-server/relay/app.ts index 83d7c4d..87a4d77 100644 --- a/services/docker/mail-server/relay/app.ts +++ b/services/docker/mail-server/relay/app.ts @@ -1,42 +1,78 @@ +import { join } from "@std/path"; import { Hono } from "hono"; +import { logger as honoLogger } from "hono/logger"; -import { Logger, setLogger } from "./logger.ts"; -import { Config, getConfig, setConfig } from "./config.ts"; +import log from "./log.ts"; +import config from "./config.ts"; import { DbService } from "./db.ts"; -import { MailDeliverer } from "./mail.ts"; +import { + AliasRecipientMailHook, + FallbackRecipientHook, + MailDeliverer, +} from "./mail.ts"; import { DovecotMailDeliverer } from "./dovecot.ts"; +import { CronTask, CronTaskConfig } from "./cron.ts"; +import { DumbSMTPServer as DumbSmtpServer } from "./dumb-smtp-server.ts"; export abstract class AppBase { protected readonly db: DbService; - protected readonly inboundDeliverer: MailDeliverer; + protected readonly crons: CronTask[] = []; protected readonly routes: Hono[] = []; + protected readonly inboundDeliverer: MailDeliverer; + protected readonly hono = new Hono(); protected abstract readonly outboundDeliverer: MailDeliverer; constructor() { - setLogger(new Logger("log")); - setConfig(new Config()); + const dataPath = config.get("dataPath"); + Deno.mkdirSync(dataPath, { recursive: true }); + log.path = join(dataPath, "log"); + log.info(config); - this.db = new DbService(`${getConfig().getValue("dataPath")}/db.sqlite`); + this.db = new DbService(join(dataPath, "db.sqlite")); this.inboundDeliverer = new DovecotMailDeliverer(); + this.inboundDeliverer.preHooks.push( + new FallbackRecipientHook(new Set(config.getList("inboundFallback"))), + new AliasRecipientMailHook(join(dataPath, "aliases.csv")), + ); - const hono = new Hono() - .post("/send/raw", async (context) => { - this.outboundDeliverer.deliverRaw(await context.req.text()); - }) - .post("/receive/raw", async (context) => { - this.inboundDeliverer.deliverRaw(await context.req.text()); - }); - this.routes.push(hono); + this.hono.onError((err, c) => { + log.error(err); + return c.json({ msg: "Server error, check its log." }, 500); + }); + + this.hono.use(honoLogger()); + this.hono.post("/send/raw", async (context) => { + const body = await context.req.text(); + if (body.trim().length === 0) { + return context.json({ msg: "Can't send an empty mail" }, 400); + } else { + const mail = await this.outboundDeliverer.deliverRaw(body); + return context.json({ + messageId: mail.messageId, + awsMessageId: mail.awsMessageId, + }); + } + }); + this.hono.post("/receive/raw", async (context) => { + await this.inboundDeliverer.deliverRaw(await context.req.text()); + return context.json({ "msg": "Done!" }); + }); } - async run(): Promise<void> { - const hono = new Hono(); - this.routes.forEach((h) => hono.route("/", h)); + createCron(config: CronTaskConfig): CronTask { + const cron = new CronTask(config); + this.crons.push(cron); + return cron; + } - const server = Deno.serve({ - hostname: "0.0.0.0", - }, hono.fetch); - await server.finished; + serve(): { smtp: DumbSmtpServer; http: Deno.HttpServer } { + const smtp = new DumbSmtpServer(this.outboundDeliverer); + smtp.serve(); + const http = Deno.serve({ + hostname: config.HTTP_HOST, + port: config.HTTP_PORT, + }, this.hono.fetch); + return { smtp, http }; } } diff --git a/services/docker/mail-server/relay/aws/app.ts b/services/docker/mail-server/relay/aws/app.ts index 251d151..4b60853 100644 --- a/services/docker/mail-server/relay/aws/app.ts +++ b/services/docker/mail-server/relay/aws/app.ts @@ -1,7 +1,9 @@ +import { parseArgs } from "@std/cli"; import { z } from "zod"; -import { Hono } from "hono"; import { zValidator } from "@hono/zod-validator"; +import log from "../log.ts"; +import config from "../config.ts"; import { AppBase } from "../app.ts"; import { AwsContext } from "./context.ts"; import { AwsMailDeliverer } from "./deliver.ts"; @@ -10,39 +12,113 @@ import { AwsMailRetriever } from "./retriever.ts"; export class AwsRelayApp extends AppBase { readonly #aws = new AwsContext(); readonly #retriever; - readonly #liveMailRecyclerAborter = new AbortController(); protected readonly outboundDeliverer = new AwsMailDeliverer(this.#aws); constructor() { super(); this.#retriever = new AwsMailRetriever(this.#aws, this.inboundDeliverer); - const hono = new Hono() - .post( - "/receive/s3", - zValidator( - "json", - z.object({ - key: z.string(), - }), - ), - async (ctx) => { - await this.#retriever.deliverS3Mail( - ctx.req.valid("json").key, - ); - }, - ); - - this.routes.push(hono); + this.hono.post( + `/${config.get("awsInboundPath")}`, + async (ctx, next) => { + const auth = ctx.req.header("Authorization"); + if (auth !== config.get("awsInboundKey")) { + return ctx.json({ "msg": "Bad auth!" }, 403); + } + await next(); + }, + zValidator( + "json", + z.object({ + key: z.string(), + recipients: z.optional(z.array(z.string())), + }), + ), + async (ctx) => { + const { key, recipients } = ctx.req.valid("json"); + await this.#retriever.deliverS3Mail(key, recipients); + return ctx.json({ "msg": "Done!" }); + }, + ); } - override run(): Promise<void> { - Deno.cron("live-mail-recycler", "0 */6 * * *", { - signal: this.#liveMailRecyclerAborter.signal, - }, () => { - this.#retriever.recycleLiveMails(); + realServe() { + this.createCron({ + name: "live-mail-recycler", + interval: 6 * 3600 * 1000, + callback: () => { + return this.#retriever.recycleLiveMails(); + }, + startNow: true, }); - return super.run(); + return this.serve(); + } + + readonly cli = { + "init": (_: unknown) => { + log.info("Just init!"); + return Promise.resolve(); + }, + "list-lives": async (_: unknown) => { + const liveMails = await this.#retriever.listLiveMails(); + log.info(`Total ${liveMails.length}:`); + log.info(liveMails.join("\n")); + }, + "recycle-lives": async (_: unknown) => { + await this.#retriever.recycleLiveMails(); + }, + "serve": async (_: unknown) => { + await this.serve().http.finished; + }, + "real-serve": async (_: unknown) => { + await this.realServe().http.finished; + }, + } as const; +} + +const nonServerCli = { + "sendmail": async (_: unknown) => { + const decoder = new TextDecoder(); + let text = ""; + for await (const chunk of Deno.stdin.readable) { + text += decoder.decode(chunk); + } + + const res = await fetch( + `http://localhost:${config.HTTP_PORT}/send/raw`, + { + method: "post", + body: text, + }, + ); + log.infoOrError(!res.ok, res); + log.infoOrError(!res.ok, "Body\n" + await res.text()); + if (!res.ok) Deno.exit(-1); + }, +} as const; + +if (import.meta.main) { + const args = parseArgs(Deno.args); + + if (args._.length === 0) { + throw new Error("You must specify a command."); + } + + const command = args._[0]; + + if (command in nonServerCli) { + log.info(`Run non-server command ${command}.`); + await nonServerCli[command as keyof typeof nonServerCli](args); + Deno.exit(0); + } + + const app = new AwsRelayApp(); + if (command in app.cli) { + log.info(`Run command ${command}.`); + await app.cli[command as keyof AwsRelayApp["cli"]](args); + Deno.exit(0); + } else { + throw new Error(command + " is not a valid command."); } } diff --git a/services/docker/mail-server/relay/aws/context.ts b/services/docker/mail-server/relay/aws/context.ts index 34d2d9f..b1e0336 100644 --- a/services/docker/mail-server/relay/aws/context.ts +++ b/services/docker/mail-server/relay/aws/context.ts @@ -3,27 +3,21 @@ import { DeleteObjectCommand, S3Client, } from "@aws-sdk/client-s3"; +import { FetchHttpHandler } from "@smithy/fetch-http-handler"; -import { getConfig } from "../config.ts"; - -declare module "../mail.ts" { - interface Mail { - awsMessageId?: string; - } -} +import config from "../config.ts"; export class AwsContext { - readonly region = "ap-southeast-1"; - - accessKeyId = getConfig().getValue("awsAccessKeyId"); - secretAccessKey = getConfig().getValue("awsSecretAccessKey"); - - getCredentials() { - const { accessKeyId, secretAccessKey } = this; - return Promise.resolve({ accessKeyId, secretAccessKey }); + readonly credentials = () => + Promise.resolve({ + accessKeyId: config.get("awsUser"), + secretAccessKey: config.get("awsPassword"), + }); + readonly requestHandler = new FetchHttpHandler(); + + get region() { + return config.get("awsRegion"); } - - readonly credentials = this.getCredentials.bind(this); } export async function s3MoveObject( @@ -35,7 +29,7 @@ export async function s3MoveObject( const copyCommand = new CopyObjectCommand({ Bucket: bucket, Key: newPath, - CopySource: path, + CopySource: `${bucket}/${path}`, }); await client.send(copyCommand); diff --git a/services/docker/mail-server/relay/aws/deliver.ts b/services/docker/mail-server/relay/aws/deliver.ts index 93e4954..5b3694f 100644 --- a/services/docker/mail-server/relay/aws/deliver.ts +++ b/services/docker/mail-server/relay/aws/deliver.ts @@ -1,7 +1,13 @@ import { SendEmailCommand, SESv2Client } from "@aws-sdk/client-sesv2"; import { AwsContext } from "./context.ts"; -import { Mail, MailDeliverer } from "../mail.ts"; +import { + Mail, + MailDeliverContext, + MailDeliverer, + MailDeliverRecipientResult, +} from "./mail.ts"; +import log from "../log.ts"; export class AwsMailDeliverer extends MailDeliverer { readonly name = "aws"; @@ -9,12 +15,19 @@ export class AwsMailDeliverer extends MailDeliverer { constructor(aws: AwsContext) { super(); - const { region, credentials } = aws; - this.#ses = new SESv2Client({ region, credentials }); + this.#ses = new SESv2Client(aws); } - protected override async doDeliver(mail: Mail): Promise<void> { - let awsMessageId: string | undefined; + protected override async doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void> { + log.info("Begin to call aws send-email api..."); + + const result: MailDeliverRecipientResult = { + kind: "done", + message: "Success to call send-email api of aws.", + }; try { const sendCommand = new SendEmailCommand({ @@ -24,18 +37,16 @@ export class AwsMailDeliverer extends MailDeliverer { }); const res = await this.#ses.send(sendCommand); - awsMessageId = res.MessageId; + if (res.MessageId == null) { + log.warn("Aws send-email returns no message id."); + } + mail.awsMessageId = res.MessageId; } catch (cause) { - mail.throwDeliverError( - this, - "failed to call send-email api of aws.", - cause, - ); - } - - if (awsMessageId == null) { - mail.setDelivered(this, new Error("No message id is returned from aws.")); + result.kind = "fail"; + result.message = "An error was thrown when calling aws send-email." + + cause; + result.cause = cause; } - mail.awsMessageId = awsMessageId; + context.result.recipients.set("*", result); } } diff --git a/services/docker/mail-server/relay/aws/mail.ts b/services/docker/mail-server/relay/aws/mail.ts new file mode 100644 index 0000000..9c2e73b --- /dev/null +++ b/services/docker/mail-server/relay/aws/mail.ts @@ -0,0 +1 @@ +export * from "../mail.ts"; diff --git a/services/docker/mail-server/relay/aws/retriever.ts b/services/docker/mail-server/relay/aws/retriever.ts index 2ee5643..756cfc3 100644 --- a/services/docker/mail-server/relay/aws/retriever.ts +++ b/services/docker/mail-server/relay/aws/retriever.ts @@ -6,16 +6,19 @@ import { S3Client, } from "@aws-sdk/client-s3"; -import { AwsContext, s3MoveObject } from "./context.ts"; -import { getLogger } from "../logger.ts"; -import { getConfig } from "../config.ts"; +import log from "../log.ts"; +import config from "../config.ts"; +import "../better-js.ts"; + import { Mail, MailDeliverer } from "../mail.ts"; -import { generateTimeStringForFileName } from "../util.ts"; +import { AwsContext, s3MoveObject } from "./context.ts"; + +const AWS_SES_S3_SETUP_TAG = "AMAZON_SES_SETUP_NOTIFICATION"; export class AwsMailRetriever { readonly liveMailPrefix = "mail/live/"; readonly archiveMailPrefix = "mail/archive/"; - readonly mailBucket = getConfig().getValue("awsMailBucket"); + readonly mailBucket = config.get("awsMailBucket"); readonly #s3; @@ -23,11 +26,12 @@ export class AwsMailRetriever { aws: AwsContext, public readonly inboundDeliverer: MailDeliverer, ) { - const { region, credentials } = aws; - this.#s3 = new S3Client({ region, credentials }); + this.#s3 = new S3Client(aws); } async listLiveMails(): Promise<string[]> { + log.info("Begin to retrieve live mails."); + const listCommand = new ListObjectsV2Command({ Bucket: this.mailBucket, Prefix: this.liveMailPrefix, @@ -35,25 +39,28 @@ export class AwsMailRetriever { const res = await this.#s3.send(listCommand); if (res.Contents == null) { - getLogger().warn("Listing live mails in S3 returns null Content."); + log.warn("Listing live mails in S3 returns null Content."); return []; } const result: string[] = []; for (const object of res.Contents) { - if (object.Key != null) { - // TODO: check prefix consistence here. - result.push(object.Key.slice(this.liveMailPrefix.length)); - } else { - getLogger().warn( - "Listing live mails in S3 returns an object with no Key.", - ); + if (object.Key == null) { + log.warn("Listing live mails in S3 returns an object with no Key."); + continue; } + + if (object.Key.endsWith(AWS_SES_S3_SETUP_TAG)) continue; + + result.push(object.Key.slice(this.liveMailPrefix.length)); } return result; } - async deliverS3Mail(s3Key: string) { + async deliverS3Mail(s3Key: string, recipients: string[] = []) { + log.info(`Begin to deliver s3 mail ${s3Key} to ${recipients.join(" ")}...`); + + log.info(`Fetching s3 mail ${s3Key}...`); const mailPath = `${this.liveMailPrefix}${s3Key}`; const command = new GetObjectCommand({ Bucket: this.mailBucket, @@ -62,29 +69,30 @@ export class AwsMailRetriever { const res = await this.#s3.send(command); if (res.Body == null) { - // TODO: Better error. - throw new Error(); + throw new Error("S3 mail returns a null body."); } const rawMail = await res.Body.transformToString(); + log.info(`Done fetching s3 mail ${s3Key}.`); + + log.info(`Delivering s3 mail ${s3Key}...`); const mail = new Mail(rawMail); - await this.inboundDeliverer.deliver(mail); - const date = mail.date ?? mail.simpleParseDate(); - const dateString = date != null - ? generateTimeStringForFileName(date, true) - : "invalid-date"; - - // TODO: Continue here. - await s3MoveObject( - this.#s3, - this.mailBucket, - mailPath, - `${this.archiveMailPrefix}${dateString}/${s3Key}`, - ); + await this.inboundDeliverer.deliver({ mail, recipients: recipients }); + log.info(`Done delivering s3 mail ${s3Key}.`); + + const date = mail.startSimpleParse().sections().headers().date(); + const dateString = date?.toFileNameString(true) ?? "invalid-date"; + const newPath = `${this.archiveMailPrefix}${dateString}/${s3Key}`; + + log.info(`Archiving s3 mail ${s3Key} to ${newPath}...`); + await s3MoveObject(this.#s3, this.mailBucket, mailPath, newPath); + log.info(`Done delivering s3 mail ${s3Key}...`); } async recycleLiveMails() { + log.info("Begin to recycle live mails..."); const mails = await this.listLiveMails(); + log.info(`Found ${mails.length} live mails`); for (const s3Key of mails) { await this.deliverS3Mail(s3Key); } diff --git a/services/docker/mail-server/relay/better-js.ts b/services/docker/mail-server/relay/better-js.ts new file mode 100644 index 0000000..c424a6e --- /dev/null +++ b/services/docker/mail-server/relay/better-js.ts @@ -0,0 +1,14 @@ +declare global { + interface Date { + toFileNameString(dateOnly?: boolean): string; + } +} + +Object.defineProperty(Date.prototype, "toFileNameString", { + value: function (this: Date, dateOnly?: boolean) { + const str = this.toISOString(); + return dateOnly === true + ? str.slice(0, str.indexOf("T")) + : str.replaceAll(/:|\./g, "-"); + }, +}); diff --git a/services/docker/mail-server/relay/config.ts b/services/docker/mail-server/relay/config.ts index 1e832cf..d58b163 100644 --- a/services/docker/mail-server/relay/config.ts +++ b/services/docker/mail-server/relay/config.ts @@ -1,60 +1,103 @@ -import { createSingleton, transformProperties } from "./util.ts"; - export const APP_PREFIX = "crupest"; -export const APP_NAME = "mailserver"; +export const APP_NAME = "mail-server"; -interface ConfigItemDef { - env: string; +export interface ConfigItemDefinition { description: string; default?: string; + secret?: boolean; } -export const CONFIG_DEFS = { +export const CONFIG_DEFINITIONS = { + mailDomain: { + description: "the part after `@` of an address", + }, dataPath: { - env: "DATA_PATH", description: "path to save app persistent data", }, - awsAccessKeyId: { env: "AWS_USER", description: "aws access key id" }, - awsSecretAccessKey: { - env: "AWS_PASSWORD", + ldaPath: { + description: "full path of lda executable", + "default": "/dovecot/libexec/dovecot/dovecot-lda", + }, + inboundFallback: { + description: "comma separated addresses used as fallback recipients", + "default": "", + }, + awsInboundPath: { + description: "(random set) path for aws sns", + }, + awsInboundKey: { + description: "(random set) http header Authorization for aws sns", + }, + awsRegion: { + description: "aws region", + }, + awsUser: { + description: "aws access key id", + }, + awsPassword: { description: "aws secret access key", + secret: true, }, awsMailBucket: { - env: "AWS_MAIL_BUCKET", description: "aws s3 bucket saving raw mails", + secret: true, }, -} as const satisfies Record<string, ConfigItemDef>; +} as const satisfies Record<string, ConfigItemDefinition>; -type ConfigDefs = typeof CONFIG_DEFS; -type ConfigKey = keyof ConfigDefs; +type ConfigDefinitions = typeof CONFIG_DEFINITIONS; +type ConfigNames = keyof ConfigDefinitions; type ConfigMap = { - [K in ConfigKey]: ConfigDefs[K] & { value: string }; + [K in ConfigNames]: ConfigDefinitions[K] & { + readonly env: string; + readonly value: string; + }; }; -function resolveAppConfigItem(def: ConfigItemDef): string { - const envKey = - `${APP_PREFIX.toUpperCase()}_${APP_NAME.toUpperCase()}_${def.env}`; - const value = Deno.env.get(envKey); - if (value != null) return value; - if (def.default != null) return def.default; - throw new Error( - `Required env ${envKey} (${def.description}) is not set.`, - ); +function resolveConfig(): ConfigMap { + const result: Record<string, ConfigMap[ConfigNames]> = {}; + for (const [name, def] of Object.entries(CONFIG_DEFINITIONS)) { + const env = `${APP_PREFIX}-${APP_NAME}-${ + name.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase()) + }`.replaceAll("-", "_").toUpperCase(); + const value = Deno.env.get(env) ?? (def as ConfigItemDefinition).default; + if (value == null) { + throw new Error(`Required env ${env} (${def.description}) is not set.`); + } + result[name] = { ...def, env, value }; + } + return result as ConfigMap; } export class Config { - private config = transformProperties( - CONFIG_DEFS, - (def) => ({ ...def, value: resolveAppConfigItem(def) }), - ) as ConfigMap; + #config = resolveConfig(); + + readonly HTTP_HOST = "0.0.0.0"; + readonly HTTP_PORT = 2345; + readonly SMTP_HOST = "127.0.0.1"; + readonly SMTP_PORT = 2346; + + getAllConfig<K extends ConfigNames>(key: K): ConfigMap[K] { + return this.#config[key]; + } + + get(key: ConfigNames): string { + return this.getAllConfig(key).value; + } - get<K extends ConfigKey>(key: K): ConfigMap[K] { - return this.config[key]; + getList(key: ConfigNames, separator: string = ","): string[] { + const value = this.get(key); + if (value.length === 0) return []; + return value.split(separator); } - getValue(key: ConfigKey): string { - return this.get(key).value; + [Symbol.for("Deno.customInspect")]() { + return Object.entries(this.#config).map(([key, item]) => + `${key} [env: ${item.env}]: ${ + (item as ConfigItemDefinition).secret === true ? "***" : item.value + }` + ).join("\n"); } } -export const [getConfig, setConfig] = createSingleton<Config>("Config"); +const config = new Config(); +export default config; diff --git a/services/docker/mail-server/relay/cron.ts b/services/docker/mail-server/relay/cron.ts new file mode 100644 index 0000000..bf0a0be --- /dev/null +++ b/services/docker/mail-server/relay/cron.ts @@ -0,0 +1,43 @@ +export type CronCallback = (task: CronTask) => Promise<void>; + +export interface CronTaskConfig { + readonly name: string; + readonly interval: number; + readonly callback: CronCallback; + readonly startNow?: boolean; +} + +export class CronTask { + #timerTag: number | null = null; + + constructor(public readonly config: CronTaskConfig) { + if (config.interval <= 0) { + throw new Error("Cron task interval must be positive."); + } + + if (config.startNow === true) { + this.start(); + } + } + + get running(): boolean { + return this.#timerTag != null; + } + + start() { + if (this.#timerTag == null) { + this.#timerTag = setInterval( + this.config.callback, + this.config.interval, + this, + ); + } + } + + stop() { + if (this.#timerTag != null) { + clearInterval(this.#timerTag); + this.#timerTag = null; + } + } +} diff --git a/services/docker/mail-server/relay/db.test.ts b/services/docker/mail-server/relay/db.test.ts index 071c1b4..2c2a26d 100644 --- a/services/docker/mail-server/relay/db.test.ts +++ b/services/docker/mail-server/relay/db.test.ts @@ -7,14 +7,12 @@ describe("DbService", () => { const mockRow = { message_id: "mock-message-id@mock.mock", aws_message_id: "mock-aws-message-id@mock.mock", - raw: "a mock raw mail content", }; it("works", async () => { const db = new DbService(":memory:"); await db.migrate(); await db.addMail(mockRow); - expect(await db.listMails()).toEqual([mockRow]); expect(await db.messageIdToAws(mockRow.message_id)).toBe( mockRow.aws_message_id, ); diff --git a/services/docker/mail-server/relay/db.ts b/services/docker/mail-server/relay/db.ts index 73c3abe..748c7f8 100644 --- a/services/docker/mail-server/relay/db.ts +++ b/services/docker/mail-server/relay/db.ts @@ -6,19 +6,17 @@ import { Kysely, Migration, Migrator, - Selectable, SqliteDatabase, SqliteDialect, SqliteStatement, } from "kysely"; - import * as sqlite from "@db/sqlite"; class SqliteStatementAdapter implements SqliteStatement { constructor(public readonly stmt: sqlite.Statement) {} get reader(): boolean { - return this.stmt.columnNames.length >= 1; + return this.stmt.columnNames().length >= 1; } all(parameters: readonly unknown[]): unknown[] { @@ -57,60 +55,59 @@ class SqliteDatabaseAdapter implements SqliteDatabase { export class DbError extends Error { } -const tableNames = { +const NAMES = { mail: { table: "mail", columns: { id: "id", messageId: "message_id", awsMessageId: "aws_message_id", - date: "date", - raw: "raw", }, }, } as const; interface MailTable { - [tableNames.mail.columns.id]: Generated<number>; - [tableNames.mail.columns.messageId]: string; - [tableNames.mail.columns.awsMessageId]: string | null; - [tableNames.mail.columns.date]: number | null; - [tableNames.mail.columns.raw]: string; + [NAMES.mail.columns.id]: Generated<number>; + [NAMES.mail.columns.messageId]: string; + [NAMES.mail.columns.awsMessageId]: string | null; } interface Database { - [tableNames.mail.table]: MailTable; + [NAMES.mail.table]: MailTable; } const migrations: Record<string, Migration> = { "0001-init": { // deno-lint-ignore no-explicit-any async up(db: Kysely<any>): Promise<void> { - const names = tableNames.mail; - await db.schema - .createTable(names.table) + .createTable(NAMES.mail.table) .addColumn( - names.columns.id, + NAMES.mail.columns.id, "integer", (col) => col.primaryKey().autoIncrement(), ) .addColumn( - names.columns.messageId, + NAMES.mail.columns.messageId, "text", (col) => col.notNull().unique(), ) - .addColumn(names.columns.awsMessageId, "text", (col) => col.unique()) - .addColumn(names.columns.date, "integer") - .addColumn(names.columns.raw, "text", (col) => col.notNull()) + .addColumn( + NAMES.mail.columns.awsMessageId, + "text", + (col) => col.unique(), + ) .execute(); for ( - const column of [names.columns.messageId, names.columns.awsMessageId] + const column of [ + NAMES.mail.columns.messageId, + NAMES.mail.columns.awsMessageId, + ] ) { await db.schema - .createIndex(`${names.table}_${column}`) - .on(names.table) + .createIndex(`${NAMES.mail.table}_${column}`) + .on(NAMES.mail.table) .column(column) .execute(); } @@ -118,7 +115,7 @@ const migrations: Record<string, Migration> = { // deno-lint-ignore no-explicit-any async down(db: Kysely<any>): Promise<void> { - await db.schema.dropTable(tableNames.mail.table).execute(); + await db.schema.dropTable(NAMES.mail.table).execute(); }, }, }; @@ -149,31 +146,28 @@ export class DbService { await this.#migrator.migrateToLatest(); } - async addMail(mail: Insertable<MailTable>): Promise<void> { - await this.#kysely.insertInto(tableNames.mail.table).values(mail) - .execute(); - } - - async listMails(): Promise<Selectable<MailTable>[]> { - return await this.#kysely.selectFrom(tableNames.mail.table).selectAll() - .execute(); + async addMail(mail: Insertable<MailTable>): Promise<number> { + const inserted = await this.#kysely.insertInto(NAMES.mail.table).values( + mail, + ).executeTakeFirstOrThrow(); + return Number(inserted.insertId!); } async messageIdToAws(messageId: string): Promise<string | null> { - const row = await this.#kysely.selectFrom(tableNames.mail.table).where( - tableNames.mail.columns.messageId, + const row = await this.#kysely.selectFrom(NAMES.mail.table).where( + NAMES.mail.columns.messageId, "=", messageId, - ).select(tableNames.mail.columns.awsMessageId).executeTakeFirst(); + ).select(NAMES.mail.columns.awsMessageId).executeTakeFirst(); return row?.aws_message_id ?? null; } async messageIdFromAws(awsMessageId: string): Promise<string | null> { - const row = await this.#kysely.selectFrom(tableNames.mail.table).where( - tableNames.mail.columns.awsMessageId, + const row = await this.#kysely.selectFrom(NAMES.mail.table).where( + NAMES.mail.columns.awsMessageId, "=", awsMessageId, - ).select(tableNames.mail.columns.messageId).executeTakeFirst(); + ).select(NAMES.mail.columns.messageId).executeTakeFirst(); return row?.message_id ?? null; } } diff --git a/services/docker/mail-server/relay/deno.json b/services/docker/mail-server/relay/deno.json index 3c2c34e..da9239e 100644 --- a/services/docker/mail-server/relay/deno.json +++ b/services/docker/mail-server/relay/deno.json @@ -1,20 +1,26 @@ { - "unstable": [ "temporal", "cron" ], + "unstable": [ "cron" ], "tasks": { - "dev": "deno run --watch main.ts" + "run": "deno run -A aws/app.ts", + "test": "deno test -A", + "compile": "deno compile -o out/crupest-relay -A aws/app.ts" }, "imports": { - "@aws-sdk/client-s3": "npm:@aws-sdk/client-s3@^3.797.0", - "@aws-sdk/client-sesv2": "npm:@aws-sdk/client-sesv2@^3.782.0", + "@aws-sdk/client-s3": "npm:@aws-sdk/client-s3@^3.821.0", + "@aws-sdk/client-sesv2": "npm:@aws-sdk/client-sesv2@^3.821.0", "@db/sqlite": "jsr:@db/sqlite@^0.12.0", - "@hono/zod-validator": "npm:@hono/zod-validator@^0.5.0", - "@std/cli": "jsr:@std/cli@^1.0.17", + "@hono/zod-validator": "npm:@hono/zod-validator@^0.7.0", + "@smithy/fetch-http-handler": "npm:@smithy/fetch-http-handler@^5.0.4", + "@std/cli": "jsr:@std/cli@^1.0.19", + "@std/csv": "jsr:@std/csv@^1.0.6", "@std/encoding": "jsr:@std/encoding@^1.0.10", "@std/expect": "jsr:@std/expect@^1.0.16", - "@std/path": "jsr:@std/path@^1.0.9", - "@std/testing": "jsr:@std/testing@^1.0.12", - "hono": "npm:hono@^4.7.10", + "@std/io": "jsr:@std/io@^0.225.2", + "@std/path": "jsr:@std/path@^1.1.0", + "@std/testing": "jsr:@std/testing@^1.0.13", + "email-addresses": "npm:email-addresses@^5.0.0", + "hono": "npm:hono@^4.7.11", "kysely": "npm:kysely@^0.28.2", - "zod": "npm:zod@^3.25.20" + "zod": "npm:zod@^3.25.48" } } diff --git a/services/docker/mail-server/relay/deno.lock b/services/docker/mail-server/relay/deno.lock index bbb516b..c60c05e 100644 --- a/services/docker/mail-server/relay/deno.lock +++ b/services/docker/mail-server/relay/deno.lock @@ -7,27 +7,35 @@ "jsr:@std/assert@1": "1.0.13", "jsr:@std/assert@^1.0.13": "1.0.13", "jsr:@std/async@^1.0.13": "1.0.13", - "jsr:@std/cli@^1.0.17": "1.0.17", + "jsr:@std/bytes@^1.0.5": "1.0.6", + "jsr:@std/cli@^1.0.19": "1.0.19", + "jsr:@std/csv@^1.0.6": "1.0.6", "jsr:@std/data-structures@^1.0.8": "1.0.8", "jsr:@std/encoding@1": "1.0.10", "jsr:@std/encoding@^1.0.10": "1.0.10", "jsr:@std/expect@^1.0.16": "1.0.16", "jsr:@std/fmt@1": "1.0.8", - "jsr:@std/fs@1": "1.0.17", - "jsr:@std/fs@^1.0.17": "1.0.17", - "jsr:@std/internal@^1.0.6": "1.0.7", - "jsr:@std/internal@^1.0.7": "1.0.7", + "jsr:@std/fs@1": "1.0.18", + "jsr:@std/fs@^1.0.17": "1.0.18", + "jsr:@std/internal@^1.0.6": "1.0.8", + "jsr:@std/internal@^1.0.7": "1.0.8", + "jsr:@std/internal@^1.0.8": "1.0.8", + "jsr:@std/io@~0.225.2": "0.225.2", "jsr:@std/path@0.217": "0.217.0", - "jsr:@std/path@1": "1.0.9", + "jsr:@std/path@1": "1.1.0", "jsr:@std/path@^1.0.9": "1.0.9", - "jsr:@std/testing@^1.0.12": "1.0.12", - "npm:@aws-sdk/client-s3@^3.797.0": "3.797.0", - "npm:@aws-sdk/client-sesv2@^3.782.0": "3.782.0", - "npm:@hono/zod-validator@0.5": "0.5.0_hono@4.7.10_zod@3.25.20", + "jsr:@std/path@^1.1.0": "1.1.0", + "jsr:@std/streams@^1.0.9": "1.0.9", + "jsr:@std/testing@^1.0.13": "1.0.13", + "npm:@aws-sdk/client-s3@^3.821.0": "3.821.0", + "npm:@aws-sdk/client-sesv2@^3.821.0": "3.821.0", + "npm:@hono/zod-validator@0.7": "0.7.0_hono@4.7.11_zod@3.25.48", + "npm:@smithy/fetch-http-handler@^5.0.4": "5.0.4", "npm:@types/node@*": "22.15.15", - "npm:hono@^4.7.10": "4.7.10", + "npm:email-addresses@5": "5.0.0", + "npm:hono@^4.7.11": "4.7.11", "npm:kysely@~0.28.2": "0.28.2", - "npm:zod@^3.25.20": "3.25.20" + "npm:zod@^3.25.48": "3.25.48" }, "jsr": { "@db/sqlite@0.12.0": { @@ -58,8 +66,17 @@ "@std/async@1.0.13": { "integrity": "1d76ca5d324aef249908f7f7fe0d39aaf53198e5420604a59ab5c035adc97c96" }, - "@std/cli@1.0.17": { - "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b" + "@std/bytes@1.0.6": { + "integrity": "f6ac6adbd8ccd99314045f5703e23af0a68d7f7e58364b47d2c7f408aeb5820a" + }, + "@std/cli@1.0.19": { + "integrity": "b3601a54891f89f3f738023af11960c4e6f7a45dc76cde39a6861124cba79e88" + }, + "@std/csv@1.0.6": { + "integrity": "52ef0e62799a0028d278fa04762f17f9bd263fad9a8e7f98c14fbd371d62d9fd", + "dependencies": [ + "jsr:@std/streams" + ] }, "@std/data-structures@1.0.8": { "integrity": "2fb7219247e044c8fcd51341788547575653c82ae2c759ff209e0263ba7d9b66" @@ -83,9 +100,24 @@ "jsr:@std/path@^1.0.9" ] }, + "@std/fs@1.0.18": { + "integrity": "24bcad99eab1af4fde75e05da6e9ed0e0dce5edb71b7e34baacf86ffe3969f3a", + "dependencies": [ + "jsr:@std/path@^1.1.0" + ] + }, "@std/internal@1.0.7": { "integrity": "39eeb5265190a7bc5d5591c9ff019490bd1f2c3907c044a11b0d545796158a0f" }, + "@std/internal@1.0.8": { + "integrity": "fc66e846d8d38a47cffd274d80d2ca3f0de71040f855783724bb6b87f60891f5" + }, + "@std/io@0.225.2": { + "integrity": "3c740cd4ee4c082e6cfc86458f47e2ab7cb353dc6234d5e9b1f91a2de5f4d6c7", + "dependencies": [ + "jsr:@std/bytes" + ] + }, "@std/path@0.217.0": { "integrity": "1217cc25534bca9a2f672d7fe7c6f356e4027df400c0e85c0ef3e4343bc67d11", "dependencies": [ @@ -95,15 +127,24 @@ "@std/path@1.0.9": { "integrity": "260a49f11edd3db93dd38350bf9cd1b4d1366afa98e81b86167b4e3dd750129e" }, - "@std/testing@1.0.12": { - "integrity": "fec973a45ccc62c540fb89296199051fee142409138fd6e3eae409366bcd4720", + "@std/path@1.1.0": { + "integrity": "ddc94f8e3c275627281cbc23341df6b8bcc874d70374f75fec2533521e3d6886" + }, + "@std/streams@1.0.9": { + "integrity": "a9d26b1988cdd7aa7b1f4b51e1c36c1557f3f252880fa6cc5b9f37078b1a5035", + "dependencies": [ + "jsr:@std/bytes" + ] + }, + "@std/testing@1.0.13": { + "integrity": "74418be16f627dfe996937ab0ffbdbda9c1f35534b78724658d981492f121e71", "dependencies": [ "jsr:@std/assert@^1.0.13", "jsr:@std/async", "jsr:@std/data-structures", "jsr:@std/fs@^1.0.17", - "jsr:@std/internal@^1.0.7", - "jsr:@std/path@^1.0.9" + "jsr:@std/internal@^1.0.8", + "jsr:@std/path@^1.1.0" ] } }, @@ -169,14 +210,14 @@ "tslib" ] }, - "@aws-sdk/client-s3@3.797.0": { - "integrity": "sha512-N7pB94mXi4fCt+rYmR9TzfbbwZsWs6Mnk/jDNX9sAZyWkZQnS3AZ/nRtnUmdCimdnOPOMNVjmAoZ4mW3Ff8LDw==", + "@aws-sdk/client-s3@3.821.0": { + "integrity": "sha512-enlFiONQD+oCaV+C6hMsAJvyQRT3wZmCtXXq7qjxX8BiLgXsHQ9HHS+Nhoq08Ya6mtd1Y1qHOOYpnD8yyUzTMQ==", "dependencies": [ "@aws-crypto/sha1-browser", "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", - "@aws-sdk/core@3.796.0", - "@aws-sdk/credential-provider-node@3.797.0", + "@aws-sdk/core", + "@aws-sdk/credential-provider-node", "@aws-sdk/middleware-bucket-endpoint", "@aws-sdk/middleware-expect-continue", "@aws-sdk/middleware-flexible-checksums", @@ -184,15 +225,15 @@ "@aws-sdk/middleware-location-constraint", "@aws-sdk/middleware-logger", "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-sdk-s3@3.796.0", + "@aws-sdk/middleware-sdk-s3", "@aws-sdk/middleware-ssec", - "@aws-sdk/middleware-user-agent@3.796.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/region-config-resolver", - "@aws-sdk/signature-v4-multi-region@3.796.0", + "@aws-sdk/signature-v4-multi-region", "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.787.0", + "@aws-sdk/util-endpoints", "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.796.0", + "@aws-sdk/util-user-agent-node", "@aws-sdk/xml-builder", "@smithy/config-resolver", "@smithy/core", @@ -230,66 +271,23 @@ "tslib" ] }, - "@aws-sdk/client-sesv2@3.782.0": { - "integrity": "sha512-h7Uhh+9BZ9UCE+SM5vld5d10M3VpF9gYbqmzW4+gWtBq9lmsLWjB9Dsk74Xrh4i7s9op7TEfVYm/o+ZB180BtQ==", - "dependencies": [ - "@aws-crypto/sha256-browser", - "@aws-crypto/sha256-js", - "@aws-sdk/core@3.775.0", - "@aws-sdk/credential-provider-node@3.782.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/signature-v4-multi-region@3.775.0", - "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.782.0", - "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.782.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", - "@smithy/util-base64", - "@smithy/util-body-length-browser", - "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", - "@smithy/util-utf8@4.0.0", - "tslib" - ] - }, - "@aws-sdk/client-sso@3.782.0": { - "integrity": "sha512-5GlJBejo8wqMpSSEKb45WE82YxI2k73YuebjLH/eWDNQeE6VI5Bh9lA1YQ7xNkLLH8hIsb0pSfKVuwh0VEzVrg==", + "@aws-sdk/client-sesv2@3.821.0": { + "integrity": "sha512-5P7cPTO7zSj4S7TymcXjS5+FAoJujAe8VGCMGQJE/X63UQlECES4YLKEJaE4vZpsh6IOIow2rlmPYrLuazpJyA==", "dependencies": [ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", - "@aws-sdk/core@3.775.0", + "@aws-sdk/core", + "@aws-sdk/credential-provider-node", "@aws-sdk/middleware-host-header", "@aws-sdk/middleware-logger", "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.782.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/region-config-resolver", + "@aws-sdk/signature-v4-multi-region", "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.782.0", + "@aws-sdk/util-endpoints", "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.782.0", + "@aws-sdk/util-user-agent-node", "@smithy/config-resolver", "@smithy/core", "@smithy/fetch-http-handler", @@ -318,21 +316,21 @@ "tslib" ] }, - "@aws-sdk/client-sso@3.797.0": { - "integrity": "sha512-9xuR918p7tShR67ZL+AOSbydpJxSHAOdXcQswxxWR/hKCF7tULX7tyL3gNo3l/ETp0CDcStvorOdH/nCbzEOjw==", + "@aws-sdk/client-sso@3.821.0": { + "integrity": "sha512-aDEBZUKUd/+Tvudi0d9KQlqt2OW2P27LATZX0jkNC8yVk4145bAPS04EYoqdKLuyUn/U33DibEOgKUpxZB12jQ==", "dependencies": [ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", - "@aws-sdk/core@3.796.0", + "@aws-sdk/core", "@aws-sdk/middleware-host-header", "@aws-sdk/middleware-logger", "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.796.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/region-config-resolver", "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.787.0", + "@aws-sdk/util-endpoints", "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.796.0", + "@aws-sdk/util-user-agent-node", "@smithy/config-resolver", "@smithy/core", "@smithy/fetch-http-handler", @@ -361,15 +359,15 @@ "tslib" ] }, - "@aws-sdk/core@3.775.0": { - "integrity": "sha512-8vpW4WihVfz0DX+7WnnLGm3GuQER++b0IwQG35JlQMlgqnc44M//KbJPsIHA0aJUJVwJAEShgfr5dUbY8WUzaA==", + "@aws-sdk/core@3.821.0": { + "integrity": "sha512-8eB3wKbmfciQFmxFq7hAjy7mXdUs7vBOR5SwT0ZtQBg0Txc18Lc9tMViqqdO6/KU7OukA6ib2IAVSjIJJEN7FQ==", "dependencies": [ "@aws-sdk/types", "@smithy/core", "@smithy/node-config-provider", "@smithy/property-provider", "@smithy/protocol-http", - "@smithy/signature-v4@5.0.2", + "@smithy/signature-v4", "@smithy/smithy-client", "@smithy/types", "@smithy/util-middleware", @@ -377,46 +375,20 @@ "tslib" ] }, - "@aws-sdk/core@3.796.0": { - "integrity": "sha512-tH8Sp7lCxISVoLnkyv4AouuXs2CDlMhTuesWa0lq2NX1f+DXsMwSBtN37ttZdpFMw3F8mWdsJt27X9h2Oq868A==", + "@aws-sdk/credential-provider-env@3.821.0": { + "integrity": "sha512-C+s/A72pd7CXwEsJj9+Uq9T726iIfIF18hGRY8o82xcIEfOyakiPnlisku8zZOaAu+jm0CihbbYN4NyYNQ+HZQ==", "dependencies": [ - "@aws-sdk/types", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/property-provider", - "@smithy/protocol-http", - "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-middleware", - "fast-xml-parser", - "tslib" - ] - }, - "@aws-sdk/credential-provider-env@3.775.0": { - "integrity": "sha512-6ESVxwCbGm7WZ17kY1fjmxQud43vzJFoLd4bmlR+idQSWdqlzGDYdcfzpjDKTcivdtNrVYmFvcH1JBUwCRAZhw==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/credential-provider-env@3.796.0": { - "integrity": "sha512-kQzGKm4IOYYO6vUrai2JocNwhJm4Aml2BsAV+tBhFhhkutE7khf9PUucoVjB78b0J48nF+kdSacqzY+gB81/Uw==", - "dependencies": [ - "@aws-sdk/core@3.796.0", + "@aws-sdk/core", "@aws-sdk/types", "@smithy/property-provider", "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-http@3.775.0": { - "integrity": "sha512-PjDQeDH/J1S0yWV32wCj2k5liRo0ssXMseCBEkCsD3SqsU8o5cU82b0hMX4sAib/RkglCSZqGO0xMiN0/7ndww==", + "@aws-sdk/credential-provider-http@3.821.0": { + "integrity": "sha512-gIRzTLnAsRfRSNarCag7G7rhcHagz4x5nNTWRihQs5cwTOghEExDy7Tj5m4TEkv3dcTAsNn+l4tnR4nZXo6R+Q==", "dependencies": [ - "@aws-sdk/core@3.775.0", + "@aws-sdk/core", "@aws-sdk/types", "@smithy/fetch-http-handler", "@smithy/node-http-handler", @@ -428,31 +400,16 @@ "tslib" ] }, - "@aws-sdk/credential-provider-http@3.796.0": { - "integrity": "sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg==", + "@aws-sdk/credential-provider-ini@3.821.0": { + "integrity": "sha512-VRTrmsca8kBHtY1tTek1ce+XkK/H0fzodBKcilM/qXjTyumMHPAzVAxKZfSvGC+28/pXyQzhOEyxZfw7giCiWA==", "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/fetch-http-handler", - "@smithy/node-http-handler", - "@smithy/property-provider", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-stream", - "tslib" - ] - }, - "@aws-sdk/credential-provider-ini@3.782.0": { - "integrity": "sha512-wd4KdRy2YjLsE4Y7pz00470Iip06GlRHkG4dyLW7/hFMzEO2o7ixswCWp6J2VGZVAX64acknlv2Q0z02ebjmhw==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/credential-provider-env@3.775.0", - "@aws-sdk/credential-provider-http@3.775.0", - "@aws-sdk/credential-provider-process@3.775.0", - "@aws-sdk/credential-provider-sso@3.782.0", - "@aws-sdk/credential-provider-web-identity@3.782.0", - "@aws-sdk/nested-clients@3.782.0", + "@aws-sdk/core", + "@aws-sdk/credential-provider-env", + "@aws-sdk/credential-provider-http", + "@aws-sdk/credential-provider-process", + "@aws-sdk/credential-provider-sso", + "@aws-sdk/credential-provider-web-identity", + "@aws-sdk/nested-clients", "@aws-sdk/types", "@smithy/credential-provider-imds", "@smithy/property-provider", @@ -461,16 +418,15 @@ "tslib" ] }, - "@aws-sdk/credential-provider-ini@3.797.0": { - "integrity": "sha512-Zpj6pJ2hnebrhLDr+x61ArMUkjHG6mfJRfamHxeVTgZkhLcwHjC5aM4u9pWTVugIaPY+VBtgkKPbi3TRbHlt2g==", + "@aws-sdk/credential-provider-node@3.821.0": { + "integrity": "sha512-oBgbcgOXWMgknAfhIdTeHSSVIv+k2LXN9oTbxu1r++o4WWBWrEQ8mHU0Zo9dfr7Uaoqi3pezYZznsBkXnMLEOg==", "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/credential-provider-env@3.796.0", - "@aws-sdk/credential-provider-http@3.796.0", - "@aws-sdk/credential-provider-process@3.796.0", - "@aws-sdk/credential-provider-sso@3.797.0", - "@aws-sdk/credential-provider-web-identity@3.797.0", - "@aws-sdk/nested-clients@3.797.0", + "@aws-sdk/credential-provider-env", + "@aws-sdk/credential-provider-http", + "@aws-sdk/credential-provider-ini", + "@aws-sdk/credential-provider-process", + "@aws-sdk/credential-provider-sso", + "@aws-sdk/credential-provider-web-identity", "@aws-sdk/types", "@smithy/credential-provider-imds", "@smithy/property-provider", @@ -479,112 +435,43 @@ "tslib" ] }, - "@aws-sdk/credential-provider-node@3.782.0": { - "integrity": "sha512-HZiAF+TCEyKjju9dgysjiPIWgt/+VerGaeEp18mvKLNfgKz1d+/82A2USEpNKTze7v3cMFASx3CvL8yYyF7mJw==", + "@aws-sdk/credential-provider-process@3.821.0": { + "integrity": "sha512-e18ucfqKB3ICNj5RP/FEdvUfhVK6E9MALOsl8pKP13mwegug46p/1BsZWACD5n+Zf9ViiiHxIO7td03zQixfwA==", "dependencies": [ - "@aws-sdk/credential-provider-env@3.775.0", - "@aws-sdk/credential-provider-http@3.775.0", - "@aws-sdk/credential-provider-ini@3.782.0", - "@aws-sdk/credential-provider-process@3.775.0", - "@aws-sdk/credential-provider-sso@3.782.0", - "@aws-sdk/credential-provider-web-identity@3.782.0", + "@aws-sdk/core", "@aws-sdk/types", - "@smithy/credential-provider-imds", "@smithy/property-provider", "@smithy/shared-ini-file-loader", "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-node@3.797.0": { - "integrity": "sha512-xJSWvvnmzEfHbqbpN4F3E3mI9+zJ/VWLGiKOjzX1Inbspa5WqNn2GoMamolZR2TvvZS4F3Hp73TD1WoBzkIjuw==", + "@aws-sdk/credential-provider-sso@3.821.0": { + "integrity": "sha512-Dt+pheBLom4O/egO4L75/72k9C1qtUOLl0F0h6lmqZe4Mvhz+wDtjoO/MdGC/P1q0kcIX/bBKr0NQ3cIvAH8pA==", "dependencies": [ - "@aws-sdk/credential-provider-env@3.796.0", - "@aws-sdk/credential-provider-http@3.796.0", - "@aws-sdk/credential-provider-ini@3.797.0", - "@aws-sdk/credential-provider-process@3.796.0", - "@aws-sdk/credential-provider-sso@3.797.0", - "@aws-sdk/credential-provider-web-identity@3.797.0", + "@aws-sdk/client-sso", + "@aws-sdk/core", + "@aws-sdk/token-providers", "@aws-sdk/types", - "@smithy/credential-provider-imds", "@smithy/property-provider", "@smithy/shared-ini-file-loader", "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-process@3.775.0": { - "integrity": "sha512-A6k68H9rQp+2+7P7SGO90Csw6nrUEm0Qfjpn9Etc4EboZhhCLs9b66umUsTsSBHus4FDIe5JQxfCUyt1wgNogg==", + "@aws-sdk/credential-provider-web-identity@3.821.0": { + "integrity": "sha512-FF5wnRJkxSQaCVVvWNv53K1MhTMgH8d+O+MHTbkv51gVIgVATrtfFQMKBLcEAxzXrgAliIO3LiNv+1TqqBZ+BA==", "dependencies": [ - "@aws-sdk/core@3.775.0", + "@aws-sdk/core", + "@aws-sdk/nested-clients", "@aws-sdk/types", "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/credential-provider-process@3.796.0": { - "integrity": "sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw==", - "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/credential-provider-sso@3.782.0": { - "integrity": "sha512-1y1ucxTtTIGDSNSNxriQY8msinilhe9gGvQpUDYW9gboyC7WQJPDw66imy258V6osdtdi+xoHzVCbCz3WhosMQ==", - "dependencies": [ - "@aws-sdk/client-sso@3.782.0", - "@aws-sdk/core@3.775.0", - "@aws-sdk/token-providers@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/credential-provider-sso@3.797.0": { - "integrity": "sha512-VlyWnjTsTnBXqXcEW0nw3S7nj00n9fYwF6uU6HPO9t860yIySG01lNPAWTvAt3DfVL5SRS0GANriCZF6ohcMcQ==", - "dependencies": [ - "@aws-sdk/client-sso@3.797.0", - "@aws-sdk/core@3.796.0", - "@aws-sdk/token-providers@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-web-identity@3.782.0": { - "integrity": "sha512-xCna0opVPaueEbJoclj5C6OpDNi0Gynj+4d7tnuXGgQhTHPyAz8ZyClkVqpi5qvHTgxROdUEDxWqEO5jqRHZHQ==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/nested-clients@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/credential-provider-web-identity@3.797.0": { - "integrity": "sha512-DIb05FEmdOX7bNsqSVEAB3UkaDgrYHonQ2+gcBLqZ7LoDNnovHIlvC5jii93usgEStxITZstnzw+49keNEgVWw==", - "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/nested-clients@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/middleware-bucket-endpoint@3.775.0": { - "integrity": "sha512-qogMIpVChDYr4xiUNC19/RDSw/sKoHkAhouS6Skxiy6s27HBhow1L3Z1qVYXuBmOZGSWPU0xiyZCvOyWrv9s+Q==", + "@aws-sdk/middleware-bucket-endpoint@3.821.0": { + "integrity": "sha512-cebgeytKlWOgGczLo3BPvNY9XlzAzGZQANSysgJ2/8PSldmUpXRIF+GKPXDVhXeInWYHIfB8zZi3RqrPoXcNYQ==", "dependencies": [ "@aws-sdk/types", "@aws-sdk/util-arn-parser", @@ -595,8 +482,8 @@ "tslib" ] }, - "@aws-sdk/middleware-expect-continue@3.775.0": { - "integrity": "sha512-Apd3owkIeUW5dnk3au9np2IdW2N0zc9NjTjHiH+Mx3zqwSrc+m+ANgJVgk9mnQjMzU/vb7VuxJ0eqdEbp5gYsg==", + "@aws-sdk/middleware-expect-continue@3.821.0": { + "integrity": "sha512-zAOoSZKe1njOrtynvK6ZORU57YGv5I7KP4+rwOvUN3ZhJbQ7QPf8gKtFUCYAPRMegaXCKF/ADPtDZBAmM+zZ9g==", "dependencies": [ "@aws-sdk/types", "@smithy/protocol-http", @@ -604,13 +491,13 @@ "tslib" ] }, - "@aws-sdk/middleware-flexible-checksums@3.796.0": { - "integrity": "sha512-JTqnyzGlbvXDcEnBtd5LFNrCFKUHnGyp/V9+BkvzNP02WXABLWzYvj1TCaf5pQySwK/b4kVn5lvbpTi0rXqjZw==", + "@aws-sdk/middleware-flexible-checksums@3.821.0": { + "integrity": "sha512-C56sBHXq1fEsLfIAup+w/7SKtb6d8Mb3YBec94r2ludVn1s3ypYWRovFE/6VhUzvwUbTQaxfrA2ewy5GQ1/DJQ==", "dependencies": [ "@aws-crypto/crc32", "@aws-crypto/crc32c", "@aws-crypto/util", - "@aws-sdk/core@3.796.0", + "@aws-sdk/core", "@aws-sdk/types", "@smithy/is-array-buffer@4.0.0", "@smithy/node-config-provider", @@ -622,8 +509,8 @@ "tslib" ] }, - "@aws-sdk/middleware-host-header@3.775.0": { - "integrity": "sha512-tkSegM0Z6WMXpLB8oPys/d+umYIocvO298mGvcMCncpRl77L9XkvSLJIFzaHes+o7djAgIduYw8wKIMStFss2w==", + "@aws-sdk/middleware-host-header@3.821.0": { + "integrity": "sha512-xSMR+sopSeWGx5/4pAGhhfMvGBHioVBbqGvDs6pG64xfNwM5vq5s5v6D04e2i+uSTj4qGa71dLUs5I0UzAK3sw==", "dependencies": [ "@aws-sdk/types", "@smithy/protocol-http", @@ -631,24 +518,24 @@ "tslib" ] }, - "@aws-sdk/middleware-location-constraint@3.775.0": { - "integrity": "sha512-8TMXEHZXZTFTckQLyBT5aEI8fX11HZcwZseRifvBKKpj0RZDk4F0EEYGxeNSPpUQ7n+PRWyfAEnnZNRdAj/1NQ==", + "@aws-sdk/middleware-location-constraint@3.821.0": { + "integrity": "sha512-sKrm80k0t3R0on8aA/WhWFoMaAl4yvdk+riotmMElLUpcMcRXAd1+600uFVrxJqZdbrKQ0mjX0PjT68DlkYXLg==", "dependencies": [ "@aws-sdk/types", "@smithy/types", "tslib" ] }, - "@aws-sdk/middleware-logger@3.775.0": { - "integrity": "sha512-FaxO1xom4MAoUJsldmR92nT1G6uZxTdNYOFYtdHfd6N2wcNaTuxgjIvqzg5y7QIH9kn58XX/dzf1iTjgqUStZw==", + "@aws-sdk/middleware-logger@3.821.0": { + "integrity": "sha512-0cvI0ipf2tGx7fXYEEN5fBeZDz2RnHyb9xftSgUsEq7NBxjV0yTZfLJw6Za5rjE6snC80dRN8+bTNR1tuG89zA==", "dependencies": [ "@aws-sdk/types", "@smithy/types", "tslib" ] }, - "@aws-sdk/middleware-recursion-detection@3.775.0": { - "integrity": "sha512-GLCzC8D0A0YDG5u3F5U03Vb9j5tcOEFhr8oc6PDk0k0vm5VwtZOE6LvK7hcCSoAB4HXyOUM0sQuXrbaAh9OwXA==", + "@aws-sdk/middleware-recursion-detection@3.821.0": { + "integrity": "sha512-efmaifbhBoqKG3bAoEfDdcM8hn1psF+4qa7ykWuYmfmah59JBeqHLfz5W9m9JoTwoKPkFcVLWZxnyZzAnVBOIg==", "dependencies": [ "@aws-sdk/types", "@smithy/protocol-http", @@ -656,16 +543,16 @@ "tslib" ] }, - "@aws-sdk/middleware-sdk-s3@3.775.0": { - "integrity": "sha512-zsvcu7cWB28JJ60gVvjxPCI7ZU7jWGcpNACPiZGyVtjYXwcxyhXbYEVDSWKsSA6ERpz9XrpLYod8INQWfW3ECg==", + "@aws-sdk/middleware-sdk-s3@3.821.0": { + "integrity": "sha512-D469De1d4NtcCTVHzUL2Q0tGvPFr7mk2j4+oCYpVyd5awSSOyl8Adkxse8qayZj9ROmuMlsoU5VhBvcc9Hoo2w==", "dependencies": [ - "@aws-sdk/core@3.775.0", + "@aws-sdk/core", "@aws-sdk/types", "@aws-sdk/util-arn-parser", "@smithy/core", "@smithy/node-config-provider", "@smithy/protocol-http", - "@smithy/signature-v4@5.0.2", + "@smithy/signature-v4", "@smithy/smithy-client", "@smithy/types", "@smithy/util-config-provider", @@ -675,115 +562,41 @@ "tslib" ] }, - "@aws-sdk/middleware-sdk-s3@3.796.0": { - "integrity": "sha512-5o78oE79sGOtYkL7Up02h2nmr9UhGQZJgxE29EBdTw4dZ1EaA46L+C8oA+fBCmAB5xPQsjQqvhRrsr4Lcp+jZQ==", - "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@aws-sdk/util-arn-parser", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/protocol-http", - "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/util-config-provider", - "@smithy/util-middleware", - "@smithy/util-stream", - "@smithy/util-utf8@4.0.0", - "tslib" - ] - }, - "@aws-sdk/middleware-ssec@3.775.0": { - "integrity": "sha512-Iw1RHD8vfAWWPzBBIKaojO4GAvQkHOYIpKdAfis/EUSUmSa79QsnXnRqsdcE0mCB0Ylj23yi+ah4/0wh9FsekA==", + "@aws-sdk/middleware-ssec@3.821.0": { + "integrity": "sha512-YYi1Hhr2AYiU/24cQc8HIB+SWbQo6FBkMYojVuz/zgrtkFmALxENGF/21OPg7f/QWd+eadZJRxCjmRwh5F2Cxg==", "dependencies": [ "@aws-sdk/types", "@smithy/types", "tslib" ] }, - "@aws-sdk/middleware-user-agent@3.782.0": { - "integrity": "sha512-i32H2R6IItX+bQ2p4+v2gGO2jA80jQoJO2m1xjU9rYWQW3+ErWy4I5YIuQHTBfb6hSdAHbaRfqPDgbv9J2rjEg==", + "@aws-sdk/middleware-user-agent@3.821.0": { + "integrity": "sha512-rw8q3TxygMg3VrofN04QyWVCCyGwz3bVthYmBZZseENPWG3Krz1OCKcyqjkTcAxMQlEywOske+GIiOasGKnJ3w==", "dependencies": [ - "@aws-sdk/core@3.775.0", + "@aws-sdk/core", "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.782.0", + "@aws-sdk/util-endpoints", "@smithy/core", "@smithy/protocol-http", "@smithy/types", "tslib" ] }, - "@aws-sdk/middleware-user-agent@3.796.0": { - "integrity": "sha512-IeNg+3jNWT37J45opi5Jx89hGF0lOnZjiNwlMp3rKq7PlOqy8kWq5J1Gxk0W3tIkPpuf68CtBs/QFrRXWOjsZw==", - "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.787.0", - "@smithy/core", - "@smithy/protocol-http", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/nested-clients@3.782.0": { - "integrity": "sha512-QOYC8q7luzHFXrP0xYAqBctoPkynjfV0r9dqntFu4/IWMTyC1vlo1UTxFAjIPyclYw92XJyEkVCVg9v/nQnsUA==", - "dependencies": [ - "@aws-crypto/sha256-browser", - "@aws-crypto/sha256-js", - "@aws-sdk/core@3.775.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.782.0", - "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.782.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler", - "@smithy/hash-node", - "@smithy/invalid-dependency", - "@smithy/middleware-content-length", - "@smithy/middleware-endpoint", - "@smithy/middleware-retry", - "@smithy/middleware-serde", - "@smithy/middleware-stack", - "@smithy/node-config-provider", - "@smithy/node-http-handler", - "@smithy/protocol-http", - "@smithy/smithy-client", - "@smithy/types", - "@smithy/url-parser", - "@smithy/util-base64", - "@smithy/util-body-length-browser", - "@smithy/util-body-length-node", - "@smithy/util-defaults-mode-browser", - "@smithy/util-defaults-mode-node", - "@smithy/util-endpoints", - "@smithy/util-middleware", - "@smithy/util-retry", - "@smithy/util-utf8@4.0.0", - "tslib" - ] - }, - "@aws-sdk/nested-clients@3.797.0": { - "integrity": "sha512-xCsRKdsv0GAg9E28fvYBdC3JR2xdtZ2o41MVknOs+pSFtMsZm3SsgxObN35p1OTMk/o/V0LORGVLnFQMlc5QiA==", + "@aws-sdk/nested-clients@3.821.0": { + "integrity": "sha512-2IuHcUsWw44ftSEDYU4dvktTEqgyDvkOcfpoGC/UmT4Qo6TVCP3U5tWEGpNK9nN+7nLvekruxxG/jaMt5/oWVw==", "dependencies": [ "@aws-crypto/sha256-browser", "@aws-crypto/sha256-js", - "@aws-sdk/core@3.796.0", + "@aws-sdk/core", "@aws-sdk/middleware-host-header", "@aws-sdk/middleware-logger", "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.796.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/region-config-resolver", "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.787.0", + "@aws-sdk/util-endpoints", "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.796.0", + "@aws-sdk/util-user-agent-node", "@smithy/config-resolver", "@smithy/core", "@smithy/fetch-http-handler", @@ -812,8 +625,8 @@ "tslib" ] }, - "@aws-sdk/region-config-resolver@3.775.0": { - "integrity": "sha512-40iH3LJjrQS3LKUJAl7Wj0bln7RFPEvUYKFxtP8a+oKFDO0F65F52xZxIJbPn6sHkxWDAnZlGgdjZXM3p2g5wQ==", + "@aws-sdk/region-config-resolver@3.821.0": { + "integrity": "sha512-t8og+lRCIIy5nlId0bScNpCkif8sc0LhmtaKsbm0ZPm3sCa/WhCbSZibjbZ28FNjVCV+p0D9RYZx0VDDbtWyjw==", "dependencies": [ "@aws-sdk/types", "@smithy/node-config-provider", @@ -823,43 +636,22 @@ "tslib" ] }, - "@aws-sdk/signature-v4-multi-region@3.775.0": { - "integrity": "sha512-cnGk8GDfTMJ8p7+qSk92QlIk2bmTmFJqhYxcXZ9PysjZtx0xmfCMxnG3Hjy1oU2mt5boPCVSOptqtWixayM17g==", + "@aws-sdk/signature-v4-multi-region@3.821.0": { + "integrity": "sha512-UjfyVR/PB/TP9qe1x6tv7qLlD8/0eiSLDkkBUgBmddkkX0l17oy9c2SJINuV3jy1fbx6KORZ6gyvRZ2nb8dtMw==", "dependencies": [ - "@aws-sdk/middleware-sdk-s3@3.775.0", + "@aws-sdk/middleware-sdk-s3", "@aws-sdk/types", "@smithy/protocol-http", - "@smithy/signature-v4@5.0.2", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/signature-v4-multi-region@3.796.0": { - "integrity": "sha512-JAOLdvazTc9HlTFslSrIOrKRMuOruuM3FeGw0hyfLP/RIbjd9bqe/xLIzDSJr3wpCpJs0sXoofwJgXtgTipvjA==", - "dependencies": [ - "@aws-sdk/middleware-sdk-s3@3.796.0", - "@aws-sdk/types", - "@smithy/protocol-http", - "@smithy/signature-v4@5.1.0", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/token-providers@3.782.0": { - "integrity": "sha512-4tPuk/3+THPrzKaXW4jE2R67UyGwHLFizZ47pcjJWbhb78IIJAy94vbeqEQ+veS84KF5TXcU7g5jGTXC0D70Wg==", - "dependencies": [ - "@aws-sdk/nested-clients@3.782.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", + "@smithy/signature-v4", "@smithy/types", "tslib" ] }, - "@aws-sdk/token-providers@3.797.0": { - "integrity": "sha512-TLFkP4BBdkH2zCXhG3JjaYrRft25MMZ+6/YDz1C/ikq2Zk8krUbVoSmhtYMVz10JtxAPiQ++w0vI/qbz2JSDXg==", + "@aws-sdk/token-providers@3.821.0": { + "integrity": "sha512-qJ7wgKhdxGbPg718zWXbCYKDuSWZNU3TSw64hPRW6FtbZrIyZxObpiTKC6DKwfsVoZZhHEoP/imGykN1OdOTJA==", "dependencies": [ - "@aws-sdk/nested-clients@3.797.0", + "@aws-sdk/core", + "@aws-sdk/nested-clients", "@aws-sdk/types", "@smithy/property-provider", "@smithy/shared-ini-file-loader", @@ -867,21 +659,21 @@ "tslib" ] }, - "@aws-sdk/types@3.775.0": { - "integrity": "sha512-ZoGKwa4C9fC9Av6bdfqcW6Ix5ot05F/S4VxWR2nHuMv7hzfmAjTOcUiWT7UR4hM/U0whf84VhDtXN/DWAk52KA==", + "@aws-sdk/types@3.821.0": { + "integrity": "sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@aws-sdk/util-arn-parser@3.723.0": { - "integrity": "sha512-ZhEfvUwNliOQROcAk34WJWVYTlTa4694kSVhDSjW6lE1bMataPnIN8A0ycukEzBXmd8ZSoBcQLn6lKGl7XIJ5w==", + "@aws-sdk/util-arn-parser@3.804.0": { + "integrity": "sha512-wmBJqn1DRXnZu3b4EkE6CWnoWMo1ZMvlfkqU5zPz67xx1GMaXlDCchFvKAXMjk4jn/L1O3tKnoFDNsoLV1kgNQ==", "dependencies": [ "tslib" ] }, - "@aws-sdk/util-endpoints@3.782.0": { - "integrity": "sha512-/RJOAO7o7HI6lEa4ASbFFLHGU9iPK876BhsVfnl54MvApPVYWQ9sHO0anOUim2S5lQTwd/6ghuH3rFYSq/+rdw==", + "@aws-sdk/util-endpoints@3.821.0": { + "integrity": "sha512-Uknt/zUZnLE76zaAAPEayOeF5/4IZ2puTFXvcSCWHsi9m3tqbb9UozlnlVqvCZLCRWfQryZQoG2W4XSS3qgk5A==", "dependencies": [ "@aws-sdk/types", "@smithy/types", @@ -889,23 +681,14 @@ "tslib" ] }, - "@aws-sdk/util-endpoints@3.787.0": { - "integrity": "sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==", - "dependencies": [ - "@aws-sdk/types", - "@smithy/types", - "@smithy/util-endpoints", - "tslib" - ] - }, - "@aws-sdk/util-locate-window@3.723.0": { - "integrity": "sha512-Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==", + "@aws-sdk/util-locate-window@3.804.0": { + "integrity": "sha512-zVoRfpmBVPodYlnMjgVjfGoEZagyRF5IPn3Uo6ZvOZp24chnW/FRstH7ESDHDDRga4z3V+ElUQHKpFDXWyBW5A==", "dependencies": [ "tslib" ] }, - "@aws-sdk/util-user-agent-browser@3.775.0": { - "integrity": "sha512-txw2wkiJmZKVdDbscK7VBK+u+TJnRtlUjRTLei+elZg2ADhpQxfVAQl436FUeIv6AhB/oRHW6/K/EAGXUSWi0A==", + "@aws-sdk/util-user-agent-browser@3.821.0": { + "integrity": "sha512-irWZHyM0Jr1xhC+38OuZ7JB6OXMLPZlj48thElpsO1ZSLRkLZx5+I7VV6k3sp2yZ7BYbKz/G2ojSv4wdm7XTLw==", "dependencies": [ "@aws-sdk/types", "@smithy/types", @@ -913,35 +696,25 @@ "tslib" ] }, - "@aws-sdk/util-user-agent-node@3.782.0": { - "integrity": "sha512-dMFkUBgh2Bxuw8fYZQoH/u3H4afQ12VSkzEi//qFiDTwbKYq+u+RYjc8GLDM6JSK1BShMu5AVR7HD4ap1TYUnA==", - "dependencies": [ - "@aws-sdk/middleware-user-agent@3.782.0", - "@aws-sdk/types", - "@smithy/node-config-provider", - "@smithy/types", - "tslib" - ] - }, - "@aws-sdk/util-user-agent-node@3.796.0": { - "integrity": "sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA==", + "@aws-sdk/util-user-agent-node@3.821.0": { + "integrity": "sha512-YwMXc9EvuzJgnLBTyiQly2juPujXwDgcMHB0iSN92tHe7Dd1jJ1feBmTgdClaaqCeHFUaFpw+3JU/ZUJ6LjR+A==", "dependencies": [ - "@aws-sdk/middleware-user-agent@3.796.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/types", "@smithy/node-config-provider", "@smithy/types", "tslib" ] }, - "@aws-sdk/xml-builder@3.775.0": { - "integrity": "sha512-b9NGO6FKJeLGYnV7Z1yvcP1TNU4dkD5jNsLWOF1/sygZoASaQhNOlaiJ/1OH331YQ1R1oWk38nBb0frsYkDsOQ==", + "@aws-sdk/xml-builder@3.821.0": { + "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@hono/zod-validator@0.5.0_hono@4.7.10_zod@3.25.20": { - "integrity": "sha512-ds5bW6DCgAnNHP33E3ieSbaZFd5dkV52ZjyaXtGoR06APFrCtzAsKZxTHwOrJNBdXsi0e5wNwo5L4nVEVnJUdg==", + "@hono/zod-validator@0.7.0_hono@4.7.11_zod@3.25.48": { + "integrity": "sha512-qe2ZE6sHFE98dcUrbYMtS3bAV8hqcCOflykvZga2S7XhmNSZzT+dIz4OuMILsjLHkJw9JMn912/dB7dQOmuPvg==", "dependencies": [ "hono", "zod" @@ -982,8 +755,8 @@ "os": ["win32"], "cpu": ["x64"] }, - "@smithy/abort-controller@4.0.2": { - "integrity": "sha512-Sl/78VDtgqKxN2+1qduaVE140XF+Xg+TafkncspwM4jFP/LHr76ZHmIY/y3V1M0mMLNk+Je6IGbzxy23RSToMw==", + "@smithy/abort-controller@4.0.4": { + "integrity": "sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==", "dependencies": [ "@smithy/types", "tslib" @@ -1002,8 +775,8 @@ "tslib" ] }, - "@smithy/config-resolver@4.1.0": { - "integrity": "sha512-8smPlwhga22pwl23fM5ew4T9vfLUCeFXlcqNOCD5M5h8VmNPNUE9j6bQSuRXpDSV11L/E/SwEBQuW8hr6+nS1A==", + "@smithy/config-resolver@4.1.4": { + "integrity": "sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==", "dependencies": [ "@smithy/node-config-provider", "@smithy/types", @@ -1012,12 +785,13 @@ "tslib" ] }, - "@smithy/core@3.2.0": { - "integrity": "sha512-k17bgQhVZ7YmUvA8at4af1TDpl0NDMBuBKJl8Yg0nrefwmValU+CnA5l/AriVdQNthU/33H3nK71HrLgqOPr1Q==", + "@smithy/core@3.5.1": { + "integrity": "sha512-xSw7bZEFKwOKrm/iv8e2BLt2ur98YZdrRD6nII8ditQeUsY2Q1JmIQ0rpILOhaLKYxxG2ivnoOpokzr9qLyDWA==", "dependencies": [ "@smithy/middleware-serde", "@smithy/protocol-http", "@smithy/types", + "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-middleware", "@smithy/util-stream", @@ -1025,8 +799,8 @@ "tslib" ] }, - "@smithy/credential-provider-imds@4.0.2": { - "integrity": "sha512-32lVig6jCaWBHnY+OEQ6e6Vnt5vDHaLiydGrwYMW9tPqO688hPGTYRamYJ1EptxEC2rAwJrHWmPoKRBl4iTa8w==", + "@smithy/credential-provider-imds@4.0.6": { + "integrity": "sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==", "dependencies": [ "@smithy/node-config-provider", "@smithy/property-provider", @@ -1035,8 +809,8 @@ "tslib" ] }, - "@smithy/eventstream-codec@4.0.2": { - "integrity": "sha512-p+f2kLSK7ZrXVfskU/f5dzksKTewZk8pJLPvER3aFHPt76C2MxD9vNatSfLzzQSQB4FNO96RK4PSXfhD1TTeMQ==", + "@smithy/eventstream-codec@4.0.4": { + "integrity": "sha512-7XoWfZqWb/QoR/rAU4VSi0mWnO2vu9/ltS6JZ5ZSZv0eovLVfDfu0/AX4ub33RsJTOth3TiFWSHS5YdztvFnig==", "dependencies": [ "@aws-crypto/crc32", "@smithy/types", @@ -1044,39 +818,39 @@ "tslib" ] }, - "@smithy/eventstream-serde-browser@4.0.2": { - "integrity": "sha512-CepZCDs2xgVUtH7ZZ7oDdZFH8e6Y2zOv8iiX6RhndH69nlojCALSKK+OXwZUgOtUZEUaZ5e1hULVCHYbCn7pug==", + "@smithy/eventstream-serde-browser@4.0.4": { + "integrity": "sha512-3fb/9SYaYqbpy/z/H3yIi0bYKyAa89y6xPmIqwr2vQiUT2St+avRt8UKwsWt9fEdEasc5d/V+QjrviRaX1JRFA==", "dependencies": [ "@smithy/eventstream-serde-universal", "@smithy/types", "tslib" ] }, - "@smithy/eventstream-serde-config-resolver@4.1.0": { - "integrity": "sha512-1PI+WPZ5TWXrfj3CIoKyUycYynYJgZjuQo8U+sphneOtjsgrttYybdqESFReQrdWJ+LKt6NEdbYzmmfDBmjX2A==", + "@smithy/eventstream-serde-config-resolver@4.1.2": { + "integrity": "sha512-JGtambizrWP50xHgbzZI04IWU7LdI0nh/wGbqH3sJesYToMi2j/DcoElqyOcqEIG/D4tNyxgRuaqBXWE3zOFhQ==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/eventstream-serde-node@4.0.2": { - "integrity": "sha512-C5bJ/C6x9ENPMx2cFOirspnF9ZsBVnBMtP6BdPl/qYSuUawdGQ34Lq0dMcf42QTjUZgWGbUIZnz6+zLxJlb9aw==", + "@smithy/eventstream-serde-node@4.0.4": { + "integrity": "sha512-RD6UwNZ5zISpOWPuhVgRz60GkSIp0dy1fuZmj4RYmqLVRtejFqQ16WmfYDdoSoAjlp1LX+FnZo+/hkdmyyGZ1w==", "dependencies": [ "@smithy/eventstream-serde-universal", "@smithy/types", "tslib" ] }, - "@smithy/eventstream-serde-universal@4.0.2": { - "integrity": "sha512-St8h9JqzvnbB52FtckiHPN4U/cnXcarMniXRXTKn0r4b4XesZOGiAyUdj1aXbqqn1icSqBlzzUsCl6nPB018ng==", + "@smithy/eventstream-serde-universal@4.0.4": { + "integrity": "sha512-UeJpOmLGhq1SLox79QWw/0n2PFX+oPRE1ZyRMxPIaFEfCqWaqpB7BU9C8kpPOGEhLF7AwEqfFbtwNxGy4ReENA==", "dependencies": [ "@smithy/eventstream-codec", "@smithy/types", "tslib" ] }, - "@smithy/fetch-http-handler@5.0.2": { - "integrity": "sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==", + "@smithy/fetch-http-handler@5.0.4": { + "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==", "dependencies": [ "@smithy/protocol-http", "@smithy/querystring-builder", @@ -1085,8 +859,8 @@ "tslib" ] }, - "@smithy/hash-blob-browser@4.0.2": { - "integrity": "sha512-3g188Z3DyhtzfBRxpZjU8R9PpOQuYsbNnyStc/ZVS+9nVX1f6XeNOa9IrAh35HwwIZg+XWk8bFVtNINVscBP+g==", + "@smithy/hash-blob-browser@4.0.4": { + "integrity": "sha512-WszRiACJiQV3QG6XMV44i5YWlkrlsM5Yxgz4jvsksuu7LDXA6wAtypfPajtNTadzpJy3KyJPoWehYpmZGKUFIQ==", "dependencies": [ "@smithy/chunked-blob-reader", "@smithy/chunked-blob-reader-native", @@ -1094,8 +868,8 @@ "tslib" ] }, - "@smithy/hash-node@4.0.2": { - "integrity": "sha512-VnTpYPnRUE7yVhWozFdlxcYknv9UN7CeOqSrMH+V877v4oqtVYuoqhIhtSjmGPvYrYnAkaM61sLMKHvxL138yg==", + "@smithy/hash-node@4.0.4": { + "integrity": "sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==", "dependencies": [ "@smithy/types", "@smithy/util-buffer-from@4.0.0", @@ -1103,16 +877,16 @@ "tslib" ] }, - "@smithy/hash-stream-node@4.0.2": { - "integrity": "sha512-POWDuTznzbIwlEXEvvXoPMS10y0WKXK790soe57tFRfvf4zBHyzE529HpZMqmDdwG9MfFflnyzndUQ8j78ZdSg==", + "@smithy/hash-stream-node@4.0.4": { + "integrity": "sha512-wHo0d8GXyVmpmMh/qOR0R7Y46/G1y6OR8U+bSTB4ppEzRxd1xVAQ9xOE9hOc0bSjhz0ujCPAbfNLkLrpa6cevg==", "dependencies": [ "@smithy/types", "@smithy/util-utf8@4.0.0", "tslib" ] }, - "@smithy/invalid-dependency@4.0.2": { - "integrity": "sha512-GatB4+2DTpgWPday+mnUkoumP54u/MDM/5u44KF9hIu8jF0uafZtQLcdfIKkIcUNuF/fBojpLEHZS/56JqPeXQ==", + "@smithy/invalid-dependency@4.0.4": { + "integrity": "sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==", "dependencies": [ "@smithy/types", "tslib" @@ -1130,24 +904,24 @@ "tslib" ] }, - "@smithy/md5-js@4.0.2": { - "integrity": "sha512-Hc0R8EiuVunUewCse2syVgA2AfSRco3LyAv07B/zCOMa+jpXI9ll+Q21Nc6FAlYPcpNcAXqBzMhNs1CD/pP2bA==", + "@smithy/md5-js@4.0.4": { + "integrity": "sha512-uGLBVqcOwrLvGh/v/jw423yWHq/ofUGK1W31M2TNspLQbUV1Va0F5kTxtirkoHawODAZcjXTSGi7JwbnPcDPJg==", "dependencies": [ "@smithy/types", "@smithy/util-utf8@4.0.0", "tslib" ] }, - "@smithy/middleware-content-length@4.0.2": { - "integrity": "sha512-hAfEXm1zU+ELvucxqQ7I8SszwQ4znWMbNv6PLMndN83JJN41EPuS93AIyh2N+gJ6x8QFhzSO6b7q2e6oClDI8A==", + "@smithy/middleware-content-length@4.0.4": { + "integrity": "sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==", "dependencies": [ "@smithy/protocol-http", "@smithy/types", "tslib" ] }, - "@smithy/middleware-endpoint@4.1.0": { - "integrity": "sha512-xhLimgNCbCzsUppRTGXWkZywksuTThxaIB0HwbpsVLY5sceac4e1TZ/WKYqufQLaUy+gUSJGNdwD2jo3cXL0iA==", + "@smithy/middleware-endpoint@4.1.9": { + "integrity": "sha512-AjDgX4UjORLltD/LZCBQTwjQqEfyrx/GeDTHcYLzIgf87pIT70tMWnN87NQpJru1K4ITirY2htSOxNECZJCBOg==", "dependencies": [ "@smithy/core", "@smithy/middleware-serde", @@ -1159,8 +933,8 @@ "tslib" ] }, - "@smithy/middleware-retry@4.1.0": { - "integrity": "sha512-2zAagd1s6hAaI/ap6SXi5T3dDwBOczOMCSkkYzktqN1+tzbk1GAsHNAdo/1uzxz3Ky02jvZQwbi/vmDA6z4Oyg==", + "@smithy/middleware-retry@4.1.10": { + "integrity": "sha512-RyhcA3sZIIvAo6r48b2Nx2qfg0OnyohlaV0fw415xrQyx5HQ2bvHl9vs/WBiDXIP49mCfws5wX4308c9Pi/isw==", "dependencies": [ "@smithy/node-config-provider", "@smithy/protocol-http", @@ -1173,22 +947,23 @@ "uuid" ] }, - "@smithy/middleware-serde@4.0.3": { - "integrity": "sha512-rfgDVrgLEVMmMn0BI8O+8OVr6vXzjV7HZj57l0QxslhzbvVfikZbVfBVthjLHqib4BW44QhcIgJpvebHlRaC9A==", + "@smithy/middleware-serde@4.0.8": { + "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==", "dependencies": [ + "@smithy/protocol-http", "@smithy/types", "tslib" ] }, - "@smithy/middleware-stack@4.0.2": { - "integrity": "sha512-eSPVcuJJGVYrFYu2hEq8g8WWdJav3sdrI4o2c6z/rjnYDd3xH9j9E7deZQCzFn4QvGPouLngH3dQ+QVTxv5bOQ==", + "@smithy/middleware-stack@4.0.4": { + "integrity": "sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/node-config-provider@4.0.2": { - "integrity": "sha512-WgCkILRZfJwJ4Da92a6t3ozN/zcvYyJGUTmfGbgS/FkCcoCjl7G4FJaCDN1ySdvLvemnQeo25FdkyMSTSwulsw==", + "@smithy/node-config-provider@4.1.3": { + "integrity": "sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==", "dependencies": [ "@smithy/property-provider", "@smithy/shared-ini-file-loader", @@ -1196,8 +971,8 @@ "tslib" ] }, - "@smithy/node-http-handler@4.0.4": { - "integrity": "sha512-/mdqabuAT3o/ihBGjL94PUbTSPSRJ0eeVTdgADzow0wRJ0rN4A27EOrtlK56MYiO1fDvlO3jVTCxQtQmK9dZ1g==", + "@smithy/node-http-handler@4.0.6": { + "integrity": "sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==", "dependencies": [ "@smithy/abort-controller", "@smithy/protocol-http", @@ -1206,63 +981,50 @@ "tslib" ] }, - "@smithy/property-provider@4.0.2": { - "integrity": "sha512-wNRoQC1uISOuNc2s4hkOYwYllmiyrvVXWMtq+TysNRVQaHm4yoafYQyjN/goYZS+QbYlPIbb/QRjaUZMuzwQ7A==", + "@smithy/property-provider@4.0.4": { + "integrity": "sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/protocol-http@5.1.0": { - "integrity": "sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==", + "@smithy/protocol-http@5.1.2": { + "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/querystring-builder@4.0.2": { - "integrity": "sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==", + "@smithy/querystring-builder@4.0.4": { + "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==", "dependencies": [ "@smithy/types", "@smithy/util-uri-escape", "tslib" ] }, - "@smithy/querystring-parser@4.0.2": { - "integrity": "sha512-v6w8wnmZcVXjfVLjxw8qF7OwESD9wnpjp0Dqry/Pod0/5vcEA3qxCr+BhbOHlxS8O+29eLpT3aagxXGwIoEk7Q==", + "@smithy/querystring-parser@4.0.4": { + "integrity": "sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/service-error-classification@4.0.2": { - "integrity": "sha512-LA86xeFpTKn270Hbkixqs5n73S+LVM0/VZco8dqd+JT75Dyx3Lcw/MraL7ybjmz786+160K8rPOmhsq0SocoJQ==", + "@smithy/service-error-classification@4.0.5": { + "integrity": "sha512-LvcfhrnCBvCmTee81pRlh1F39yTS/+kYleVeLCwNtkY8wtGg8V/ca9rbZZvYIl8OjlMtL6KIjaiL/lgVqHD2nA==", "dependencies": [ "@smithy/types" ] }, - "@smithy/shared-ini-file-loader@4.0.2": { - "integrity": "sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==", - "dependencies": [ - "@smithy/types", - "tslib" - ] - }, - "@smithy/signature-v4@5.0.2": { - "integrity": "sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw==", + "@smithy/shared-ini-file-loader@4.0.4": { + "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==", "dependencies": [ - "@smithy/is-array-buffer@4.0.0", - "@smithy/protocol-http", "@smithy/types", - "@smithy/util-hex-encoding", - "@smithy/util-middleware", - "@smithy/util-uri-escape", - "@smithy/util-utf8@4.0.0", "tslib" ] }, - "@smithy/signature-v4@5.1.0": { - "integrity": "sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==", + "@smithy/signature-v4@5.1.2": { + "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==", "dependencies": [ "@smithy/is-array-buffer@4.0.0", "@smithy/protocol-http", @@ -1274,8 +1036,8 @@ "tslib" ] }, - "@smithy/smithy-client@4.2.0": { - "integrity": "sha512-Qs65/w30pWV7LSFAez9DKy0Koaoh3iHhpcpCCJ4waj/iqwsuSzJna2+vYwq46yBaqO5ZbP9TjUsATUNxrKeBdw==", + "@smithy/smithy-client@4.4.1": { + "integrity": "sha512-XPbcHRfd0iwx8dY5XCBCGyI7uweMW0oezYezxXcG8ANgvZ5YPuC6Ylh+n0bTHpdU3SCMZOnhzgVklYz+p3fIhw==", "dependencies": [ "@smithy/core", "@smithy/middleware-endpoint", @@ -1286,14 +1048,14 @@ "tslib" ] }, - "@smithy/types@4.2.0": { - "integrity": "sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==", + "@smithy/types@4.3.1": { + "integrity": "sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==", "dependencies": [ "tslib" ] }, - "@smithy/url-parser@4.0.2": { - "integrity": "sha512-Bm8n3j2ScqnT+kJaClSVCMeiSenK6jVAzZCNewsYWuZtnBehEz4r2qP0riZySZVfzB+03XZHJeqfmJDkeeSLiQ==", + "@smithy/url-parser@4.0.4": { + "integrity": "sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==", "dependencies": [ "@smithy/querystring-parser", "@smithy/types", @@ -1340,8 +1102,8 @@ "tslib" ] }, - "@smithy/util-defaults-mode-browser@4.0.8": { - "integrity": "sha512-ZTypzBra+lI/LfTYZeop9UjoJhhGRTg3pxrNpfSTQLd3AJ37r2z4AXTKpq1rFXiiUIJsYyFgNJdjWRGP/cbBaQ==", + "@smithy/util-defaults-mode-browser@4.0.17": { + "integrity": "sha512-HXq5181qnXmIwB7VrwqwP8rsJybHMoYuJnNoXy4PROs2pfSI4sWDMASF2i+7Lo+u64Y6xowhegcdxczowgJtZg==", "dependencies": [ "@smithy/property-provider", "@smithy/smithy-client", @@ -1350,8 +1112,8 @@ "tslib" ] }, - "@smithy/util-defaults-mode-node@4.0.8": { - "integrity": "sha512-Rgk0Jc/UDfRTzVthye/k2dDsz5Xxs9LZaKCNPgJTRyoyBoeiNCnHsYGOyu1PKN+sDyPnJzMOz22JbwxzBp9NNA==", + "@smithy/util-defaults-mode-node@4.0.17": { + "integrity": "sha512-RfU2A5LjFhEHw4Nwl1GZNitK4AUWu5jGtigAUDoQtfDUvYHpQxcuLw2QGAdKDtKRflIiHSZ8wXBDR36H9R2Ang==", "dependencies": [ "@smithy/config-resolver", "@smithy/credential-provider-imds", @@ -1362,8 +1124,8 @@ "tslib" ] }, - "@smithy/util-endpoints@3.0.2": { - "integrity": "sha512-6QSutU5ZyrpNbnd51zRTL7goojlcnuOB55+F9VBD+j8JpRY50IGamsjlycrmpn8PQkmJucFW8A0LSfXj7jjtLQ==", + "@smithy/util-endpoints@3.0.6": { + "integrity": "sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==", "dependencies": [ "@smithy/node-config-provider", "@smithy/types", @@ -1376,23 +1138,23 @@ "tslib" ] }, - "@smithy/util-middleware@4.0.2": { - "integrity": "sha512-6GDamTGLuBQVAEuQ4yDQ+ti/YINf/MEmIegrEeg7DdB/sld8BX1lqt9RRuIcABOhAGTA50bRbPzErez7SlDtDQ==", + "@smithy/util-middleware@4.0.4": { + "integrity": "sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==", "dependencies": [ "@smithy/types", "tslib" ] }, - "@smithy/util-retry@4.0.2": { - "integrity": "sha512-Qryc+QG+7BCpvjloFLQrmlSd0RsVRHejRXd78jNO3+oREueCjwG1CCEH1vduw/ZkM1U9TztwIKVIi3+8MJScGg==", + "@smithy/util-retry@4.0.5": { + "integrity": "sha512-V7MSjVDTlEt/plmOFBn1762Dyu5uqMrV2Pl2X0dYk4XvWfdWJNe9Bs5Bzb56wkCuiWjSfClVMGcsuKrGj7S/yg==", "dependencies": [ "@smithy/service-error-classification", "@smithy/types", "tslib" ] }, - "@smithy/util-stream@4.2.0": { - "integrity": "sha512-Vj1TtwWnuWqdgQI6YTUF5hQ/0jmFiOYsc51CSMgj7QfyO+RF4EnT2HNjoviNlOOmgzgvf3f5yno+EiC4vrnaWQ==", + "@smithy/util-stream@4.2.2": { + "integrity": "sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==", "dependencies": [ "@smithy/fetch-http-handler", "@smithy/node-http-handler", @@ -1424,8 +1186,8 @@ "tslib" ] }, - "@smithy/util-waiter@4.0.3": { - "integrity": "sha512-JtaY3FxmD+te+KSI2FJuEcfNC9T/DGGVf551babM7fAaXhjJUt7oSYurH1Devxd2+BOSUACCgt3buinx4UnmEA==", + "@smithy/util-waiter@4.0.5": { + "integrity": "sha512-4QvC49HTteI1gfemu0I1syWovJgPvGn7CVUoN9ZFkdvr/cCFkrEL7qNCdx/2eICqDWEGnnr68oMdSIPCLAriSQ==", "dependencies": [ "@smithy/abort-controller", "@smithy/types", @@ -1441,6 +1203,9 @@ "bowser@2.11.0": { "integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==" }, + "email-addresses@5.0.0": { + "integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw==" + }, "fast-xml-parser@4.4.1": { "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==", "dependencies": [ @@ -1448,8 +1213,8 @@ ], "bin": true }, - "hono@4.7.10": { - "integrity": "sha512-QkACju9MiN59CKSY5JsGZCYmPZkA6sIW6OFCUp7qDjZu6S6KHtJHhAc9Uy9mV9F8PJ1/HQ3ybZF2yjCa/73fvQ==" + "hono@4.7.11": { + "integrity": "sha512-rv0JMwC0KALbbmwJDEnxvQCeJh+xbS3KEWW5PC9cMJ08Ur9xgatI0HmtgYZfOdOSOeYsp5LO2cOhdI8cLEbDEQ==" }, "kysely@0.28.2": { "integrity": "sha512-4YAVLoF0Sf0UTqlhgQMFU9iQECdah7n+13ANkiuVfRvlK+uI0Etbgd7bVP36dKlG+NXWbhGua8vnGt+sdhvT7A==" @@ -1470,24 +1235,28 @@ "ws@8.18.1": { "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==" }, - "zod@3.25.20": { - "integrity": "sha512-z03fqpTMDF1G02VLKUMt6vyACE7rNWkh3gpXVHgPTw28NPtDFRGvcpTtPwn2kMKtQ0idtYJUTxchytmnqYswcw==" + "zod@3.25.48": { + "integrity": "sha512-0X1mz8FtgEIvaxGjdIImYpZEaZMrund9pGXm3M6vM7Reba0e2eI71KPjSCGXBfwKDPwPoywf6waUKc3/tFvX2Q==" } }, "workspace": { "dependencies": [ "jsr:@db/sqlite@0.12", - "jsr:@std/cli@^1.0.17", + "jsr:@std/cli@^1.0.19", + "jsr:@std/csv@^1.0.6", "jsr:@std/encoding@^1.0.10", "jsr:@std/expect@^1.0.16", - "jsr:@std/path@^1.0.9", - "jsr:@std/testing@^1.0.12", - "npm:@aws-sdk/client-s3@^3.797.0", - "npm:@aws-sdk/client-sesv2@^3.782.0", - "npm:@hono/zod-validator@0.5", - "npm:hono@^4.7.10", + "jsr:@std/io@~0.225.2", + "jsr:@std/path@^1.1.0", + "jsr:@std/testing@^1.0.13", + "npm:@aws-sdk/client-s3@^3.821.0", + "npm:@aws-sdk/client-sesv2@^3.821.0", + "npm:@hono/zod-validator@0.7", + "npm:@smithy/fetch-http-handler@^5.0.4", + "npm:email-addresses@5", + "npm:hono@^4.7.11", "npm:kysely@~0.28.2", - "npm:zod@^3.25.20" + "npm:zod@^3.25.48" ] } } diff --git a/services/docker/mail-server/relay/dovecot.ts b/services/docker/mail-server/relay/dovecot.ts index 6f962a3..4971943 100644 --- a/services/docker/mail-server/relay/dovecot.ts +++ b/services/docker/mail-server/relay/dovecot.ts @@ -1,38 +1,94 @@ -import { getLogger } from "./logger.ts"; -import { Mail, MailDeliverer } from "./mail.ts"; +import { basename } from "@std/path"; + +import config from "./config.ts"; +import log from "./log.ts"; +import { + Mail, + MailDeliverContext, + MailDeliverer, + MailDeliverRecipientResult, + RecipientFromHeadersHook, +} from "./mail.ts"; export class DovecotMailDeliverer extends MailDeliverer { readonly name = "dovecot"; - readonly ldaBin = "dovecot-lda"; - protected override async doDeliver(mail: Mail): Promise<void> { - const { ldaBin } = this; + constructor() { + super(); + this.preHooks.push( + new RecipientFromHeadersHook(), + ); + } + + protected override async doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void> { + const ldaPath = config.get("ldaPath"); + const ldaBinName = basename(ldaPath); + const utf8Stream = mail.toUtf8Bytes(); - let status; - try { - const utf8Stream = mail.toUtf8Bytes(); + const recipients = [...context.recipients]; + if (recipients.length === 0) { + throw new Error("No recipients found."); + } - const ldaCommand = new Deno.Command(ldaBin, { - stdin: "piped", - stdout: "piped", - stderr: "piped", - }); + log.info(`Deliver to ${recipients.join(", ")}.`); - const ldaProcess = ldaCommand.spawn(); - getLogger().logProgramOutput(ldaProcess, ldaBin); + for (const recipient of recipients) { + log.info(`Call ${ldaBinName} for ${recipient}...`); - const stdinWriter = ldaProcess.stdin.getWriter(); - await stdinWriter.ready; - await stdinWriter.write(utf8Stream); - await stdinWriter.ready; + const result: MailDeliverRecipientResult = { + kind: "done", + message: `${ldaBinName} exited with success.`, + }; - status = await ldaProcess.status; - } catch (cause) { - mail.throwDeliverError(this, "external error.", cause); - } + try { + const ldaCommand = new Deno.Command(ldaPath, { + args: ["-d", recipient], + stdin: "piped", + stdout: "piped", + stderr: "piped", + }); + + const ldaProcess = ldaCommand.spawn(); + using logFiles = await log.openLogForProgram(ldaBinName); + ldaProcess.stdout.pipeTo(logFiles.stdout.writable); + ldaProcess.stderr.pipeTo(logFiles.stderr.writable); + + const stdinWriter = ldaProcess.stdin.getWriter(); + await stdinWriter.write(utf8Stream); + await stdinWriter.close(); + + const status = await ldaProcess.status; + + if (!status.success) { + result.kind = "fail"; + result.message = + `${ldaBinName} exited with error code ${status.code}`; + + if (status.signal != null) { + result.message += ` (signal ${status.signal})`; + } + + // https://doc.dovecot.org/main/core/man/dovecot-lda.1.html + switch (status.code) { + case 67: + result.message += ", recipient user not known"; + break; + case 75: + result.kind = "retry"; + break; + } - if (!status.success) { - mail.throwDeliverError(this, `${ldaBin} exited with non-zero.`); + result.message += "."; + } + } catch (e) { + result.kind = "fail"; + result.message = "An error was thrown when running lda process: " + e; + result.cause = e; + } + context.result.recipients.set(recipient, result); } } } diff --git a/services/docker/mail-server/relay/dumb-smtp-server.ts b/services/docker/mail-server/relay/dumb-smtp-server.ts new file mode 100644 index 0000000..21679ea --- /dev/null +++ b/services/docker/mail-server/relay/dumb-smtp-server.ts @@ -0,0 +1,115 @@ +import config from "./config.ts"; +import log from "./log.ts"; +import { MailDeliverer } from "./mail.ts"; + +const CRLF = "\r\n"; + +const SERVER_NAME = `[${config.SMTP_HOST}]:${config.SMTP_PORT}`; + +const RESPONSES = { + "READY": `220 ${SERVER_NAME} SMTP Ready`, + "EHLO": `250 ${SERVER_NAME}`, + "MAIL": "250 2.1.0 Sender OK", + "RCPT": "250 2.1.5 Recipient OK", + "DATA": "354 Start mail input; end with <CRLF>.<CRLF>", + "QUIT": `211 2.0.0 ${SERVER_NAME} closing connection`, + "INVALID": "500 5.5.1 Error: command not recognized", +} as const; + +export class DumbSMTPServer { + #deliverer: MailDeliverer; + + constructor(deliverer: MailDeliverer) { + this.#deliverer = deliverer; + } + + async #handleConnection(conn: Deno.Conn) { + using disposeStack = new DisposableStack(); + disposeStack.defer(() => { + log.info("Close smtp session tcp connection."); + conn.close(); + }); + const writer = conn.writable.getWriter(); + disposeStack.defer(() => writer.releaseLock()); + const reader = conn.readable.getReader(); + disposeStack.defer(() => reader.releaseLock()); + + const [decoder, encoder] = [new TextDecoder(), new TextEncoder()]; + const decode = (data: Uint8Array) => decoder.decode(data); + const send = async (s: string) => + await writer.write(encoder.encode(s + CRLF)); + + let buffer: string = ""; + let rawMail: string | null = null; + + await send(RESPONSES["READY"]); + + while (true) { + const { value, done } = await reader.read(); + if (done) break; + + buffer += decode(value); + + while (true) { + const eolPos = buffer.indexOf(CRLF); + if (eolPos === -1) break; + + const line = buffer.slice(0, eolPos); + buffer = buffer.slice(eolPos + CRLF.length); + + if (rawMail == null) { + log.info("Smtp server received line:", line); + const upperLine = line.toUpperCase(); + if (upperLine.startsWith("EHLO") || upperLine.startsWith("HELO")) { + await send(RESPONSES["EHLO"]); + } else if (upperLine.startsWith("MAIL FROM:")) { + await send(RESPONSES["MAIL"]); + } else if (upperLine.startsWith("RCPT TO:")) { + await send(RESPONSES["RCPT"]); + } else if (upperLine === "DATA") { + await send(RESPONSES["DATA"]); + log.info("Begin to receive mail data..."); + rawMail = ""; + } else if (upperLine === "QUIT") { + await send(RESPONSES["QUIT"]); + return; + } else { + log.warn("Smtp server command unrecognized:", line); + await send(RESPONSES["INVALID"]); + return; + } + } else { + if (line === ".") { + try { + log.info("Done receiving mail data..."); + const { message } = await this.#deliverer.deliverRaw(rawMail); + await send(`250 2.6.0 ${message}`); + rawMail = null; + log.info("Done SMTP mail session."); + } catch (err) { + log.info(err); + await send("554 5.3.0 Error: check server log"); + return; + } + } else { + const dataLine = line.startsWith("..") ? line.slice(1) : line; + rawMail += dataLine + CRLF; + } + } + } + } + } + + async serve() { + const listener = Deno.listen({ + hostname: config.SMTP_HOST, + port: config.SMTP_PORT, + }); + listener.unref(); + log.info(`Dumb SMTP server running on port ${config.SMTP_PORT}.`); + + for await (const conn of listener) { + await this.#handleConnection(conn); + } + } +} diff --git a/services/docker/mail-server/relay/log.ts b/services/docker/mail-server/relay/log.ts new file mode 100644 index 0000000..ce27eca --- /dev/null +++ b/services/docker/mail-server/relay/log.ts @@ -0,0 +1,116 @@ +import { join } from "@std/path"; +import { toWritableStream, Writer } from "@std/io"; + +import "./better-js.ts"; + +export interface LogOptions { + time?: Date; + error?: boolean; +} + +export type LogFile = Pick<Deno.FsFile, "writable"> & Disposable; + +export class Log { + #path: string | null = null; + + #wrapWriter(writer: Writer): LogFile { + return { + writable: toWritableStream(writer, { autoClose: false }), + [Symbol.dispose]() {}, + }; + } + + #stdoutWrapper: LogFile = this.#wrapWriter(Deno.stdout); + #stderrWrapper: LogFile = this.#wrapWriter(Deno.stderr); + + constructor() { + } + + get path() { + return this.#path; + } + + set path(path) { + this.#path = path; + if (path != null) { + Deno.mkdirSync(path, { recursive: true }); + } + } + + infoOrError(isError: boolean, ...args: unknown[]) { + this[isError ? "error" : "info"].call(this, ...args); + } + + info(...args: unknown[]) { + console.log(...args); + } + + warn(...args: unknown[]) { + console.warn(...args); + } + + error(...args: unknown[]) { + console.error(...args); + } + + #extractOptions(options?: LogOptions): Required<LogOptions> { + return { + time: options?.time ?? new Date(), + error: options?.error ?? false, + }; + } + + async openLog( + prefix: string, + suffix: string, + options?: LogOptions, + ): Promise<LogFile> { + if (prefix.includes("/")) { + throw new Error(`Log file prefix ${prefix} contains '/'.`); + } + if (suffix.includes("/")) { + throw new Error(`Log file suffix ${suffix} contains '/'.`); + } + + const { time, error } = this.#extractOptions(options); + if (this.#path == null) { + return error ? this.#stderrWrapper : this.#stdoutWrapper; + } + + const logPath = join( + this.#path, + `${prefix}-${time.toFileNameString()}-${suffix}`, + ); + return await Deno.open(logPath, { + read: false, + write: true, + append: true, + create: true, + }); + } + + async openLogForProgram( + program: string, + options?: Omit<LogOptions, "error">, + ): Promise<{ stdout: LogFile; stderr: LogFile } & Disposable> { + const stdout = await this.openLog(program, "stdout", { + ...options, + error: false, + }); + const stderr = await this.openLog(program, "stderr", { + ...options, + error: true, + }); + return { + stdout, + stderr, + [Symbol.dispose]: () => { + stdout[Symbol.dispose](); + stderr[Symbol.dispose](); + }, + }; + } +} + +const log = new Log(); +export default log; diff --git a/services/docker/mail-server/relay/logger.ts b/services/docker/mail-server/relay/logger.ts deleted file mode 100644 index 160d70a..0000000 --- a/services/docker/mail-server/relay/logger.ts +++ /dev/null @@ -1,50 +0,0 @@ -import * as path from "@std/path"; - -import { createSingleton, generateTimeStringForFileName } from "./util.ts"; - -export class Logger { - constructor(public readonly path: string) {} - - warn(message: string) { - console.log(message); - } - - generateLogFilePath( - prefix: string = "", - suffix: string = "", - instant?: Temporal.Instant | Date, - ): string { - return path.join( - this.path, - `${prefix}-${generateTimeStringForFileName(instant)}-${suffix}`, - ); - } - - openLogFile( - prefix: string = "", - suffix: string = "", - instant?: Temporal.Instant | Date, - ): Promise<Deno.FsFile> { - const logPath = this.generateLogFilePath(prefix, suffix, instant); - return Deno.open(logPath, { - read: false, - write: true, - append: true, - create: true, - }); - } - - async logProgramOutput( - process: Deno.ChildProcess, - program: string, - instant?: Temporal.Instant | Date, - ): Promise<void> { - const stdoutFile = await this.openLogFile(program, "stdout", instant); - const stderrFile = await this.openLogFile(program, "stderr", instant); - - process.stdout.pipeTo(stdoutFile.writable); - process.stderr.pipeTo(stderrFile.writable); - } -} - -export const [getLogger, setLogger] = createSingleton<Logger>("Logger"); diff --git a/services/docker/mail-server/relay/mail.test.ts b/services/docker/mail-server/relay/mail.test.ts index b734c70..687d666 100644 --- a/services/docker/mail-server/relay/mail.test.ts +++ b/services/docker/mail-server/relay/mail.test.ts @@ -3,43 +3,72 @@ import { expect, fn } from "@std/expect"; import { Mail, MailDeliverer } from "./mail.ts"; -describe("Mail", () => { - const mockDate = "Fri, 02 May 2025 08:33:02 +0000"; - const mockBodyStr = `This is body content. +const mockDate = "Fri, 02 May 2025 08:33:02 +0000"; +const mockBodyStr = `This is body content. Line 2 Line 4`; - const mockHeaders = [ - ["Content-Disposition", "inline"], - ["Content-Transfer-Encoding", "quoted-printable"], - ["MIME-Version", "1.0"], - ["X-Mailer", "MIME-tools 5.509 (Entity 5.509)"], - ["Content-Type", "text/plain; charset=utf-8"], - ["From", '"Mock From" <mock@from.mock>'], - ["To", "Mock To <mock@to.mock>"], - ["CC", "Mock CC <mock@cc.mock"], - ["Subject", "A very long mock\n subject"], - ["Message-ID", "<abcdef@from.mock>"], - ["Date", mockDate], - ]; - const mockHeaderStr = mockHeaders.map((h) => h[0] + ": " + h[1]).join("\n"); - const mockMailStr = mockHeaderStr + "\n\n" + mockBodyStr; +const mockHeaders = [ + ["Content-Disposition", "inline"], + ["Content-Transfer-Encoding", "quoted-printable"], + ["MIME-Version", "1.0"], + ["X-Mailer", "MIME-tools 5.509 (Entity 5.509)"], + ["Content-Type", "text/plain; charset=utf-8"], + ["From", '"Mock From" <mock@from.mock>'], + [ + "To", + `"John \\"Big\\" Doe" <john@example.com>, "Alice (Work)" <alice+work@example.com>, + undisclosed-recipients:;, "Group: Team" <team@company.com>, + "Escaped, Name" <escape@test.com>, just@email.com, + "Comment (This is valid)" <comment@domain.net>, + "Odd @Chars" <weird!#$%'*+-/=?^_\`{|}~@char-test.com>, + "Non-ASCII 用户" <user@例子.中国>, + admin@[192.168.1.1]`, + ], + ["CC", "Mock CC <mock@cc.mock>"], + ["Subject", "A very long mock\n subject"], + ["Message-ID", "<abcdef@from.mock>"], + ["Date", mockDate], +]; +const mockHeaderStr = mockHeaders.map((h) => h[0] + ": " + h[1]).join("\n"); +const mockMailStr = mockHeaderStr + "\n\n" + mockBodyStr; +const mockCrlfMailStr = mockMailStr.replaceAll("\n", "\r\n"); +const mockToAddresses = [ + "john@example.com", + "alice+work@example.com", + "team@company.com", + "escape@test.com", + "just@email.com", + "comment@domain.net", + "weird!#$%'*+-/=?^_`{|}~@char-test.com", + "user@例子.中国", + "admin@[192.168.1.1]", +]; +const mockCcAddresses = ["mock@cc.mock"]; +describe("Mail", () => { it("simple parse", () => { - const parsed = new Mail(mockMailStr).simpleParse(); - expect(parsed.sections.header).toEqual(mockHeaderStr); - expect(parsed.sections.body).toEqual(mockBodyStr); + const parsed = new Mail(mockMailStr).startSimpleParse().sections(); + expect(parsed.header).toEqual(mockHeaderStr); + expect(parsed.body).toEqual(mockBodyStr); expect(parsed.sep).toBe("\n"); expect(parsed.eol).toBe("\n"); }); + it("simple parse crlf", () => { + const parsed = new Mail(mockCrlfMailStr).startSimpleParse().sections(); + expect(parsed.sep).toBe("\r\n"); + expect(parsed.eol).toBe("\r\n"); + }); + it("simple parse date", () => { - expect(new Mail(mockMailStr).simpleParseDate()).toEqual(new Date(mockDate)); + expect(new Mail(mockMailStr).startSimpleParse().sections().headers().date()) + .toEqual(new Date(mockDate)); }); it("simple parse headers", () => { expect( - new Mail(mockMailStr).simpleParseHeaders(), + new Mail(mockMailStr).startSimpleParse().sections().headers(), ).toEqual(mockHeaders.map( (h) => [h[0], " " + h[1].replaceAll("\n", "")], )); @@ -59,6 +88,22 @@ Line 4`; "\n\n" + mockBodyStr, ); }); + + it("parse recipients", () => { + const mail = new Mail(mockMailStr); + expect(mail.startSimpleParse().sections().headers().recipients()).toEqual([ + ...mockToAddresses, + ...mockCcAddresses, + ]); + expect( + mail.startSimpleParse().sections().headers().recipients({ + domain: "example.com", + }), + ).toEqual([ + ...mockToAddresses, + ...mockCcAddresses, + ].filter((a) => a.endsWith("example.com"))); + }); }); describe("MailDeliverer", () => { @@ -69,12 +114,7 @@ describe("MailDeliverer", () => { const mockDeliverer = new MockMailDeliverer(); it("deliver success", async () => { - const mail = await mockDeliverer.deliverRaw("mock mail"); + await mockDeliverer.deliverRaw(mockMailStr); expect(mockDeliverer.doDeliver).toHaveBeenCalledTimes(1); - expect(mail.deliverState).toEqual({ - kind: "delivered", - error: undefined, - deliverer: mockDeliverer, - }); }); }); diff --git a/services/docker/mail-server/relay/mail.ts b/services/docker/mail-server/relay/mail.ts index 859ce63..9c12876 100644 --- a/services/docker/mail-server/relay/mail.ts +++ b/services/docker/mail-server/relay/mail.ts @@ -1,27 +1,14 @@ import { encodeBase64 } from "@std/encoding/base64"; +import { parse } from "@std/csv/parse"; +import emailAddresses from "email-addresses"; -import { getLogger } from "./logger.ts"; - -export type MailDeliverStateNotSent = { kind: "not-sent" }; -export type MailDeliverStateDelivered = { - kind: "delivered"; - deliverer: MailDeliverer; - error?: Error; -}; -export type MailDeliverStateError = { - kind: "error"; - deliverer: MailDeliverer; - error: Error; -}; -export type MailDeliverState = - | MailDeliverStateNotSent - | MailDeliverStateDelivered - | MailDeliverStateError; - -class MailParseError extends Error { +import log from "./log.ts"; +import config from "./config.ts"; + +class MailSimpleParseError extends Error { constructor( message: string, - public readonly mail: Mail, + public readonly text: string, public readonly lineNumber?: number, options?: ErrorOptions, ) { @@ -30,99 +17,69 @@ class MailParseError extends Error { } } -class MailDeliverError extends Error { - constructor( - message: string, - public readonly mail: Mail, - options?: ErrorOptions, - ) { - super(message, options); - } -} - -const eolNames = new Map([ - ["\n", "\\n"], - ["\r", "\\r"], - ["\n\r", "\\n\\r"], -]); - -interface ParsedMail { - sections: { - header: string; - body: string; - }; - /** - * The empty line between headers and body. - */ - sep: string; - eol: string; -} - -export class Mail { - date?: Date; - messageId?: string; - deliverState: MailDeliverState = { kind: "not-sent" }; - - constructor(public raw: string) {} - - setDelivered(deliverer: MailDeliverer, error?: Error) { - this.deliverState = { "kind": "delivered", deliverer, error }; - } - - throwDeliverError( - deliverer: MailDeliverer, - reason: string, - cause?: unknown, - ): never { - const error = new MailDeliverError( - `Failed to deliver mail with ${deliverer.name}: ${reason}`, - this, - { cause }, - ); - this.deliverState = { "kind": "error", deliverer, error }; - throw error; +class MailSimpleParsedHeaders extends Array<[key: string, value: string]> { + date(invalidToUndefined: boolean = true): Date | undefined { + for (const [key, value] of this) { + if (key.toLowerCase() === "date") { + const date = new Date(value); + if (invalidToUndefined && isNaN(date.getTime())) { + log.warn(`Invalid date string (${value}) found in header.`); + return undefined; + } + return date; + } + } + return undefined; } - toUtf8Bytes(): Uint8Array { - const utf8Encoder = new TextEncoder(); - return utf8Encoder.encode(this.raw); + recipients(options?: { domain?: string; headers?: string[] }): Set<string> { + const domain = options?.domain; + const headers = options?.headers ?? ["to", "cc", "bcc", "x-original-to"]; + const recipients = new Set<string>(); + for (const [key, value] of this) { + if (headers.includes(key.toLowerCase())) { + emailAddresses.parseAddressList(value)?.flatMap((a) => + a.type === "mailbox" ? a : a.addresses + )?.forEach(({ address }) => { + if (domain == null || address.endsWith(domain)) { + recipients.add(address); + } + }); + } + } + return recipients; } +} - toBase64(): string { - return encodeBase64(this.raw); - } +class MailSimpleParsedSections { + header: string; + body: string; + eol: string; + sep: string; - simpleParse(): ParsedMail { - const twoEolMatch = this.raw.match(/(\r\n|\n|\r)(\r\n|\n|\r)/); - // "\r\n" is a false positive. - if (twoEolMatch == null || twoEolMatch[0] === "\r\n") { - throw new MailParseError( + constructor(raw: string) { + const twoEolMatch = raw.match(/(\r?\n)(\r?\n)/); + if (twoEolMatch == null) { + throw new MailSimpleParseError( "No header/body section separator (2 successive EOLs) found.", - this, + raw, ); } const [eol, sep] = [twoEolMatch[1], twoEolMatch[2]]; if (eol !== sep) { - getLogger().warn( - `Different EOLs (${eolNames.get(eol)} and ${eolNames.get(sep)}) found.`, - ); + log.warn("Different EOLs (\\r\\n, \\n) found."); } - return { - sections: { - header: this.raw.slice(0, twoEolMatch.index!), - body: this.raw.slice(twoEolMatch.index! + eol.length + sep.length), - }, - sep, - eol, - }; + this.header = raw.slice(0, twoEolMatch.index!); + this.body = raw.slice(twoEolMatch.index! + eol.length + sep.length); + this.eol = eol; + this.sep = sep; } - simpleParseHeaders(): [key: string, value: string][] { - const { sections } = this.simpleParse(); - const headers: [string, string][] = []; + headers(): MailSimpleParsedHeaders { + const headers = new MailSimpleParsedHeaders(); let field: string | null = null; let lineNumber = 1; @@ -131,9 +88,9 @@ export class Mail { if (field == null) return; const sepPos = field.indexOf(":"); if (sepPos === -1) { - throw new MailParseError( + throw new MailSimpleParseError( "No ':' in the header field.", - this, + this.header, lineNumber, ); } @@ -141,12 +98,12 @@ export class Mail { field = null; }; - for (const line of sections.header.trimEnd().split(/\r?\n|\r/)) { + for (const line of this.header.trimEnd().split(/\r?\n|\r/)) { if (line.match(/^\s/)) { if (field == null) { - throw new MailParseError( + throw new MailSimpleParseError( "Header field starts with a space.", - this, + this.header, lineNumber, ); } @@ -162,62 +119,184 @@ export class Mail { return headers; } +} - simpleParseDate<T = undefined>( - invalidValue: T | undefined = undefined, - ): Date | T | undefined { - const headers = this.simpleParseHeaders(); - for (const [key, value] of headers) { - if (key.toLowerCase() === "date") { - const date = new Date(value); - if (isNaN(date.getTime())) { - getLogger().warn(`Invalid date string (${value}) found in header.`); - return invalidValue; - } - return date; - } - } - return undefined; +export class Mail { + constructor(public raw: string) {} + + toUtf8Bytes(): Uint8Array { + const utf8Encoder = new TextEncoder(); + return utf8Encoder.encode(this.raw); + } + + toBase64(): string { + return encodeBase64(this.raw); + } + + startSimpleParse() { + return { sections: () => new MailSimpleParsedSections(this.raw) }; } // TODO: Add folding. appendHeaders(headers: [key: string, value: string][]) { - const { sections, sep, eol } = this.simpleParse(); + const { header, body, sep, eol } = this.startSimpleParse().sections(); - this.raw = sections.header + eol + + this.raw = header + eol + headers.map(([k, v]) => `${k}: ${v}`).join(eol) + eol + sep + - sections.body; + body; + } +} + +export type MailDeliverResultKind = "done" | "fail" | "retry"; + +export interface MailDeliverRecipientResult { + kind: MailDeliverResultKind; + message: string; + cause?: unknown; +} + +export class MailDeliverResult { + message: string = ""; + recipients: Map<string, MailDeliverRecipientResult> = new Map(); + + constructor(public mail: Mail) {} + + hasError(): boolean { + return this.recipients.values().some((r) => r.kind !== "done"); + } + + [Symbol.for("Deno.customInspect")]() { + return [ + `message: ${this.message}`, + ...this.recipients.entries().map(([recipient, result]) => + `${recipient} [${result.kind}]: ${result.message}` + ), + ].join("\n"); } } -export type MailDeliverHook = (mail: Mail) => Promise<void>; +export class MailDeliverContext { + readonly recipients: Set<string> = new Set(); + readonly result; + + constructor(public mail: Mail) { + this.result = new MailDeliverResult(this.mail); + } +} + +export interface MailDeliverHook { + callback(context: MailDeliverContext): Promise<void>; +} export abstract class MailDeliverer { abstract readonly name: string; preHooks: MailDeliverHook[] = []; postHooks: MailDeliverHook[] = []; - protected abstract doDeliver(mail: Mail): Promise<void>; + protected abstract doDeliver( + mail: Mail, + context: MailDeliverContext, + ): Promise<void>; - async deliverRaw(rawMail: string): Promise<Mail> { - const mail = new Mail(rawMail); - await this.deliver(mail); - return mail; + async deliverRaw(rawMail: string) { + return await this.deliver({ mail: new Mail(rawMail) }); } - async deliver(mail: Mail): Promise<void> { + async deliver( + options: { mail: Mail; recipients?: string[] }, + ): Promise<MailDeliverResult> { + log.info(`Begin to deliver mail via ${this.name}...`); + + const context = new MailDeliverContext(options.mail); + options.recipients?.forEach((r) => context.recipients.add(r)); + for (const hook of this.preHooks) { - await hook(mail); + await hook.callback(context); } - await this.doDeliver(mail); + await this.doDeliver(context.mail, context); - if (mail.deliverState.kind === "not-sent") { - mail.setDelivered(this); + for (const hook of this.postHooks) { + await hook.callback(context); } - for (const hook of this.postHooks) { - await hook(mail); + log.info("Deliver result:"); + log.info(context.result); + + if (context.result.hasError()) { + throw new Error("Mail failed to deliver."); + } + + return context.result; + } +} + +export class RecipientFromHeadersHook implements MailDeliverHook { + callback(context: MailDeliverContext) { + if (context.recipients.size !== 0) { + log.warn( + "Recipients are already filled. Won't set them with ones in headers.", + ); + } else { + context.mail.startSimpleParse().sections().headers().recipients({ + domain: config.get("mailDomain"), + }).forEach((r) => context.recipients.add(r)); + + log.info( + "Recipients found from mail headers: ", + [...context.recipients].join(" "), + ); + } + return Promise.resolve(); + } +} + +export class FallbackRecipientHook implements MailDeliverHook { + constructor(public fallback: Set<string> = new Set()) {} + + callback(context: MailDeliverContext) { + if (context.recipients.size === 0) { + log.info( + "No recipients, fill with fallback: ", + [...this.fallback].join(" "), + ); + this.fallback.forEach((a) => context.recipients.add(a)); + } + return Promise.resolve(); + } +} + +export class AliasRecipientMailHook implements MailDeliverHook { + #aliasFile; + + constructor(aliasFile: string) { + this.#aliasFile = aliasFile; + } + + async #parseAliasFile(): Promise<Map<string, string>> { + const result = new Map(); + if ((await Deno.stat(this.#aliasFile)).isFile) { + log.info(`Found recipients alias file: ${this.#aliasFile}.`); + const text = await Deno.readTextFile(this.#aliasFile); + const csv = parse(text); + for (const [real, ...aliases] of csv) { + aliases.forEach((a) => result.set(a, real)); + } + } + return result; + } + + async callback(context: MailDeliverContext) { + const aliases = await this.#parseAliasFile(); + for (const recipient of [...context.recipients]) { + const realRecipients = aliases.get(recipient); + if (realRecipients != null) { + log.info( + `Recipient alias resolved: ${recipient} => ${realRecipients}.`, + ); + context.recipients.delete(recipient); + context.recipients.add(realRecipients); + } } } } diff --git a/services/docker/mail-server/relay/main.ts b/services/docker/mail-server/relay/main.ts deleted file mode 100644 index 5a021d8..0000000 --- a/services/docker/mail-server/relay/main.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { parseArgs } from "@std/cli"; - -import { AwsRelayApp } from "./aws/app.ts"; - -if (import.meta.main) { - const app = new AwsRelayApp(); - - const args = parseArgs(Deno.args); - if (args._.length === 0) { - throw new Error("You must specify a command."); - } - - const commands = { - "list-lives": () => { - console.log("absdf") - }, - }; - - const command = args._[0]; - if (command in commands) { - commands[command as keyof typeof commands](); - Deno.exit(0); - } else { - throw new Error(command + " is not a valid command."); - } - - await app.run(); -} diff --git a/services/docker/mail-server/relay/util.ts b/services/docker/mail-server/relay/util.ts deleted file mode 100644 index 29cda8b..0000000 --- a/services/docker/mail-server/relay/util.ts +++ /dev/null @@ -1,60 +0,0 @@ -function getZonedDateTime(instant?: Temporal.Instant | Date) { - if (instant == null) { - instant = Temporal.Now.instant(); - } else if (instant instanceof Date) { - instant = instant.toTemporalInstant(); - } - - return instant.toZonedDateTimeISO("UTC"); -} - -export function generateTimeStringForFileName( - instant?: Temporal.Instant | Date, - dateOnly: boolean = false, -): string { - const time = getZonedDateTime(instant); - - if (dateOnly) { - return time.toPlainDate().toString(); - } else { - return time.toPlainDateTime().toString().replaceAll(/:|\./g, "-"); - } -} - -export function transformProperties<T extends object, N>( - object: T, - transformer: (value: T[keyof T], key: keyof T) => N, -): { [k in keyof T]: N } { - return Object.fromEntries( - Object.entries(object).map(( - [k, v], - ) => [k, transformer(v, k as keyof T)]), - ) as { [k in keyof T]: N }; -} - -export function createSingleton<T>( - name: string, -): [() => T, (v: T | null) => void] { - let singleton: T | null = null; - - return [ - () => { - if (singleton == null) { - throw new Error(`Singleton ${name} is not set now.`); - } - return singleton; - }, - (newValue: T | null) => singleton = newValue, - ]; -} - -export function withDefaults<T extends object>( - partial: Partial<T> | null | undefined, - defaults: T, -): T { - const result: Record<PropertyKey, unknown> = {}; - for (const [key, value] of Object.entries(defaults)) { - result[key] = partial?.[key as keyof T] ?? value; - } - return result as T; -} |