diff options
| -rw-r--r-- | services/docker/mail-server/relay/aws/app.ts | 2 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/aws/deliver.ts | 2 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/aws/mail.ts | 6 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/aws/retriever.ts | 2 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/better-js.ts | 4 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/db.test.ts | 1 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/db.ts | 6 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/deno.json | 16 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/deno.lock | 965 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/dovecot.ts | 2 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/dumb-smtp-server.ts | 9 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/mail.test.ts | 23 | ||||
| -rw-r--r-- | services/docker/mail-server/relay/mail.ts | 188 |
13 files changed, 451 insertions, 775 deletions
diff --git a/services/docker/mail-server/relay/aws/app.ts b/services/docker/mail-server/relay/aws/app.ts index 9135d21..4b60853 100644 --- a/services/docker/mail-server/relay/aws/app.ts +++ b/services/docker/mail-server/relay/aws/app.ts @@ -31,7 +31,7 @@ export class AwsRelayApp extends AppBase { "json", z.object({ key: z.string(), - recipients: z.array(z.string()).optional(), + recipients: z.optional(z.array(z.string())), }), ), async (ctx) => { diff --git a/services/docker/mail-server/relay/aws/deliver.ts b/services/docker/mail-server/relay/aws/deliver.ts index 9c62496..5b3694f 100644 --- a/services/docker/mail-server/relay/aws/deliver.ts +++ b/services/docker/mail-server/relay/aws/deliver.ts @@ -47,6 +47,6 @@ export class AwsMailDeliverer extends MailDeliverer { cause; result.cause = cause; } - context.result.set("*", result); + 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 index a0f2639..9c2e73b 100644 --- a/services/docker/mail-server/relay/aws/mail.ts +++ b/services/docker/mail-server/relay/aws/mail.ts @@ -1,7 +1 @@ export * from "../mail.ts"; - -declare module "../mail.ts" { - interface Mail { - awsMessageId?: string; - } -} diff --git a/services/docker/mail-server/relay/aws/retriever.ts b/services/docker/mail-server/relay/aws/retriever.ts index daa3d8c..756cfc3 100644 --- a/services/docker/mail-server/relay/aws/retriever.ts +++ b/services/docker/mail-server/relay/aws/retriever.ts @@ -80,7 +80,7 @@ export class AwsMailRetriever { await this.inboundDeliverer.deliver({ mail, recipients: recipients }); log.info(`Done delivering s3 mail ${s3Key}.`); - const date = mail.date ?? mail.simpleParseDate(); + const date = mail.startSimpleParse().sections().headers().date(); const dateString = date?.toFileNameString(true) ?? "invalid-date"; const newPath = `${this.archiveMailPrefix}${dateString}/${s3Key}`; diff --git a/services/docker/mail-server/relay/better-js.ts b/services/docker/mail-server/relay/better-js.ts index a23dd0b..c424a6e 100644 --- a/services/docker/mail-server/relay/better-js.ts +++ b/services/docker/mail-server/relay/better-js.ts @@ -5,8 +5,8 @@ declare global { } Object.defineProperty(Date.prototype, "toFileNameString", { - value: function (dateOnly?: boolean) { - const str = (this as Date).toISOString(); + 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/db.test.ts b/services/docker/mail-server/relay/db.test.ts index eef3e1b..2c2a26d 100644 --- a/services/docker/mail-server/relay/db.test.ts +++ b/services/docker/mail-server/relay/db.test.ts @@ -7,7 +7,6 @@ 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 () => { diff --git a/services/docker/mail-server/relay/db.ts b/services/docker/mail-server/relay/db.ts index ee8bad1..748c7f8 100644 --- a/services/docker/mail-server/relay/db.ts +++ b/services/docker/mail-server/relay/db.ts @@ -62,8 +62,6 @@ const NAMES = { id: "id", messageId: "message_id", awsMessageId: "aws_message_id", - date: "date", - raw: "raw", }, }, } as const; @@ -72,8 +70,6 @@ interface MailTable { [NAMES.mail.columns.id]: Generated<number>; [NAMES.mail.columns.messageId]: string; [NAMES.mail.columns.awsMessageId]: string | null; - [NAMES.mail.columns.date]: string | null; - [NAMES.mail.columns.raw]: string; } interface Database { @@ -101,8 +97,6 @@ const migrations: Record<string, Migration> = { "text", (col) => col.unique(), ) - .addColumn(NAMES.mail.columns.date, "text") - .addColumn(NAMES.mail.columns.raw, "text", (col) => col.notNull()) .execute(); for ( diff --git a/services/docker/mail-server/relay/deno.json b/services/docker/mail-server/relay/deno.json index 9208126..da9239e 100644 --- a/services/docker/mail-server/relay/deno.json +++ b/services/docker/mail-server/relay/deno.json @@ -6,21 +6,21 @@ "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", + "@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.17", + "@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/io": "jsr:@std/io@^0.225.2", - "@std/path": "jsr:@std/path@^1.0.9", - "@std/testing": "jsr:@std/testing@^1.0.12", + "@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.10", + "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 19293f4..c60c05e 100644 --- a/services/docker/mail-server/relay/deno.lock +++ b/services/docker/mail-server/relay/deno.lock @@ -8,32 +8,34 @@ "jsr:@std/assert@^1.0.13": "1.0.13", "jsr:@std/async@^1.0.13": "1.0.13", "jsr:@std/bytes@^1.0.5": "1.0.6", - "jsr:@std/cli@^1.0.17": "1.0.17", + "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/path@^1.1.0": "1.1.0", "jsr:@std/streams@^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/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:email-addresses@5": "5.0.0", - "npm:hono@^4.7.10": "4.7.10", + "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": { @@ -67,8 +69,8 @@ "@std/bytes@1.0.6": { "integrity": "f6ac6adbd8ccd99314045f5703e23af0a68d7f7e58364b47d2c7f408aeb5820a" }, - "@std/cli@1.0.17": { - "integrity": "e15b9abe629e17be90cc6216327f03a29eae613365f1353837fa749aad29ce7b" + "@std/cli@1.0.19": { + "integrity": "b3601a54891f89f3f738023af11960c4e6f7a45dc76cde39a6861124cba79e88" }, "@std/csv@1.0.6": { "integrity": "52ef0e62799a0028d278fa04762f17f9bd263fad9a8e7f98c14fbd371d62d9fd", @@ -98,9 +100,18 @@ "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": [ @@ -116,18 +127,24 @@ "@std/path@1.0.9": { "integrity": "260a49f11edd3db93dd38350bf9cd1b4d1366afa98e81b86167b4e3dd750129e" }, + "@std/path@1.1.0": { + "integrity": "ddc94f8e3c275627281cbc23341df6b8bcc874d70374f75fec2533521e3d6886" + }, "@std/streams@1.0.9": { - "integrity": "a9d26b1988cdd7aa7b1f4b51e1c36c1557f3f252880fa6cc5b9f37078b1a5035" + "integrity": "a9d26b1988cdd7aa7b1f4b51e1c36c1557f3f252880fa6cc5b9f37078b1a5035", + "dependencies": [ + "jsr:@std/bytes" + ] }, - "@std/testing@1.0.12": { - "integrity": "fec973a45ccc62c540fb89296199051fee142409138fd6e3eae409366bcd4720", + "@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" ] } }, @@ -193,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", @@ -208,22 +225,22 @@ "@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", "@smithy/eventstream-serde-browser", "@smithy/eventstream-serde-config-resolver", "@smithy/eventstream-serde-node", - "@smithy/fetch-http-handler@5.0.2", + "@smithy/fetch-http-handler", "@smithy/hash-blob-browser", "@smithy/hash-node", "@smithy/hash-stream-node", @@ -236,9 +253,9 @@ "@smithy/middleware-stack", "@smithy/node-config-provider", "@smithy/node-http-handler", - "@smithy/protocol-http@5.1.0", + "@smithy/protocol-http", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "@smithy/util-base64", "@smithy/util-body-length-browser", @@ -254,26 +271,26 @@ "tslib" ] }, - "@aws-sdk/client-sesv2@3.782.0": { - "integrity": "sha512-h7Uhh+9BZ9UCE+SM5vld5d10M3VpF9gYbqmzW4+gWtBq9lmsLWjB9Dsk74Xrh4i7s9op7TEfVYm/o+ZB180BtQ==", + "@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/credential-provider-node@3.782.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@3.775.0", + "@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@5.0.2", + "@smithy/fetch-http-handler", "@smithy/hash-node", "@smithy/invalid-dependency", "@smithy/middleware-content-length", @@ -283,9 +300,9 @@ "@smithy/middleware-stack", "@smithy/node-config-provider", "@smithy/node-http-handler", - "@smithy/protocol-http@5.1.0", + "@smithy/protocol-http", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "@smithy/util-base64", "@smithy/util-body-length-browser", @@ -299,24 +316,24 @@ "tslib" ] }, - "@aws-sdk/client-sso@3.782.0": { - "integrity": "sha512-5GlJBejo8wqMpSSEKb45WE82YxI2k73YuebjLH/eWDNQeE6VI5Bh9lA1YQ7xNkLLH8hIsb0pSfKVuwh0VEzVrg==", + "@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.775.0", + "@aws-sdk/core", "@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/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@5.0.2", + "@smithy/fetch-http-handler", "@smithy/hash-node", "@smithy/invalid-dependency", "@smithy/middleware-content-length", @@ -326,9 +343,9 @@ "@smithy/middleware-stack", "@smithy/node-config-provider", "@smithy/node-http-handler", - "@smithy/protocol-http@5.1.0", + "@smithy/protocol-http", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "@smithy/util-base64", "@smithy/util-body-length-browser", @@ -342,356 +359,202 @@ "tslib" ] }, - "@aws-sdk/client-sso@3.797.0": { - "integrity": "sha512-9xuR918p7tShR67ZL+AOSbydpJxSHAOdXcQswxxWR/hKCF7tULX7tyL3gNo3l/ETp0CDcStvorOdH/nCbzEOjw==", - "dependencies": [ - "@aws-crypto/sha256-browser", - "@aws-crypto/sha256-js", - "@aws-sdk/core@3.796.0", - "@aws-sdk/middleware-host-header", - "@aws-sdk/middleware-logger", - "@aws-sdk/middleware-recursion-detection", - "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/region-config-resolver", - "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.787.0", - "@aws-sdk/util-user-agent-browser", - "@aws-sdk/util-user-agent-node@3.796.0", - "@smithy/config-resolver", - "@smithy/core", - "@smithy/fetch-http-handler@5.0.2", - "@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@5.1.0", - "@smithy/smithy-client", - "@smithy/types@4.2.0", - "@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/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@5.1.0", - "@smithy/signature-v4@5.0.2", + "@smithy/protocol-http", + "@smithy/signature-v4", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/util-middleware", "fast-xml-parser", "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/core", "@aws-sdk/types", - "@smithy/core", - "@smithy/node-config-provider", "@smithy/property-provider", - "@smithy/protocol-http@5.1.0", - "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types@4.2.0", - "@smithy/util-middleware", - "fast-xml-parser", + "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-env@3.775.0": { - "integrity": "sha512-6ESVxwCbGm7WZ17kY1fjmxQud43vzJFoLd4bmlR+idQSWdqlzGDYdcfzpjDKTcivdtNrVYmFvcH1JBUwCRAZhw==", + "@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/property-provider", - "@smithy/types@4.2.0", - "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/types", - "@smithy/property-provider", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/credential-provider-http@3.775.0": { - "integrity": "sha512-PjDQeDH/J1S0yWV32wCj2k5liRo0ssXMseCBEkCsD3SqsU8o5cU82b0hMX4sAib/RkglCSZqGO0xMiN0/7ndww==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/fetch-http-handler@5.0.2", - "@smithy/node-http-handler", - "@smithy/property-provider", - "@smithy/protocol-http@5.1.0", - "@smithy/smithy-client", - "@smithy/types@4.2.0", - "@smithy/util-stream", - "tslib" - ] - }, - "@aws-sdk/credential-provider-http@3.796.0": { - "integrity": "sha512-wWOT6VAHIKOuHdKFGm1iyKvx7f6+Kc/YTzFWJPuT+l+CPlXR6ylP1UMIDsHHLKpMzsrh3CH77QDsjkhQrnKkfg==", - "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/types", - "@smithy/fetch-http-handler@5.0.2", + "@smithy/fetch-http-handler", "@smithy/node-http-handler", "@smithy/property-provider", - "@smithy/protocol-http@5.1.0", + "@smithy/protocol-http", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@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/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/credential-provider-ini@3.797.0": { - "integrity": "sha512-Zpj6pJ2hnebrhLDr+x61ArMUkjHG6mfJRfamHxeVTgZkhLcwHjC5aM4u9pWTVugIaPY+VBtgkKPbi3TRbHlt2g==", - "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/types", - "@smithy/credential-provider-imds", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/credential-provider-node@3.782.0": { - "integrity": "sha512-HZiAF+TCEyKjju9dgysjiPIWgt/+VerGaeEp18mvKLNfgKz1d+/82A2USEpNKTze7v3cMFASx3CvL8yYyF7mJw==", + "@aws-sdk/credential-provider-ini@3.821.0": { + "integrity": "sha512-VRTrmsca8kBHtY1tTek1ce+XkK/H0fzodBKcilM/qXjTyumMHPAzVAxKZfSvGC+28/pXyQzhOEyxZfw7giCiWA==", "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/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", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-node@3.797.0": { - "integrity": "sha512-xJSWvvnmzEfHbqbpN4F3E3mI9+zJ/VWLGiKOjzX1Inbspa5WqNn2GoMamolZR2TvvZS4F3Hp73TD1WoBzkIjuw==", + "@aws-sdk/credential-provider-node@3.821.0": { + "integrity": "sha512-oBgbcgOXWMgknAfhIdTeHSSVIv+k2LXN9oTbxu1r++o4WWBWrEQ8mHU0Zo9dfr7Uaoqi3pezYZznsBkXnMLEOg==", "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/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", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/credential-provider-process@3.775.0": { - "integrity": "sha512-A6k68H9rQp+2+7P7SGO90Csw6nrUEm0Qfjpn9Etc4EboZhhCLs9b66umUsTsSBHus4FDIe5JQxfCUyt1wgNogg==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-process@3.796.0": { - "integrity": "sha512-r4e8/4AdKn/qQbRVocW7oXkpoiuXdTv0qty8AASNLnbQnT1vjD1bvmP6kp4fbHPWgwY8I9h0Dqjp49uy9Bqyuw==", + "@aws-sdk/credential-provider-process@3.821.0": { + "integrity": "sha512-e18ucfqKB3ICNj5RP/FEdvUfhVK6E9MALOsl8pKP13mwegug46p/1BsZWACD5n+Zf9ViiiHxIO7td03zQixfwA==", "dependencies": [ - "@aws-sdk/core@3.796.0", + "@aws-sdk/core", "@aws-sdk/types", "@smithy/property-provider", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-sso@3.782.0": { - "integrity": "sha512-1y1ucxTtTIGDSNSNxriQY8msinilhe9gGvQpUDYW9gboyC7WQJPDw66imy258V6osdtdi+xoHzVCbCz3WhosMQ==", + "@aws-sdk/credential-provider-sso@3.821.0": { + "integrity": "sha512-Dt+pheBLom4O/egO4L75/72k9C1qtUOLl0F0h6lmqZe4Mvhz+wDtjoO/MdGC/P1q0kcIX/bBKr0NQ3cIvAH8pA==", "dependencies": [ - "@aws-sdk/client-sso@3.782.0", - "@aws-sdk/core@3.775.0", - "@aws-sdk/token-providers@3.782.0", + "@aws-sdk/client-sso", + "@aws-sdk/core", + "@aws-sdk/token-providers", "@aws-sdk/types", "@smithy/property-provider", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "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@4.2.0", - "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@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/credential-provider-web-identity@3.797.0": { - "integrity": "sha512-DIb05FEmdOX7bNsqSVEAB3UkaDgrYHonQ2+gcBLqZ7LoDNnovHIlvC5jii93usgEStxITZstnzw+49keNEgVWw==", + "@aws-sdk/credential-provider-web-identity@3.821.0": { + "integrity": "sha512-FF5wnRJkxSQaCVVvWNv53K1MhTMgH8d+O+MHTbkv51gVIgVATrtfFQMKBLcEAxzXrgAliIO3LiNv+1TqqBZ+BA==", "dependencies": [ - "@aws-sdk/core@3.796.0", - "@aws-sdk/nested-clients@3.797.0", + "@aws-sdk/core", + "@aws-sdk/nested-clients", "@aws-sdk/types", "@smithy/property-provider", - "@smithy/types@4.2.0", + "@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", "@smithy/node-config-provider", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "@smithy/util-config-provider", "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@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "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", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "@smithy/util-middleware", "@smithy/util-stream", "@smithy/util-utf8@4.0.0", "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@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "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@4.2.0", + "@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@4.2.0", + "@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@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "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@5.1.0", - "@smithy/signature-v4@5.0.2", + "@smithy/protocol-http", + "@smithy/signature-v4", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/util-config-provider", "@smithy/util-middleware", "@smithy/util-stream", @@ -699,118 +562,44 @@ "tslib" ] }, - "@aws-sdk/middleware-sdk-s3@3.796.0": { - "integrity": "sha512-5o78oE79sGOtYkL7Up02h2nmr9UhGQZJgxE29EBdTw4dZ1EaA46L+C8oA+fBCmAB5xPQsjQqvhRrsr4Lcp+jZQ==", + "@aws-sdk/middleware-ssec@3.821.0": { + "integrity": "sha512-YYi1Hhr2AYiU/24cQc8HIB+SWbQo6FBkMYojVuz/zgrtkFmALxENGF/21OPg7f/QWd+eadZJRxCjmRwh5F2Cxg==", "dependencies": [ - "@aws-sdk/core@3.796.0", "@aws-sdk/types", - "@aws-sdk/util-arn-parser", - "@smithy/core", - "@smithy/node-config-provider", - "@smithy/protocol-http@5.1.0", - "@smithy/signature-v4@5.1.0", - "@smithy/smithy-client", - "@smithy/types@4.2.0", - "@smithy/util-config-provider", - "@smithy/util-middleware", - "@smithy/util-stream", - "@smithy/util-utf8@4.0.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/middleware-ssec@3.775.0": { - "integrity": "sha512-Iw1RHD8vfAWWPzBBIKaojO4GAvQkHOYIpKdAfis/EUSUmSa79QsnXnRqsdcE0mCB0Ylj23yi+ah4/0wh9FsekA==", + "@aws-sdk/middleware-user-agent@3.821.0": { + "integrity": "sha512-rw8q3TxygMg3VrofN04QyWVCCyGwz3bVthYmBZZseENPWG3Krz1OCKcyqjkTcAxMQlEywOske+GIiOasGKnJ3w==", "dependencies": [ + "@aws-sdk/core", "@aws-sdk/types", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/middleware-user-agent@3.782.0": { - "integrity": "sha512-i32H2R6IItX+bQ2p4+v2gGO2jA80jQoJO2m1xjU9rYWQW3+ErWy4I5YIuQHTBfb6hSdAHbaRfqPDgbv9J2rjEg==", - "dependencies": [ - "@aws-sdk/core@3.775.0", - "@aws-sdk/types", - "@aws-sdk/util-endpoints@3.782.0", + "@aws-sdk/util-endpoints", "@smithy/core", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", - "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@5.1.0", - "@smithy/types@4.2.0", - "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@5.0.2", - "@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@5.1.0", - "@smithy/smithy-client", - "@smithy/types@4.2.0", - "@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", + "@smithy/protocol-http", + "@smithy/types", "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@5.0.2", + "@smithy/fetch-http-handler", "@smithy/hash-node", "@smithy/invalid-dependency", "@smithy/middleware-content-length", @@ -820,9 +609,9 @@ "@smithy/middleware-stack", "@smithy/node-config-provider", "@smithy/node-http-handler", - "@smithy/protocol-http@5.1.0", + "@smithy/protocol-http", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "@smithy/util-base64", "@smithy/util-body-length-browser", @@ -836,136 +625,96 @@ "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", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/util-config-provider", "@smithy/util-middleware", "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@5.1.0", - "@smithy/signature-v4@5.0.2", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/signature-v4", + "@smithy/types", "tslib" ] }, - "@aws-sdk/signature-v4-multi-region@3.796.0": { - "integrity": "sha512-JAOLdvazTc9HlTFslSrIOrKRMuOruuM3FeGw0hyfLP/RIbjd9bqe/xLIzDSJr3wpCpJs0sXoofwJgXtgTipvjA==", + "@aws-sdk/token-providers@3.821.0": { + "integrity": "sha512-qJ7wgKhdxGbPg718zWXbCYKDuSWZNU3TSw64hPRW6FtbZrIyZxObpiTKC6DKwfsVoZZhHEoP/imGykN1OdOTJA==", "dependencies": [ - "@aws-sdk/middleware-sdk-s3@3.796.0", - "@aws-sdk/types", - "@smithy/protocol-http@5.1.0", - "@smithy/signature-v4@5.1.0", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/token-providers@3.782.0": { - "integrity": "sha512-4tPuk/3+THPrzKaXW4jE2R67UyGwHLFizZ47pcjJWbhb78IIJAy94vbeqEQ+veS84KF5TXcU7g5jGTXC0D70Wg==", - "dependencies": [ - "@aws-sdk/nested-clients@3.782.0", + "@aws-sdk/core", + "@aws-sdk/nested-clients", "@aws-sdk/types", "@smithy/property-provider", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/token-providers@3.797.0": { - "integrity": "sha512-TLFkP4BBdkH2zCXhG3JjaYrRft25MMZ+6/YDz1C/ikq2Zk8krUbVoSmhtYMVz10JtxAPiQ++w0vI/qbz2JSDXg==", - "dependencies": [ - "@aws-sdk/nested-clients@3.797.0", - "@aws-sdk/types", - "@smithy/property-provider", - "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", - "tslib" - ] - }, - "@aws-sdk/types@3.775.0": { - "integrity": "sha512-ZoGKwa4C9fC9Av6bdfqcW6Ix5ot05F/S4VxWR2nHuMv7hzfmAjTOcUiWT7UR4hM/U0whf84VhDtXN/DWAk52KA==", - "dependencies": [ - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/util-arn-parser@3.723.0": { - "integrity": "sha512-ZhEfvUwNliOQROcAk34WJWVYTlTa4694kSVhDSjW6lE1bMataPnIN8A0ycukEzBXmd8ZSoBcQLn6lKGl7XIJ5w==", + "@aws-sdk/types@3.821.0": { + "integrity": "sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA==", "dependencies": [ + "@smithy/types", "tslib" ] }, - "@aws-sdk/util-endpoints@3.782.0": { - "integrity": "sha512-/RJOAO7o7HI6lEa4ASbFFLHGU9iPK876BhsVfnl54MvApPVYWQ9sHO0anOUim2S5lQTwd/6ghuH3rFYSq/+rdw==", + "@aws-sdk/util-arn-parser@3.804.0": { + "integrity": "sha512-wmBJqn1DRXnZu3b4EkE6CWnoWMo1ZMvlfkqU5zPz67xx1GMaXlDCchFvKAXMjk4jn/L1O3tKnoFDNsoLV1kgNQ==", "dependencies": [ - "@aws-sdk/types", - "@smithy/types@4.2.0", - "@smithy/util-endpoints", "tslib" ] }, - "@aws-sdk/util-endpoints@3.787.0": { - "integrity": "sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==", + "@aws-sdk/util-endpoints@3.821.0": { + "integrity": "sha512-Uknt/zUZnLE76zaAAPEayOeF5/4IZ2puTFXvcSCWHsi9m3tqbb9UozlnlVqvCZLCRWfQryZQoG2W4XSS3qgk5A==", "dependencies": [ "@aws-sdk/types", - "@smithy/types@4.2.0", + "@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@4.2.0", + "@smithy/types", "bowser", "tslib" ] }, - "@aws-sdk/util-user-agent-node@3.782.0": { - "integrity": "sha512-dMFkUBgh2Bxuw8fYZQoH/u3H4afQ12VSkzEi//qFiDTwbKYq+u+RYjc8GLDM6JSK1BShMu5AVR7HD4ap1TYUnA==", + "@aws-sdk/util-user-agent-node@3.821.0": { + "integrity": "sha512-YwMXc9EvuzJgnLBTyiQly2juPujXwDgcMHB0iSN92tHe7Dd1jJ1feBmTgdClaaqCeHFUaFpw+3JU/ZUJ6LjR+A==", "dependencies": [ - "@aws-sdk/middleware-user-agent@3.782.0", + "@aws-sdk/middleware-user-agent", "@aws-sdk/types", "@smithy/node-config-provider", - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/util-user-agent-node@3.796.0": { - "integrity": "sha512-9fQpNcHgVFitf1tbTT8V1xGRoRHSmOAWjrhevo6Tc0WoINMAKz+4JNqfVGWRE5Tmtpq0oHKo1RmvxXQQtJYciA==", + "@aws-sdk/xml-builder@3.821.0": { + "integrity": "sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==", "dependencies": [ - "@aws-sdk/middleware-user-agent@3.796.0", - "@aws-sdk/types", - "@smithy/node-config-provider", - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@aws-sdk/xml-builder@3.775.0": { - "integrity": "sha512-b9NGO6FKJeLGYnV7Z1yvcP1TNU4dkD5jNsLWOF1/sygZoASaQhNOlaiJ/1OH331YQ1R1oWk38nBb0frsYkDsOQ==", - "dependencies": [ - "@smithy/types@4.2.0", - "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" @@ -1006,10 +755,10 @@ "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@4.2.0", + "@smithy/types", "tslib" ] }, @@ -1026,22 +775,23 @@ "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@4.2.0", + "@smithy/types", "@smithy/util-config-provider", "@smithy/util-middleware", "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@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", + "@smithy/util-base64", "@smithy/util-body-length-browser", "@smithy/util-middleware", "@smithy/util-stream", @@ -1049,106 +799,96 @@ "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", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "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@4.2.0", + "@smithy/types", "@smithy/util-hex-encoding", "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@4.2.0", + "@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@4.2.0", + "@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@4.2.0", + "@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@4.2.0", - "tslib" - ] - }, - "@smithy/fetch-http-handler@5.0.2": { - "integrity": "sha512-+9Dz8sakS9pe7f2cBocpJXdeVjMopUDLgZs1yWeu7h++WqSbjUYv/JAJwKwXw1HV6gq1jyWjxuyn24E2GhoEcQ==", - "dependencies": [ - "@smithy/protocol-http@5.1.0", - "@smithy/querystring-builder@4.0.2", - "@smithy/types@4.2.0", - "@smithy/util-base64", + "@smithy/types", "tslib" ] }, "@smithy/fetch-http-handler@5.0.4": { "integrity": "sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==", "dependencies": [ - "@smithy/protocol-http@5.1.2", - "@smithy/querystring-builder@4.0.4", - "@smithy/types@4.3.1", + "@smithy/protocol-http", + "@smithy/querystring-builder", + "@smithy/types", "@smithy/util-base64", "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", - "@smithy/types@4.2.0", + "@smithy/types", "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@4.2.0", + "@smithy/types", "@smithy/util-buffer-from@4.0.0", "@smithy/util-utf8@4.0.0", "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@4.2.0", + "@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@4.2.0", + "@smithy/types", "tslib" ] }, @@ -1164,145 +904,131 @@ "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@4.2.0", + "@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@5.1.0", - "@smithy/types@4.2.0", + "@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", "@smithy/node-config-provider", "@smithy/shared-ini-file-loader", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/url-parser", "@smithy/util-middleware", "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@5.1.0", + "@smithy/protocol-http", "@smithy/service-error-classification", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/util-middleware", "@smithy/util-retry", "tslib", "uuid" ] }, - "@smithy/middleware-serde@4.0.3": { - "integrity": "sha512-rfgDVrgLEVMmMn0BI8O+8OVr6vXzjV7HZj57l0QxslhzbvVfikZbVfBVthjLHqib4BW44QhcIgJpvebHlRaC9A==", + "@smithy/middleware-serde@4.0.8": { + "integrity": "sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==", "dependencies": [ - "@smithy/types@4.2.0", + "@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@4.2.0", + "@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", - "@smithy/types@4.2.0", + "@smithy/types", "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@5.1.0", - "@smithy/querystring-builder@4.0.2", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/querystring-builder", + "@smithy/types", "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@4.2.0", - "tslib" - ] - }, - "@smithy/protocol-http@5.1.0": { - "integrity": "sha512-KxAOL1nUNw2JTYrtviRRjEnykIDhxc84qMBzxvu1MUfQfHTuBlCG7PA6EdVwqpJjH7glw7FqQoFxUJSyBQgu7g==", - "dependencies": [ - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, "@smithy/protocol-http@5.1.2": { "integrity": "sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==", "dependencies": [ - "@smithy/types@4.3.1", - "tslib" - ] - }, - "@smithy/querystring-builder@4.0.2": { - "integrity": "sha512-NTOs0FwHw1vimmQM4ebh+wFQvOwkEf/kQL6bSM1Lock+Bv4I89B3hGYoUEPkmvYPkDKyp5UdXJYu+PoTQ3T31Q==", - "dependencies": [ - "@smithy/types@4.2.0", - "@smithy/util-uri-escape", + "@smithy/types", "tslib" ] }, "@smithy/querystring-builder@4.0.4": { "integrity": "sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==", "dependencies": [ - "@smithy/types@4.3.1", + "@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@4.2.0", + "@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@4.2.0" + "@smithy/types" ] }, - "@smithy/shared-ini-file-loader@4.0.2": { - "integrity": "sha512-J9/gTWBGVuFZ01oVA6vdb4DAjf1XbDhK6sLsu3OS9qmLrS6KB5ygpeHiM3miIbj1qgSJ96GYszXFWv6ErJ8QEw==", + "@smithy/shared-ini-file-loader@4.0.4": { + "integrity": "sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==", "dependencies": [ - "@smithy/types@4.2.0", + "@smithy/types", "tslib" ] }, - "@smithy/signature-v4@5.0.2": { - "integrity": "sha512-Mz+mc7okA73Lyz8zQKJNyr7lIcHLiPYp0+oiqiMNc/t7/Kf2BENs5d63pEj7oPqdjaum6g0Fc8wC78dY1TgtXw==", + "@smithy/signature-v4@5.1.2": { + "integrity": "sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==", "dependencies": [ "@smithy/is-array-buffer@4.0.0", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "@smithy/util-hex-encoding", "@smithy/util-middleware", "@smithy/util-uri-escape", @@ -1310,48 +1036,29 @@ "tslib" ] }, - "@smithy/signature-v4@5.1.0": { - "integrity": "sha512-4t5WX60sL3zGJF/CtZsUQTs3UrZEDO2P7pEaElrekbLqkWPYkgqNW1oeiNYC6xXifBnT9dVBOnNQRvOE9riU9w==", - "dependencies": [ - "@smithy/is-array-buffer@4.0.0", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", - "@smithy/util-hex-encoding", - "@smithy/util-middleware", - "@smithy/util-uri-escape", - "@smithy/util-utf8@4.0.0", - "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", "@smithy/middleware-stack", - "@smithy/protocol-http@5.1.0", - "@smithy/types@4.2.0", + "@smithy/protocol-http", + "@smithy/types", "@smithy/util-stream", "tslib" ] }, - "@smithy/types@4.2.0": { - "integrity": "sha512-7eMk09zQKCO+E/ivsjQv+fDlOupcFUCSC/L2YUPgwhvowVGWbPQHjEFcmjt7QQ4ra5lyowS92SV53Zc6XD4+fg==", - "dependencies": [ - "tslib" - ] - }, "@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@4.2.0", + "@smithy/types", "tslib" ] }, @@ -1395,33 +1102,33 @@ "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", - "@smithy/types@4.2.0", + "@smithy/types", "bowser", "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", "@smithy/node-config-provider", "@smithy/property-provider", "@smithy/smithy-client", - "@smithy/types@4.2.0", + "@smithy/types", "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@4.2.0", + "@smithy/types", "tslib" ] }, @@ -1431,27 +1138,27 @@ "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@4.2.0", + "@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@4.2.0", + "@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@5.0.2", + "@smithy/fetch-http-handler", "@smithy/node-http-handler", - "@smithy/types@4.2.0", + "@smithy/types", "@smithy/util-base64", "@smithy/util-buffer-from@4.0.0", "@smithy/util-hex-encoding", @@ -1479,11 +1186,11 @@ "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@4.2.0", + "@smithy/types", "tslib" ] }, @@ -1506,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==" @@ -1528,28 +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/io@~0.225.2", - "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", + "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.10", + "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 a8f4b2a..4971943 100644 --- a/services/docker/mail-server/relay/dovecot.ts +++ b/services/docker/mail-server/relay/dovecot.ts @@ -88,7 +88,7 @@ export class DovecotMailDeliverer extends MailDeliverer { result.message = "An error was thrown when running lda process: " + e; result.cause = e; } - context.result.set(recipient, result); + 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 index af2a69f..21679ea 100644 --- a/services/docker/mail-server/relay/dumb-smtp-server.ts +++ b/services/docker/mail-server/relay/dumb-smtp-server.ts @@ -23,13 +23,6 @@ export class DumbSMTPServer { this.#deliverer = deliverer; } - async #send(rawMail: string): Promise<{ message: string }> { - const mail = await this.#deliverer.deliverRaw(rawMail); - return { - message: mail.deliverMessage ?? "Success", - }; - } - async #handleConnection(conn: Deno.Conn) { using disposeStack = new DisposableStack(); disposeStack.defer(() => { @@ -89,7 +82,7 @@ export class DumbSMTPServer { if (line === ".") { try { log.info("Done receiving mail data..."); - const { message } = await this.#send(rawMail); + const { message } = await this.#deliverer.deliverRaw(rawMail); await send(`250 2.6.0 ${message}`); rawMail = null; log.info("Done SMTP mail session."); diff --git a/services/docker/mail-server/relay/mail.test.ts b/services/docker/mail-server/relay/mail.test.ts index 69cc5d9..687d666 100644 --- a/services/docker/mail-server/relay/mail.test.ts +++ b/services/docker/mail-server/relay/mail.test.ts @@ -48,26 +48,27 @@ 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).simpleParse(); + 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", "")], )); @@ -90,14 +91,18 @@ describe("Mail", () => { it("parse recipients", () => { const mail = new Mail(mockMailStr); - expect(mail.simpleParseRecipients()).toEqual([ + expect(mail.startSimpleParse().sections().headers().recipients()).toEqual([ ...mockToAddresses, ...mockCcAddresses, ]); - expect(mail.simpleParseRecipients({domain: "example.com"})).toEqual([ + expect( + mail.startSimpleParse().sections().headers().recipients({ + domain: "example.com", + }), + ).toEqual([ ...mockToAddresses, ...mockCcAddresses, - ].filter(a => a.endsWith("example.com"))); + ].filter((a) => a.endsWith("example.com"))); }); }); diff --git a/services/docker/mail-server/relay/mail.ts b/services/docker/mail-server/relay/mail.ts index 7727b8b..9c12876 100644 --- a/services/docker/mail-server/relay/mail.ts +++ b/services/docker/mail-server/relay/mail.ts @@ -5,10 +5,10 @@ import emailAddresses from "email-addresses"; import log from "./log.ts"; import config from "./config.ts"; -class MailParseError extends Error { +class MailSimpleParseError extends Error { constructor( message: string, - public readonly mail: Mail, + public readonly text: string, public readonly lineNumber?: number, options?: ErrorOptions, ) { @@ -17,40 +17,52 @@ class MailParseError extends Error { } } -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; - deliverMessage?: string; - - constructor(public raw: string) {} - - toUtf8Bytes(): Uint8Array { - const utf8Encoder = new TextEncoder(); - return utf8Encoder.encode(this.raw); +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; } - toBase64(): string { - return encodeBase64(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; } +} - simpleParse(): ParsedMail { - const twoEolMatch = this.raw.match(/(\r?\n)(\r?\n)/); +class MailSimpleParsedSections { + header: string; + body: string; + eol: string; + sep: string; + + constructor(raw: string) { + const twoEolMatch = raw.match(/(\r?\n)(\r?\n)/); if (twoEolMatch == null) { - throw new MailParseError( + throw new MailSimpleParseError( "No header/body section separator (2 successive EOLs) found.", - this, + raw, ); } @@ -60,19 +72,14 @@ export class Mail { 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; @@ -81,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, ); } @@ -91,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, ); } @@ -112,51 +119,31 @@ 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())) { - log.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); } - simpleParseRecipients( - 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.simpleParseHeaders()) { - if (headers.includes(key.toLowerCase())) { - emailAddresses.parseAddressList(value)?.flatMap((a) => - a.type === "mailbox" ? a.address : a.addresses.map((a) => a.address) - )?.forEach((a) => { - if (domain == null || a.endsWith(domain)) { - recipients.add(a); - } - }); - } - } - return recipients; + 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; } } @@ -169,23 +156,18 @@ export interface MailDeliverRecipientResult { } export class MailDeliverResult { - readonly recipients: Map<string, MailDeliverRecipientResult> = new Map(); + message: string = ""; + recipients: Map<string, MailDeliverRecipientResult> = new Map(); - add( - recipient: string, - kind: MailDeliverResultKind, - message: string, - cause?: unknown, - ) { - this.recipients.set(recipient, { kind, message, cause }); - } + constructor(public mail: Mail) {} - set(recipient: string, result: MailDeliverRecipientResult) { - this.recipients.set(recipient, result); + 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}` ), @@ -195,9 +177,11 @@ export class MailDeliverResult { export class MailDeliverContext { readonly recipients: Set<string> = new Set(); - readonly result: MailDeliverResult = new MailDeliverResult(); + readonly result; - constructor(public mail: Mail) {} + constructor(public mail: Mail) { + this.result = new MailDeliverResult(this.mail); + } } export interface MailDeliverHook { @@ -214,10 +198,8 @@ export abstract class MailDeliverer { 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( @@ -241,7 +223,7 @@ export abstract class MailDeliverer { log.info("Deliver result:"); log.info(context.result); - if (context.result.recipients.values().some((r) => r.kind !== "done")) { + if (context.result.hasError()) { throw new Error("Mail failed to deliver."); } @@ -256,7 +238,7 @@ export class RecipientFromHeadersHook implements MailDeliverHook { "Recipients are already filled. Won't set them with ones in headers.", ); } else { - context.mail.simpleParseRecipients({ + context.mail.startSimpleParse().sections().headers().recipients({ domain: config.get("mailDomain"), }).forEach((r) => context.recipients.add(r)); @@ -309,7 +291,9 @@ export class AliasRecipientMailHook implements MailDeliverHook { for (const recipient of [...context.recipients]) { const realRecipients = aliases.get(recipient); if (realRecipients != null) { - log.info(`Recipient alias resolved: ${recipient} => ${realRecipients}.`); + log.info( + `Recipient alias resolved: ${recipient} => ${realRecipients}.`, + ); context.recipients.delete(recipient); context.recipients.add(realRecipients); } |