aboutsummaryrefslogtreecommitdiff
path: root/deno
diff options
context:
space:
mode:
Diffstat (limited to 'deno')
-rw-r--r--deno/base/config.ts3
-rw-r--r--deno/base/deno.json3
-rw-r--r--deno/base/lib.ts (renamed from deno/base/date.ts)4
-rw-r--r--deno/base/log.ts118
-rw-r--r--deno/base/text.ts3
-rw-r--r--deno/deno.json12
-rw-r--r--deno/deno.lock92
-rw-r--r--deno/mail-relay/app.ts28
-rw-r--r--deno/mail-relay/aws/app.ts157
-rw-r--r--deno/mail-relay/aws/deliver.ts13
-rw-r--r--deno/mail-relay/aws/fetch.ts42
-rw-r--r--deno/mail-relay/aws/mail.ts22
-rw-r--r--deno/mail-relay/db.ts47
-rw-r--r--deno/mail-relay/dovecot.ts29
-rw-r--r--deno/mail-relay/dumb-smtp-server.ts40
-rw-r--r--deno/mail-relay/mail.test.ts30
-rw-r--r--deno/mail-relay/mail.ts107
-rw-r--r--deno/service-manager/deno.json13
-rw-r--r--deno/service-manager/main.ts39
-rw-r--r--deno/tools/deno.json8
-rw-r--r--deno/tools/generate-geosite-rules.ts160
-rw-r--r--deno/tools/manage-service.ts42
-rw-r--r--deno/tools/manage-vm.ts144
-rw-r--r--deno/tools/template.ts (renamed from deno/service-manager/template.ts)12
24 files changed, 705 insertions, 463 deletions
diff --git a/deno/base/config.ts b/deno/base/config.ts
index 98722f6..a5f5d86 100644
--- a/deno/base/config.ts
+++ b/deno/base/config.ts
@@ -1,4 +1,4 @@
-import { camelCaseToKebabCase } from "./text.ts";
+import { camelCaseToKebabCase } from "./lib.ts";
export interface ConfigDefinitionItem {
readonly description: string;
@@ -91,4 +91,3 @@ export class ConfigProvider<K extends string> {
.join("\n");
}
}
-
diff --git a/deno/base/deno.json b/deno/base/deno.json
index 2c2d550..dabc02a 100644
--- a/deno/base/deno.json
+++ b/deno/base/deno.json
@@ -2,10 +2,9 @@
"name": "@crupest/base",
"version": "0.1.0",
"exports": {
+ ".": "./lib.ts",
"./config": "./config.ts",
"./cron": "./cron.ts",
- "./date": "./date.ts",
- "./text": "./text.ts",
"./log": "./log.ts"
}
}
diff --git a/deno/base/date.ts b/deno/base/lib.ts
index e65691e..a5e4a6a 100644
--- a/deno/base/date.ts
+++ b/deno/base/lib.ts
@@ -1,3 +1,7 @@
+export function camelCaseToKebabCase(str: string): string {
+ return str.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase());
+}
+
export function toFileNameString(date: Date, dateOnly?: boolean): string {
const str = date.toISOString();
return dateOnly === true
diff --git a/deno/base/log.ts b/deno/base/log.ts
index 1a4942d..940f569 100644
--- a/deno/base/log.ts
+++ b/deno/base/log.ts
@@ -1,117 +1,17 @@
import { join } from "@std/path";
-import { toFileNameString } from "./date.ts";
-
-export type LogLevel = "error" | "warn" | "info";
-
-export interface LogEntry {
- content: [unknown, ...unknown[]];
- level?: LogLevel;
- cause?: unknown;
-}
-
-export interface LogEntryBuilder {
- withLevel(level: LogLevel): LogEntryBuilder;
- withCause(cause: unknown): LogEntryBuilder;
- setError(error: boolean): LogEntryBuilder;
- write(): void;
-}
+import { toFileNameString } from "./lib.ts";
export interface ExternalLogStream extends Disposable {
stream: WritableStream;
}
-export class Logger {
- #indentSize = 2;
- #externalLogDir?: string;
-
- #contextStack: { depth: number; level: LogLevel }[] = [
- { depth: 0, level: "info" },
- ];
+export class LogFileProvider {
+ #directory: string;
- get #context() {
- return this.#contextStack.at(-1)!;
- }
-
- get indentSize() {
- return this.#indentSize;
- }
-
- set indentSize(value: number) {
- this.#indentSize = value;
- }
-
- get externalLogDir() {
- return this.#externalLogDir;
- }
-
- set externalLogDir(value: string | undefined) {
- this.#externalLogDir = value;
- if (value != null) {
- Deno.mkdirSync(value, {
- recursive: true,
- });
- }
- }
-
- write(entry: LogEntry): void {
- const { content, level, cause } = entry;
- const [message, ...rest] = content;
- console[level ?? this.#context.level](
- " ".repeat(this.#indentSize * this.#context.depth) + String(message),
- ...(cause != null ? [cause, ...rest] : rest),
- );
- }
-
- push(entry: LogEntry): Disposable {
- this.write(entry);
- this.#contextStack.push({
- depth: this.#context.depth + 1,
- level: entry.level ?? this.#context.level,
- });
- return {
- [Symbol.dispose]: () => {
- this.#contextStack.pop();
- },
- };
- }
-
- info(message: unknown, ...args: unknown[]) {
- this.write({ level: "info", content: [message, ...args] });
- }
-
- warn(message: unknown, ...args: unknown[]) {
- this.write({ level: "warn", content: [message, ...args] });
- }
-
- error(message: unknown, ...args: unknown[]) {
- this.write({ level: "error", content: [message, ...args] });
- }
-
- builder(message: unknown, ...args: unknown[]): LogEntryBuilder {
- const entry: LogEntry = {
- content: [message, ...args],
- level: "info",
- cause: undefined,
- };
- const builder: LogEntryBuilder = {
- withCause: (cause) => {
- entry.cause = cause;
- return builder;
- },
- withLevel: (level) => {
- entry.level = level;
- return builder;
- },
- setError: (error) => {
- if (error) entry.level = "error";
- return builder;
- },
- write: () => {
- this.write(entry);
- },
- };
- return builder;
+ constructor(directory: string) {
+ this.#directory = directory;
+ Deno.mkdirSync(directory, { recursive: true });
}
async createExternalLogStream(
@@ -123,12 +23,9 @@ export class Logger {
if (name.includes("/")) {
throw new Error(`External log stream's name (${name}) contains '/'.`);
}
- if (this.#externalLogDir == null) {
- throw new Error("External log directory is not set.");
- }
const logPath = join(
- this.#externalLogDir,
+ this.#directory,
options?.noTime === true
? name
: `${name}-${toFileNameString(new Date())}`,
@@ -161,4 +58,3 @@ export class Logger {
};
}
}
-
diff --git a/deno/base/text.ts b/deno/base/text.ts
deleted file mode 100644
index f3e4020..0000000
--- a/deno/base/text.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function camelCaseToKebabCase(str: string): string {
- return str.replace(/[A-Z]/g, (m) => "-" + m.toLowerCase());
-}
diff --git a/deno/deno.json b/deno/deno.json
index 71ad398..53cdf7a 100644
--- a/deno/deno.json
+++ b/deno/deno.json
@@ -1,17 +1,19 @@
{
- "workspace": [ "./base", "./service-manager", "./mail-relay" ],
+ "workspace": ["./base", "./mail-relay", "./tools"],
"tasks": {
- "compile:mail-relay": "deno task --cwd=mail-relay compile",
- "compile:service-manager": "deno task --cwd=service-manager compile"
+ "compile:mail-relay": "deno task --cwd=mail-relay compile"
},
"imports": {
- "@std/cli": "jsr:@std/cli@^1.0.19",
"@std/collections": "jsr:@std/collections@^1.1.1",
"@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.1.0",
- "@std/testing": "jsr:@std/testing@^1.0.13"
+ "@std/testing": "jsr:@std/testing@^1.0.13",
+ "@std/dotenv": "jsr:@std/dotenv@^0.225.5",
+ "@std/fs": "jsr:@std/fs@^1.0.18",
+ "yargs": "npm:yargs@^18.0.0",
+ "@types/yargs": "npm:@types/yargs@^17.0.33"
}
}
diff --git a/deno/deno.lock b/deno/deno.lock
index 357b31f..871a9ae 100644
--- a/deno/deno.lock
+++ b/deno/deno.lock
@@ -7,7 +7,6 @@
"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.19": "1.0.19",
"jsr:@std/collections@^1.1.1": "1.1.1",
"jsr:@std/csv@^1.0.6": "1.0.6",
"jsr:@std/data-structures@^1.0.8": "1.0.8",
@@ -36,10 +35,13 @@
"npm:@types/lodash@*": "4.17.17",
"npm:@types/mustache@*": "4.2.6",
"npm:@types/node@*": "22.15.15",
+ "npm:@types/yargs@*": "17.0.33",
+ "npm:@types/yargs@^17.0.33": "17.0.33",
"npm:email-addresses@5": "5.0.0",
"npm:hono@^4.7.11": "4.7.11",
"npm:kysely@~0.28.2": "0.28.2",
"npm:mustache@^4.2.0": "4.2.0",
+ "npm:yargs@18": "18.0.0",
"npm:zod@^3.25.48": "3.25.51"
},
"jsr": {
@@ -74,9 +76,6 @@
"@std/bytes@1.0.6": {
"integrity": "f6ac6adbd8ccd99314045f5703e23af0a68d7f7e58364b47d2c7f408aeb5820a"
},
- "@std/cli@1.0.19": {
- "integrity": "b3601a54891f89f3f738023af11960c4e6f7a45dc76cde39a6861124cba79e88"
- },
"@std/collections@1.1.1": {
"integrity": "eff6443fbd9d5a6697018fb39c5d13d5f662f0045f21392d640693d0008ab2af"
},
@@ -1183,12 +1182,41 @@
"undici-types"
]
},
+ "@types/yargs-parser@21.0.3": {
+ "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="
+ },
+ "@types/yargs@17.0.33": {
+ "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
+ "dependencies": [
+ "@types/yargs-parser"
+ ]
+ },
+ "ansi-regex@6.1.0": {
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="
+ },
+ "ansi-styles@6.2.1": {
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="
+ },
"bowser@2.11.0": {
"integrity": "sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
},
+ "cliui@9.0.1": {
+ "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==",
+ "dependencies": [
+ "string-width",
+ "strip-ansi",
+ "wrap-ansi"
+ ]
+ },
"email-addresses@5.0.0": {
"integrity": "sha512-4OIPYlA6JXqtVn8zpHpGiI7vE6EQOAg16aGnDMIAlZVinnoZ8208tW1hAbjWydgN/4PLTT9q+O1K6AH/vALJGw=="
},
+ "emoji-regex@10.4.0": {
+ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw=="
+ },
+ "escalade@3.2.0": {
+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="
+ },
"fast-xml-parser@4.4.1": {
"integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
"dependencies": [
@@ -1196,6 +1224,12 @@
],
"bin": true
},
+ "get-caller-file@2.0.5": {
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+ },
+ "get-east-asian-width@1.3.0": {
+ "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ=="
+ },
"hono@4.7.11": {
"integrity": "sha512-rv0JMwC0KALbbmwJDEnxvQCeJh+xbS3KEWW5PC9cMJ08Ur9xgatI0HmtgYZfOdOSOeYsp5LO2cOhdI8cLEbDEQ=="
},
@@ -1206,6 +1240,20 @@
"integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
"bin": true
},
+ "string-width@7.2.0": {
+ "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+ "dependencies": [
+ "emoji-regex",
+ "get-east-asian-width",
+ "strip-ansi"
+ ]
+ },
+ "strip-ansi@7.1.0": {
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "dependencies": [
+ "ansi-regex"
+ ]
+ },
"strnum@1.1.2": {
"integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA=="
},
@@ -1219,20 +1267,48 @@
"integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
"bin": true
},
+ "wrap-ansi@9.0.0": {
+ "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+ "dependencies": [
+ "ansi-styles",
+ "string-width",
+ "strip-ansi"
+ ]
+ },
+ "y18n@5.0.8": {
+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+ },
+ "yargs-parser@22.0.0": {
+ "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw=="
+ },
+ "yargs@18.0.0": {
+ "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==",
+ "dependencies": [
+ "cliui",
+ "escalade",
+ "get-caller-file",
+ "string-width",
+ "y18n",
+ "yargs-parser"
+ ]
+ },
"zod@3.25.51": {
"integrity": "sha512-TQSnBldh+XSGL+opiSIq0575wvDPqu09AqWe1F7JhUMKY+M91/aGlK4MhpVNO7MgYfHcVCB1ffwAUTJzllKJqg=="
}
},
"workspace": {
"dependencies": [
- "jsr:@std/cli@^1.0.19",
"jsr:@std/collections@^1.1.1",
"jsr:@std/csv@^1.0.6",
+ "jsr:@std/dotenv@~0.225.5",
"jsr:@std/encoding@^1.0.10",
"jsr:@std/expect@^1.0.16",
+ "jsr:@std/fs@^1.0.18",
"jsr:@std/io@~0.225.2",
"jsr:@std/path@^1.1.0",
- "jsr:@std/testing@^1.0.13"
+ "jsr:@std/testing@^1.0.13",
+ "npm:@types/yargs@^17.0.33",
+ "npm:yargs@18"
],
"members": {
"mail-relay": {
@@ -1248,10 +1324,8 @@
"npm:zod@^3.25.48"
]
},
- "service-manager": {
+ "tools": {
"dependencies": [
- "jsr:@std/dotenv@~0.225.5",
- "jsr:@std/fs@^1.0.18",
"npm:mustache@^4.2.0"
]
}
diff --git a/deno/mail-relay/app.ts b/deno/mail-relay/app.ts
index 3cac44b..eeffc12 100644
--- a/deno/mail-relay/app.ts
+++ b/deno/mail-relay/app.ts
@@ -1,7 +1,7 @@
import { Hono } from "hono";
import { logger as honoLogger } from "hono/logger";
-import { Logger } from "@crupest/base/log";
+import { LogFileProvider } from "@crupest/base/log";
import {
AliasRecipientMailHook,
@@ -13,7 +13,7 @@ import { DovecotMailDeliverer } from "./dovecot.ts";
import { DumbSmtpServer } from "./dumb-smtp-server.ts";
export function createInbound(
- logger: Logger,
+ logFileProvider: LogFileProvider,
{
fallback,
mailDomain,
@@ -26,7 +26,7 @@ export function createInbound(
ldaPath: string;
},
) {
- const deliverer = new DovecotMailDeliverer(logger, ldaPath);
+ const deliverer = new DovecotMailDeliverer(logFileProvider, ldaPath);
deliverer.preHooks.push(
new RecipientFromHeadersHook(mailDomain),
new FallbackRecipientHook(new Set(fallback)),
@@ -35,15 +35,11 @@ export function createInbound(
return deliverer;
}
-export function createHono(
- logger: Logger,
- outbound: MailDeliverer,
- inbound: MailDeliverer,
-) {
+export function createHono(outbound: MailDeliverer, inbound: MailDeliverer) {
const hono = new Hono();
hono.onError((err, c) => {
- logger.error(err);
+ console.error("Hono handler throws an error.", err);
return c.json({ msg: "Server error, check its log." }, 500);
});
hono.use(honoLogger());
@@ -66,11 +62,11 @@ export function createHono(
return hono;
}
-export function createSmtp(logger: Logger, outbound: MailDeliverer) {
- return new DumbSmtpServer(logger, outbound);
+export function createSmtp(outbound: MailDeliverer) {
+ return new DumbSmtpServer(outbound);
}
-export async function sendMail(logger: Logger, port: number) {
+export async function sendMail(port: number) {
const decoder = new TextDecoder();
let text = "";
for await (const chunk of Deno.stdin.readable) {
@@ -81,10 +77,8 @@ export async function sendMail(logger: Logger, port: number) {
method: "post",
body: text,
});
- logger.builder(res).setError(!res.ok).write();
- logger
- .builder("Body\n" + (await res.text()))
- .setError(!res.ok)
- .write();
+ const fn = res.ok ? "info" : "error";
+ console[fn](res);
+ console[fn](await res.text());
if (!res.ok) Deno.exit(-1);
}
diff --git a/deno/mail-relay/aws/app.ts b/deno/mail-relay/aws/app.ts
index 685d7a9..cb275ae 100644
--- a/deno/mail-relay/aws/app.ts
+++ b/deno/mail-relay/aws/app.ts
@@ -1,11 +1,12 @@
import { join } from "@std/path";
-import { parseArgs } from "@std/cli";
import { z } from "zod";
import { Hono } from "hono";
import { zValidator } from "@hono/zod-validator";
import { FetchHttpHandler } from "@smithy/fetch-http-handler";
+// @ts-types="npm:@types/yargs"
+import yargs from "yargs";
-import { Logger } from "@crupest/base/log";
+import { LogFileProvider } from "@crupest/base/log";
import { ConfigDefinition, ConfigProvider } from "@crupest/base/config";
import { CronTask } from "@crupest/base/cron";
@@ -17,7 +18,7 @@ import {
} from "./mail.ts";
import { AwsMailDeliverer } from "./deliver.ts";
import { AwsMailFetcher, AwsS3MailConsumer } from "./fetch.ts";
-import { createInbound, createHono, sendMail, createSmtp } from "../app.ts";
+import { createHono, createInbound, createSmtp, sendMail } from "../app.ts";
const PREFIX = "crupest-mail-server";
const CONFIG_DEFINITIONS = {
@@ -93,17 +94,16 @@ function createAwsOptions({
}
function createOutbound(
- logger: Logger,
awsOptions: ReturnType<typeof createAwsOptions>,
db: DbService,
) {
- const deliverer = new AwsMailDeliverer(logger, awsOptions);
+ const deliverer = new AwsMailDeliverer(awsOptions);
deliverer.preHooks.push(
new AwsMailMessageIdRewriteHook(db.messageIdToAws.bind(db)),
);
deliverer.postHooks.push(
new AwsMailMessageIdSaveHook((original, aws) =>
- db.addMessageIdMap({ message_id: original, aws_message_id: aws }).then(),
+ db.addMessageIdMap({ message_id: original, aws_message_id: aws }).then()
),
);
return deliverer;
@@ -155,80 +155,70 @@ function createCron(fetcher: AwsMailFetcher, consumer: AwsS3MailConsumer) {
function createBaseServices() {
const config = new ConfigProvider(PREFIX, CONFIG_DEFINITIONS);
Deno.mkdirSync(config.get("dataPath"), { recursive: true });
- const logger = new Logger();
- logger.externalLogDir = join(config.get("dataPath"), "log");
- return { config, logger };
+ const logFileProvider = new LogFileProvider(
+ join(config.get("dataPath"), "log"),
+ );
+ return { config, logFileProvider };
}
function createAwsFetchOnlyServices() {
- const { config, logger } = createBaseServices();
+ const services = createBaseServices();
+ const { config } = services;
+
const awsOptions = createAwsOptions({
user: config.get("awsUser"),
password: config.get("awsPassword"),
region: config.get("awsRegion"),
});
- const fetcher = new AwsMailFetcher(
- logger,
- awsOptions,
- config.get("awsMailBucket"),
- );
- return { config, logger, awsOptions, fetcher };
+ const fetcher = new AwsMailFetcher(awsOptions, config.get("awsMailBucket"));
+
+ return { ...services, awsOptions, fetcher };
}
function createAwsRecycleOnlyServices() {
- const { config, logger, awsOptions, fetcher } = createAwsFetchOnlyServices();
+ const services = createAwsFetchOnlyServices();
+ const { config, logFileProvider } = services;
- const inbound = createInbound(logger, {
+ const inbound = createInbound(logFileProvider, {
fallback: config.getList("inboundFallback"),
ldaPath: config.get("ldaPath"),
aliasFile: join(config.get("dataPath"), "aliases.csv"),
mailDomain: config.get("mailDomain"),
});
-
const recycler = (rawMail: string, _: unknown): Promise<void> =>
inbound.deliver({ mail: new Mail(rawMail) }).then();
- return { config, logger, awsOptions, fetcher, inbound, recycler };
+ return { ...services, inbound, recycler };
}
function createAwsServices() {
- const { config, logger, inbound, awsOptions, fetcher, recycler } =
- createAwsRecycleOnlyServices();
+ const services = createAwsRecycleOnlyServices();
+ const { config, awsOptions } = services;
+
const dbService = new DbService(join(config.get("dataPath"), "db.sqlite"));
- const outbound = createOutbound(logger, awsOptions, dbService);
+ const outbound = createOutbound(awsOptions, dbService);
- return {
- config,
- logger,
- inbound,
- dbService,
- awsOptions,
- fetcher,
- recycler,
- outbound,
- };
+ return { ...services, dbService, outbound };
}
function createServerServices() {
const services = createAwsServices();
- const { logger, config, outbound, inbound, fetcher } = services;
- const smtp = createSmtp(logger, outbound);
+ const { config, outbound, inbound, fetcher } = services;
- const hono = createHono(logger, outbound, inbound);
+ const smtp = createSmtp(outbound);
+ const hono = createHono(outbound, inbound);
setupAwsHono(hono, {
path: config.get("awsInboundPath"),
auth: config.get("awsInboundKey"),
callback: (s3Key, recipients) => {
- return fetcher.consumeS3Mail(s3Key, (rawMail, _) =>
- inbound.deliver({ mail: new Mail(rawMail), recipients }).then(),
+ return fetcher.consumeS3Mail(
+ s3Key,
+ (rawMail, _) =>
+ inbound.deliver({ mail: new Mail(rawMail), recipients }).then(),
);
},
});
- return {
- ...services,
- smtp,
- hono,
- };
+ return { ...services, smtp, hono };
}
function serve(cron: boolean = false) {
@@ -251,10 +241,12 @@ function serve(cron: boolean = false) {
}
async function listLives() {
- const { logger, fetcher } = createAwsFetchOnlyServices();
+ const { fetcher } = createAwsFetchOnlyServices();
const liveMails = await fetcher.listLiveMails();
- logger.info(`Total ${liveMails.length}:`);
- logger.info(liveMails.join("\n"));
+ console.info(`Total ${liveMails.length}:`);
+ if (liveMails.length !== 0) {
+ console.info(liveMails.join("\n"));
+ }
}
async function recycleLives() {
@@ -263,38 +255,43 @@ async function recycleLives() {
}
if (import.meta.main) {
- const args = parseArgs(Deno.args);
-
- if (args._.length === 0) {
- throw new Error("You must specify a command.");
- }
-
- const command = String(args._[0]);
-
- switch (command) {
- case "sendmail": {
- const { logger, config } = createBaseServices();
- await sendMail(logger, config.getInt("httpPort"));
- break;
- }
- case "list-lives": {
- await listLives();
- break;
- }
- case "recycle-lives": {
- await recycleLives();
- break;
- }
- case "serve": {
- serve();
- break;
- }
- case "real-serve": {
- serve(true);
- break;
- }
- default: {
- throw new Error(command + " is not a valid command.");
- }
- }
+ await yargs(Deno.args)
+ .scriptName("mail-relay")
+ .command({
+ command: "sendmail",
+ describe: "send mail via this server's endpoint",
+ handler: async (_argv) => {
+ const { config } = createBaseServices();
+ await sendMail(config.getInt("httpPort"));
+ },
+ })
+ .command({
+ command: "live",
+ describe: "work with live mails",
+ builder: (builder) => {
+ return builder
+ .command({
+ command: "list",
+ describe: "list live mails",
+ handler: listLives,
+ })
+ .command({
+ command: "recycle",
+ describe: "recycle all live mails",
+ handler: recycleLives,
+ })
+ .demandCommand(1, "One command must be specified.");
+ },
+ handler: () => {},
+ })
+ .command({
+ command: "serve",
+ describe: "start the http and smtp servers",
+ builder: (builder) => builder.option("real", { type: "boolean" }),
+ handler: (argv) => serve(argv.real),
+ })
+ .demandCommand(1, "One command must be specified.")
+ .help()
+ .strict()
+ .parse();
}
diff --git a/deno/mail-relay/aws/deliver.ts b/deno/mail-relay/aws/deliver.ts
index 3e1f162..4dd4b3a 100644
--- a/deno/mail-relay/aws/deliver.ts
+++ b/deno/mail-relay/aws/deliver.ts
@@ -1,12 +1,9 @@
-// spellchecker:words sesv2 amazonses
-
import {
SendEmailCommand,
SESv2Client,
SESv2ClientConfig,
} from "@aws-sdk/client-sesv2";
-import { Logger } from "@crupest/base/log";
import { Mail, MailDeliverContext, SyncMailDeliverer } from "../mail.ts";
declare module "../mail.ts" {
@@ -17,13 +14,11 @@ declare module "../mail.ts" {
export class AwsMailDeliverer extends SyncMailDeliverer {
readonly name = "aws";
- readonly #logger;
readonly #aws;
readonly #ses;
- constructor(logger: Logger, aws: SESv2ClientConfig) {
- super(logger);
- this.#logger = logger;
+ constructor(aws: SESv2ClientConfig) {
+ super();
this.#aws = aws;
this.#ses = new SESv2Client(aws);
}
@@ -32,7 +27,7 @@ export class AwsMailDeliverer extends SyncMailDeliverer {
mail: Mail,
context: MailDeliverContext,
): Promise<void> {
- this.#logger.info("Begin to call aws send-email api...");
+ console.info("Begin to call aws send-email api...");
try {
const sendCommand = new SendEmailCommand({
@@ -43,7 +38,7 @@ export class AwsMailDeliverer extends SyncMailDeliverer {
const res = await this.#ses.send(sendCommand);
if (res.MessageId == null) {
- this.#logger.warn("Aws send-email returns no message id.");
+ console.warn("Aws send-email returns no message id.");
} else {
context.result.awsMessageId =
`${res.MessageId}@${this.#aws.region}.amazonses.com`;
diff --git a/deno/mail-relay/aws/fetch.ts b/deno/mail-relay/aws/fetch.ts
index ef1ba5f..9278e63 100644
--- a/deno/mail-relay/aws/fetch.ts
+++ b/deno/mail-relay/aws/fetch.ts
@@ -7,8 +7,7 @@ import {
S3ClientConfig,
} from "@aws-sdk/client-s3";
-import { toFileNameString } from "@crupest/base/date";
-import { Logger } from "@crupest/base/log";
+import { toFileNameString } from "@crupest/base";
import { Mail } from "../mail.ts";
@@ -42,18 +41,16 @@ export type AwsS3MailConsumer = (
export class AwsMailFetcher {
readonly #livePrefix = "mail/live/";
readonly #archivePrefix = "mail/archive/";
- readonly #logger;
readonly #s3;
readonly #bucket;
- constructor(logger: Logger, aws: S3ClientConfig, bucket: string) {
- this.#logger = logger;
+ constructor(aws: S3ClientConfig, bucket: string) {
this.#s3 = new S3Client(aws);
this.#bucket = bucket;
}
async listLiveMails(): Promise<string[]> {
- this.#logger.info("Begin to retrieve live mails.");
+ console.info("Begin to retrieve live mails.");
const listCommand = new ListObjectsV2Command({
Bucket: this.#bucket,
@@ -62,16 +59,14 @@ export class AwsMailFetcher {
const res = await this.#s3.send(listCommand);
if (res.Contents == null) {
- this.#logger.warn("Listing live mails in S3 returns null Content.");
+ console.warn("Listing live mails in S3 returns null Content.");
return [];
}
const result: string[] = [];
for (const object of res.Contents) {
if (object.Key == null) {
- this.#logger.warn(
- "Listing live mails in S3 returns an object with no Key.",
- );
+ console.warn("Listing live mails in S3 returns an object with no Key.");
continue;
}
@@ -83,9 +78,9 @@ export class AwsMailFetcher {
}
async consumeS3Mail(s3Key: string, consumer: AwsS3MailConsumer) {
- this.#logger.info(`Begin to consume s3 mail ${s3Key} ...`);
+ console.info(`Begin to consume s3 mail ${s3Key} ...`);
- this.#logger.info(`Fetching s3 mail ${s3Key}...`);
+ console.info(`Fetching s3 mail ${s3Key}...`);
const mailPath = `${this.#livePrefix}${s3Key}`;
const command = new GetObjectCommand({
Bucket: this.#bucket,
@@ -98,32 +93,33 @@ export class AwsMailFetcher {
}
const rawMail = await res.Body.transformToString();
- this.#logger.info(`Done fetching s3 mail ${s3Key}.`);
+ console.info(`Done fetching s3 mail ${s3Key}.`);
- this.#logger.info(`Calling consumer...`);
+ console.info(`Calling consumer...`);
await consumer(rawMail, s3Key);
- this.#logger.info(`Done consuming s3 mail ${s3Key}.`);
+ console.info(`Done consuming s3 mail ${s3Key}.`);
const date = new Mail(rawMail)
- .startSimpleParse(this.#logger)
+ .startSimpleParse()
.sections()
.headers()
.date();
- const dateString =
- date != null ? toFileNameString(date, true) : "invalid-date";
+ const dateString = date != null
+ ? toFileNameString(date, true)
+ : "invalid-date";
const newPath = `${this.#archivePrefix}${dateString}/${s3Key}`;
- this.#logger.info(`Archiving s3 mail ${s3Key} to ${newPath}...`);
+ console.info(`Archiving s3 mail ${s3Key} to ${newPath}...`);
await s3MoveObject(this.#s3, this.#bucket, mailPath, newPath);
- this.#logger.info(`Done archiving s3 mail ${s3Key}.`);
+ console.info(`Done archiving s3 mail ${s3Key}.`);
- this.#logger.info(`Done consuming s3 mail ${s3Key}.`);
+ console.info(`Done consuming s3 mail ${s3Key}.`);
}
async recycleLiveMails(consumer: AwsS3MailConsumer) {
- this.#logger.info("Begin to recycle live mails...");
+ console.info("Begin to recycle live mails...");
const mails = await this.listLiveMails();
- this.#logger.info(`Found ${mails.length} live mails`);
+ console.info(`Found ${mails.length} live mails`);
for (const s3Key of mails) {
await this.consumeS3Mail(s3Key, consumer);
}
diff --git a/deno/mail-relay/aws/mail.ts b/deno/mail-relay/aws/mail.ts
index d2cfad1..cc05d23 100644
--- a/deno/mail-relay/aws/mail.ts
+++ b/deno/mail-relay/aws/mail.ts
@@ -8,17 +8,17 @@ export class AwsMailMessageIdRewriteHook implements MailDeliverHook {
}
async callback(context: MailDeliverContext): Promise<void> {
- context.logger.info("Rewrite message ids...");
+ console.info("Rewrite message ids...");
const addresses = context.mail.simpleFindAllAddresses();
- context.logger.info(`Addresses found in mail: ${addresses.join(", ")}.`);
+ console.info(`Addresses found in mail: ${addresses.join(", ")}.`);
for (const address of addresses) {
const awsMessageId = await this.#lookup(address);
if (awsMessageId != null && awsMessageId.length !== 0) {
- context.logger.info(`Rewrite ${address} to ${awsMessageId}.`);
+ console.info(`Rewrite ${address} to ${awsMessageId}.`);
context.mail.raw = context.mail.raw.replaceAll(address, awsMessageId);
}
}
- context.logger.info("Done rewrite message ids.");
+ console.info("Done rewrite message ids.");
}
}
@@ -30,24 +30,20 @@ export class AwsMailMessageIdSaveHook implements MailDeliverHook {
}
async callback(context: MailDeliverContext): Promise<void> {
- context.logger.info("Save aws message ids...");
+ console.info("Save aws message ids...");
const messageId = context.mail
- .startSimpleParse(context.logger)
+ .startSimpleParse()
.sections()
.headers()
.messageId();
if (messageId == null) {
- context.logger.info(
- "Original mail does not have message id. Skip saving.",
- );
+ console.info("Original mail does not have message id. Skip saving.");
return;
}
if (context.result.awsMessageId != null) {
- context.logger.info(
- `Saving ${messageId} => ${context.result.awsMessageId}.`,
- );
+ console.info(`Saving ${messageId} => ${context.result.awsMessageId}.`);
await this.#record(messageId, context.result.awsMessageId);
}
- context.logger.info("Done save message ids.");
+ console.info("Done save message ids.");
}
}
diff --git a/deno/mail-relay/db.ts b/deno/mail-relay/db.ts
index 9b05e32..062700b 100644
--- a/deno/mail-relay/db.ts
+++ b/deno/mail-relay/db.ts
@@ -1,5 +1,3 @@
-// spellchecker: words kysely insertable updateable introspector
-
import {
Generated,
Insertable,
@@ -20,19 +18,20 @@ class SqliteStatementAdapter implements SqliteStatement {
}
all(parameters: readonly unknown[]): unknown[] {
- return this.stmt.all(...parameters as sqlite.BindValue[]);
+ return this.stmt.all(...(parameters as sqlite.BindValue[]));
}
iterate(parameters: readonly unknown[]): IterableIterator<unknown> {
- return this.stmt.iter(...parameters as sqlite.BindValue[]);
+ return this.stmt.iter(...(parameters as sqlite.BindValue[]));
}
- run(
- parameters: readonly unknown[],
- ): { changes: number | bigint; lastInsertRowid: number | bigint } {
+ run(parameters: readonly unknown[]): {
+ changes: number | bigint;
+ lastInsertRowid: number | bigint;
+ } {
const { db } = this.stmt;
const totalChangesBefore = db.totalChanges;
- const changes = this.stmt.run(...parameters as sqlite.BindValue[]);
+ const changes = this.stmt.run(...(parameters as sqlite.BindValue[]));
return {
changes: totalChangesBefore === db.totalChanges ? 0 : changes,
lastInsertRowid: db.lastInsertRowId,
@@ -52,8 +51,7 @@ class SqliteDatabaseAdapter implements SqliteDatabase {
}
}
-export class DbError extends Error {
-}
+export class DbError extends Error {}
interface AwsMessageIdMapTable {
id: Generated<number>;
@@ -100,9 +98,9 @@ export class DbService {
constructor(public readonly path: string) {
this.#db = new sqlite.Database(path);
this.#kysely = new Kysely<Database>({
- dialect: new SqliteDialect(
- { database: new SqliteDatabaseAdapter(this.#db) },
- ),
+ dialect: new SqliteDialect({
+ database: new SqliteDatabaseAdapter(this.#db),
+ }),
});
this.#migrator = new Migrator({
db: this.#kysely,
@@ -121,24 +119,27 @@ export class DbService {
async addMessageIdMap(
mail: Insertable<AwsMessageIdMapTable>,
): Promise<number> {
- const inserted = await this.#kysely.insertInto("aws_message_id_map").values(
- mail,
- ).executeTakeFirstOrThrow();
+ const inserted = await this.#kysely
+ .insertInto("aws_message_id_map")
+ .values(mail)
+ .executeTakeFirstOrThrow();
return Number(inserted.insertId!);
}
async messageIdToAws(messageId: string): Promise<string | null> {
- const row = await this.#kysely.selectFrom("aws_message_id_map").where(
- "message_id",
- "=",
- messageId,
- ).select("aws_message_id").executeTakeFirst();
+ const row = await this.#kysely
+ .selectFrom("aws_message_id_map")
+ .where("message_id", "=", messageId)
+ .select("aws_message_id")
+ .executeTakeFirst();
return row?.aws_message_id ?? null;
}
async messageIdFromAws(awsMessageId: string): Promise<string | null> {
- const row = await this.#kysely.selectFrom("aws_message_id_map")
- .where("aws_message_id", "=", awsMessageId).select("message_id")
+ const row = await this.#kysely
+ .selectFrom("aws_message_id_map")
+ .where("aws_message_id", "=", awsMessageId)
+ .select("message_id")
.executeTakeFirst();
return row?.message_id ?? null;
}
diff --git a/deno/mail-relay/dovecot.ts b/deno/mail-relay/dovecot.ts
index cb63766..bace225 100644
--- a/deno/mail-relay/dovecot.ts
+++ b/deno/mail-relay/dovecot.ts
@@ -1,19 +1,17 @@
import { basename } from "@std/path";
-import { Logger } from "@crupest/base/log";
+import { LogFileProvider } from "@crupest/base/log";
-import {
- Mail,
- MailDeliverContext,
- MailDeliverer,
-} from "./mail.ts";
+import { Mail, MailDeliverContext, MailDeliverer } from "./mail.ts";
export class DovecotMailDeliverer extends MailDeliverer {
readonly name = "dovecot";
+ readonly #logFileProvider;
readonly #ldaPath;
- constructor(logger: Logger, ldaPath: string) {
- super(logger);
+ constructor(logFileProvider: LogFileProvider, ldaPath: string) {
+ super();
+ this.#logFileProvider = logFileProvider;
this.#ldaPath = ldaPath;
}
@@ -33,14 +31,12 @@ export class DovecotMailDeliverer extends MailDeliverer {
return;
}
- this.logger.info(`Deliver to dovecot users: ${recipients.join(", ")}.`);
+ console.info(`Deliver to dovecot users: ${recipients.join(", ")}.`);
for (const recipient of recipients) {
try {
const commandArgs = ["-d", recipient];
- this.logger.info(
- `Run ${ldaBinName} ${commandArgs.join(" ")}...`,
- );
+ console.info(`Run ${ldaBinName} ${commandArgs.join(" ")}...`);
const ldaCommand = new Deno.Command(ldaPath, {
args: commandArgs,
@@ -50,9 +46,10 @@ export class DovecotMailDeliverer extends MailDeliverer {
});
const ldaProcess = ldaCommand.spawn();
- using logFiles = await this.logger.createExternalLogStreamsForProgram(
- ldaBinName,
- );
+ using logFiles = await this.#logFileProvider
+ .createExternalLogStreamsForProgram(
+ ldaBinName,
+ );
ldaProcess.stdout.pipeTo(logFiles.stdout);
ldaProcess.stderr.pipeTo(logFiles.stderr);
@@ -97,6 +94,6 @@ export class DovecotMailDeliverer extends MailDeliverer {
}
}
- this.logger.info("Done handling all recipients.");
+ console.info("Done handling all recipients.");
}
}
diff --git a/deno/mail-relay/dumb-smtp-server.ts b/deno/mail-relay/dumb-smtp-server.ts
index 66c2f7c..ac7069c 100644
--- a/deno/mail-relay/dumb-smtp-server.ts
+++ b/deno/mail-relay/dumb-smtp-server.ts
@@ -1,4 +1,3 @@
-import { Logger } from "@crupest/base/log";
import { MailDeliverer } from "./mail.ts";
const CRLF = "\r\n";
@@ -17,25 +16,28 @@ function createResponses(host: string, port: number | string) {
} as const;
}
+const LOG_TAG = "[dumb-smtp]";
+
export class DumbSmtpServer {
- #logger;
#deliverer;
#responses: ReturnType<typeof createResponses> = createResponses(
"invalid",
"invalid",
);
- constructor(logger: Logger, deliverer: MailDeliverer) {
- this.#logger = logger;
+ constructor(deliverer: MailDeliverer) {
this.#deliverer = deliverer;
}
async #handleConnection(conn: Deno.Conn) {
using disposeStack = new DisposableStack();
disposeStack.defer(() => {
- this.#logger.info("Close smtp session tcp connection.");
+ console.info(LOG_TAG, "Close session's tcp connection.");
conn.close();
});
+
+ console.info(LOG_TAG, "New session's tcp connection established.");
+
const writer = conn.writable.getWriter();
disposeStack.defer(() => writer.releaseLock());
const reader = conn.readable.getReader();
@@ -43,8 +45,10 @@ export class DumbSmtpServer {
const [decoder, encoder] = [new TextDecoder(), new TextEncoder()];
const decode = (data: Uint8Array) => decoder.decode(data);
- const send = async (s: string) =>
+ const send = async (s: string) => {
+ console.info(LOG_TAG, "Send line: " + s);
await writer.write(encoder.encode(s + CRLF));
+ };
let buffer: string = "";
let rawMail: string | null = null;
@@ -65,7 +69,7 @@ export class DumbSmtpServer {
buffer = buffer.slice(eolPos + CRLF.length);
if (rawMail == null) {
- this.#logger.info("Smtp server received line:", line);
+ console.info(LOG_TAG, "Received line: " + line);
const upperLine = line.toUpperCase();
if (upperLine.startsWith("EHLO") || upperLine.startsWith("HELO")) {
await send(this.#responses["EHLO"]);
@@ -75,26 +79,26 @@ export class DumbSmtpServer {
await send(this.#responses["RCPT"]);
} else if (upperLine === "DATA") {
await send(this.#responses["DATA"]);
- this.#logger.info("Begin to receive mail data...");
+ console.info(LOG_TAG, "Begin to receive mail data...");
rawMail = "";
} else if (upperLine === "QUIT") {
await send(this.#responses["QUIT"]);
return;
} else {
- this.#logger.warn("Smtp server command unrecognized:", line);
+ console.warn(LOG_TAG, "Unrecognized command from client: " + line);
await send(this.#responses["INVALID"]);
return;
}
} else {
if (line === ".") {
try {
- this.#logger.info("Done receiving mail data, begin to relay...");
+ console.info(LOG_TAG, "Mail data Received, begin to relay...");
const { message } = await this.#deliverer.deliverRaw(rawMail);
await send(`250 2.6.0 ${message}`);
rawMail = null;
- this.#logger.info("Done SMTP mail session.");
+ console.info(LOG_TAG, "Relay succeeded.");
} catch (err) {
- this.#logger.info(err);
+ console.error(LOG_TAG, "Relay failed.", err);
await send("554 5.3.0 Error: check server log");
return;
}
@@ -107,21 +111,19 @@ export class DumbSmtpServer {
}
}
- async serve(options: {
- hostname: string,
- port: number
- }) {
+ async serve(options: { hostname: string; port: number }) {
const listener = Deno.listen(options);
this.#responses = createResponses(options.hostname, options.port);
- this.#logger.info(
- `Dumb SMTP server starts running on ${this.#responses.serverName}.`,
+ console.info(
+ LOG_TAG,
+ `Dumb SMTP server starts to listen on ${this.#responses.serverName}.`,
);
for await (const conn of listener) {
try {
await this.#handleConnection(conn);
} catch (cause) {
- this.#logger.error("One smtp connection session throws an error " + cause);
+ console.error(LOG_TAG, "Tcp connection throws an error.", cause);
}
}
}
diff --git a/deno/mail-relay/mail.test.ts b/deno/mail-relay/mail.test.ts
index 6f3cd13..cd0c38d 100644
--- a/deno/mail-relay/mail.test.ts
+++ b/deno/mail-relay/mail.test.ts
@@ -1,8 +1,6 @@
import { describe, it } from "@std/testing/bdd";
import { expect, fn } from "@std/expect";
-import { Logger } from "@crupest/base/log";
-
import { Mail, MailDeliverContext, MailDeliverer } from "./mail.ts";
const mockDate = "Fri, 02 May 2025 08:33:02 +0000";
@@ -67,33 +65,31 @@ describe("Mail", () => {
});
it("simple parse date", () => {
- expect(new Mail(mockMailStr).startSimpleParse().sections().headers().date())
- .toEqual(new Date(mockDate));
+ expect(
+ new Mail(mockMailStr).startSimpleParse().sections().headers().date(),
+ ).toEqual(new Date(mockDate));
});
it("simple parse headers", () => {
expect(
new Mail(mockMailStr).startSimpleParse().sections().headers().fields,
- ).toEqual(mockHeaders.map(
- (h) => [h[0], " " + h[1].replaceAll("\n", "")],
- ));
+ ).toEqual(mockHeaders.map((h) => [h[0], " " + h[1].replaceAll("\n", "")]));
});
it("parse recipients", () => {
const mail = new Mail(mockMailStr);
- expect([...mail.startSimpleParse().sections().headers().recipients()])
- .toEqual([
- ...mockToAddresses,
- mockCcAddress,
- ]);
+ expect([
+ ...mail.startSimpleParse().sections().headers().recipients(),
+ ]).toEqual([...mockToAddresses, mockCcAddress]);
expect([
...mail.startSimpleParse().sections().headers().recipients({
domain: "example.com",
}),
- ]).toEqual([
- ...mockToAddresses,
- mockCcAddress,
- ].filter((a) => a.endsWith("example.com")));
+ ]).toEqual(
+ [...mockToAddresses, mockCcAddress].filter((a) =>
+ a.endsWith("example.com")
+ ),
+ );
});
it("find all addresses", () => {
@@ -121,7 +117,7 @@ describe("MailDeliverer", () => {
return Promise.resolve();
}) as MailDeliverer["doDeliver"];
}
- const mockDeliverer = new MockMailDeliverer(new Logger());
+ const mockDeliverer = new MockMailDeliverer();
it("deliver success", async () => {
await mockDeliverer.deliverRaw(mockMailStr);
diff --git a/deno/mail-relay/mail.ts b/deno/mail-relay/mail.ts
index 8c2e067..d6dfe65 100644
--- a/deno/mail-relay/mail.ts
+++ b/deno/mail-relay/mail.ts
@@ -2,16 +2,10 @@ import { encodeBase64 } from "@std/encoding/base64";
import { parse } from "@std/csv/parse";
import emailAddresses from "email-addresses";
-import { Logger } from "@crupest/base/log";
-
-class MailSimpleParseError extends Error { }
+class MailSimpleParseError extends Error {}
class MailSimpleParsedHeaders {
- #logger
-
- constructor(logger: Logger | undefined, public fields: [key:string, value: string][]) {
- this.#logger = logger;
- }
+ constructor(public fields: [key: string, value: string][]) {}
getFirst(fieldKey: string): string | undefined {
for (const [key, value] of this.fields) {
@@ -28,7 +22,7 @@ class MailSimpleParsedHeaders {
if (match != null) {
return match[1];
} else {
- this.#logger?.warn("Invalid message-id header of mail: ", messageIdField);
+ console.warn("Invalid message-id header of mail: " + messageIdField);
return undefined;
}
}
@@ -39,7 +33,7 @@ class MailSimpleParsedHeaders {
const date = new Date(dateField);
if (invalidToUndefined && isNaN(date.getTime())) {
- this.#logger?.warn(`Invalid date string (${dateField}) found in header.`);
+ console.warn(`Invalid date string (${dateField}) found in header.`);
return undefined;
}
return date;
@@ -71,11 +65,7 @@ class MailSimpleParsedSections {
eol: string;
sep: string;
- #logger
-
- constructor(logger: Logger | undefined, raw: string) {
- this.#logger = logger
-
+ constructor(raw: string) {
const twoEolMatch = raw.match(/(\r?\n)(\r?\n)/);
if (twoEolMatch == null) {
throw new MailSimpleParseError(
@@ -86,7 +76,7 @@ class MailSimpleParsedSections {
const [eol, sep] = [twoEolMatch[1], twoEolMatch[2]];
if (eol !== sep) {
- logger?.warn("Different EOLs (\\r\\n, \\n) found.");
+ console.warn("Different EOLs (\\r\\n, \\n) found.");
}
this.header = raw.slice(0, twoEolMatch.index!);
@@ -96,7 +86,7 @@ class MailSimpleParsedSections {
}
headers(): MailSimpleParsedHeaders {
- const headers = [] as [key:string, value: string][];
+ const headers = [] as [key: string, value: string][];
let field: string | null = null;
let lineNumber = 1;
@@ -105,9 +95,7 @@ class MailSimpleParsedSections {
if (field == null) return;
const sepPos = field.indexOf(":");
if (sepPos === -1) {
- throw new MailSimpleParseError(
- `No ':' in the header line: ${field}`,
- );
+ throw new MailSimpleParseError(`No ':' in the header line: ${field}`);
}
headers.push([field.slice(0, sepPos).trim(), field.slice(sepPos + 1)]);
field = null;
@@ -128,7 +116,7 @@ class MailSimpleParsedSections {
handleField();
- return new MailSimpleParsedHeaders(this.#logger, headers);
+ return new MailSimpleParsedHeaders(headers);
}
}
@@ -144,13 +132,13 @@ export class Mail {
return encodeBase64(this.raw);
}
- startSimpleParse(logger?: Logger) {
- return { sections: () => new MailSimpleParsedSections(logger, this.raw) };
+ startSimpleParse() {
+ return { sections: () => new MailSimpleParsedSections(this.raw) };
}
simpleFindAllAddresses(): string[] {
- const re = /,?\<?([a-z0-9_'+\-\.]+\@[a-z0-9_'+\-\.]+)\>?,?/ig
- return [...this.raw.matchAll(re)].map(m => m[1])
+ const re = /,?\<?([a-z0-9_'+\-\.]+\@[a-z0-9_'+\-\.]+)\>?,?/gi;
+ return [...this.raw.matchAll(re)].map((m) => m[1]);
}
}
@@ -169,16 +157,21 @@ export class MailDeliverResult {
constructor(public mail: Mail) {}
hasError(): boolean {
- return this.recipients.size === 0 ||
- this.recipients.values().some((r) => r.kind !== "done");
+ return (
+ this.recipients.size === 0 ||
+ 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}`
- ),
+ ...this.recipients
+ .entries()
+ .map(
+ ([recipient, result]) =>
+ `${recipient} [${result.kind}]: ${result.message}`,
+ ),
].join("\n");
}
}
@@ -187,10 +180,7 @@ export class MailDeliverContext {
readonly recipients: Set<string> = new Set();
readonly result;
- constructor(
- public readonly logger: Logger,
- public mail: Mail,
- ) {
+ constructor(public mail: Mail) {
this.result = new MailDeliverResult(this.mail);
}
}
@@ -204,8 +194,6 @@ export abstract class MailDeliverer {
preHooks: MailDeliverHook[] = [];
postHooks: MailDeliverHook[] = [];
- constructor(protected readonly logger: Logger) { }
-
protected abstract doDeliver(
mail: Mail,
context: MailDeliverContext,
@@ -219,9 +207,9 @@ export abstract class MailDeliverer {
mail: Mail;
recipients?: string[];
}): Promise<MailDeliverResult> {
- this.logger.info(`Begin to deliver mail via ${this.name}...`);
+ console.info(`Begin to deliver mail via ${this.name}...`);
- const context = new MailDeliverContext(this.logger, options.mail);
+ const context = new MailDeliverContext(options.mail);
options.recipients?.forEach((r) => context.recipients.add(r));
for (const hook of this.preHooks) {
@@ -234,8 +222,8 @@ export abstract class MailDeliverer {
await hook.callback(context);
}
- context.logger.info("Deliver result:");
- context.logger.info(context.result);
+ console.info("Deliver result:");
+ console.info(context.result);
if (context.result.hasError()) {
throw new Error("Mail failed to deliver.");
@@ -248,13 +236,19 @@ export abstract class MailDeliverer {
export abstract class SyncMailDeliverer extends MailDeliverer {
#last: Promise<void> = Promise.resolve();
- override async deliver(
- options: { mail: Mail; recipients?: string[] },
- ): Promise<MailDeliverResult> {
- this.logger.info("The mail deliverer is sync. Wait for last delivering done...");
+ override async deliver(options: {
+ mail: Mail;
+ recipients?: string[];
+ }): Promise<MailDeliverResult> {
+ console.info(
+ "The mail deliverer is sync. Wait for last delivering done...",
+ );
await this.#last;
const result = super.deliver(options);
- this.#last = result.then(() => {}, () => {});
+ this.#last = result.then(
+ () => {},
+ () => {},
+ );
return result;
}
}
@@ -264,12 +258,12 @@ export class RecipientFromHeadersHook implements MailDeliverHook {
callback(context: MailDeliverContext) {
if (context.recipients.size !== 0) {
- context.logger.warn(
+ console.warn(
"Recipients are already filled. Won't set them with ones in headers.",
);
} else {
context.mail
- .startSimpleParse(context.logger)
+ .startSimpleParse()
.sections()
.headers()
.recipients({
@@ -277,9 +271,9 @@ export class RecipientFromHeadersHook implements MailDeliverHook {
})
.forEach((r) => context.recipients.add(r));
- context.logger.info(
- "Recipients found from mail headers: ",
- [...context.recipients].join(" "),
+ console.info(
+ "Recipients found from mail headers: " +
+ [...context.recipients].join(", "),
);
}
return Promise.resolve();
@@ -291,9 +285,8 @@ export class FallbackRecipientHook implements MailDeliverHook {
callback(context: MailDeliverContext) {
if (context.recipients.size === 0) {
- context.logger.info(
- "No recipients, fill with fallback: ",
- [...this.fallback].join(" "),
+ console.info(
+ "No recipients, fill with fallback: " + [...this.fallback].join(", "),
);
this.fallback.forEach((a) => context.recipients.add(a));
}
@@ -308,10 +301,10 @@ export class AliasRecipientMailHook implements MailDeliverHook {
this.#aliasFile = aliasFile;
}
- async #parseAliasFile(logger: Logger): Promise<Map<string, string>> {
+ async #parseAliasFile(): Promise<Map<string, string>> {
const result = new Map();
if ((await Deno.stat(this.#aliasFile)).isFile) {
- logger.info(`Found recipients alias file: ${this.#aliasFile}.`);
+ console.info(`Found recipients alias file: ${this.#aliasFile}.`);
const text = await Deno.readTextFile(this.#aliasFile);
const csv = parse(text);
for (const [real, ...aliases] of csv) {
@@ -322,11 +315,11 @@ export class AliasRecipientMailHook implements MailDeliverHook {
}
async callback(context: MailDeliverContext) {
- const aliases = await this.#parseAliasFile(context.logger);
+ const aliases = await this.#parseAliasFile();
for (const recipient of [...context.recipients]) {
const realRecipients = aliases.get(recipient);
if (realRecipients != null) {
- context.logger.info(
+ console.info(
`Recipient alias resolved: ${recipient} => ${realRecipients}.`,
);
context.recipients.delete(recipient);
diff --git a/deno/service-manager/deno.json b/deno/service-manager/deno.json
deleted file mode 100644
index 2ba8394..0000000
--- a/deno/service-manager/deno.json
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{
- "version": "0.1.0",
- "tasks": {
- "run": "deno run -A main.ts",
- "compile": "deno compile -o out/manage -A main.ts"
- },
- "imports": {
- "@std/dotenv": "jsr:@std/dotenv@^0.225.5",
- "@std/fs": "jsr:@std/fs@^1.0.18",
- "mustache": "npm:mustache@^4.2.0"
- }
-}
diff --git a/deno/service-manager/main.ts b/deno/service-manager/main.ts
deleted file mode 100644
index 93f4c1b..0000000
--- a/deno/service-manager/main.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { parseArgs } from "@std/cli";
-import { loadVariables, TemplateDir } from "./template.ts";
-import { join } from "@std/path";
-
-if (import.meta.main) {
- const args = parseArgs(Deno.args, {
- string: ["project-dir"],
- boolean: ["no-dry-run"],
- });
-
- if (args._.length === 0) {
- throw new Error("You must specify a command.");
- }
-
- const projectDir = args["project-dir"];
- if (projectDir == null) {
- throw new Error("You must specify project-dir.");
- }
-
- const command = String(args._[0]);
-
- switch (command) {
- case "gen-tmpl":
- new TemplateDir(
- join(projectDir, "services/templates"),
- ).generateWithVariableFiles(
- [
- join(projectDir, "data/config"),
- join(projectDir, "services/config.template"),
- ],
- args["no-dry-run"] === true
- ? join(projectDir, "services/generated")
- : undefined,
- );
- break;
- default:
- throw new Error(command + " is not a valid command.");
- }
-}
diff --git a/deno/tools/deno.json b/deno/tools/deno.json
new file mode 100644
index 0000000..355046a
--- /dev/null
+++ b/deno/tools/deno.json
@@ -0,0 +1,8 @@
+{
+ "version": "0.1.0",
+ "tasks": {
+ },
+ "imports": {
+ "mustache": "npm:mustache@^4.2.0"
+ }
+}
diff --git a/deno/tools/generate-geosite-rules.ts b/deno/tools/generate-geosite-rules.ts
new file mode 100644
index 0000000..bfa53ba
--- /dev/null
+++ b/deno/tools/generate-geosite-rules.ts
@@ -0,0 +1,160 @@
+const PROXY_NAME = "node-select";
+const ATTR = "cn";
+const REPO_NAME = "domain-list-community";
+const URL =
+ "https://github.com/v2fly/domain-list-community/archive/refs/heads/master.zip";
+const SITES = [
+ "github",
+ "google",
+ "youtube",
+ "twitter",
+ "facebook",
+ "discord",
+ "reddit",
+ "twitch",
+ "quora",
+ "telegram",
+ "imgur",
+ "stackexchange",
+ "onedrive",
+ "duckduckgo",
+ "wikimedia",
+ "gitbook",
+ "gitlab",
+ "creativecommons",
+ "archive",
+ "matrix",
+ "tor",
+ "python",
+ "ruby",
+ "rust",
+ "nodejs",
+ "npmjs",
+ "qt",
+ "docker",
+ "v2ray",
+ "homebrew",
+ "bootstrap",
+ "heroku",
+ "vercel",
+ "ieee",
+ "sci-hub",
+ "libgen",
+];
+
+const prefixes = ["include", "domain", "keyword", "full", "regexp"] as const;
+
+interface Rule {
+ kind: (typeof prefixes)[number];
+ value: string;
+ attrs: string[];
+}
+
+type FileProvider = (name: string) => string;
+
+function extract(starts: string[], provider: FileProvider): Rule[] {
+ function parseLine(line: string): Rule {
+ let kind = prefixes.find((p) => line.startsWith(p + ":"));
+ if (kind != null) {
+ line = line.slice(line.indexOf(":") + 1);
+ } else {
+ kind = "domain";
+ }
+ const segs = line.split("@");
+ return {
+ kind,
+ value: segs[0].trim(),
+ attrs: [...segs.slice(1)].map((s) => s.trim()),
+ };
+ }
+
+ function parse(text: string): Rule[] {
+ return text
+ .replaceAll("\c\n", "\n")
+ .split("\n")
+ .map((l) => l.trim())
+ .filter((l) => l.length !== 0 && !l.startsWith("#"))
+ .map((l) => parseLine(l));
+ }
+
+ const visited = [] as string[];
+ const rules = [] as Rule[];
+
+ function add(name: string) {
+ const text = provider(name);
+ for (const rule of parse(text)) {
+ if (rule.kind === "include") {
+ if (visited.includes(rule.value)) {
+ console.warn(`circular refs found: ${name} includes ${rule.value}.`);
+ continue;
+ } else {
+ visited.push(rule.value);
+ add(rule.value);
+ }
+ } else {
+ rules.push(rule);
+ }
+ }
+ }
+
+ for (const start of starts) {
+ add(start);
+ }
+
+ return rules;
+}
+
+function toNewFormat(rules: Rule[], attr: string): [string, string] {
+ function toLine(rule: Rule) {
+ const prefixMap = {
+ domain: "DOMAIN-SUFFIX",
+ full: "DOMAIN",
+ keyword: "DOMAIN-KEYWORD",
+ regexp: "DOMAIN-REGEX",
+ } as const;
+ if (rule.kind === "include") {
+ throw new Error("Include rule not parsed.");
+ }
+ return `${prefixMap[rule.kind]},${rule.value}`;
+ }
+
+ function toLines(rules: Rule[]) {
+ return rules.map((r) => toLine(r)).join("\n");
+ }
+
+ const has: Rule[] = [];
+ const notHas: Rule[] = [];
+ rules.forEach((r) => (r.attrs.includes(attr) ? has.push(r) : notHas.push(r)));
+
+ return [toLines(has), toLines(notHas)];
+}
+
+if (import.meta.main) {
+ const tmpDir = Deno.makeTempDirSync({ prefix: "geosite-rules-" });
+ console.log("Work dir is ", tmpDir);
+ const zipFilePath = tmpDir + "/repo.zip";
+ const res = await fetch(URL);
+ if (!res.ok) {
+ throw new Error("Failed to download repo.");
+ }
+ Deno.writeFileSync(zipFilePath, await res.bytes());
+ const unzip = new Deno.Command("unzip", {
+ args: ["-q", zipFilePath],
+ cwd: tmpDir,
+ });
+ if (!(await unzip.spawn().status).success) {
+ throw new Error("Failed to unzip");
+ }
+
+ const dataDir = tmpDir + "/" + REPO_NAME + "-master/data";
+ const provider = (name: string) =>
+ Deno.readTextFileSync(dataDir + "/" + name);
+
+ const rules = extract(SITES, provider);
+ const [has, notHas] = toNewFormat(rules, ATTR);
+ const hasFile = tmpDir + "/has-rule";
+ const notHasFile = tmpDir + "/not-has-rule";
+ console.log("Write result to: " + hasFile + " , " + notHasFile);
+ Deno.writeTextFileSync(hasFile, has);
+ Deno.writeTextFileSync(notHasFile, notHas);
+}
diff --git a/deno/tools/manage-service.ts b/deno/tools/manage-service.ts
new file mode 100644
index 0000000..148f55a
--- /dev/null
+++ b/deno/tools/manage-service.ts
@@ -0,0 +1,42 @@
+import { join } from "@std/path";
+// @ts-types="npm:@types/yargs"
+import yargs from "yargs";
+
+import { TemplateDir } from "./template.ts";
+
+if (import.meta.main) {
+ await yargs(Deno.args)
+ .scriptName("manage-service")
+ .option("project-dir", {
+ type: "string",
+ })
+ .demandOption("project-dir")
+ .command({
+ command: "gen-tmpl",
+ describe: "generate files for templates",
+ builder: (builder) => {
+ return builder
+ .option("dry-run", {
+ type: "boolean",
+ default: true,
+ })
+ .strict();
+ },
+ handler: (argv) => {
+ const { projectDir, dryRun } = argv;
+ new TemplateDir(
+ join(projectDir, "services/templates"),
+ ).generateWithVariableFiles(
+ [
+ join(projectDir, "data/config"),
+ join(projectDir, "services/config.template"),
+ ],
+ dryRun ? undefined : join(projectDir, "services/generated"),
+ );
+ },
+ })
+ .demandCommand(1, "One command must be specified.")
+ .help()
+ .strict()
+ .parse();
+}
diff --git a/deno/tools/manage-vm.ts b/deno/tools/manage-vm.ts
new file mode 100644
index 0000000..bb985ce
--- /dev/null
+++ b/deno/tools/manage-vm.ts
@@ -0,0 +1,144 @@
+import os from "node:os";
+import { join } from "@std/path";
+// @ts-types="npm:@types/yargs"
+import yargs from "yargs";
+
+type ArchAliasMap = { [name: string]: string[] };
+const arches = {
+ x86_64: ["x86_64", "amd64"],
+ i386: ["i386", "x86", "i686"],
+} as const satisfies ArchAliasMap;
+type Arch = keyof typeof arches;
+type GeneralArch = (typeof arches)[Arch][number];
+
+function normalizeArch(generalName: GeneralArch): Arch {
+ for (const [name, aliases] of Object.entries(arches as ArchAliasMap)) {
+ if (aliases.includes(generalName)) return name as Arch;
+ }
+ throw Error("Unknown architecture name.");
+}
+
+interface GeneralVmSetup {
+ name?: string[];
+ arch: GeneralArch;
+ disk: string;
+ sshForwardPort: number;
+ kvm?: boolean;
+}
+
+interface VmSetup {
+ arch: Arch;
+ disk: string;
+ sshForwardPort: number;
+ kvm: boolean;
+}
+
+const MY_VMS: GeneralVmSetup[] = [
+ {
+ name: ["hurd", ...arches.i386.map((a) => `hurd-${a}`)],
+ arch: "i386",
+ disk: join(os.homedir(), "vms/hurd-i386.qcow2"),
+ sshForwardPort: 3222,
+ },
+ {
+ name: [...arches.x86_64.map((a) => `hurd-${a}`)],
+ arch: "x86_64",
+ disk: join(os.homedir(), "vms/hurd-x86_64.qcow2"),
+ sshForwardPort: 3223,
+ },
+];
+
+function normalizeVmSetup(generalSetup: GeneralVmSetup): VmSetup {
+ const { arch, disk, sshForwardPort, kvm } = generalSetup;
+ return {
+ arch: normalizeArch(arch),
+ disk,
+ sshForwardPort,
+ kvm: kvm ?? Deno.build.os === "linux",
+ };
+}
+
+function resolveVmSetup(
+ name: string,
+ vms: GeneralVmSetup[],
+): VmSetup | undefined {
+ const setup = vms.find((vm) => vm.name?.includes(name));
+ return setup == null ? undefined : normalizeVmSetup(setup);
+}
+
+const qemuBinPrefix = "qemu-system" as const;
+
+const qemuBinSuffix = {
+ x86_64: "x86_64",
+ i386: "x86_64",
+} as const;
+
+function getQemuBin(arch: Arch): string {
+ return `${qemuBinPrefix}-${qemuBinSuffix[arch]}`;
+}
+
+function getLinuxHostArgs(kvm: boolean): string[] {
+ return kvm ? ["-enable-kvm"] : [];
+}
+
+function getMachineArgs(arch: Arch): string[] {
+ const is64 = arch === "x86_64";
+ const machineArgs = is64 ? ["-machine", "q35"] : [];
+ const memory = is64 ? 8 : 4;
+ return [...machineArgs, "-m", `${memory}G`];
+}
+
+function getNetworkArgs(sshForwardPort: number): string[] {
+ return ["-net", "nic", "-net", `user,hostfwd=tcp::${sshForwardPort}-:22`];
+}
+
+function getDisplayArgs(): string[] {
+ return ["-vga", "vmware"];
+}
+
+function getDiskArgs(disk: string): string[] {
+ return ["-drive", `cache=writeback,file=${disk}`];
+}
+
+function createQemuArgs(setup: VmSetup): string[] {
+ const { arch, disk, sshForwardPort } = setup;
+ return [
+ getQemuBin(arch),
+ ...getLinuxHostArgs(setup.kvm),
+ ...getMachineArgs(arch),
+ ...getDisplayArgs(),
+ ...getNetworkArgs(sshForwardPort),
+ ...getDiskArgs(disk),
+ ];
+}
+
+if (import.meta.main) {
+ await yargs(Deno.args)
+ .scriptName("manage-vm")
+ .command({
+ command: "gen <name>",
+ describe: "generate cli command to run the vm",
+ builder: (builder) => {
+ return builder
+ .positional("name", {
+ describe: "name of the vm to run",
+ type: "string",
+ })
+ .demandOption("name")
+ .strict();
+ },
+ handler: (argv) => {
+ const vm = resolveVmSetup(argv.name, MY_VMS);
+ if (vm == null) {
+ console.error(`No vm called ${argv.name} is found.`);
+ Deno.exit(-1);
+ }
+ const cli = createQemuArgs(vm);
+ console.log(`${cli.join(" ")}`);
+ },
+ })
+ .demandCommand(1, "One command must be specified.")
+ .help()
+ .strict()
+ .parse();
+}
diff --git a/deno/service-manager/template.ts b/deno/tools/template.ts
index be6cb60..1b67eb8 100644
--- a/deno/service-manager/template.ts
+++ b/deno/tools/template.ts
@@ -1,9 +1,9 @@
import { dirname, join, relative } from "@std/path";
import { copySync, existsSync, walkSync } from "@std/fs";
import { parse } from "@std/dotenv";
-import { distinct } from "@std/collections"
+import { distinct } from "@std/collections";
// @ts-types="npm:@types/mustache"
-import Mustache from "mustache"
+import Mustache from "mustache";
Mustache.tags = ["@@", "@@"];
Mustache.escape = (value) => String(value);
@@ -21,7 +21,7 @@ function getVariableKeys(original: string): string[] {
}
export function loadVariables(files: string[]): Record<string, string> {
- const vars: Record<string, string> = {}
+ const vars: Record<string, string> = {};
for (const file of files) {
const text = Deno.readTextFileSync(file);
for (const [key, valueText] of Object.entries(parse(text))) {
@@ -38,7 +38,7 @@ export function loadVariables(files: string[]): Record<string, string> {
return vars;
}
-const TEMPLATE_FILE_EXT = ".template"
+const TEMPLATE_FILE_EXT = ".template";
export class TemplateDir {
templates: { path: string; ext: string; text: string; vars: string[] }[] = [];
@@ -73,7 +73,9 @@ export class TemplateDir {
generate(vars: Record<string, string>, generatedDir?: string) {
console.log(
- `Generating, template dir: ${this.dir}, generated dir: ${generatedDir ?? "[dry-run]"}:`,
+ `Generating, template dir: ${this.dir}, generated dir: ${
+ generatedDir ?? "[dry-run]"
+ }:`,
);
const undefinedVars = this.allNeededVars().filter((v) => !(v in vars));
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-14 09:10:23 +0000