bun run prettier

src/js/internal/http.ts

@@ -88,8 +88,6 @@ const kRequest = Symbol("request");
 const kCloseCallback = Symbol("closeCallback");
 const kDeferredTimeouts = Symbol("deferredTimeouts");
 
-const kEmptyObject = Object.freeze(Object.create(null));
-
 export const enum ClientRequestEmitState {
   socket = 1,
   prefinish = 2,
@@ -360,10 +358,14 @@ const setMaxHTTPHeaderSize = $newZigFunction("node_http_binding.zig", "setMaxHTT
 const getMaxHTTPHeaderSize = $newZigFunction("node_http_binding.zig", "getMaxHTTPHeaderSize", 0);
 const kOutHeaders = Symbol("kOutHeaders");
 
+const NODE_HTTP_WARNING =
+  "WARN: Agent is mostly unused in Bun's implementation of http. If you see strange behavior, this is probably the cause.";
+
 export {
   ConnResetException,
   Headers,
   METHODS,
+  NODE_HTTP_WARNING,
   STATUS_CODES,
   abortedSymbol,
   assignHeadersFast,
@@ -398,7 +400,6 @@ export {
   kDeferredTimeouts,
   kDeprecatedReplySymbol,
   kEmitState,
-  kEmptyObject,
   kFetchRequest,
   kHandle,
   kHost,

src/js/node/_http_agent.ts

@@ -1,53 +1,31 @@
 const EventEmitter: typeof import("node:events").EventEmitter = require("node:events");
+const net = require("node:net");
+const { validateNumber, validateOneOf, validateString } = require("internal/validators");
+const { kEmptyObject, once } = require("internal/shared");
 
-const { kEmptyObject } = require("internal/http");
+const kOnKeylog = Symbol("onkeylog");
+const kRequestOptions = Symbol("requestOptions");
+const kRequestAsyncResource = Symbol("requestAsyncResource");
 
-const { FakeSocket } = require("internal/http/FakeSocket");
+const HTTP_AGENT_KEEP_ALIVE_TIMEOUT_BUFFER = 1000;
 
-const ObjectDefineProperty = Object.defineProperty;
-
-const kfakeSocket = Symbol("kfakeSocket");
-
-const NODE_HTTP_WARNING =
-  "WARN: Agent is mostly unused in Bun's implementation of http. If you see strange behavior, this is probably the cause.";
-
-// Define Agent interface
-interface Agent extends InstanceType<typeof EventEmitter> {
-  defaultPort: number;
-  protocol: string;
-  options: any;
-  requests: Record<string, any>;
-  sockets: Record<string, any>;
-  freeSockets: Record<string, any>;
-  keepAliveMsecs: number;
-  keepAlive: boolean;
-  maxSockets: number;
-  maxFreeSockets: number;
-  scheduling: string;
-  maxTotalSockets: any;
-  totalSocketCount: number;
-  [kfakeSocket]?: any;
-
-  createConnection(): any;
-  getName(options?: any): string;
-  addRequest(): void;
-  createSocket(req: any, options: any, cb: (err: any, socket: any) => void): void;
-  removeSocket(): void;
-  keepSocketAlive(): boolean;
-  reuseSocket(): void;
-  destroy(): void;
+class ReusedHandle {
+  type: string;
+  handle: any;
+  constructor(type: string, handle: any) {
+    this.type = type;
+    this.handle = handle;
+  }
 }
 
-// Define the constructor interface
-interface AgentConstructor {
-  new (options?: any): Agent;
-  (options?: any): Agent;
-  defaultMaxSockets: number;
-  globalAgent: Agent;
-  prototype: Agent;
+function freeSocketErrorListener(err) {
+  const socket = this;
+  $debug("SOCKET ERROR on FREE socket:", err.message, err.stack);
+  socket.destroy();
+  socket.emit("agentRemove");
 }
 
-function Agent(options = kEmptyObject) {
+function Agent(options): void {
   if (!(this instanceof Agent)) return new Agent(options);
 
   EventEmitter.$apply(this, []);
@@ -55,47 +33,112 @@ function Agent(options = kEmptyObject) {
   this.defaultPort = 80;
   this.protocol = "http:";
 
-  this.options = options = { ...options, path: null };
-  if (options.noDelay === undefined) options.noDelay = true;
+  this.options = { __proto__: null, ...options };
 
-  // Don't confuse net and make it think that we're connecting to a pipe
-  this.requests = Object.create(null);
-  this.sockets = Object.create(null);
-  this.freeSockets = Object.create(null);
+  if (this.options.noDelay === undefined) this.options.noDelay = true;
 
-  this.keepAliveMsecs = options.keepAliveMsecs || 1000;
-  this.keepAlive = options.keepAlive || false;
-  this.maxSockets = options.maxSockets || Agent.defaultMaxSockets;
-  this.maxFreeSockets = options.maxFreeSockets || 256;
-  this.scheduling = options.scheduling || "lifo";
-  this.maxTotalSockets = options.maxTotalSockets;
+  this.options.path = null;
+  this.requests = { __proto__: null };
+  this.sockets = { __proto__: null };
+  this.freeSockets = { __proto__: null };
+  this.keepAliveMsecs = this.options.keepAliveMsecs || 1000;
+  this.keepAlive = this.options.keepAlive || false;
+  this.maxSockets = this.options.maxSockets || Agent.defaultMaxSockets;
+  this.maxFreeSockets = this.options.maxFreeSockets || 256;
+  this.scheduling = this.options.scheduling || "lifo";
+  this.maxTotalSockets = this.options.maxTotalSockets;
   this.totalSocketCount = 0;
-  this.defaultPort = options.defaultPort || 80;
-  this.protocol = options.protocol || "http:";
+
+  validateOneOf(this.scheduling, "scheduling", ["fifo", "lifo"]);
+
+  if (this.maxTotalSockets !== undefined) {
+    validateNumber(this.maxTotalSockets, "maxTotalSockets", 1);
+  } else {
+    this.maxTotalSockets = Infinity;
+  }
+
+  this.on("free", (socket, options) => {
+    const name = this.getName(options);
+    $debug("agent.on(free)", name);
+
+    if (!socket.writable) {
+      socket.destroy();
+      return;
+    }
+
+    const requests = this.requests[name];
+    if (requests?.length) {
+      const req = requests.shift();
+      const reqAsyncRes = req[kRequestAsyncResource];
+      if (reqAsyncRes) {
+        reqAsyncRes.runInAsyncScope(() => {
+          asyncResetHandle(socket);
+          setRequestSocket(this, req, socket);
+        });
+        req[kRequestAsyncResource] = null;
+      } else {
+        setRequestSocket(this, req, socket);
+      }
+      if (requests.length === 0) {
+        delete this.requests[name];
+      }
+      return;
+    }
+
+    const req = socket._httpMessage;
+    if (!req || !req.shouldKeepAlive || !this.keepAlive) {
+      socket.destroy();
+      return;
+    }
+
+    const freeSockets = this.freeSockets[name] || [];
+    const freeLen = freeSockets.length;
+    let count = freeLen;
+    if (this.sockets[name]) count += this.sockets[name].length;
+
+    if (
+      this.totalSocketCount > this.maxTotalSockets ||
+      count > this.maxSockets ||
+      freeLen >= this.maxFreeSockets ||
+      !this.keepSocketAlive(socket)
+    ) {
+      socket.destroy();
+      return;
+    }
+
+    this.freeSockets[name] = freeSockets;
+    // TODO:
+    // socket[async_id_symbol] = -1;
+    socket._httpMessage = null;
+    this.removeSocket(socket, options);
+
+    socket.once("error", freeSocketErrorListener);
+    freeSockets.push(socket);
+  });
+
+  this.on("newListener", maybeEnableKeylog);
 }
 $toClass(Agent, "Agent", EventEmitter);
 
-// Type assertion to help TypeScript understand Agent has static properties
-const AgentClass = Agent as unknown as AgentConstructor;
+function maybeEnableKeylog(eventName) {
+  if (eventName === "keylog") {
+    this.removeListener("newListener", maybeEnableKeylog);
+    const agent = this;
+    this[kOnKeylog] = function onkeylog(keylog) {
+      agent.emit("keylog", keylog, this);
+    };
+    const sockets = Object.values(this.sockets);
+    for (let i = 0; i < sockets.length; i++) {
+      sockets[i].on("keylog", this[kOnKeylog]);
+    }
+  }
+}
 
-ObjectDefineProperty(AgentClass, "globalAgent", {
-  get: function () {
-    return globalAgent;
-  },
-});
+Agent.defaultMaxSockets = Infinity;
 
-ObjectDefineProperty(AgentClass, "defaultMaxSockets", {
-  get: function () {
-    return Infinity;
-  },
-});
+Agent.prototype.createConnection = net.createConnection;
 
-Agent.prototype.createConnection = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.createConnection is a no-op, returns fake socket");
-  return (this[kfakeSocket] ??= new FakeSocket());
-};
-
-Agent.prototype.getName = function (options = kEmptyObject) {
+Agent.prototype.getName = function getName(options = kEmptyObject) {
   let name = options.host || "localhost";
   name += ":";
   if (options.port) {
@@ -116,38 +159,276 @@ Agent.prototype.getName = function (options = kEmptyObject) {
   return name;
 };
 
-Agent.prototype.addRequest = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.addRequest is a no-op");
+Agent.prototype.addRequest = function addRequest(req, options, port /* legacy */, localAddress /* legacy */) {
+  if (typeof options === "string") {
+    options = {
+      __proto__: null,
+      host: options,
+      port,
+      localAddress,
+    };
+  }
+
+  options = { __proto__: null, ...options, ...this.options };
+  if (options.socketPath) options.path = options.socketPath;
+
+  normalizeServerName(options, req);
+
+  const name = this.getName(options);
+  this.sockets[name] ||= [];
+
+  const freeSockets = this.freeSockets[name];
+  let socket;
+  if (freeSockets) {
+    while (freeSockets.length && freeSockets[0].destroyed) {
+      freeSockets.shift();
+    }
+    socket = this.scheduling === "fifo" ? freeSockets.shift() : freeSockets.pop();
+    if (!freeSockets.length) delete this.freeSockets[name];
+  }
+
+  const freeLen = freeSockets ? freeSockets.length : 0;
+  const sockLen = freeLen + this.sockets[name].length;
+
+  if (socket) {
+    asyncResetHandle(socket);
+    this.reuseSocket(socket, req);
+    setRequestSocket(this, req, socket);
+    this.sockets[name].push(socket);
+  } else if (sockLen < this.maxSockets && this.totalSocketCount < this.maxTotalSockets) {
+    $debug("call onSocket", sockLen, freeLen);
+    this.createSocket(req, options, (err, socket) => {
+      if (err) req.onSocket(socket, err);
+      else setRequestSocket(this, req, socket);
+    });
+  } else {
+    $debug("wait for socket");
+    this.requests[name] ||= [];
+
+    req[kRequestOptions] = options;
+    // TODO:
+    // req[kRequestAsyncResource] = new AsyncResource("QueuedRequest");
+
+    this.requests[name].push(req);
+  }
 };
 
-Agent.prototype.createSocket = function (req, options, cb) {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.createSocket returns fake socket");
-  cb(null, (this[kfakeSocket] ??= new FakeSocket()));
+Agent.prototype.createSocket = function createSocket(req, options, cb) {
+  options = { __proto__: null, ...options, ...this.options };
+  if (options.socketPath) options.path = options.socketPath;
+
+  normalizeServerName(options, req);
+
+  const name = this.getName(options);
+  options._agentKey = name;
+
+  $debug("createConnection", name, options);
+  options.encoding = null;
+
+  const oncreate = once((err, s) => {
+    if (err) return cb(err);
+    this.sockets[name] ||= [];
+    this.sockets[name].push(s);
+    this.totalSocketCount++;
+    $debug("sockets", name, this.sockets[name].length, this.totalSocketCount);
+    installListeners(this, s, options);
+    cb(null, s);
+  });
+  if (this.keepAlive) {
+    options.keepAlive = this.keepAlive;
+    options.keepAliveInitialDelay = this.keepAliveMsecs;
+  }
+  const newSocket = this.createConnection(options, oncreate);
+  if (newSocket) oncreate(null, newSocket);
 };
 
-Agent.prototype.removeSocket = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.removeSocket is a no-op");
+function normalizeServerName(options, req) {
+  if (!options.servername && options.servername !== "") options.servername = calculateServerName(options, req);
+}
+
+function calculateServerName(options, req) {
+  let servername = options.host;
+  const hostHeader = req.getHeader("host");
+  if (hostHeader) {
+    validateString(hostHeader, "options.headers.host");
+
+    // abc => abc
+    // abc:123 => abc
+    // [::1] => ::1
+    // [::1]:123 => ::1
+    if (hostHeader[0] === "[") {
+      const index = hostHeader.indexOf("]");
+      if (index === -1) {
+        // Leading '[', but no ']'. Need to do something...
+        servername = hostHeader;
+      } else {
+        servername = hostHeader.substring(1, index);
+      }
+    } else {
+      servername = hostHeader.split(":", 1)[0];
+    }
+  }
+  if (net.isIP(servername)) servername = "";
+  return servername;
+}
+
+function installListeners(agent, s, options) {
+  function onFree() {
+    $debug("CLIENT socket onFree");
+    agent.emit("free", s, options);
+  }
+  s.on("free", onFree);
+
+  function onClose(err) {
+    $debug("CLIENT socket onClose");
+    agent.totalSocketCount--;
+    agent.removeSocket(s, options);
+  }
+  s.on("close", onClose);
+
+  function onTimeout() {
+    $debug("CLIENT socket onTimeout");
+
+    const sockets = agent.freeSockets;
+    if (Object.keys(sockets).some(name => sockets[name].includes(s))) {
+      return s.destroy();
+    }
+  }
+  s.on("timeout", onTimeout);
+
+  function onRemove() {
+    $debug("CLIENT socket onRemove");
+    agent.totalSocketCount--;
+    agent.removeSocket(s, options);
+    s.removeListener("close", onClose);
+    s.removeListener("free", onFree);
+    s.removeListener("timeout", onTimeout);
+    s.removeListener("agentRemove", onRemove);
+  }
+  s.on("agentRemove", onRemove);
+
+  if (agent[kOnKeylog]) {
+    s.on("keylog", agent[kOnKeylog]);
+  }
+}
+
+Agent.prototype.removeSocket = function removeSocket(s, options) {
+  const name = this.getName(options);
+  $debug("removeSocket", name, "writable:", s.writable);
+  const sets = [this.sockets];
+
+  if (!s.writable) sets.push(this.freeSockets);
+
+  for (let sk = 0; sk < sets.length; sk++) {
+    const sockets = sets[sk];
+
+    if (sockets[name]) {
+      const index = sockets[name].indexOf(s);
+      if (index !== -1) {
+        sockets[name].splice(index, 1);
+        if (sockets[name].length === 0) delete sockets[name];
+      }
+    }
+  }
+
+  let req;
+  if (this.requests[name]?.length) {
+    $debug("removeSocket, have a request, make a socket");
+    req = this.requests[name][0];
+  } else {
+    const keys = Object.keys(this.requests);
+    for (let i = 0; i < keys.length; i++) {
+      const prop = keys[i];
+      if (this.sockets[prop]?.length) break;
+      $debug("removeSocket, have a request with different origin," + " make a socket");
+      req = this.requests[prop][0];
+      options = req[kRequestOptions];
+      break;
+    }
+  }
+
+  if (req && options) {
+    req[kRequestOptions] = undefined;
+    this.createSocket(req, options, (err, socket) => {
+      if (err) req.onSocket(socket, err);
+      else socket.emit("free");
+    });
+  }
 };
 
-Agent.prototype.keepSocketAlive = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.keepSocketAlive is a no-op");
-  return true;
+Agent.prototype.keepSocketAlive = function keepSocketAlive(socket) {
+  socket.setKeepAlive(true, this.keepAliveMsecs);
+  socket.unref();
+
+  let agentTimeout = this.options.timeout || 0;
+  let canKeepSocketAlive = true;
+
+  if (socket._httpMessage?.res) {
+    const keepAliveHint = socket._httpMessage.res.headers["keep-alive"];
+
+    if (keepAliveHint) {
+      const hint = /^timeout=(\d+)/.exec(keepAliveHint)?.[1];
+
+      if (hint) {
+        let serverHintTimeout = Number.parseInt(hint) * 1000 - HTTP_AGENT_KEEP_ALIVE_TIMEOUT_BUFFER;
+        serverHintTimeout = serverHintTimeout > 0 ? serverHintTimeout : 0;
+        if (serverHintTimeout === 0) {
+          canKeepSocketAlive = false;
+        } else if (serverHintTimeout < agentTimeout) {
+          agentTimeout = serverHintTimeout;
+        }
+      }
+    }
+  }
+
+  if (socket.timeout !== agentTimeout) {
+    socket.setTimeout(agentTimeout);
+  }
+
+  return canKeepSocketAlive;
 };
 
-Agent.prototype.reuseSocket = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.reuseSocket is a no-op");
+Agent.prototype.reuseSocket = function reuseSocket(socket, req) {
+  socket.removeListener("error", freeSocketErrorListener);
+  req.reusedSocket = true;
+  socket.ref();
 };
 
-Agent.prototype.destroy = function () {
-  $debug(`${NODE_HTTP_WARNING}\n`, "WARN: Agent.destroy is a no-op");
+Agent.prototype.destroy = function destroy() {
+  const sets = [this.freeSockets, this.sockets];
+  for (let s = 0; s < sets.length; s++) {
+    const set = sets[s];
+    const keys = Object.keys(set);
+    for (let v = 0; v < keys.length; v++) {
+      const setName = set[keys[v]];
+      for (let n = 0; n < setName.length; n++) {
+        setName[n].destroy();
+      }
+    }
+  }
 };
 
-var globalAgent = new Agent();
+function setRequestSocket(agent, req, socket) {
+  req.onSocket(socket);
+  const agentTimeout = agent.options.timeout || 0;
+  if (req.timeout === undefined || req.timeout === agentTimeout) {
+    return;
+  }
+  socket.setTimeout(req.timeout);
+}
 
-const http_agent_exports = {
-  Agent: AgentClass,
-  globalAgent,
-  NODE_HTTP_WARNING,
+function asyncResetHandle(socket) {
+  const handle = socket._handle;
+  if (handle && typeof handle.asyncReset === "function") {
+    handle.asyncReset(new ReusedHandle(handle.getProviderType(), handle));
+    // TODO:
+    // socket[async_id_symbol] = handle.getAsyncId();
+  }
+}
+
+const agent_exports = {
+  Agent,
+  globalAgent: new Agent({ keepAlive: true, scheduling: "lifo", timeout: 5000 }),
 };
 
-export default http_agent_exports;
+export default agent_exports;

src/js/node/_http_client.ts

@@ -33,7 +33,6 @@ const {
   kEmitState,
   ClientRequestEmitState,
   kSignal,
-  kEmptyObject,
   getIsNextIncomingMessageHTTPS,
   setIsNextIncomingMessageHTTPS,
   typeSymbol,
@@ -42,9 +41,12 @@ const {
   callCloseCallback,
   emitCloseNTAndComplete,
   ConnResetException,
+  NODE_HTTP_WARNING,
 } = require("internal/http");
 
-const { Agent, NODE_HTTP_WARNING } = require("node:_http_agent");
+const { kEmptyObject } = require("internal/shared");
+
+const Agent = require("node:_http_agent");
 const { IncomingMessage } = require("node:_http_incoming");
 const { OutgoingMessage } = require("node:_http_outgoing");
 

src/js/node/_http_incoming.ts

@@ -10,7 +10,6 @@ const {
   fakeSocketSymbol,
   isAbortError,
   emitErrorNextTickIfErrorListenerNT,
-  kEmptyObject,
   getIsNextIncomingMessageHTTPS,
   setIsNextIncomingMessageHTTPS,
   NodeHTTPBodyReadState,
@@ -28,6 +27,8 @@ const {
   getCompleteWebRequestOrResponseBodyValueAsArrayBuffer,
 } = require("internal/http");
 
+const { kEmptyObject } = require("internal/shared");
+
 const { FakeSocket } = require("internal/http/FakeSocket");
 
 var defaultIncomingOpts = { type: "request" };

src/js/node/_http_outgoing.ts

@@ -12,7 +12,6 @@ const {
   kBodyChunks,
   kEmitState,
   ClientRequestEmitState,
-  kEmptyObject,
   kHandle,
   getHeader,
   setHeader,
@@ -21,6 +20,8 @@ const {
   kOutHeaders,
 } = require("internal/http");
 
+const { kEmptyObject } = require("internal/shared");
+
 const {
   validateHeaderName,
   validateHeaderValue,

src/js/node/http.ts

@@ -1,12 +1,18 @@
 const { validateInteger } = require("internal/validators");
-const { Agent, globalAgent, NODE_HTTP_WARNING } = require("node:_http_agent");
+const { Agent, globalAgent } = require("node:_http_agent");
 const { ClientRequest } = require("node:_http_client");
 const { validateHeaderName, validateHeaderValue } = require("node:_http_common");
 const { IncomingMessage } = require("node:_http_incoming");
 const { OutgoingMessage } = require("node:_http_outgoing");
 const { Server, ServerResponse } = require("node:_http_server");
 
-const { METHODS, STATUS_CODES, setMaxHTTPHeaderSize, getMaxHTTPHeaderSize } = require("internal/http");
+const {
+  METHODS,
+  STATUS_CODES,
+  setMaxHTTPHeaderSize,
+  getMaxHTTPHeaderSize,
+  NODE_HTTP_WARNING,
+} = require("internal/http");
 
 const { WebSocket, CloseEvent, MessageEvent } = globalThis;