@k03mad/request 5.2.0 → 5.3.0

package/app/lib/curl.js

@@ -27,9 +27,11 @@ const SKIP_HEADERS = new Set(['accept-encoding: gzip, deflate, br']);
  * @param {string} [opts.body]
  * @param {object} [opts.json]
  * @param {object} [opts.form]
+ * @param {object} [params]
+ * @param {boolean} [params.skipResponse]
  * @returns {string}
  */
-export default (res, {body, form, json}) => {
+export default (res, {body, form, json}, {skipResponse} = {}) => {
     const msg = [];
 
     const response = res?.response || res;
@@ -52,15 +54,19 @@ export default (res, {body, form, json}) => {
     }
 
     if (response.timings?.phases?.total) {
-        msg.push(gray(`[${response.timings.phases.total} ms]`));
+        msg.push(gray(`[response: ${response.timings.phases.total} ms]`));
     }
 
     if (response.headers?.['content-length']) {
-        msg.push(gray(`[${prettyBytes(Number(response.headers['content-length']))}]`));
+        msg.push(gray(`[content: ${prettyBytes(Number(response.headers['content-length']))}]`));
+    }
+
+    if (response.ip) {
+        msg.push(gray(`[host: ${response.ip}]`));
     }
 
     // begin verbose curl with method and url
-    msg.push('curl -v');
+    msg.push('\ncurl -v');
 
     if (reqOptions?.method) {
         msg.push(cyan(`-X ${reqOptions.method}`));
@@ -104,7 +110,7 @@ export default (res, {body, form, json}) => {
     }
 
     // response if any and small length
-    if (response) {
+    if (!skipResponse && response) {
         const message = JSON.stringify(response.body || response.message);
 
         if (message?.length < MIN_RESPONSE_SYM_LENGTH_TO_PRINT) {

package/app/lib/request.js

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import _debug from 'debug';
 import got from 'got';
+import stripAnsi from 'strip-ansi';
 
 import getCurl from './curl.js';
 import getQueue from './queue.js';
@@ -40,7 +41,7 @@ const sendRequest = async (url, opts) => {
     try {
         const response = await gotDefaultOpts(url, opts);
 
-        if (!opts.responseType) {
+        if (!opts.responseType && response.body) {
             try {
                 response.body = JSON.parse(response.body);
             } catch {}
@@ -49,27 +50,24 @@ const sendRequest = async (url, opts) => {
         debug(getCurl(response, opts));
         return response;
     } catch (err) {
-        debug(getCurl(err, opts));
-
-        err.__req = [
-            err?.response?.statusCode || err?.code,
-            err?.options?.method,
-            url,
-        ].join(' ').trim();
-
-        if (err?.response?.ip) {
-            err.__ip = err.response.ip;
+        if (!opts.responseType && err.response?.body) {
+            try {
+                err.response.body = JSON.parse(err.response.body);
+            } catch {}
         }
 
-        if (Object.keys(opts).length > 0) {
-            err.__opts = opts;
-        }
+        const curl = getCurl(err, opts, {skipResponse: true});
+        debug(curl);
+
+        err.__ = {
+            debug: stripAnsi(curl).split(' \n'),
+        };
 
         if (err?.response?.body) {
             try {
-                err.__res = JSON.parse(err.response.body);
+                err.__.response = JSON.parse(err.response.body);
             } catch {
-                err.__res = err.response.body;
+                err.__.response = err.response.body;
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/request",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "description": "Request library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"
@@ -17,10 +17,11 @@
     "debug": "4.3.4",
     "got": "14.0.0",
     "p-queue": "8.0.1",
-    "pretty-bytes": "6.1.1"
+    "pretty-bytes": "6.1.1",
+    "strip-ansi": "7.1.0"
   },
   "devDependencies": {
-    "@k03mad/eslint-config": "17.12.5",
+    "@k03mad/eslint-config": "17.13.0",
     "eslint": "8.56.0",
     "husky": "8.0.3"
   },