midline-agent 0.4.0 → 0.5.0

package/test/proxy.test.js

@@ -5,7 +5,7 @@ const assert = require("node:assert/strict");
 const net = require("net");
 const { MidlineAgent, createMidlineProxy, startMidlineProxy, ConfigError } = require("../dist");
 const { REDACTED } = require("../dist/redact");
-const { makeCerts, startCollector, listen, request, closedPort, waitFor } = require("./helpers");
+const { makeCerts, startSocketCollector, listen, request, closedPort, waitFor } = require("./helpers");
 
 const certs = makeCerts();
 const needsOpenssl = certs ? {} : { skip: "openssl not available" };
@@ -27,7 +27,7 @@ function echo(req, res) {
 }
 
 async function setup({ target, collectorOptions, agentOptions, proxyOptions } = {}) {
-  const collector = await startCollector(collectorOptions);
+  const collector = await startSocketCollector(collectorOptions);
   const agent = new MidlineAgent({ apiKey: "ak_proxy", endpoint: collector.url, flushIntervalMs: 60_000, ...agentOptions });
   const server = await startMidlineProxy({ target, port: 0, agent, onError: () => {}, ...proxyOptions });
   const base = `http://127.0.0.1:${server.address().port}`;
@@ -93,7 +93,7 @@ test("forwards to the destination and reports the exchange to Midline separately
     await waitFor(() => ctx.agent.queued === 1);
     await ctx.agent.flush();
     const [event] = ctx.collector.events();
-    assert.equal(ctx.collector.requests[0].url, "/api/api-monitor/events/batch", "events go to Midline, not the destination");
+    assert.equal(ctx.collector.requests.length, 1, "events go to Midline, not the destination");
     assert.equal(event.route, "/v1/items");
     assert.equal(event.metadata.integrationType, "proxy");
     assert.equal(event.metadata.requestId, "rid-7");
@@ -254,7 +254,7 @@ test("https destination with a private CA: trusted only via targetCa, never by d
 
 test("the destination CA and the Midline CA are independent", needsOpenssl, async () => {
   const destination = await listen(echo, certs.trusted);
-  const collector = await startCollector({ tls: certs.selfSigned });
+  const collector = await startSocketCollector({ tls: certs.selfSigned });
   const agent = new MidlineAgent({ apiKey: "ak_proxy", endpoint: collector.url, flushIntervalMs: 60_000, onError: () => {} });
   const server = await startMidlineProxy({ target: `https://localhost:${destination.port}`, targetCa: certs.ca, port: 0, agent });
   try {

package/src/transport.ts

@@ -1,125 +0,0 @@
-import * as http from "http";
-import * as https from "https";
-
-export interface PostResult {
-  status: number;
-  headers: http.IncomingHttpHeaders;
-  body: string;
-}
-
-export interface TransportOptions {
-  /** Full trust store for https, or undefined for Node's default. Verification is never disabled. */
-  ca?: Array<string | Buffer>;
-  connectTimeoutMs: number;
-  timeoutMs: number;
-  userAgent: string;
-  /** Response bodies are only read for diagnostics; anything past this is discarded. */
-  maxResponseBytes?: number;
-}
-
-/** A transport failure with a stable `code`, including the two timeouts Node doesn't name. */
-export class TransportError extends Error {
-  constructor(message: string, readonly code: string) {
-    super(message);
-    this.name = "TransportError";
-  }
-}
-
-/**
- * Minimal JSON POST over Node's own http/https.
- *
- * Node's modules rather than fetch because this needs things fetch doesn't expose
- * portably: a per-endpoint CA that extends rather than replaces the trust store, a
- * connect timeout separate from the request deadline, and sockets that don't keep
- * the host process alive.
- */
-export class Transport {
-  private readonly agent: http.Agent;
-
-  constructor(origin: URL, private readonly options: TransportOptions) {
-    this.agent = origin.protocol === "https:"
-      ? new https.Agent({ keepAlive: true, maxSockets: 4, ca: options.ca })
-      : new http.Agent({ keepAlive: true, maxSockets: 4 });
-  }
-
-  post(url: URL, body: string, headers: Record<string, string>, keepProcessAlive: boolean): Promise<PostResult> {
-    const { connectTimeoutMs, timeoutMs } = this.options;
-    const maxResponseBytes = this.options.maxResponseBytes ?? 64 * 1024;
-    const isHttps = url.protocol === "https:";
-
-    return new Promise<PostResult>((resolve, reject) => {
-      let settled = false;
-      let connectTimer: NodeJS.Timeout | undefined;
-
-      const settle = (fn: () => void) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(deadline);
-        if (connectTimer) clearTimeout(connectTimer);
-        fn();
-      };
-
-      const request = (isHttps ? https : http).request(url, {
-        method: "POST",
-        agent: this.agent,
-        headers: {
-          ...headers,
-          "content-type": "application/json",
-          "content-length": String(Buffer.byteLength(body)),
-          "user-agent": this.options.userAgent,
-        },
-      });
-
-      const deadline = setTimeout(() => {
-        request.destroy(new TransportError(`no response within ${timeoutMs}ms`, "ETIMEDOUT"));
-      }, timeoutMs);
-
-      request.on("socket", (socket) => {
-        if (!keepProcessAlive) {
-          socket.unref();
-        } else {
-          socket.ref();
-        }
-        // A pooled keep-alive socket is already connected; only time fresh ones.
-        // The overall deadline still covers a handshake that stalls after connect.
-        if ((socket as any).connecting) {
-          connectTimer = setTimeout(() => {
-            request.destroy(new TransportError(`connection not established within ${connectTimeoutMs}ms`, "ECONNECT_TIMEOUT"));
-          }, connectTimeoutMs);
-          socket.once(isHttps ? "secureConnect" : "connect", () => clearTimeout(connectTimer));
-        }
-      });
-
-      request.on("response", (response) => {
-        const chunks: Buffer[] = [];
-        let received = 0;
-        response.on("data", (chunk: Buffer) => {
-          if (received < maxResponseBytes) {
-            chunks.push(chunk.subarray(0, maxResponseBytes - received));
-          }
-          received += chunk.length;
-        });
-        response.on("end", () =>
-          settle(() =>
-            resolve({
-              status: response.statusCode ?? 0,
-              headers: response.headers,
-              body: Buffer.concat(chunks).toString("utf8"),
-            }),
-          ),
-        );
-        response.on("error", (err) => settle(() => reject(err)));
-        response.on("aborted", () =>
-          settle(() => reject(new TransportError("response aborted by the server", "ECONNRESET"))),
-        );
-      });
-
-      request.on("error", (err) => settle(() => reject(err)));
-      request.end(body);
-    });
-  }
-
-  destroy(): void {
-    this.agent.destroy();
-  }
-}