node: tls v26 compat: engine validation, keepalive delay units, reinitialize handle, setMaxSendFragment, cleared timer _idleTimeout (+7 tests)

src/js/internal/test/binding.ts

@@ -92,6 +92,12 @@ function internalBinding(name: string) {
       return { TCP: TestTCPWrap, constants: { SOCKET: 0, SERVER: 1 } };
     case "util":
       return { isInsideNodeModules };
+    // The engine tests construct or replace binding.SecureContext before requiring node:tls.
+    case "crypto":
+      return { SecureContext: require("node:tls").SecureContext };
+    // BoringSSL has no SSL_trace(), the same as a node built without it.
+    case "tls_wrap":
+      return { HAVE_SSL_TRACE: false };
     case "cares_wrap":
       // Only the pure IP-normalizer the vendored tls/dns tests reach for; the
       // resolver surface lives in node:dns.

src/js/internal/timers.ts

@@ -23,6 +23,7 @@ function getTimerDuration(msecs, name) {
 }
 
 export default {
+  TIMEOUT_MAX,
   // For hiding Timeouts on other internals. A registered symbol so the node
   // test harness's --expose-internals shim ("internal/timers" virtual module
   // in test/js/node/test/common/index.js) can hand the same symbol to ported

src/js/node/net.ts

@@ -140,6 +140,11 @@ const kSetTOS = Symbol("kSetTOS");
 const kSetKeepAlive = Symbol("kSetKeepAlive");
 const kSyncWriteFd = Symbol("kSyncWriteFd");
 const kSetKeepAliveInitialDelay = Symbol("kSetKeepAliveInitialDelay");
+
+// The delay is stored in whole seconds like node; the native handle takes int32 milliseconds.
+function keepAliveDelayMs(seconds) {
+  return MathMin(seconds * 1000, 2147483647);
+}
 const kConnectOptions = Symbol("connect-options");
 const kAttach = Symbol("kAttach");
 const kCloseRawConnection = Symbol("kCloseRawConnection");
@@ -503,7 +508,7 @@ const SocketHandlers: SocketHandler = {
     }
 
     if (self[kSetKeepAlive]) {
-      socket.setKeepAlive(true, self[kSetKeepAliveInitialDelay]);
+      socket.setKeepAlive(true, keepAliveDelayMs(self[kSetKeepAliveInitialDelay]));
     }
 
     // A TOS value set before the connection existed (setTypeOfService before
@@ -1216,7 +1221,7 @@ function onconnection(err, clientHandle) {
   if (self.keepAlive && clientHandle.setKeepAlive) {
     _socket[kSetKeepAlive] = true;
     _socket[kSetKeepAliveInitialDelay] = self.keepAliveInitialDelay;
-    clientHandle.setKeepAlive(true, self.keepAliveInitialDelay);
+    clientHandle.setKeepAlive(true, keepAliveDelayMs(self.keepAliveInitialDelay));
   }
 
   self._connections++;
@@ -1585,9 +1590,8 @@ function Socket(options?) {
 
   this[kSetNoDelay] = Boolean(noDelay);
   this[kSetKeepAlive] = Boolean(keepAlive);
-  // Bun's native _handle.setKeepAlive takes milliseconds (it is the public
-  // Bun.Socket), so store ms here. Node stores seconds because libuv does.
-  this[kSetKeepAliveInitialDelay] = MathMax(0, ~~keepAliveInitialDelay);
+  // Whole seconds, as in node.
+  this[kSetKeepAliveInitialDelay] = MathMax(0, ~~(keepAliveInitialDelay / 1000));
 
   this[khandlers] = SocketHandlers2;
   this.bytesRead = 0;
@@ -1873,7 +1877,7 @@ Socket.prototype[kAttach] = function (port, socket) {
   }
 
   if (this[kSetKeepAlive]) {
-    socket.setKeepAlive(true, this[kSetKeepAliveInitialDelay]);
+    socket.setKeepAlive(true, keepAliveDelayMs(this[kSetKeepAliveInitialDelay]));
   }
 
   if (!this[kupgraded]) {
@@ -2149,7 +2153,8 @@ Socket.prototype.connect = function connect(...args) {
 Socket.prototype[kReinitializeHandle] = function reinitializeHandle(handle) {
   this._handle?.close();
 
-  this._handle = handle;
+  // node's TLSSocket override creates the handle itself; Bun's TLS sockets share this method.
+  this._handle = handle ?? newDetachedSocket(typeof this[bunTlsSymbol] === "function");
   this._handle[owner_symbol] = this;
 
   initSocketHandle(this);
@@ -2592,10 +2597,8 @@ Socket.prototype.resetAndDestroy = function resetAndDestroy() {
 
 Socket.prototype.setKeepAlive = function setKeepAlive(enable = false, initialDelayMsecs = 0) {
   enable = Boolean(enable);
-  // Bun's native _handle.setKeepAlive takes milliseconds; the ms→seconds
-  // conversion for TCP_KEEPIDLE lives in the native binding. Clamp to 0 so
-  // negatives and ~~ overflow match Node's no-validate behavior.
-  const initialDelay = MathMax(0, ~~initialDelayMsecs);
+  // Whole seconds, as in node.
+  const initialDelay = MathMax(0, ~~(initialDelayMsecs / 1000));
 
   if (!this._handle) {
     this[kSetKeepAlive] = enable;
@@ -2608,7 +2611,7 @@ Socket.prototype.setKeepAlive = function setKeepAlive(enable = false, initialDel
   if (enable !== this[kSetKeepAlive] || (enable && this[kSetKeepAliveInitialDelay] !== initialDelay)) {
     this[kSetKeepAlive] = enable;
     this[kSetKeepAliveInitialDelay] = initialDelay;
-    this._handle.setKeepAlive(enable, initialDelay);
+    this._handle.setKeepAlive(enable, keepAliveDelayMs(initialDelay));
   }
   return this;
 };
@@ -3379,7 +3382,7 @@ function afterConnect(status, handle, req, readable, writable) {
     }
 
     if (self[kSetKeepAlive] && self._handle.setKeepAlive) {
-      self._handle.setKeepAlive(true, self[kSetKeepAliveInitialDelay]);
+      self._handle.setKeepAlive(true, keepAliveDelayMs(self[kSetKeepAliveInitialDelay]));
     }
 
     self.emit("connect");
@@ -3522,7 +3525,7 @@ function Server(options?, connectionListener?) {
   // https://github.com/nodejs/node/blob/843dc5f0d5ad/lib/net.js#L1880
   this.allowHalfOpen = allowHalfOpen;
   this.keepAlive = Boolean(keepAlive);
-  this.keepAliveInitialDelay = MathMax(0, ~~keepAliveInitialDelay);
+  this.keepAliveInitialDelay = MathMax(0, ~~(keepAliveInitialDelay / 1000));
   this.highWaterMark = highWaterMark;
   this.pauseOnConnect = Boolean(pauseOnConnect);
   this.noDelay = Boolean(noDelay);

src/js/node/tls.ts

@@ -200,10 +200,13 @@ const SUPPORTED_ECDH_GROUPS = new Set([
 function validateSecureContextOptions(options) {
   const {
     ciphers,
+    key,
     passphrase,
     ecdhCurve,
     minVersion,
     maxVersion,
+    privateKeyIdentifier,
+    privateKeyEngine,
     sessionTimeout,
     sigalgs,
     ticketKeys,
@@ -218,6 +221,28 @@ function validateSecureContextOptions(options) {
     validateString(sigalgs, "options.sigalgs");
     if (sigalgs === "") throw $ERR_INVALID_ARG_VALUE("options.sigalgs", sigalgs);
   }
+  // BoringSSL has no ENGINE support; same checks and order as node's no-engine build (lib/internal/tls/secure-context.js).
+  if (privateKeyIdentifier !== undefined && privateKeyIdentifier !== null) {
+    if (privateKeyEngine === undefined || privateKeyEngine === null) {
+      // Engine is required when privateKeyIdentifier is present
+      throw $ERR_INVALID_ARG_VALUE("options.privateKeyEngine", privateKeyEngine);
+    }
+    if (key) {
+      // Both data key and engine key can't be set at the same time
+      throw $ERR_INVALID_ARG_VALUE("options.privateKeyIdentifier", privateKeyIdentifier);
+    }
+    if (typeof privateKeyIdentifier === "string" && typeof privateKeyEngine === "string") {
+      throw $ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED("Custom engines not supported by this OpenSSL");
+    } else if (typeof privateKeyIdentifier !== "string") {
+      throw $ERR_INVALID_ARG_TYPE(
+        "options.privateKeyIdentifier",
+        ["string", "null", "undefined"],
+        privateKeyIdentifier,
+      );
+    } else {
+      throw $ERR_INVALID_ARG_TYPE("options.privateKeyEngine", ["string", "null", "undefined"], privateKeyEngine);
+    }
+  }
   if (ecdhCurve !== undefined) {
     validateString(ecdhCurve, "options.ecdhCurve");
     if (ecdhCurve !== "auto") {
@@ -638,20 +663,6 @@ var InternalSecureContext = class SecureContext {
         throw new TypeError("servername argument must be an string");
       if (options.secureOptions != null && typeof options.secureOptions !== "number")
         throw new TypeError("secureOptions argument must be an number");
-      const privateKeyIdentifier = options.privateKeyIdentifier;
-      if (!$isUndefinedOrNull(privateKeyIdentifier)) {
-        const privateKeyEngine = options.privateKeyEngine;
-        if ($isUndefinedOrNull(privateKeyEngine))
-          throw $ERR_INVALID_ARG_VALUE("options.privateKeyEngine", privateKeyEngine);
-        if (typeof privateKeyEngine !== "string")
-          throw $ERR_INVALID_ARG_TYPE("options.privateKeyEngine", ["string", "null", "undefined"], privateKeyEngine);
-        if (typeof privateKeyIdentifier !== "string")
-          throw $ERR_INVALID_ARG_TYPE(
-            "options.privateKeyIdentifier",
-            ["string", "null", "undefined"],
-            privateKeyIdentifier,
-          );
-      }
     }
     const requestedCiphers = options?.ciphers;
     if (requestedCiphers && StringPrototypeIncludes.$call(requestedCiphers, "TLS_")) {

src/runtime/socket/tls_socket_functions.rs

@@ -423,13 +423,14 @@ pub(super) fn set_max_send_fragment(
         return Err(global.throw(format_args!("Expected size to be a number")));
     }
     let size = arg.coerce_to_int64(global)?;
-    if !(512..=16384).contains(&size) {
+    if size < 0 {
         return Ok(JSValue::FALSE);
     }
 
     let Some(ssl_ptr) = this.socket.get().ssl() else {
         return Ok(JSValue::FALSE);
     };
+    // Like node, return SSL_set_max_send_fragment's own verdict (BoringSSL clamps the size).
     Ok(JSValue::from(
         ffi::SSL_set_max_send_fragment(
             boringssl::SSL::opaque_ref(ssl_ptr),

src/runtime/timer/ImmediateObject.rs

@@ -11,6 +11,10 @@ use super::{Kind, TimerObjectInternals};
 super::impl_timer_object!(ImmediateObject, ImmediateObject, "Immediate");
 
 impl ImmediateObject {
+    /// `impl_timer_object!`'s `dispose` hook; an Immediate has no `_idleTimeout`.
+    #[inline]
+    pub(crate) fn before_explicit_cancel(&self, _global: &JSGlobalObject, _this_value: JSValue) {}
+
     pub(crate) fn init(
         global: &JSGlobalObject,
         id: i32,

src/runtime/timer/TimeoutObject.rs

@@ -32,10 +32,21 @@ impl TimeoutObject {
 
     #[bun_jsc::host_fn(method)]
     pub fn close(this: &Self, global: &JSGlobalObject, frame: &CallFrame) -> JsResult<JSValue> {
+        this.before_explicit_cancel(global, frame.this());
         this.internals.cancel(global.bun_vm_ptr());
         Ok(frame.this())
     }
 
+    /// Node's `unenroll`: an explicitly cancelled timer reads back `_idleTimeout === -1`.
+    pub(crate) fn mark_unenrolled(this_value: JSValue, global: &JSGlobalObject) {
+        js::idle_timeout_set_cached(this_value, global, JSValue::js_number(-1.0));
+    }
+
+    /// `impl_timer_object!`'s `dispose` hook.
+    pub(crate) fn before_explicit_cancel(&self, global: &JSGlobalObject, this_value: JSValue) {
+        Self::mark_unenrolled(this_value, global);
+    }
+
     // Cached-property getters/setters — codegen passes `this_value` (the JS
     // wrapper) so the cached `WriteBarrier` slot on the C++ side can be read/written.
     // Signature does not match the standard `host_fn(getter/setter)` shape; the

src/runtime/timer/Timer.rs

@@ -398,6 +398,12 @@ impl All {
         };
 
         let Some(timer) = timer else { return Ok(()) };
+        if kind != Kind::SetImmediate
+            // SAFETY: timer points to a live TimerObjectInternals
+            && let Some(js_timer) = unsafe { (*timer).this_value.get().try_get() }
+        {
+            TimeoutObject::mark_unenrolled(js_timer, global_this);
+        }
         // SAFETY: timer points to a live TimerObjectInternals
         unsafe { (*timer).cancel(vm) };
         Ok(())

src/runtime/timer/mod.rs

@@ -249,8 +249,9 @@ macro_rules! impl_timer_object {
             pub fn dispose(
                 this: &Self,
                 global: &::bun_jsc::JSGlobalObject,
-                _frame: &::bun_jsc::CallFrame,
+                frame: &::bun_jsc::CallFrame,
             ) -> ::bun_jsc::JsResult<::bun_jsc::JSValue> {
+                this.before_explicit_cancel(global, frame.this());
                 this.internals.cancel(global.bun_vm_ptr());
                 Ok(::bun_jsc::JSValue::UNDEFINED)
             }

test/js/node/net/node-net-server.test.ts

@@ -1,6 +1,6 @@
 import { realpathSync } from "fs";
 import { bunEnv, bunExe, tempDir } from "harness";
-import { AddressInfo, createServer, Server, Socket } from "net";
+import { AddressInfo, connect, createServer, Server, Socket } from "net";
 import { createTest } from "node-harness";
 import { once } from "node:events";
 import { tmpdir } from "os";
@@ -662,3 +662,30 @@ it("server.unref() on a pipe/unix-socket listener lets the process exit", async
   expect(exitCode === 0 ? "" : stderr).toBe("");
   expect(exitCode).toBe(0);
 });
+
+describe("keepAlive initial delay", () => {
+  // node stores the delay in whole seconds and passes it on to libuv without a
+  // ceiling; the native handle takes int32 milliseconds, so the conversion
+  // back must clamp instead of throwing inside the connection callbacks.
+  it("a delay above int32 milliseconds is stored in seconds and does not throw", async () => {
+    const delay = 3_000_000_000;
+    await using server = createServer({ keepAlive: true, keepAliveInitialDelay: delay });
+    expect(server.keepAliveInitialDelay).toBe(delay / 1000);
+    server.on("connection", socket => socket.end("ok"));
+    server.listen(0, "127.0.0.1");
+    await once(server, "listening");
+
+    const client = connect({ port: (server.address() as AddressInfo).port, host: "127.0.0.1" });
+    await once(client, "connect");
+    expect(client.setKeepAlive(true, delay)).toBe(client);
+    const [data] = await once(client, "data");
+    expect(String(data)).toBe("ok");
+    await once(client, "close");
+  });
+
+  it("sub-second delays truncate to whole seconds like node", async () => {
+    await using server = createServer({ keepAlive: true, keepAliveInitialDelay: 1999 });
+    expect(server.keepAliveInitialDelay).toBe(1);
+    expect(createServer({ keepAliveInitialDelay: 999 }).keepAliveInitialDelay).toBe(0);
+  });
+});

test/js/node/test/common/index.js

@@ -1494,7 +1494,23 @@ function installBunExposeInternalsShim() {
         const normalizedArgsSymbol = Object.getOwnPropertySymbols(probe).find(
           s => s.description === "normalizedArgs",
         );
-        return { loader: "object", exports: { normalizedArgsSymbol } };
+        // The per-socket option symbols are module-private in Bun's node:net,
+        // like normalizedArgsSymbol; recover the real ones from a probe
+        // socket (the constructor always sets them) and the prototype.
+        const socketProbe = new net.Socket();
+        const bySymbolName = name =>
+          Object.getOwnPropertySymbols(socketProbe).find(s => s.description === name) ??
+          Object.getOwnPropertySymbols(net.Socket.prototype).find(s => s.description === name);
+        return {
+          loader: "object",
+          exports: {
+            normalizedArgsSymbol,
+            kSetNoDelay: bySymbolName("kSetNoDelay"),
+            kSetKeepAlive: bySymbolName("kSetKeepAlive"),
+            kSetKeepAliveInitialDelay: bySymbolName("kSetKeepAliveInitialDelay"),
+            kReinitializeHandle: bySymbolName("kReinitializeHandle"),
+          },
+        };
       });
       // node's internal/options: map the few CLI options vendored http tests ask
       // about onto the equivalent runtime values. Unknown options return undefined.

test/js/node/test/parallel/test-tls-clientcertengine-unsupported.js

@@ -0,0 +1,30 @@
+// Flags: --expose-internals
+'use strict';
+const common = require('../common');
+
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+const assert = require('assert');
+// Monkey-patch SecureContext
+const { internalBinding } = require('internal/test/binding');
+const binding = internalBinding('crypto');
+const NativeSecureContext = binding.SecureContext;
+
+binding.SecureContext = function() {
+  const rv = new NativeSecureContext();
+  rv.setClientCertEngine = undefined;
+  return rv;
+};
+
+const tls = require('tls');
+
+{
+  assert.throws(
+    () => { tls.createSecureContext({ clientCertEngine: 'Cannonmouth' }); },
+    {
+      code: 'ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED',
+      message: 'Custom engines not supported by this OpenSSL'
+    }
+  );
+}