fix STARTTLS (fixes #59)

EC-Nordbund · Feb 12, 2023 · d37b3cc · d37b3cc
1 parent 4189e21
commit d37b3cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/client/basic/client.ts b/client/basic/client.ts
@@ -334,6 +334,8 @@ export class SMTPClient {
     ) {
       this.#connection.writeCmdAndAssert(CommandCode.READY, "STARTTLS");
 
+      await this.#connection.cleanupForStartTLS()
+
       const conn = await Deno.startTls(this.#connection.conn, {
         hostname: this.config.connection.hostname,
       });

diff --git a/client/basic/connection.ts b/client/basic/connection.ts
@@ -36,6 +36,11 @@ export class SMTPConnection {
     this.#writer = this.#writableTransformStream.writable.getWriter();
   }
 
+  async cleanupForStartTLS() {
+  await this.#reader.cancel()
+   await this.#writer.close()
+  }
+
   async readLine() {
     const ret = await this.#reader.read();
     return ret.value ?? null;
@@ -66,6 +71,7 @@ export class SMTPConnection {
     }
   }
 
+
   public assertCode(cmd: Command | null, code: number, msg?: string) {
     if (!cmd) {
       throw new Error(`invalid cmd`);