Revert "fix(api): preserve http apiFetch support"

This reverts commit 7b3e4ac.

Author: simonhj

src/utils/api.mts

@@ -19,7 +19,6 @@
  * - Falls back to configured apiBaseUrl or default API_V0_URL
  */
 
-import { request as httpRequest } from 'node:http'
 import { Agent as HttpsAgent, request as httpsRequest } from 'node:https'
 import { ReadableStream } from 'node:stream/web'
 
@@ -85,27 +84,25 @@ export type ApiFetchInit = {
   method?: string | undefined
 }
 
-// Internal node request-based fetch with redirect support.
-function _nodeRequestFetch(
+// Internal httpsRequest-based fetch with redirect support.
+function _httpsRequestFetch(
   url: string,
   init: ApiFetchInit,
   agent: HttpsAgent | undefined,
   redirectCount: number,
 ): Promise<Response> {
   return new Promise((resolve, reject) => {
-    const parsedUrl = new URL(url)
     const headers: Record<string, string> = { ...init.headers }
     // Set Content-Length for request bodies to avoid chunked transfer encoding.
     if (init.body) {
       headers['content-length'] = String(Buffer.byteLength(init.body))
     }
-    const request = parsedUrl.protocol === 'http:' ? httpRequest : httpsRequest
-    const req = request(
+    const req = httpsRequest(
       url,
       {
         method: init.method || 'GET',
         headers,
-        agent: parsedUrl.protocol === 'https:' ? agent : undefined,
+        agent,
       },
       res => {
         const { statusCode } = res
@@ -144,7 +141,7 @@ function _nodeRequestFetch(
           // 307 and 308 preserve the original method and body.
           const preserveMethod = statusCode === 307 || statusCode === 308
           resolve(
-            _nodeRequestFetch(
+            _httpsRequestFetch(
               redirectUrl,
               preserveMethod
                 ? { ...init, headers: redirectHeaders }
@@ -207,7 +204,7 @@ export async function apiFetch(
   url: string,
   init: ApiFetchInit = {},
 ): Promise<Response> {
-  return await _nodeRequestFetch(url, init, getHttpsAgent(), 0)
+  return await _httpsRequestFetch(url, init, getHttpsAgent(), 0)
 }
 
 export type CommandRequirements = {

src/utils/api.test.mts

@@ -45,13 +45,9 @@ type RequestCallback = (
   },
 ) => void
 const mockHttpsRequest = vi.hoisted(() => vi.fn())
-const mockHttpRequest = vi.hoisted(() => vi.fn())
 const MockHttpsAgent = vi.hoisted(() =>
   vi.fn().mockImplementation(opts => ({ ...opts, _isHttpsAgent: true })),
 )
-vi.mock('node:http', () => ({
-  request: mockHttpRequest,
-}))
 vi.mock('node:https', () => ({
   Agent: MockHttpsAgent,
   request: mockHttpsRequest,
@@ -160,48 +156,6 @@ describe('apiFetch with extra CA certificates', () => {
     expect(result.ok).toBe(true)
   })
 
-  it('should use http.request for plain HTTP API URLs', async () => {
-    const mockReq = {
-      end: vi.fn(),
-      on: vi.fn(),
-      write: vi.fn(),
-    }
-
-    mockHttpRequest.mockImplementation(
-      (_url: string, _opts: unknown, callback: RequestCallback) => {
-        setTimeout(() => {
-          const mockRes = {
-            headers: { 'content-type': 'text/plain' },
-            on: vi.fn(),
-            statusCode: 200,
-            statusMessage: 'OK',
-          }
-          const handlers: Record<string, Function> = {}
-          mockRes.on.mockImplementation((event: string, handler: Function) => {
-            handlers[event] = handler
-            return mockRes
-          })
-          callback(mockRes)
-          handlers['data']?.(Buffer.from('local response'))
-          handlers['end']?.()
-        }, 0)
-        return mockReq
-      },
-    )
-
-    const { apiFetch } = await import('./api.mts')
-    const response = await apiFetch('http://localhost:3000/v0/report')
-
-    expect(response.status).toBe(200)
-    expect(await response.text()).toBe('local response')
-    expect(mockHttpRequest).toHaveBeenCalledWith(
-      'http://localhost:3000/v0/report',
-      expect.objectContaining({ agent: undefined, method: 'GET' }),
-      expect.any(Function),
-    )
-    expect(mockHttpsRequest).not.toHaveBeenCalled()
-  })
-
   it('should use https.request when extra CA certs are available', async () => {
     const caCerts = ['ROOT_CERT', 'EXTRA_CERT']
     mockGetExtraCaCerts.mockReturnValue(caCerts)