@owlmeans/api 0.1.18-rc.45 → 0.1.18-rc.47

package/tests/body.spec.ts

@@ -1,60 +1,59 @@
 import { afterAll, beforeAll, describe, expect, test } from 'bun:test'
-import { provideResponse } from '@owlmeans/entrypoint'
-import type { AbstractRequest } from '@owlmeans/entrypoint'
+import { provideResponse, type AbstractRequest } from '@owlmeans/entrypoint'
 import { RouteMethod } from '@owlmeans/route'
 import { createApiService } from '../src/service.js'
-import { contentTypeOf, isJsonContentType, jsonScalarBody, requestBodyOf } from '../src/utils/body.js'
+import { bodyUtils } from '../src/utils/body.js'
 
 const STRING = { type: 'string' }
 
 describe('what a request body becomes', () => {
   test('a scalar on a POST without a content type is JSON text', () => {
-    expect(requestBodyOf('abc', {}, RouteMethod.POST)).toEqual({ data: '"abc"', contentType: 'application/json', verbatim: true })
-    expect(requestBodyOf('', {}, RouteMethod.POST).data).toBe('""')
-    expect(requestBodyOf(5, {}, RouteMethod.POST).data).toBe('5')
-    expect(requestBodyOf(0, {}, RouteMethod.POST).data).toBe('0')
-    expect(requestBodyOf(true, {}, RouteMethod.POST).data).toBe('true')
-    expect(requestBodyOf(false, {}, RouteMethod.POST).data).toBe('false')
+    expect(bodyUtils.requestBodyOf('abc', {}, RouteMethod.POST)).toEqual({ data: '"abc"', contentType: 'application/json', verbatim: true })
+    expect(bodyUtils.requestBodyOf('', {}, RouteMethod.POST).data).toBe('""')
+    expect(bodyUtils.requestBodyOf(5, {}, RouteMethod.POST).data).toBe('5')
+    expect(bodyUtils.requestBodyOf(0, {}, RouteMethod.POST).data).toBe('0')
+    expect(bodyUtils.requestBodyOf(true, {}, RouteMethod.POST).data).toBe('true')
+    expect(bodyUtils.requestBodyOf(false, {}, RouteMethod.POST).data).toBe('false')
   })
 
   test('a scalar under an explicit JSON content type is JSON text, on any method', () => {
-    expect(requestBodyOf('abc', { 'Content-Type': 'application/json; charset=utf-8' }, RouteMethod.PUT))
+    expect(bodyUtils.requestBodyOf('abc', { 'Content-Type': 'application/json; charset=utf-8' }, RouteMethod.PUT))
       .toEqual({ data: '"abc"', verbatim: true })
-    expect(requestBodyOf(7, { 'content-type': 'application/merge-patch+json' }, RouteMethod.PATCH).data).toBe('7')
+    expect(bodyUtils.requestBodyOf(7, { 'content-type': 'application/merge-patch+json' }, RouteMethod.PATCH).data).toBe('7')
   })
 
   test('already-serialized JSON text is sent as it is', () => {
-    expect(requestBodyOf('{"a":1}', {}, RouteMethod.POST).data).toBe('{"a":1}')
-    expect(requestBodyOf('[1,2]', {}, RouteMethod.POST).data).toBe('[1,2]')
-    expect(requestBodyOf('"abc"', {}, RouteMethod.POST).data).toBe('"abc"')
-    expect(requestBodyOf('"abc"', {}, RouteMethod.POST, STRING).data).toBe('"abc"')
+    expect(bodyUtils.requestBodyOf('{"a":1}', {}, RouteMethod.POST).data).toBe('{"a":1}')
+    expect(bodyUtils.requestBodyOf('[1,2]', {}, RouteMethod.POST).data).toBe('[1,2]')
+    expect(bodyUtils.requestBodyOf('"abc"', {}, RouteMethod.POST).data).toBe('"abc"')
+    expect(bodyUtils.requestBodyOf('"abc"', {}, RouteMethod.POST, STRING).data).toBe('"abc"')
   })
 
   test('under a string body schema, JSON-looking text is the string the caller means', () => {
-    expect(jsonScalarBody('123', STRING)).toBe('"123"')
-    expect(jsonScalarBody('true', STRING)).toBe('"true"')
-    expect(jsonScalarBody('null', { type: ['string', 'null'] })).toBe('"null"')
-    expect(jsonScalarBody('{"a":1}', STRING)).toBe('"{\\"a\\":1}"')
-    expect(jsonScalarBody('123', { type: 'number' })).toBe('123')
+    expect(bodyUtils.jsonScalarBody('123', STRING)).toBe('"123"')
+    expect(bodyUtils.jsonScalarBody('true', STRING)).toBe('"true"')
+    expect(bodyUtils.jsonScalarBody('null', { type: ['string', 'null'] })).toBe('"null"')
+    expect(bodyUtils.jsonScalarBody('{"a":1}', STRING)).toBe('"{\\"a\\":1}"')
+    expect(bodyUtils.jsonScalarBody('123', { type: 'number' })).toBe('123')
   })
 
   test('objects, arrays and everything outside JSON behave as before', () => {
     const object = { a: 1 }
-    expect(requestBodyOf(object, {}, RouteMethod.POST)).toEqual({ data: object, verbatim: false })
-    expect(requestBodyOf([1], {}, RouteMethod.POST)).toEqual({ data: [1], verbatim: false })
-    expect(requestBodyOf(undefined, {}, RouteMethod.POST)).toEqual({ data: undefined, verbatim: false })
-    expect(requestBodyOf('abc', { 'content-type': 'text/plain' }, RouteMethod.POST)).toEqual({ data: 'abc', verbatim: false })
-    expect(requestBodyOf('abc', {}, RouteMethod.PUT)).toEqual({ data: 'abc', verbatim: false })
-    expect(requestBodyOf({ a: '1', b: ['x'] }, { 'content-type': 'application/x-www-form-urlencoded' }, RouteMethod.POST).data)
+    expect(bodyUtils.requestBodyOf(object, {}, RouteMethod.POST)).toEqual({ data: object, verbatim: false })
+    expect(bodyUtils.requestBodyOf([1], {}, RouteMethod.POST)).toEqual({ data: [1], verbatim: false })
+    expect(bodyUtils.requestBodyOf(undefined, {}, RouteMethod.POST)).toEqual({ data: undefined, verbatim: false })
+    expect(bodyUtils.requestBodyOf('abc', { 'content-type': 'text/plain' }, RouteMethod.POST)).toEqual({ data: 'abc', verbatim: false })
+    expect(bodyUtils.requestBodyOf('abc', {}, RouteMethod.PUT)).toEqual({ data: 'abc', verbatim: false })
+    expect(bodyUtils.requestBodyOf({ a: '1', b: ['x'] }, { 'content-type': 'application/x-www-form-urlencoded' }, RouteMethod.POST).data)
       .toBe('a=1&b%5B0%5D=x')
   })
 
   test('the content-type header is read whatever its case', () => {
-    expect(contentTypeOf({ 'CONTENT-TYPE': 'application/json' })).toBe('application/json')
-    expect(contentTypeOf({ accept: 'application/json' })).toBeUndefined()
-    expect(isJsonContentType('application/vnd.api+json')).toBe(true)
-    expect(isJsonContentType('application/jsonp')).toBe(false)
-    expect(isJsonContentType('text/plain')).toBe(false)
+    expect(bodyUtils.contentTypeOf({ 'CONTENT-TYPE': 'application/json' })).toBe('application/json')
+    expect(bodyUtils.contentTypeOf({ accept: 'application/json' })).toBeUndefined()
+    expect(bodyUtils.isJsonContentType('application/vnd.api+json')).toBe(true)
+    expect(bodyUtils.isJsonContentType('application/jsonp')).toBe(false)
+    expect(bodyUtils.isJsonContentType('text/plain')).toBe(false)
   })
 })
 

package/tests/handler.spec.ts

@@ -6,12 +6,12 @@ import { EntrypointOutcome } from '@owlmeans/entrypoint'
 import { ResilientError } from '@owlmeans/error'
 import { RecordExists, UnknownRecordError } from '@owlmeans/resource'
 import {
-  ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError, httpStatusOf, incidentIdOf,
+  ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError, apiStatusHelper,
   INCIDENT_ID_HEADER,
   DENIAL_KIND_HEADER, ACCESS_DENIED_KIND,
 } from '../src/index.js'
-import { processResponse, statusError } from '../src/utils/handler.js'
-import * as status from '../src/status/index.js'
+import { responseUtils } from '../src/utils/response.js'
+import * as statusModule from '../src/status/index.js'
 
 const INCIDENT = '6f1c1a52-8a0e-4f5e-9a7c-1f2d3e4c5b6a'
 
@@ -41,7 +41,7 @@ const respond = (
     resolve: (value, outcome) => { reply.value = value; reply.outcome = outcome },
     reject: error => { reply.error = error },
   }
-  processResponse({
+  responseUtils.processResponse({
     status: statusCode, statusText: '', data, headers, config: { url: '/spec' },
   } as unknown as AxiosResponse, reply)
 
@@ -63,64 +63,64 @@ describe('2xx', () => {
 describe('a production incident body keeps its status and incident id', () => {
   test('only a labelled 403 is an auth/IAM denial', () => {
     const denied = respond(403, INCIDENT, { [DENIAL_KIND_HEADER]: ACCESS_DENIED_KIND }).error
-    expect(status.isAccessDenied(denied)).toBe(true)
-    expect(status.isAccessDenied(respond(403, INCIDENT).error)).toBe(false)
-    expect(status.isAccessDenied(respond(401, INCIDENT, { [DENIAL_KIND_HEADER]: ACCESS_DENIED_KIND }).error)).toBe(false)
+    expect(statusModule.apiStatusHelper.isAccessDenied(denied)).toBe(true)
+    expect(statusModule.apiStatusHelper.isAccessDenied(respond(403, INCIDENT).error)).toBe(false)
+    expect(statusModule.apiStatusHelper.isAccessDenied(respond(401, INCIDENT, { [DENIAL_KIND_HEADER]: ACCESS_DENIED_KIND }).error)).toBe(false)
   })
   test('428 with the header becomes ApiStatusError', () => {
     const { error } = respond(428, INCIDENT, { [INCIDENT_ID_HEADER.toLowerCase()]: INCIDENT })
     expect(error).toBeInstanceOf(ApiStatusError)
     expect(error!.message).toBe(`api:client:status:428:${INCIDENT}`)
-    expect(httpStatusOf(error)).toBe(428)
-    expect(incidentIdOf(error)).toBe(INCIDENT)
+    expect(apiStatusHelper.httpStatusOf(error)).toBe(428)
+    expect(apiStatusHelper.incidentIdOf(error)).toBe(INCIDENT)
     expect((error as ApiStatusError).status).toBe(428)
   })
 
   test('the header is read from AxiosHeaders too, and the body alone suffices', () => {
     const headers = new AxiosHeaders({ [INCIDENT_ID_HEADER]: INCIDENT })
-    expect(incidentIdOf(respond(409, 'x', headers).error)).toBe(INCIDENT)
-    expect(incidentIdOf(respond(402, INCIDENT).error)).toBe(INCIDENT)
-    expect(httpStatusOf(respond(402, INCIDENT).error)).toBe(402)
+    expect(apiStatusHelper.incidentIdOf(respond(409, 'x', headers).error)).toBe(INCIDENT)
+    expect(apiStatusHelper.incidentIdOf(respond(402, INCIDENT).error)).toBe(INCIDENT)
+    expect(apiStatusHelper.httpStatusOf(respond(402, INCIDENT).error)).toBe(402)
   })
 
   test('500, 401 and 403 keep their classes and markers', () => {
     const crashed = respond(500, INCIDENT).error
     expect(crashed).toBeInstanceOf(ServerCrashedError)
     expect(crashed!.message).toBe(`api:client:crashed:${INCIDENT}`)
-    expect(httpStatusOf(crashed)).toBe(500)
+    expect(apiStatusHelper.httpStatusOf(crashed)).toBe(500)
 
     const auth = respond(401, INCIDENT).error
     expect(auth).toBeInstanceOf(ServerAuthError)
     expect(auth!.message).toBe(`api:client:auth:${INCIDENT}`)
-    expect(httpStatusOf(auth)).toBe(401)
+    expect(apiStatusHelper.httpStatusOf(auth)).toBe(401)
 
     const forbidden = respond(403, INCIDENT).error
     expect(forbidden).toBeInstanceOf(ApiClientError)
     expect(forbidden).not.toBeInstanceOf(ApiStatusError)
     expect(forbidden!.message).toBe(`api:client:forbidden:${INCIDENT}`)
-    expect(httpStatusOf(forbidden)).toBe(403)
+    expect(apiStatusHelper.httpStatusOf(forbidden)).toBe(403)
   })
 
   test('without an incident id the markers stay as before', () => {
-    expect(statusError(500).message).toBe('api:client:crashed:error')
-    expect(statusError(403).message).toBe('api:client:forbidden')
-    expect(incidentIdOf(statusError(500))).toBeNull()
-    expect(statusError(418).message).toBe('api:client:status:418')
+    expect(responseUtils.statusError(500).message).toBe('api:client:crashed:error')
+    expect(responseUtils.statusError(403).message).toBe('api:client:forbidden')
+    expect(apiStatusHelper.incidentIdOf(responseUtils.statusError(500))).toBeNull()
+    expect(responseUtils.statusError(418).message).toBe('api:client:status:418')
   })
 
   test('a proxy HTML page or framework JSON becomes a status error', () => {
     const html = respond(502, '<html><body>Bad Gateway</body></html>').error
     expect(html).toBeInstanceOf(ApiStatusError)
-    expect(httpStatusOf(html)).toBe(502)
-    expect(incidentIdOf(html)).toBeNull()
+    expect(apiStatusHelper.httpStatusOf(html)).toBe(502)
+    expect(apiStatusHelper.incidentIdOf(html)).toBeNull()
 
     const json = respond(400, { statusCode: 400, error: 'Bad Request', message: 'body/x' }).error
     expect(json).toBeInstanceOf(ApiStatusError)
-    expect(httpStatusOf(json)).toBe(400)
+    expect(apiStatusHelper.httpStatusOf(json)).toBe(400)
   })
 
   test('no class declares a static httpStatus, so a rethrow upstream stays 500', () => {
-    for (const error of [statusError(428), statusError(500), statusError(401), statusError(403)]) {
+    for (const error of [responseUtils.statusError(428), responseUtils.statusError(500), responseUtils.statusError(401), responseUtils.statusError(403)]) {
       expect((error.constructor as { httpStatus?: unknown }).httpStatus).toBeUndefined()
     }
   })
@@ -133,8 +133,8 @@ describe('a development body stays its typed class', () => {
     expect(error).toBeInstanceOf(ConsentRequired)
     expect(error!.message).toBe('spec:consent-required:2')
     expect((error as { responseStatus?: number }).responseStatus).toBe(428)
-    expect(httpStatusOf(error)).toBe(428)
-    expect(incidentIdOf(error)).toBe(INCIDENT)
+    expect(apiStatusHelper.httpStatusOf(error)).toBe(428)
+    expect(apiStatusHelper.incidentIdOf(error)).toBe(INCIDENT)
   })
 
   test('a typed api error keeps its marker fields', () => {
@@ -153,8 +153,8 @@ describe('a development body stays its typed class', () => {
       const { error } = respond(code, body, { [INCIDENT_ID_HEADER]: INCIDENT })
       expect(error!.constructor).toBe(refusal.constructor)
       expect(error!.message).toBe(refusal.message)
-      expect(httpStatusOf(error)).toBe(code)
-      expect(incidentIdOf(error)).toBe(INCIDENT)
+      expect(apiStatusHelper.httpStatusOf(error)).toBe(code)
+      expect(apiStatusHelper.incidentIdOf(error)).toBe(INCIDENT)
     }
     const body = ResilientError.marshal(new UnknownRecordError('shelf/3')).message
     expect((respond(404, body).error as UnknownRecordError).id).toBe('shelf/3')
@@ -164,8 +164,8 @@ describe('a development body stays its typed class', () => {
     const body = `ApiSpecUnregisteredRefusal${ResilientError.separator}spec:unregistered:x`
     const { error } = respond(404, body, { [INCIDENT_ID_HEADER]: INCIDENT })
     expect(error).not.toBeInstanceOf(ServerCrashedError)
-    expect(httpStatusOf(error)).toBe(404)
-    expect(incidentIdOf(error)).toBe(INCIDENT)
+    expect(apiStatusHelper.httpStatusOf(error)).toBe(404)
+    expect(apiStatusHelper.incidentIdOf(error)).toBe(INCIDENT)
   })
 })
 
@@ -176,7 +176,7 @@ describe('a production body of a storage refusal keeps the declared status', ()
       expect(error).toBeInstanceOf(ApiStatusError)
       expect(error).not.toBeInstanceOf(ServerCrashedError)
       expect(error!.message).toBe(`api:client:status:${code}:${INCIDENT}`)
-      expect(httpStatusOf(error)).toBe(code)
+      expect(apiStatusHelper.httpStatusOf(error)).toBe(code)
     }
   })
 })
@@ -195,35 +195,35 @@ describe('marshal round trips', () => {
       const back = roundTrip(error)
       expect(back.constructor).toBe(error.constructor)
       expect((back as ApiClientError).status).toBe(code)
-      expect(httpStatusOf(back)).toBe(code)
-      expect(incidentIdOf(back)).toBe(INCIDENT)
+      expect(apiStatusHelper.httpStatusOf(back)).toBe(code)
+      expect(apiStatusHelper.incidentIdOf(back)).toBe(INCIDENT)
     }
   })
 
   test('a legacy bare-status marker still reads', () => {
-    expect(httpStatusOf(new ApiClientError('404'))).toBe(404)
+    expect(apiStatusHelper.httpStatusOf(new ApiClientError('404'))).toBe(404)
   })
 })
 
 describe('./status', () => {
   test('a declared static 428 answers without any marker; an undeclared 5xx does not', () => {
-    expect(status.httpStatusOf(new ConsentRequired())).toBe(428)
-    expect(status.httpStatusOf(new Unavailable())).toBeNull()
-    expect(status.httpStatusOf(new Error('plain'))).toBeNull()
-    expect(status.httpStatusOf(null)).toBeNull()
+    expect(statusModule.apiStatusHelper.httpStatusOf(new ConsentRequired())).toBe(428)
+    expect(statusModule.apiStatusHelper.httpStatusOf(new Unavailable())).toBeNull()
+    expect(statusModule.apiStatusHelper.httpStatusOf(new Error('plain'))).toBeNull()
+    expect(statusModule.apiStatusHelper.httpStatusOf(null)).toBeNull()
   })
 
   test('reads a marker from a plain error message or a type', () => {
-    expect(status.httpStatusOf(new Error(`${status.API_STATUS_MARKER}428:${INCIDENT}`))).toBe(428)
-    expect(status.httpStatusOf({ type: 'api:client:auth:error' })).toBe(401)
-    expect(status.incidentIdOf(new Error(`api:client:crashed:${INCIDENT}`))).toBe(INCIDENT)
+    expect(statusModule.apiStatusHelper.httpStatusOf(new Error(`${statusModule.API_STATUS_MARKER}428:${INCIDENT}`))).toBe(428)
+    expect(statusModule.apiStatusHelper.httpStatusOf({ type: 'api:client:auth:error' })).toBe(401)
+    expect(statusModule.apiStatusHelper.incidentIdOf(new Error(`api:client:crashed:${INCIDENT}`))).toBe(INCIDENT)
   })
 
   test('isIncidentBody accepts a bare incident UUID only', () => {
-    expect(status.isIncidentBody(INCIDENT)).toBe(true)
-    expect(status.isIncidentBody(`${INCIDENT}\n`)).toBe(true)
-    expect(status.isIncidentBody('Unauthorized')).toBe(false)
-    expect(status.isIncidentBody(`ApiError|||api:x|||${INCIDENT}`)).toBe(false)
-    expect(status.isIncidentBody({ id: INCIDENT })).toBe(false)
+    expect(statusModule.apiStatusHelper.isIncidentBody(INCIDENT)).toBe(true)
+    expect(statusModule.apiStatusHelper.isIncidentBody(`${INCIDENT}\n`)).toBe(true)
+    expect(statusModule.apiStatusHelper.isIncidentBody('Unauthorized')).toBe(false)
+    expect(statusModule.apiStatusHelper.isIncidentBody(`ApiError|||api:x|||${INCIDENT}`)).toBe(false)
+    expect(statusModule.apiStatusHelper.isIncidentBody({ id: INCIDENT })).toBe(false)
   })
 })

package/build/utils/handler.d.ts

@@ -1,11 +0,0 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint';
-import type { AxiosResponse } from 'axios';
-import { ApiClientError } from '../errors.js';
-export declare const processResponse: (response: AxiosResponse, reply: AbstractResponse<any>) => void;
-/**
- * The typed error of a bare status: `ServerCrashedError` (500), `ServerAuthError` (401),
- * `ApiClientError('forbidden[:<id>]')` (403), `ApiStatusError` (`api:client:status:<n>[:<id>]`)
- * for every other one.
- */
-export declare const statusError: (status: number, incidentId?: string) => ApiClientError;
-//# sourceMappingURL=handler.d.ts.map

package/build/utils/handler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAE5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAM1C,OAAO,EAAE,cAAc,EAAuD,MAAM,cAAc,CAAA;AAOlG,eAAO,MAAM,eAAe,aAAc,aAAa,SAAS,gBAAgB,CAAC,GAAG,CAAC,SAqBpF,CAAA;AAkCD;;;;GAIG;AACH,eAAO,MAAM,WAAW,WAAY,MAAM,eAAe,MAAM,KAAG,cAUjE,CAAA"}

package/build/utils/handler.js

@@ -1,95 +0,0 @@
-import { EntrypointOutcome } from '@owlmeans/entrypoint';
-import { ACCEPTED, CREATED, FINISHED, FORBIDDEN_ERROR, INCIDENT_ID_HEADER, DENIAL_KIND_HEADER, ACCESS_DENIED_KIND, OK, SERVER_ERROR, UNAUTHORIZED_ERROR, } from '../consts.js';
-import { ResilientError } from '@owlmeans/error';
-import { ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError } from '../errors.js';
-import { isIncidentBody } from '../status/index.js';
-import { logger } from '@owlmeans/log';
-const log = logger('api');
-export const processResponse = (response, reply) => {
-    switch (response.status) {
-        case OK:
-            reply.resolve(response.data, EntrypointOutcome.Ok);
-            return;
-        case ACCEPTED:
-            reply.resolve(response.data, EntrypointOutcome.Accepted);
-            return;
-        case CREATED:
-            return processEmptyResponse(response, reply, EntrypointOutcome.Created);
-        case FINISHED:
-            return processEmptyResponse(response, reply, EntrypointOutcome.Finished);
-        default:
-            // A refusal is ordinary traffic (401, 403, 409, 428): debug, and never the headers.
-            log.debug('Request answered with a failure', {
-                status: response.status, statusText: response.statusText, url: response.config?.url,
-                incidentId: headerOf(response.headers, INCIDENT_ID_HEADER),
-            });
-            reply.reject(failureOf(response));
-    }
-};
-/**
- * The error a non-2xx answer rejects with — always carrying the HTTP status and, when the server
- * sent one, its incident id.
- *
- * A development body is the marshaled `ResilientError`: it is rebuilt into its own class and
- * stamped with `responseStatus`. Anything else — the bare incident id of a production body, a
- * proxy's HTML, a framework's JSON — becomes the status error of {@link statusError}.
- */
-const failureOf = (response) => {
-    const incidentId = headerOf(response.headers, INCIDENT_ID_HEADER)
-        ?? (isIncidentBody(response.data) ? response.data.trim() : undefined);
-    const denialKind = response.status === FORBIDDEN_ERROR
-        && headerOf(response.headers, DENIAL_KIND_HEADER) === ACCESS_DENIED_KIND
-        ? ACCESS_DENIED_KIND : undefined;
-    if (typeof response.data === 'string' && response.data.includes(ResilientError.separator)) {
-        try {
-            const error = ResilientError.ensure(response.data, true);
-            error.incidentId ??= incidentId;
-            Object.assign(error, {
-                responseStatus: response.status, denialKind,
-            });
-            return error;
-        }
-        catch {
-            log.warn('Server returned an unrecognizable text error', { status: response.status, body: response.data });
-        }
-    }
-    return Object.assign(statusError(response.status, incidentId), { denialKind });
-};
-/**
- * The typed error of a bare status: `ServerCrashedError` (500), `ServerAuthError` (401),
- * `ApiClientError('forbidden[:<id>]')` (403), `ApiStatusError` (`api:client:status:<n>[:<id>]`)
- * for every other one.
- */
-export const statusError = (status, incidentId) => {
-    const error = status === SERVER_ERROR ? new ServerCrashedError(incidentId)
-        : status === UNAUTHORIZED_ERROR ? new ServerAuthError(incidentId)
-            : status === FORBIDDEN_ERROR ? new ApiClientError(incidentId != null ? `forbidden:${incidentId}` : 'forbidden')
-                : new ApiStatusError(status, incidentId);
-    if (incidentId != null) {
-        error.incidentId = incidentId;
-    }
-    return Object.assign(error, { responseStatus: status });
-};
-/** One response header, from an `AxiosHeaders` instance or a plain header object alike. */
-const headerOf = (headers, name) => {
-    if (headers == null || typeof headers !== 'object') {
-        return undefined;
-    }
-    const get = headers.get;
-    const viaGet = typeof get === 'function' ? get.call(headers, name) : undefined;
-    const value = viaGet ?? Object.entries(headers).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1];
-    const first = Array.isArray(value) ? value[0] : value;
-    return typeof first === 'string' && first.trim() !== '' ? first.trim() : undefined;
-};
-const processEmptyResponse = (response, reply, outcome) => {
-    if (response.data != null && response.data != '') {
-        reply.resolve(response.data, outcome);
-        return;
-    }
-    if (response.headers.toJSON != null && typeof response.headers.toJSON === 'function') {
-        reply.resolve(response.headers.toJSON(), outcome);
-        return;
-    }
-    reply.resolve(response.headers, outcome);
-};
-//# sourceMappingURL=handler.js.map

package/build/utils/handler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/utils/handler.ts"],"names":[],"mappings":"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"}

package/src/utils/handler.ts

@@ -1,111 +0,0 @@
-import type { AbstractResponse } from '@owlmeans/entrypoint'
-import { EntrypointOutcome } from '@owlmeans/entrypoint'
-import type { AxiosResponse } from 'axios'
-import {
-  ACCEPTED, CREATED, FINISHED, FORBIDDEN_ERROR, INCIDENT_ID_HEADER, DENIAL_KIND_HEADER,
-  ACCESS_DENIED_KIND, OK, SERVER_ERROR, UNAUTHORIZED_ERROR,
-} from '../consts.js'
-import { ResilientError } from '@owlmeans/error'
-import { ApiClientError, ApiStatusError, ServerAuthError, ServerCrashedError } from '../errors.js'
-import { isIncidentBody } from '../status/index.js'
-import type { ResponseStatusCarrier } from '../status/index.js'
-import { logger } from '@owlmeans/log'
-
-const log = logger('api')
-
-export const processResponse = (response: AxiosResponse, reply: AbstractResponse<any>) => {
-  switch (response.status) {
-    case OK:
-      reply.resolve(response.data, EntrypointOutcome.Ok)
-      return
-    case ACCEPTED:
-      reply.resolve(response.data, EntrypointOutcome.Accepted)
-      return
-    case CREATED:
-      return processEmptyResponse(response, reply, EntrypointOutcome.Created)
-    case FINISHED:
-      return processEmptyResponse(response, reply, EntrypointOutcome.Finished)
-    default:
-      // A refusal is ordinary traffic (401, 403, 409, 428): debug, and never the headers.
-      log.debug('Request answered with a failure', {
-        status: response.status, statusText: response.statusText, url: response.config?.url,
-        incidentId: headerOf(response.headers, INCIDENT_ID_HEADER),
-      })
-
-      reply.reject(failureOf(response))
-  }
-}
-
-/**
- * The error a non-2xx answer rejects with — always carrying the HTTP status and, when the server
- * sent one, its incident id.
- *
- * A development body is the marshaled `ResilientError`: it is rebuilt into its own class and
- * stamped with `responseStatus`. Anything else — the bare incident id of a production body, a
- * proxy's HTML, a framework's JSON — becomes the status error of {@link statusError}.
- */
-const failureOf = (response: AxiosResponse): Error => {
-  const incidentId = headerOf(response.headers, INCIDENT_ID_HEADER)
-    ?? (isIncidentBody(response.data) ? response.data.trim() : undefined)
-  const denialKind = response.status === FORBIDDEN_ERROR
-    && headerOf(response.headers, DENIAL_KIND_HEADER) === ACCESS_DENIED_KIND
-    ? ACCESS_DENIED_KIND : undefined
-
-  if (typeof response.data === 'string' && response.data.includes(ResilientError.separator)) {
-    try {
-      const error = ResilientError.ensure(response.data, true)
-      error.incidentId ??= incidentId
-      Object.assign(error, {
-        responseStatus: response.status, denialKind,
-      } satisfies ResponseStatusCarrier)
-
-      return error
-    } catch {
-      log.warn('Server returned an unrecognizable text error', { status: response.status, body: response.data })
-    }
-  }
-
-  return Object.assign(statusError(response.status, incidentId), { denialKind })
-}
-
-/**
- * The typed error of a bare status: `ServerCrashedError` (500), `ServerAuthError` (401),
- * `ApiClientError('forbidden[:<id>]')` (403), `ApiStatusError` (`api:client:status:<n>[:<id>]`)
- * for every other one.
- */
-export const statusError = (status: number, incidentId?: string): ApiClientError => {
-  const error = status === SERVER_ERROR ? new ServerCrashedError(incidentId)
-    : status === UNAUTHORIZED_ERROR ? new ServerAuthError(incidentId)
-      : status === FORBIDDEN_ERROR ? new ApiClientError(incidentId != null ? `forbidden:${incidentId}` : 'forbidden')
-        : new ApiStatusError(status, incidentId)
-  if (incidentId != null) {
-    error.incidentId = incidentId
-  }
-
-  return Object.assign(error, { responseStatus: status } satisfies ResponseStatusCarrier)
-}
-
-/** One response header, from an `AxiosHeaders` instance or a plain header object alike. */
-const headerOf = (headers: unknown, name: string): string | undefined => {
-  if (headers == null || typeof headers !== 'object') {
-    return undefined
-  }
-  const get = (headers as { get?: unknown }).get
-  const viaGet = typeof get === 'function' ? get.call(headers, name) : undefined
-  const value = viaGet ?? Object.entries(headers).find(([key]) => key.toLowerCase() === name.toLowerCase())?.[1]
-  const first = Array.isArray(value) ? value[0] : value
-
-  return typeof first === 'string' && first.trim() !== '' ? first.trim() : undefined
-}
-
-const processEmptyResponse = (response: AxiosResponse, reply: AbstractResponse<any>, outcome: EntrypointOutcome) => {
-  if (response.data != null && response.data != '') {
-    reply.resolve(response.data, outcome)
-    return
-  }
-  if (response.headers.toJSON != null && typeof response.headers.toJSON === 'function') {
-    reply.resolve(response.headers.toJSON(), outcome)
-    return
-  }
-  reply.resolve(response.headers, outcome)
-}