@outputai/http 0.9.1-next.6fe398d.0 → 0.9.1

package/dist/fetch/index.js

@@ -2,6 +2,8 @@ import * as undici from 'undici';
 import { randomUUID } from 'node:crypto';
 import { logRequest, logResponse, logError, logFailure } from './logger.js';
 import { addRequestIdToResponse } from './utils.js';
+/* Ignore HTTP/2. Check: https://github.com/growthxai/output/issues/299 */
+const customDispatcher = new undici.EnvHttpProxyAgent({ allowH2: false });
 /*
  * Unifies undici and nodes realms
  * https://github.com/nodejs/undici#keep-fetch-and-formdata-together
@@ -34,8 +36,10 @@ export const fetch = async (input, init) => {
     const url = request.url;
     const startedAt = performance.now();
     await logRequest({ requestId, request });
+    // this allows for users not only to override the dispatcher but also to define it as undefined and remove it altogether.
+    const dispatcher = Object.hasOwn(init ?? {}, 'dispatcher') ? init?.dispatcher : customDispatcher;
     try {
-        const response = await undici.fetch(request);
+        const response = await undici.fetch(request, dispatcher ? { dispatcher } : undefined);
         const durationMs = performance.now() - startedAt;
         // This enriches the response of the request id, so it is identifiable later.
         addRequestIdToResponse(response, requestId);

package/dist/fetch/index.spec.js

@@ -30,6 +30,7 @@ describe('fetch/index', () => {
         mockAgent: undefined,
         previousDispatcher: undefined
     };
+    const fetchWithMockDispatcher = (input, init) => fetch(input, { ...init, dispatcher: undiciCtx.mockAgent });
     beforeEach(() => {
         undiciCtx.mockAgent = new MockAgent();
         undiciCtx.mockAgent.disableNetConnect();
@@ -54,7 +55,7 @@ describe('fetch/index', () => {
     describe('fetch with MockAgent', () => {
         it('returns 200, traces request start and response end', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/ok', method: 'GET' }).reply(200, 'hello', { headers: { 'content-type': 'text/plain' } });
-            const response = await fetch(`${MOCK_ORIGIN}/ok`);
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/ok`);
             expect(response.status).toBe(200);
             expect(await response.text()).toBe('hello');
             expect(loggerMock.logRequest).toHaveBeenCalledTimes(1);
@@ -76,7 +77,7 @@ describe('fetch/index', () => {
         });
         it('uses logError for status > 399 without logging response end', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/missing', method: 'GET' }).reply(404, 'nope', { headers: { 'content-type': 'text/plain' } });
-            const response = await fetch(`${MOCK_ORIGIN}/missing`);
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/missing`);
             expect(response.status).toBe(404);
             expect(loggerMock.logRequest).toHaveBeenCalledTimes(1);
             expect(loggerMock.logResponse).not.toHaveBeenCalled();
@@ -88,7 +89,7 @@ describe('fetch/index', () => {
         });
         it('treats status 399 as success (logs response end, not HTTP error)', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/edge', method: 'GET' }).reply(399, '', { headers: { 'content-type': 'text/plain' } });
-            const response = await fetch(`${MOCK_ORIGIN}/edge`);
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/edge`);
             expect(response.status).toBe(399);
             expect(loggerMock.logResponse).toHaveBeenCalledTimes(1);
             expect(loggerMock.logError).not.toHaveBeenCalled();
@@ -102,7 +103,7 @@ describe('fetch/index', () => {
                     'x-custom': 'plain-value'
                 }
             }).reply(200, 'ok');
-            const response = await fetch(`${MOCK_ORIGIN}/with-plain-headers`, {
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/with-plain-headers`, {
                 headers: { 'X-Custom': 'plain-value' }
             });
             expect(response.status).toBe(200);
@@ -121,7 +122,7 @@ describe('fetch/index', () => {
             }).reply(200, 'ok');
             const userHeaders = new Headers();
             userHeaders.set('X-From-Headers', 'yes');
-            const response = await fetch(`${MOCK_ORIGIN}/with-headers-instance`, {
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/with-headers-instance`, {
                 headers: userHeaders
             });
             expect(response.status).toBe(200);
@@ -131,7 +132,7 @@ describe('fetch/index', () => {
         });
         it('calls logFailure when the mock responds with replyWithError', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/boom', method: 'GET' }).replyWithError(new Error('simulated network failure'));
-            await expect(fetch(`${MOCK_ORIGIN}/boom`)).rejects.toThrow('fetch failed');
+            await expect(fetchWithMockDispatcher(`${MOCK_ORIGIN}/boom`)).rejects.toThrow('fetch failed');
             expect(loggerMock.logRequest).toHaveBeenCalledTimes(1);
             expect(loggerMock.logResponse).not.toHaveBeenCalled();
             expect(loggerMock.logFailure).toHaveBeenCalledTimes(1);
@@ -143,7 +144,7 @@ describe('fetch/index', () => {
             expect(failure.cause.message).toBe('simulated network failure');
         });
         it('fails when no mock matches (disabled net)', async () => {
-            await expect(fetch(`${MOCK_ORIGIN}/unmocked`)).rejects.toThrow();
+            await expect(fetchWithMockDispatcher(`${MOCK_ORIGIN}/unmocked`)).rejects.toThrow();
             expect(loggerMock.logRequest).toHaveBeenCalledTimes(1);
             expect(loggerMock.logResponse).not.toHaveBeenCalled();
             expect(loggerMock.logFailure).toHaveBeenCalledTimes(1);
@@ -151,7 +152,7 @@ describe('fetch/index', () => {
         });
         it('passes method and body through to undici for POST JSON', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/create', method: 'POST' }).reply(201, JSON.stringify({ id: 1 }), { headers: { 'content-type': 'application/json' } });
-            const response = await fetch(`${MOCK_ORIGIN}/create`, {
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/create`, {
                 method: 'POST',
                 headers: { 'content-type': 'application/json' },
                 body: JSON.stringify({ name: 'a' })
@@ -162,7 +163,7 @@ describe('fetch/index', () => {
         });
         it('works when the second argument is omitted', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/bare', method: 'GET' }).reply(204);
-            const response = await fetch(`${MOCK_ORIGIN}/bare`);
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/bare`);
             expect(response.status).toBe(204);
             expect(loggerMock.logRequest.mock.calls[0][0].request.method).toBe('GET');
         });
@@ -171,7 +172,7 @@ describe('fetch/index', () => {
         it('accepts a URL object as the first argument', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/from-url', method: 'GET' }).reply(200, 'url-ok', { headers: { 'content-type': 'text/plain' } });
             const href = new URL('/from-url', `${MOCK_ORIGIN}/`);
-            const response = await fetch(href);
+            const response = await fetchWithMockDispatcher(href);
             expect(response.status).toBe(200);
             expect(await response.text()).toBe('url-ok');
             expect(loggerMock.logRequest.mock.calls[0][0].request.url).toBe(href.href);
@@ -179,7 +180,7 @@ describe('fetch/index', () => {
         it('accepts a Request as the first argument (no init)', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/req-only', method: 'GET' }).reply(200, 'r1');
             const input = new Request(`${MOCK_ORIGIN}/req-only`, { method: 'GET' });
-            const response = await fetch(input);
+            const response = await fetchWithMockDispatcher(input);
             expect(response.status).toBe(200);
             expect(await response.text()).toBe('r1');
             const { request } = loggerMock.logRequest.mock.calls[0][0];
@@ -189,7 +190,7 @@ describe('fetch/index', () => {
         it('accepts Request plus init that overrides method and body', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/req-plus-init', method: 'POST' }).reply(201, JSON.stringify({ saved: true }), { headers: { 'content-type': 'application/json' } });
             const input = new Request(`${MOCK_ORIGIN}/req-plus-init`, { method: 'GET' });
-            const response = await fetch(input, {
+            const response = await fetchWithMockDispatcher(input, {
                 method: 'POST',
                 headers: { 'content-type': 'application/json' },
                 body: JSON.stringify({ name: 'override' })
@@ -200,7 +201,7 @@ describe('fetch/index', () => {
         });
         it('accepts string URL with explicit undefined init', async () => {
             undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({ path: '/explicit-undefined', method: 'GET' }).reply(200, 'ok');
-            const response = await fetch(`${MOCK_ORIGIN}/explicit-undefined`, undefined);
+            const response = await fetchWithMockDispatcher(`${MOCK_ORIGIN}/explicit-undefined`, undefined);
             expect(response.status).toBe(200);
             expect(loggerMock.logRequest.mock.calls[0][0].request.method).toBe('GET');
         });
@@ -211,7 +212,7 @@ describe('fetch/index', () => {
                 headers: { 'content-type': 'application/json', 'x-request-trace-id': FIXED_REQUEST_ID }
             }).reply(200, '{}');
             const href = new URL('/url-post', `${MOCK_ORIGIN}/`);
-            const response = await fetch(href, {
+            const response = await fetchWithMockDispatcher(href, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: '{}'
@@ -219,5 +220,45 @@ describe('fetch/index', () => {
             expect(response.status).toBe(200);
             expect(loggerMock.logRequest.mock.calls[0][0].request.method).toBe('POST');
         });
+        it('uses caller-provided dispatcher without dropping init request options', async () => {
+            const dispatcher = new MockAgent();
+            dispatcher.disableNetConnect();
+            dispatcher.get(MOCK_ORIGIN).intercept({
+                path: '/custom-dispatcher',
+                method: 'POST',
+                headers: {
+                    'content-type': 'application/json',
+                    'x-request-trace-id': FIXED_REQUEST_ID,
+                    'x-custom': 'custom-value'
+                }
+            }).reply(200, 'ok');
+            const response = await fetch(`${MOCK_ORIGIN}/custom-dispatcher`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-Custom': 'custom-value'
+                },
+                body: '{}',
+                dispatcher
+            });
+            expect(response.status).toBe(200);
+            expect(await response.text()).toBe('ok');
+            expect(loggerMock.logRequest.mock.calls[0][0].request.method).toBe('POST');
+            expect(loggerMock.logResponse).toHaveBeenCalledTimes(1);
+            await dispatcher.close();
+        });
+        it('allows dispatcher undefined to disable the default dispatcher', async () => {
+            undiciCtx.mockAgent.get(MOCK_ORIGIN).intercept({
+                path: '/undefined-dispatcher',
+                method: 'GET',
+                headers: { 'x-request-trace-id': FIXED_REQUEST_ID }
+            }).reply(200, 'ok');
+            const response = await fetch(`${MOCK_ORIGIN}/undefined-dispatcher`, {
+                dispatcher: undefined
+            });
+            expect(response.status).toBe(200);
+            expect(await response.text()).toBe('ok');
+            expect(loggerMock.logResponse).toHaveBeenCalledTimes(1);
+        });
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@outputai/http",
-  "version": "0.9.1-next.6fe398d.0",
+  "version": "0.9.1",
   "description": "Framework abstraction to make HTTP calls with tracing",
   "type": "module",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
   "dependencies": {
     "ky": "1.14.3",
     "undici": "8.5.0",
-    "@outputai/core": "0.9.1-next.6fe398d.0"
+    "@outputai/core": "0.9.1"
   },
   "license": "Apache-2.0",
   "publishConfig": {