@marianmeres/http-utils 1.5.0 → 1.6.0

package/dist/error.d.ts

@@ -2,6 +2,7 @@ declare class HttpError extends Error {
     name: string;
     status: number;
     statusText: string;
+    body: any;
 }
 declare class BadRequest extends HttpError {
     name: string;
@@ -82,5 +83,5 @@ export declare const HTTP_ERROR: {
     BadGateway: typeof BadGateway;
     ServiceUnavailable: typeof ServiceUnavailable;
 };
-export declare const createHttpError: (code: number | string, message?: string | null, cause?: any) => BadRequest | Unauthorized | Forbidden | NotFound | MethodNotAllowed | RequestTimeout | Conflict | Gone | ImATeapot | InternalServerError | NotImplemented | BadGateway | ServiceUnavailable;
+export declare const createHttpError: (code: number | string, message?: string | null, body?: string | null, cause?: any) => BadRequest | Unauthorized | Forbidden | NotFound | MethodNotAllowed | RequestTimeout | Conflict | Gone | ImATeapot | InternalServerError | NotImplemented | BadGateway | ServiceUnavailable;
 export {};

package/dist/index.cjs

@@ -106,8 +106,10 @@ class HTTP_STATUS {
 // opinionated base for all
 class HttpError extends Error {
     name = 'HttpError';
+    // props simulating fetch Response
     status = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR.CODE;
     statusText = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR.TEXT;
+    body = null;
 }
 // some more specific instances of the well known ones...
 // client
@@ -212,8 +214,11 @@ const _wellKnownCtorMap = {
     '503': ServiceUnavailable,
 };
 const createHttpError = (code, message, 
+// arbitrary content, typically http response body which threw this error
+// (will be JSON.parse-d if the content is a valid json string)
+body, 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause
-// arbitrary details, typically response text (will be JSON.parse-d if text is valid json string)
+// arbitrary details, typically response text (will be JSON.parse-d if text is a valid json string)
 cause) => {
     const fallback = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR;
     code = Number(code);
@@ -222,6 +227,14 @@ cause) => {
     const found = HTTP_STATUS.findByCode(code);
     const statusText = found?.TEXT ?? fallback.TEXT;
     // opinionated convention
+    if (typeof body === 'string') {
+        // prettier-ignore
+        try {
+            body = JSON.parse(body);
+        }
+        catch (e) { }
+    }
+    // opinionated convention
     if (typeof cause === 'string') {
         // prettier-ignore
         try {
@@ -234,6 +247,7 @@ cause) => {
     let e = new ctor(message || statusText, { cause });
     e.status = found?.CODE ?? fallback.CODE;
     e.statusText = statusText;
+    e.body = body;
     return e;
 };
 
@@ -267,14 +281,13 @@ const _fetch = async (params, respHeaders = null, _dumpParams = false) => {
     const r = await _fetchRaw(params);
     if (params.raw)
         return r;
+    //
+    const headers = [...r.headers.entries()].reduce((m, [k, v]) => ({ ...m, [k]: v }), {});
     // quick-n-dirty reference to headers (so it's still accessible over this api wrap)
     if (respHeaders) {
-        Object.assign(respHeaders, [...r.headers.entries()].reduce((m, [k, v]) => ({ ...m, [k]: v }), {}), 
+        Object.assign(respHeaders, { ...headers }, 
         // adding status/text under special keys
-        {
-            __http_status_code__: r.status,
-            __http_status_text__: r.statusText,
-        });
+        { __http_status_code__: r.status, __http_status_text__: r.statusText });
     }
     let body = await r.text();
     // prettier-ignore
@@ -284,7 +297,15 @@ const _fetch = async (params, respHeaders = null, _dumpParams = false) => {
     catch (e) { }
     params.assert ??= true; // default is true
     if (!r.ok && params.assert) {
-        throw createHttpError(r.status, null, body);
+        throw createHttpError(r.status, null, body, {
+            method: params.method,
+            path: params.path,
+            response: {
+                status: r.status,
+                statusText: r.statusText,
+                headers,
+            },
+        });
     }
     return body;
 };

package/dist/index.js

@@ -104,8 +104,10 @@ class HTTP_STATUS {
 // opinionated base for all
 class HttpError extends Error {
     name = 'HttpError';
+    // props simulating fetch Response
     status = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR.CODE;
     statusText = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR.TEXT;
+    body = null;
 }
 // some more specific instances of the well known ones...
 // client
@@ -210,8 +212,11 @@ const _wellKnownCtorMap = {
     '503': ServiceUnavailable,
 };
 const createHttpError = (code, message, 
+// arbitrary content, typically http response body which threw this error
+// (will be JSON.parse-d if the content is a valid json string)
+body, 
 // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause
-// arbitrary details, typically response text (will be JSON.parse-d if text is valid json string)
+// arbitrary details, typically response text (will be JSON.parse-d if text is a valid json string)
 cause) => {
     const fallback = HTTP_STATUS.ERROR_SERVER.INTERNAL_SERVER_ERROR;
     code = Number(code);
@@ -220,6 +225,14 @@ cause) => {
     const found = HTTP_STATUS.findByCode(code);
     const statusText = found?.TEXT ?? fallback.TEXT;
     // opinionated convention
+    if (typeof body === 'string') {
+        // prettier-ignore
+        try {
+            body = JSON.parse(body);
+        }
+        catch (e) { }
+    }
+    // opinionated convention
     if (typeof cause === 'string') {
         // prettier-ignore
         try {
@@ -232,6 +245,7 @@ cause) => {
     let e = new ctor(message || statusText, { cause });
     e.status = found?.CODE ?? fallback.CODE;
     e.statusText = statusText;
+    e.body = body;
     return e;
 };
 
@@ -265,14 +279,13 @@ const _fetch = async (params, respHeaders = null, _dumpParams = false) => {
     const r = await _fetchRaw(params);
     if (params.raw)
         return r;
+    //
+    const headers = [...r.headers.entries()].reduce((m, [k, v]) => ({ ...m, [k]: v }), {});
     // quick-n-dirty reference to headers (so it's still accessible over this api wrap)
     if (respHeaders) {
-        Object.assign(respHeaders, [...r.headers.entries()].reduce((m, [k, v]) => ({ ...m, [k]: v }), {}), 
+        Object.assign(respHeaders, { ...headers }, 
         // adding status/text under special keys
-        {
-            __http_status_code__: r.status,
-            __http_status_text__: r.statusText,
-        });
+        { __http_status_code__: r.status, __http_status_text__: r.statusText });
     }
     let body = await r.text();
     // prettier-ignore
@@ -282,7 +295,15 @@ const _fetch = async (params, respHeaders = null, _dumpParams = false) => {
     catch (e) { }
     params.assert ??= true; // default is true
     if (!r.ok && params.assert) {
-        throw createHttpError(r.status, null, body);
+        throw createHttpError(r.status, null, body, {
+            method: params.method,
+            path: params.path,
+            response: {
+                status: r.status,
+                statusText: r.statusText,
+                headers,
+            },
+        });
     }
     return body;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@marianmeres/http-utils",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"description": "Misc DRY http fetch related helpers",
 	"type": "module",
 	"main": "./dist/index.cjs",