@verii/http-client 1.2.0-pre.1783496206.0 → 1.2.0-pre.1783496499.0

package/index.d.ts

@@ -4,6 +4,8 @@ export type HttpRawBody = Dispatcher.ResponseData['body'];
 
 export type HttpCacheStore = InstanceType<typeof cacheStores.MemoryCacheStore>;
 
+export type HttpResponseErrorMode = 'throw' | 'return';
+
 export interface HttpClientContext {
   traceId?: string;
   log?: {
@@ -47,6 +49,7 @@ export interface HttpClientInitOptions {
   isTest?: boolean;
   bearerToken?: string;
   requestTimeout?: number;
+  responseErrorMode?: HttpResponseErrorMode;
   traceIdHeader?: string;
   customHeaders?: Record<string, string>;
   cache?: HttpCacheStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/http-client",
-  "version": "1.2.0-pre.1783496206.0",
+  "version": "1.2.0-pre.1783496499.0",
   "description": "HTTP client for Verii network",
   "repository": "https://github.com/LFDT-Verii/core",
   "main": "index.js",

package/src/client.js

@@ -66,10 +66,8 @@ const initHttpClient = (options) => {
         path,
         method,
         headers: reqHeaders,
+        ...(body ? { body } : {}),
       };
-      if (body) {
-        httpRequest.body = body;
-      }
       const httpResponse = await agent.request(httpRequest);
       const { statusCode, headers: resHeaders, body: rawBody } = httpResponse;
       return {
@@ -172,6 +170,7 @@ const parseOptions = (options) => {
     },
   };
   if (options.requestTimeout != null) {
+    clientOptions.headersTimeout = options.requestTimeout;
     clientOptions.bodyTimeout = options.requestTimeout;
   }
 
@@ -192,6 +191,7 @@ const buildInterceptorChain = (
     clientSecret,
     scopes,
     audience,
+    responseErrorMode = 'throw',
   },
 ) => {
   const chain = [];
@@ -201,7 +201,7 @@ const buildInterceptorChain = (
     );
   }
 
-  chain.push(interceptors.responseError());
+  chain.push(...buildResponseErrorInterceptors(responseErrorMode));
 
   if (cacheStore != null) {
     chain.push(interceptors.cache({ store: cacheStore, methods: ['GET'] }));
@@ -223,6 +223,24 @@ const buildInterceptorChain = (
   return chain;
 };
 
+const buildResponseErrorInterceptors = (responseErrorMode) =>
+  parseResponseErrorMode(responseErrorMode) === 'throw'
+    ? [interceptors.responseError()]
+    : [];
+
+const parseResponseErrorMode = (responseErrorMode) => {
+  if (responseErrorMode == null) {
+    return 'throw';
+  }
+
+  if (responseErrorMode === 'throw' || responseErrorMode === 'return') {
+    return responseErrorMode;
+  }
+  throw new Error(
+    `HttpClient: Unsupported responseErrorMode '${responseErrorMode}'`,
+  );
+};
+
 const parsePrefixUrl = (prefixUrl) => {
   const url = new URL(prefixUrl);
   return {