@api-client/core 0.18.12 → 0.18.13

package/tests/unit/runtime/http-engine/http-get.spec.ts

@@ -1,7 +1,7 @@
 import { test } from '@japa/runner'
-import { DummyLogger, CoreEngine, IHttpRequest, HttpEngineOptions } from '../../../../src/index.js'
+import { createLogger, CoreEngine, IHttpRequest, HttpEngineOptions } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
+const logger = createLogger()
 
 test.group('GET requests', (group) => {
   let request: IHttpRequest

package/tests/unit/runtime/http-engine/http-post.spec.ts

@@ -3,13 +3,13 @@ import {
   ISentRequest,
   IResponse,
   Response,
-  DummyLogger,
+  createLogger,
   CoreEngine,
   IHttpRequest,
   HttpEngineOptions,
 } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
+const logger = createLogger()
 
 test.group('POST requests', (group) => {
   let request: IHttpRequest

package/tests/unit/runtime/http-engine/logger.spec.ts

@@ -20,12 +20,4 @@ test.group('Logger', (group) => {
     assert.typeOf(result.warn, 'function')
     assert.typeOf(result.error, 'function')
   })
-
-  test('Sets passed logger option', ({ assert }) => {
-    const base = new CoreEngine(request)
-    const result = base.setupLogger({
-      logger: console,
-    })
-    assert.isTrue(result === console)
-  })
 })

package/tests/unit/runtime/http-engine/message.spec.ts

@@ -1,144 +1,14 @@
 import { test } from '@japa/runner'
-import net from 'net'
 import {
-  DummyLogger,
+  createLogger,
   CoreEngine,
   IHttpRequest,
   HttpEngineOptions,
   RequestAuthorizationKind,
-  Headers,
   PayloadSerializer,
 } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
-
-test.group('_prepareMessage()', () => {
-  test('returns a buffer', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])),
-    }
-    const opts: HttpEngineOptions = {
-      timeout: 50000,
-      followRedirects: false,
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers(''))
-    assert.isTrue(result instanceof Buffer)
-  })
-
-  test('contains the status message', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])),
-    }
-    const opts: HttpEngineOptions = {
-      timeout: 50000,
-      followRedirects: false,
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers('')).toString()
-    assert.equal(result.split('\n')[0], 'POST /api/endpoint?query=param HTTP/1.1\r')
-  })
-
-  test('removes hash from the URL', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param#access_token=test`,
-      method: 'GET',
-      headers: 'Host: test.com',
-    }
-    const opts: HttpEngineOptions = {
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers('')).toString()
-    assert.equal(result.split('\n')[0], 'GET /api/endpoint?query=param HTTP/1.1\r')
-  })
-
-  test('adds the Host header', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])),
-    }
-    const opts: HttpEngineOptions = {
-      timeout: 50000,
-      followRedirects: false,
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers('')).toString()
-    assert.equal(result.split('\n')[1], `Host: localhost:${httpConfig.httpPort}\r`)
-  })
-
-  test('adds the passed headers', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])),
-    }
-    const opts: HttpEngineOptions = {
-      timeout: 50000,
-      followRedirects: false,
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers('content-type: text/plain')).toString()
-    assert.equal(result.split('\n')[2], 'content-type: text/plain\r')
-  })
-
-  test('adds empty line after headers', ({ assert, httpConfig }) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])),
-    }
-    const opts: HttpEngineOptions = {
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const result = engine._prepareMessage(new Headers('content-type: text/plain')).toString()
-    assert.equal(result.split('\n')[3], '\r')
-  })
-
-  test('adds the payload message', ({ assert, httpConfig }) => {
-    const payloadBuffer = Buffer.from([0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74])
-    const request: IHttpRequest = {
-      url: `http://localhost:${httpConfig.httpPort}/api/endpoint?query=param`,
-      method: 'POST',
-      headers: 'content-type: text/plain',
-      payload: PayloadSerializer.stringifyBuffer(payloadBuffer),
-    }
-    const opts: HttpEngineOptions = {
-      logger,
-    }
-    const engine = new CoreEngine(request, opts)
-    const headers = new Headers('content-type: text/plain')
-    const result = engine._prepareMessage(headers, payloadBuffer).toString()
-    assert.equal(result.split('\n')[4], 'test')
-    assert.equal(result.split('\n')[5], 'test')
-  })
-
-  test('encodes query parameters', ({ assert, httpConfig }) => {
-    const request = {
-      url: `http://localhost:${httpConfig.httpPort}/v1/query-params?va=test-paßword`,
-      method: 'GET',
-      headers: '',
-    }
-    const engine = new CoreEngine(request, { logger })
-    const result = engine._prepareMessage(new Headers('')).toString()
-    assert.include(result, 'GET /v1/query-params?va=test-pa%C3%9Fword HTTP/1.1')
-  })
-})
+const logger = createLogger()
 
 test.group('prepareMessage()', () => {
   const bytes = [0x74, 0x65, 0x73, 0x74, 0x0a, 0x74, 0x65, 0x73, 0x74]
@@ -318,65 +188,3 @@ test.group('prepareMessage()', () => {
     assert.notInclude(engine.sentRequest.headers, 'content-type')
   })
 })
-
-test.group('writeMessage()', (group) => {
-  let message: Buffer
-  let engine: CoreEngine
-  let createdClient: net.Socket | undefined
-
-  group.setup(() => {
-    let str = 'GET /api/endpoint?query=param HTTP/1.1\r\n'
-    str += 'Host: localhost:8123\r\n'
-    str += '\r\n'
-    message = Buffer.from(str)
-  })
-
-  group.each.setup(async (ctx) => {
-    const request: IHttpRequest = {
-      url: `http://localhost:${ctx.context.httpConfig.httpPort}/v1/stream`,
-      method: 'GET',
-      headers: 'Host: test.com\nContent-Length: 0',
-      payload: 'abc',
-    }
-    const opts: HttpEngineOptions = {
-      logger,
-    }
-
-    engine = new CoreEngine(request, opts)
-    createdClient = await engine.connect()
-  })
-
-  group.each.teardown(() => {
-    if (createdClient) {
-      createdClient.end()
-      createdClient.destroy()
-      createdClient = undefined
-    }
-  })
-
-  test('sets the messageSent property on the sentRequest', async ({ assert }) => {
-    await engine.writeMessage(message)
-    assert.typeOf(engine.sentRequest.httpMessage, 'string')
-  })
-
-  test('sets the messageStart property on the stats object', async ({ assert }) => {
-    await engine.writeMessage(message)
-    assert.typeOf(engine.stats.messageStart, 'number')
-  })
-
-  test('sets the sentTime property on stats object', async ({ assert }) => {
-    await engine.writeMessage(message)
-    assert.typeOf(engine.stats.sentTime, 'number')
-  })
-
-  test('emits the "loadstart" event', async ({ assert }) => {
-    const loadstartPromise = new Promise<void>((resolve) => {
-      engine.once('loadstart', () => {
-        resolve()
-      })
-    })
-    engine.writeMessage(message)
-    await loadstartPromise
-    assert.isTrue(true)
-  })
-})

package/tests/unit/runtime/http-engine/params.spec.ts

@@ -2,7 +2,7 @@ import { test } from '@japa/runner'
 import {
   IResponse,
   Response,
-  DummyLogger,
+  createLogger,
   CoreEngine,
   IHttpRequest,
   HttpEngineOptions,
@@ -10,7 +10,7 @@ import {
   IHostRule,
 } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
+const logger = createLogger()
 
 test.group('BaseRequest uri', (group) => {
   let request: IHttpRequest
@@ -343,7 +343,7 @@ test.group('Sending request parameters', (group) => {
     const payload = (await response.readPayload('buffer')) as Buffer
 
     const { body } = JSON.parse(payload.toString('utf8'))
-    assert.deepEqual(body, jsonBody)
+    assert.deepEqual(body, JSON.parse(jsonBody))
   })
 
   test('sends the buffer body with the request', async ({ assert, httpConfig }) => {
@@ -364,7 +364,7 @@ test.group('Sending request parameters', (group) => {
     const payload = (await response.readPayload('buffer')) as Buffer
 
     const { body } = JSON.parse(payload.toString('utf8'))
-    assert.deepEqual(body, jsonBody)
+    assert.deepEqual(body, JSON.parse(jsonBody))
   })
 
   test('sends the FormData body with the request', async ({ assert, httpConfig }) => {

package/tests/unit/runtime/http-engine/proxy.spec.ts

@@ -1,4 +1,3 @@
-import nock from 'nock'
 import { test } from '@japa/runner'
 import {
   IResponse,
@@ -8,18 +7,12 @@ import {
   CoreEngine,
   ResponseRedirect,
   HttpEngineOptions,
-  DummyLogger,
+  createLogger,
 } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
+const logger = createLogger({ minLevel: 5 })
 
 test.group('http proxy', (group) => {
-  group.setup(async () => {
-    if (nock.isActive()) {
-      nock.restore()
-    }
-  })
-
   const httpOpts: HttpEngineOptions = {
     logger,
     validateCertificates: false,
@@ -78,7 +71,7 @@ test.group('http proxy', (group) => {
     assert.strictEqual(timings.ssl, -1, 'has the timings.ssl')
   })
 
-  test('posts to an HTTP server', async ({ assert }) => {
+  test('http / posts to an HTTP server', async ({ assert }) => {
     const sentBody = JSON.stringify({ test: true })
     const config: IHttpRequest = {
       url: `http://${baseHttpHostname}/v1/get?x=y`,
@@ -168,6 +161,7 @@ test.group('http proxy', (group) => {
     const request = new CoreEngine(config, httpOpts)
     const log = await request.send()
     assert.ok(log, 'has the response')
+
     const response = new Response(log.response as IResponse)
     assert.strictEqual(response.status, 200, 'has the response status code')
     assert.strictEqual(response.statusText, 'OK', 'has the response status text')
@@ -187,6 +181,7 @@ test.group('http proxy', (group) => {
     assert.equal(body.body, sentBody, 'passes the body')
 
     const timings = response.timings as RequestTime
+
     assert.strictEqual(timings.blocked, 0, 'has the timings.blocked')
     assert.typeOf(timings.connect, 'number', 'has the timings.connect')
     assert.isAtLeast(timings.receive, 0, 'has the timings.receive')
@@ -227,7 +222,7 @@ test.group('http proxy', (group) => {
       method: 'GET',
       headers: 'x-custom: true',
     }
-    const localOptions = { ...httpOpts, proxyUsername: 'proxy-name', proxyPassword: 'proxy-password' }
+    const localOptions = { ...httpOpts, proxyUsername: 'proxyuser', proxyPassword: 'proxypass' }
     const request = new CoreEngine(config, localOptions)
 
     const log = await request.send()
@@ -324,9 +319,10 @@ test.group('https proxy', (group) => {
     assert.isAtLeast(timings.ssl!, 0, 'has the timings.ssl')
   })
 
-  test('posts to an HTTP server', async ({ assert }) => {
+  test('https / posts to HTTP server', async ({ assert }) => {
     const sentBody = JSON.stringify({ test: true })
     const config: IHttpRequest = {
+      // `localhost:${httpPort}`
       url: `http://${baseHttpHostname}/v1/get?x=y`,
       method: 'POST',
       headers: `content-type: application/json\nx-custom: true`,
@@ -472,7 +468,7 @@ test.group('https proxy', (group) => {
       method: 'GET',
       headers: 'x-custom: true',
     }
-    const localOptions = { ...httpOpts, proxyUsername: 'proxy-name', proxyPassword: 'proxy-password' }
+    const localOptions = { ...httpOpts, proxyUsername: 'proxyuser', proxyPassword: 'proxypass' }
     const request = new CoreEngine(config, localOptions)
     const log = await request.send()
     assert.ok(log, 'has the response')
@@ -511,7 +507,12 @@ test.group('https proxy', (group) => {
       method: 'GET',
       headers: 'x-custom: true',
     }
-    const localOptions = { ...httpOpts, proxyUsername: 'some-name', proxyPassword: 'invalid' }
+    const localOptions: HttpEngineOptions = {
+      ...httpOpts,
+      proxyUsername: 'some-name',
+      proxyPassword: 'invalid',
+      proxyAuthorization: 'Basic',
+    }
     const request = new CoreEngine(config, localOptions)
     const log = await request.send()
 

package/tests/unit/runtime/http-engine/redirects.spec.ts

@@ -3,7 +3,7 @@ import {
   ISentRequest,
   IResponse,
   Response,
-  DummyLogger,
+  createLogger,
   CoreEngine,
   IHttpRequest,
   HttpEngineOptions,
@@ -12,7 +12,7 @@ import {
   HttpResponse,
 } from '../../../../src/index.js'
 
-const logger = new DummyLogger()
+const logger = createLogger()
 
 test.group('Absolute redirects', (group) => {
   let opts: HttpEngineOptions