imapkit 4.3.0 → 4.3.1

package/dist/cjs/server.d.ts

@@ -482,6 +482,8 @@ declare class IMAPConnection {
     /** notifications are sent right away instead of before the next tagged response (IDLE) */
     directNotifications: boolean;
     notificationQueue: Notification[];
+    /** the plain socket that STARTTLS wrapped in TLS */
+    tcpSocket: net.Socket | null | undefined;
     /** the number of the connection, 1 for the first one the server accepted (script rules match it) */
     sessionNumber: number;
     /** the tag and name of the command whose input handler reads the lines that follow (IDLE, AUTHENTICATE) */

package/dist/cjs/server.js

@@ -1491,16 +1491,10 @@ class IMAPConnection {
             socket.pause();
             // a RST sent in the same tick as the last output can get lost: on macOS the client received the output but
             // never the RST (#81). Node has no signal for output that reached the peer, so the RST waits a little
+            const tcpSocket = this.tcpSocket;
             setTimeout(() => {
-                if (socket.destroyed) {
-                    return;
-                }
-                // resetAndDestroy sends a TCP RST (Node 16.17), not every runtime has it
-                if (typeof socket.resetAndDestroy === 'function') {
-                    socket.resetAndDestroy();
-                }
-                else {
-                    socket.destroy();
+                if (!socket.destroyed) {
+                    resetSocket(socket, tcpSocket);
                 }
             }, RESET_DELAY);
         }
@@ -2121,6 +2115,9 @@ class IMAPConnection {
         };
         // STARTTLS runs on a live connection
         const socket = this.socket;
+        // the RST of a script rule goes to the TCP socket under the TLS layer, see resetSocket. Node also has it as the
+        // _parent of the TLS socket, Bun does not
+        this.tcpSocket = socket;
         // remove all listeners from the original socket besides the error handler
         socket.removeAllListeners();
         socket.on('error', this.onError.bind(this));
@@ -2830,6 +2827,32 @@ class IMAPConnection {
     }
 }
 exports.IMAPConnection = IMAPConnection;
+/**
+ * Destroys a socket with a TCP RST (`close: 'reset'` of a script rule). resetAndDestroy (Node 16.17) needs a socket with
+ * a TCP handle, a TLS socket throws ERR_INVALID_HANDLE_TYPE (#84), so the RST goes to the TCP socket under the TLS
+ * layer: the plain socket of STARTTLS, or the parent socket of implicit TLS (Node). A runtime without resetAndDestroy,
+ * or a socket that can not be reset, is destroyed without a RST
+ *
+ * @param {Object} socket The socket of the connection
+ * @param {Object} [tcpSocket] The plain socket that STARTTLS wrapped
+ */
+function resetSocket(socket, tcpSocket) {
+    const parent = socket._parent;
+    const candidates = [tcpSocket, parent instanceof node_net_1.default.Socket ? parent : null, socket];
+    for (const candidate of candidates) {
+        if (candidate && !candidate.destroyed && typeof candidate.resetAndDestroy === 'function') {
+            try {
+                candidate.resetAndDestroy();
+                break;
+            }
+            catch {
+                // not a TCP handle, try the next one
+            }
+        }
+    }
+    // the TLS socket closes with the TCP socket under it, and emits close for the connection
+    socket.destroy();
+}
 /**
  * Copies a response tree for the `mutate` action of a script rule: arrays and plain objects are copied,
  * other values (Buffers) are shared

package/dist/esm/server.d.ts

@@ -482,6 +482,8 @@ declare class IMAPConnection {
     /** notifications are sent right away instead of before the next tagged response (IDLE) */
     directNotifications: boolean;
     notificationQueue: Notification[];
+    /** the plain socket that STARTTLS wrapped in TLS */
+    tcpSocket: net.Socket | null | undefined;
     /** the number of the connection, 1 for the first one the server accepted (script rules match it) */
     sessionNumber: number;
     /** the tag and name of the command whose input handler reads the lines that follow (IDLE, AUTHENTICATE) */

package/dist/esm/server.js

@@ -1449,16 +1449,10 @@ class IMAPConnection {
             socket.pause();
             // a RST sent in the same tick as the last output can get lost: on macOS the client received the output but
             // never the RST (#81). Node has no signal for output that reached the peer, so the RST waits a little
+            const tcpSocket = this.tcpSocket;
             setTimeout(() => {
-                if (socket.destroyed) {
-                    return;
-                }
-                // resetAndDestroy sends a TCP RST (Node 16.17), not every runtime has it
-                if (typeof socket.resetAndDestroy === 'function') {
-                    socket.resetAndDestroy();
-                }
-                else {
-                    socket.destroy();
+                if (!socket.destroyed) {
+                    resetSocket(socket, tcpSocket);
                 }
             }, RESET_DELAY);
         }
@@ -2079,6 +2073,9 @@ class IMAPConnection {
         };
         // STARTTLS runs on a live connection
         const socket = this.socket;
+        // the RST of a script rule goes to the TCP socket under the TLS layer, see resetSocket. Node also has it as the
+        // _parent of the TLS socket, Bun does not
+        this.tcpSocket = socket;
         // remove all listeners from the original socket besides the error handler
         socket.removeAllListeners();
         socket.on('error', this.onError.bind(this));
@@ -2787,6 +2784,32 @@ class IMAPConnection {
         }, mailbox, ignoreSelf || ignoreExists ? this : false);
     }
 }
+/**
+ * Destroys a socket with a TCP RST (`close: 'reset'` of a script rule). resetAndDestroy (Node 16.17) needs a socket with
+ * a TCP handle, a TLS socket throws ERR_INVALID_HANDLE_TYPE (#84), so the RST goes to the TCP socket under the TLS
+ * layer: the plain socket of STARTTLS, or the parent socket of implicit TLS (Node). A runtime without resetAndDestroy,
+ * or a socket that can not be reset, is destroyed without a RST
+ *
+ * @param {Object} socket The socket of the connection
+ * @param {Object} [tcpSocket] The plain socket that STARTTLS wrapped
+ */
+function resetSocket(socket, tcpSocket) {
+    const parent = socket._parent;
+    const candidates = [tcpSocket, parent instanceof net.Socket ? parent : null, socket];
+    for (const candidate of candidates) {
+        if (candidate && !candidate.destroyed && typeof candidate.resetAndDestroy === 'function') {
+            try {
+                candidate.resetAndDestroy();
+                break;
+            }
+            catch {
+                // not a TCP handle, try the next one
+            }
+        }
+    }
+    // the TLS socket closes with the TCP socket under it, and emits close for the connection
+    socket.destroy();
+}
 /**
  * Copies a response tree for the `mutate` action of a script rule: arrays and plain objects are copied,
  * other values (Buffers) are shared

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "imapkit",
-    "version": "4.3.0",
+    "version": "4.3.1",
     "description": "Scriptable, strictly RFC compliant in-memory IMAP server for testing IMAP clients",
     "type": "module",
     "main": "./dist/cjs/index.js",