@bumail/smtp 0.1.0 → 0.2.0

package/dist/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,MAAM,MAAM,aAAa,GACtB,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,cAAc,GACd,oBAAoB,GACpB,kBAAkB,CAAC;AAEtB;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,KAAK;IACnC,SAAkB,IAAI,eAAe;IACrC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;gBAEjB,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM;CAIhD"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,uGAAuG;AACvG,MAAM,MAAM,aAAa,GACtB,gBAAgB,GAChB,mBAAmB,GACnB,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,cAAc,GACd,oBAAoB,GACpB,kBAAkB,GAClB,mBAAmB,GACnB,SAAS,GACT,WAAW,GACX,SAAS,GACT,oBAAoB,GACpB,iBAAiB,GACjB,YAAY,GACZ,kBAAkB,GAClB,mBAAmB,GACnB,SAAS,GACT,YAAY,CAAC;AAEhB,6DAA6D;AAC7D,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACtB;AAED,uFAAuF;AACvF,MAAM,WAAW,gBAAgB;IAChC,qEAAqE;IACrE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,kFAAkF;IAClF,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IACvB,yEAAyE;IACzE,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;CAC9C;AAYD;;;;;;;GAOG;AACH,qBAAa,SAAU,SAAQ,KAAK;IACnC,SAAkB,IAAI,eAAe;IACrC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,0EAA0E;IAC1E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,mFAAmF;IACnF,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IACvB,gFAAgF;IAChF,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;gBAG7C,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,gBAAqB;CAU/B"}

package/dist/index.js

@@ -1,54 +1,11 @@
-// src/errors.ts
-class SmtpError extends Error {
-  name = "SmtpError";
-  code;
-  constructor(code, message) {
-    super(message);
-    this.code = code;
-  }
-}
-// src/protocol/path.ts
-var ATOM = /^[A-Za-z0-9!#$%&'*+\-/=?^_`{|}~\u0080-\u{10ffff}]+$/u;
-var LABEL = /^(?:[A-Za-z0-9\u0080-\u{10ffff}](?:[A-Za-z0-9\-\u0080-\u{10ffff}]*[A-Za-z0-9\u0080-\u{10ffff}])?)$/u;
-var INVISIBLE = /[\u0080-\u009f\u2028\u2029\p{Cf}]/u;
-function isDotString(text) {
-  return text.split(".").every((atom) => ATOM.test(atom));
-}
-function isQuotedString(text) {
-  return /^"(?:[\x20\x21\x23-\x5b\x5d-\x7e\u0080-\u{10ffff}]|\\[\x20-\x7e])*"$/u.test(text);
-}
-function isDomain(domain) {
-  if (/^\[(?:IPv6:[0-9A-Fa-f:.]+|\d{1,3}(?:\.\d{1,3}){3})\]$/.test(domain))
-    return true;
-  return domain.length <= 255 && domain.split(".").every((label) => label.length <= 63 && LABEL.test(label));
-}
-function parsePath(text, allowNull) {
-  if (!text.startsWith("<") || !text.endsWith(">"))
-    return;
-  let inner = text.slice(1, -1);
-  if (INVISIBLE.test(inner))
-    return;
-  if (inner === "")
-    return allowNull ? { address: "", local: "", domain: "" } : undefined;
-  const route = /^@[^:]+:/.exec(inner);
-  if (route)
-    inner = inner.slice(route[0].length);
-  const at = inner.lastIndexOf("@");
-  if (at <= 0)
-    return;
-  const local = inner.slice(0, at);
-  const domain = inner.slice(at + 1);
-  if (local.length > 64 || !(isDotString(local) || isQuotedString(local)))
-    return;
-  if (!isDomain(domain))
-    return;
-  return {
-    address: `${local}@${domain.toLowerCase()}`,
-    local,
-    domain: domain.toLowerCase()
-  };
-}
-
+import {
+  SmtpError2,
+  parsePath2,
+  decodePlain2,
+  decodeLoginStep2,
+  LineSplitter,
+  Outgoing
+} from "./chunks/index-2ybj2z1w.js";
 // src/protocol/command.ts
 function parseCommand(line) {
   const space = line.indexOf(" ");
@@ -63,7 +20,7 @@ function parsePathCommand(argument, keyword) {
   const match = new RegExp(`^${keyword}:\\s*(<[^>]*>)(.*)$`, "i").exec(argument);
   if (!match)
     return;
-  const path = parsePath(match[1], keyword === "FROM");
+  const path = parsePath2(match[1], keyword === "FROM");
   if (!path)
     return;
   const parameters = {};
@@ -165,36 +122,6 @@ function formatReply(reply, enhanced = true) {
   }).join("");
 }
 var reply = (code, status, text) => status === undefined ? { code, text } : { code, status, text };
-// src/protocol/sasl.ts
-function base64ToText(text) {
-  if (!/^[A-Za-z0-9+/]*={0,2}$/.test(text) || text.length % 4 !== 0)
-    return;
-  try {
-    return new TextDecoder("utf-8", { fatal: true }).decode(Uint8Array.fromBase64(text));
-  } catch {
-    return;
-  }
-}
-function decodePlain(response) {
-  const text = base64ToText(response);
-  if (text === undefined)
-    return;
-  const parts = text.split("\x00");
-  if (parts.length !== 3)
-    return;
-  const [authorizationId = "", username = "", password = ""] = parts;
-  if (username === "" || password === "")
-    return;
-  return {
-    mechanism: "PLAIN",
-    username,
-    password,
-    ...authorizationId === "" || authorizationId === username ? {} : { authorizationId }
-  };
-}
-function decodeLoginStep(response) {
-  return base64ToText(response);
-}
 // src/server/guard.ts
 var LOCAL_ERROR = reply(451, "4.3.0", "Local error in processing");
 var TIMED_OUT = Symbol("timed out");
@@ -213,7 +140,7 @@ function timedOut(value) {
   return value === TIMED_OUT;
 }
 function hookTimeout(name, seconds) {
-  return new SmtpError("HOOK_TIMEOUT", `${name} did not settle within hookTimeout (${seconds} s)`);
+  return new SmtpError2("HOOK_TIMEOUT", `${name} did not settle within hookTimeout (${seconds} s)`);
 }
 function refusalOf(name, answer, report) {
   if (answer === undefined)
@@ -222,7 +149,7 @@ function refusalOf(name, answer, report) {
   if (typeof code === "number" && code >= 400 && code < 600) {
     return answer;
   }
-  report(new SmtpError("INVALID_HOOK_REPLY", `${name} answered ${JSON.stringify(answer)}, which is not a refusal: a hook refuses with a 4xx or 5xx reply, and accepts with undefined`));
+  report(new SmtpError2("INVALID_HOOK_REPLY", `${name} answered ${JSON.stringify(answer)}, which is not a refusal: a hook refuses with a 4xx or 5xx reply, and accepts with undefined`));
   return LOCAL_ERROR;
 }
 
@@ -281,7 +208,7 @@ async function authenticate(connection, argument) {
         state.waiting = "auth-plain";
         return connection.send(reply(334, undefined, ""));
       }
-      return check(connection, decodePlain(initial === "=" ? "" : initial));
+      return check(connection, decodePlain2(initial === "=" ? "" : initial));
     case "LOGIN":
       if (initial === undefined) {
         state.waiting = "auth-login-user";
@@ -293,7 +220,7 @@ async function authenticate(connection, argument) {
   }
 }
 function loginUser(connection, response) {
-  const user = decodeLoginStep(response);
+  const user = decodeLoginStep2(response);
   if (!user)
     return check(connection, undefined);
   connection.state.loginUser = user;
@@ -309,11 +236,11 @@ async function continueAuth(connection, line) {
   }
   switch (state.waiting) {
     case "auth-plain":
-      return check(connection, decodePlain(line));
+      return check(connection, decodePlain2(line));
     case "auth-login-user":
       return loginUser(connection, line);
     default: {
-      const password = decodeLoginStep(line);
+      const password = decodeLoginStep2(line);
       const username = state.loginUser ?? "";
       return check(connection, password ? { mechanism: "LOGIN", username, password } : undefined);
     }
@@ -499,7 +426,7 @@ async function runCommand(connection, line) {
     case "HELP":
       return connection.send(reply(214, "2.0.0", "See RFC 5321"));
     case "QUIT":
-      return connection.close(reply(221, "2.0.0", `${connection.settings.options.hostname} closing connection`));
+      return connection.quit(reply(221, "2.0.0", `${connection.settings.options.hostname} closing connection`));
     case "STARTTLS":
       return startTls(connection, argument);
     case "AUTH":
@@ -565,22 +492,22 @@ function receivedField(connection, recipients, id, now = new Date) {
 var TOO_BIG = reply(552, "5.3.4", "Message too big for system");
 var BARE_LINE_BREAK = reply(550, "5.6.11", "Bare CR or LF is not allowed in a message");
 function tooBig(maxMessageSize) {
-  return new SmtpError("MESSAGE_TOO_BIG", `The message is larger than maxMessageSize (${maxMessageSize} bytes); do not deliver it`);
+  return new SmtpError2("MESSAGE_TOO_BIG", `The message is larger than maxMessageSize (${maxMessageSize} bytes); do not deliver it`);
 }
 function bareLineBreak() {
-  return new SmtpError("BARE_LINE_BREAK", "The message holds a bare CR or LF (SMTP smuggling); do not deliver it");
+  return new SmtpError2("BARE_LINE_BREAK", "The message holds a bare CR or LF (SMTP smuggling); do not deliver it");
 }
 function connectionLost(ended) {
-  return new SmtpError("CONNECTION_LOST", ended ? "The connection closed before the reply to the message; do not deliver it" : "The connection closed before the end of the message; do not deliver it");
+  return new SmtpError2("CONNECTION_LOST", ended ? "The connection closed before the reply to the message; do not deliver it" : "The connection closed before the end of the message; do not deliver it");
 }
 function notAnswered(seconds) {
-  return new SmtpError("HOOK_TIMEOUT", `onData did not answer within hookTimeout (${seconds} s); do not deliver it`);
+  return new SmtpError2("HOOK_TIMEOUT", `onData did not answer within hookTimeout (${seconds} s); do not deliver it`);
 }
 function notReadInTime(seconds) {
-  return new SmtpError("HOOK_TIMEOUT", `onData did not read the message within hookTimeout (${seconds} s); do not deliver it`);
+  return new SmtpError2("HOOK_TIMEOUT", `onData did not read the message within hookTimeout (${seconds} s); do not deliver it`);
 }
 function notRead() {
-  return new SmtpError("MESSAGE_NOT_READ", "onData answered without reading the message to its end; it was not taken");
+  return new SmtpError2("MESSAGE_NOT_READ", "onData answered without reading the message to its end; it was not taken");
 }
 
 // src/server/intake.ts
@@ -755,61 +682,6 @@ class Intake {
   }
 }
 
-// src/server/lines.ts
-var MAX_LINE = 2048;
-
-class LineSplitter {
-  #held = new Uint8Array(0);
-  #skipping = false;
-  #rest = new Uint8Array(0);
-  push(chunk) {
-    this.#rest = this.#held.length > 0 ? concat(this.#held, chunk) : chunk;
-    this.#held = new Uint8Array(0);
-  }
-  next() {
-    for (;; ) {
-      const data = this.#rest;
-      const lf = data.indexOf(10);
-      if (lf < 0) {
-        this.#rest = new Uint8Array(0);
-        if (this.#skipping)
-          return;
-        if (data.length > MAX_LINE) {
-          this.#skipping = true;
-          return { tooLong: true };
-        }
-        this.#held = data.slice();
-        return;
-      }
-      const end = lf > 0 && data[lf - 1] === 13 ? lf - 1 : lf;
-      this.#rest = data.subarray(lf + 1);
-      if (this.#skipping) {
-        this.#skipping = false;
-        continue;
-      }
-      if (end > MAX_LINE)
-        return { tooLong: true };
-      return { line: new TextDecoder().decode(data.subarray(0, end)) };
-    }
-  }
-  takeRest() {
-    const rest = this.#rest;
-    this.#rest = new Uint8Array(0);
-    return rest;
-  }
-  clear() {
-    this.#held = new Uint8Array(0);
-    this.#rest = new Uint8Array(0);
-    this.#skipping = false;
-  }
-}
-function concat(a, b) {
-  const out = new Uint8Array(a.length + b.length);
-  out.set(a, 0);
-  out.set(b, a.length);
-  return out;
-}
-
 // src/server/input.ts
 var INPUT_LIMIT = 64 * 1024;
 
@@ -1008,6 +880,14 @@ class Connection {
       this.send(answer);
     this.#closed = true;
     this.input.abort();
+    this.transport.abort();
+  }
+  quit(answer) {
+    if (this.#closed)
+      return;
+    this.send(answer);
+    this.#closed = true;
+    this.input.abort();
     this.transport.end();
   }
   fail(answer) {
@@ -1072,7 +952,8 @@ class Connection {
 }
 
 // src/server/settings.ts
-var invalid = (message) => new SmtpError("INVALID_OPTION", `createSmtpServer(): ${message}`);
+var MAX_TIMER_SECONDS = Math.floor(2147483647 / 1000);
+var invalid = (message) => new SmtpError2("INVALID_OPTION", `createSmtpServer(): ${message}`);
 function positive(name, value, fallback) {
   if (value === undefined)
     return fallback;
@@ -1081,6 +962,13 @@ function positive(name, value, fallback) {
   }
   return value;
 }
+function timer(name, value, fallback) {
+  const seconds = positive(name, value, fallback);
+  if (seconds > MAX_TIMER_SECONDS) {
+    throw invalid(`${name} must be at most ${MAX_TIMER_SECONDS} seconds, not ${seconds}`);
+  }
+  return seconds;
+}
 function nonNegative(name, value, fallback) {
   if (value === undefined)
     return fallback;
@@ -1128,68 +1016,87 @@ function settingsOf(options) {
     maxConnections: positive("maxConnections", options.maxConnections, 1000),
     maxErrors: positive("maxErrors", options.maxErrors, 10),
     timeout,
-    hookTimeout: positive("hookTimeout", options.hookTimeout, 60),
+    hookTimeout: timer("hookTimeout", options.hookTimeout, 60),
     greetingDelay,
     isLocal: (domain) => isLocal(domain.toLowerCase())
   };
 }
 
 // src/server/transport.ts
+var CLOSE_GRACE_MS = 5000;
+
 class SocketTransport {
   #socket;
   remoteAddress;
   secure;
   #startTls;
-  #queue = [];
-  #waiters = [];
+  #outgoing;
   #ending = false;
+  #closed = false;
+  #grace;
   constructor(socket, secure, startTls, remoteAddress = socket.remoteAddress) {
     this.#socket = socket;
     this.secure = secure;
     this.#startTls = startTls;
     this.remoteAddress = remoteAddress;
+    this.#outgoing = new Outgoing((bytes) => socket.write(bytes));
   }
   write(text) {
-    const bytes = new TextEncoder().encode(text);
-    if (this.#queue.length > 0) {
-      this.#queue.push(bytes);
+    if (this.#closed)
       return;
-    }
-    const written = this.#socket.write(bytes);
-    if (written < bytes.length)
-      this.#queue.push(bytes.subarray(written));
+    this.#outgoing.write(new TextEncoder().encode(text));
   }
   drain() {
-    while (this.#queue.length > 0) {
-      const bytes = this.#queue[0];
-      const written = this.#socket.write(bytes);
-      if (written < bytes.length) {
-        this.#queue[0] = bytes.subarray(written);
-        return;
-      }
-      this.#queue.shift();
-    }
-    for (const wake of this.#waiters.splice(0))
-      wake();
-    if (this.#ending)
-      this.#socket.end();
+    if (this.#outgoing.drain() && this.#ending)
+      this.#hangUp(true);
   }
   drained() {
-    if (this.#queue.length === 0)
-      return Promise.resolve();
-    return new Promise((wake) => this.#waiters.push(wake));
+    return this.#outgoing.drained();
   }
   closed() {
-    this.#queue = [];
-    for (const wake of this.#waiters.splice(0))
-      wake();
+    this.#closed = true;
+    this.#disarm();
+    this.#outgoing.clear();
   }
   end() {
-    if (this.#queue.length === 0)
-      this.#socket.end();
+    if (this.#closed)
+      return;
+    this.#arm();
+    if (this.#outgoing.empty)
+      this.#hangUp(false);
     else
       this.#ending = true;
   }
+  abort() {
+    if (this.#closed)
+      return;
+    if (this.#outgoing.empty)
+      this.end();
+    else
+      this.#terminate();
+  }
+  #hangUp(drained) {
+    this.#ending = false;
+    if (drained && this.secure)
+      this.#socket.shutdown();
+    else
+      this.#socket.shutdown(true);
+  }
+  #terminate() {
+    this.#disarm();
+    this.#outgoing.clear();
+    this.#socket.terminate();
+  }
+  #arm() {
+    if (this.#grace)
+      return;
+    this.#grace = setTimeout(() => this.#terminate(), CLOSE_GRACE_MS);
+    this.#grace.unref?.();
+  }
+  #disarm() {
+    clearTimeout(this.#grace);
+    this.#grace = undefined;
+  }
   pause() {
     this.#socket.pause();
   }
@@ -1224,7 +1131,11 @@ function handlers(settings) {
     timeout(socket) {
       if (socket.data.upgraded)
         return;
-      socket.data.connection?.close(idle);
+      const { connection, transport } = socket.data;
+      if (connection?.closed)
+        transport?.abort();
+      else
+        connection?.close(idle);
     }
   };
 }
@@ -1257,15 +1168,15 @@ function transportOf(socket, settings, secure) {
 function createSmtpServer(options) {
   const settings = settingsOf(options);
   let listener;
-  let open = 0;
+  const open = new Set;
   const secure = options.implicitTls === true;
   return {
     get connections() {
-      return open;
+      return open.size;
     },
     async listen({ port, hostname = "0.0.0.0" }) {
       if (listener) {
-        throw new SmtpError("ALREADY_LISTENING", `listen(): the server is already listening on ${listener.hostname}:${listener.port}`);
+        throw new SmtpError2("ALREADY_LISTENING", `listen(): the server is already listening on ${listener.hostname}:${listener.port}`);
       }
       listener = Bun.listen({
         hostname,
@@ -1276,19 +1187,23 @@ function createSmtpServer(options) {
           open(socket) {
             socket.data = { upgraded: false };
             socket.timeout(settings.timeout);
-            if (open >= settings.maxConnections) {
-              socket.end(`421 4.3.2 ${options.hostname} Too many connections, try later\r
+            if (open.size >= settings.maxConnections) {
+              const refused = new SocketTransport(socket, secure, () => {});
+              socket.data.transport = refused;
+              refused.write(`421 4.3.2 ${options.hostname} Too many connections, try later\r
 `);
+              refused.end();
               return;
             }
-            open++;
             const connection = new Connection(settings, transportOf(socket, settings, secure));
+            open.add(connection);
             socket.data.connection = connection;
             connection.open();
           },
           close(socket) {
-            if (socket.data.connection)
-              open--;
+            const connection = socket.data.connection;
+            if (connection)
+              open.delete(connection);
             socket.data.transport?.closed();
             socket.data.connection?.close();
           }
@@ -1299,21 +1214,25 @@ function createSmtpServer(options) {
     stop(closeConnections = false) {
       listener?.stop(closeConnections);
       listener = undefined;
+      if (!closeConnections)
+        return;
+      for (const connection of [...open])
+        connection.close();
     }
   };
 }
 export {
   DataReader,
-  SmtpError,
+  SmtpError2 as SmtpError,
   createSmtpServer,
-  decodeLoginStep,
-  decodePlain,
+  decodeLoginStep2 as decodeLoginStep,
+  decodePlain2 as decodePlain,
   formatReply,
   parseCommand,
-  parsePath,
+  parsePath2 as parsePath,
   parsePathCommand,
   reply
 };
 
-//# debugId=DE4D9903D05BDADC64756E2164756E21
+//# debugId=7E57D02B62ACF1F164756E2164756E21
 //# sourceMappingURL=index.js.map