@k03mad/request 5.1.1 → 5.3.0

package/app/lib/curl.js

@@ -1,81 +1,119 @@
 import chalk from 'chalk';
 import prettyBytes from 'pretty-bytes';
 
-const {bgWhite, black, blue, dim, green, magenta, red, white, yellow} = chalk;
+const {
+    bgGreen,
+    bgRed,
+    bgWhite,
+    bgYellow,
+    black,
+    blue,
+    bold,
+    cyan,
+    dim,
+    gray,
+    green,
+    magenta,
+    yellow,
+} = chalk;
+
+const MIN_RESPONSE_SYM_LENGTH_TO_PRINT = 2000;
+
+const SKIP_HEADERS = new Set(['accept-encoding: gzip, deflate, br']);
 
 /**
- * @param {string} url
+ * @param {object} res
  * @param {object} [opts]
- * @param {string} [opts.method]
- * @param {object} [opts.headers]
  * @param {string} [opts.body]
  * @param {object} [opts.json]
  * @param {object} [opts.form]
- * @param {object} [opts.searchParams]
- * @param {string} [opts.username]
- * @param {string} [opts.password]
- * @param {object} res
+ * @param {object} [params]
+ * @param {boolean} [params.skipResponse]
  * @returns {string}
  */
-export default (url, {
-    body, form,
-    headers = {}, json, method = 'GET', password,
-    searchParams, username,
-}, res) => {
+export default (res, {body, form, json}, {skipResponse} = {}) => {
     const msg = [];
 
-    const fullUrl = searchParams
-        ? `${url}?${new URLSearchParams(searchParams).toString()}`
-        : url;
-
     const response = res?.response || res;
+    const reqOptions = response.request?.options;
 
+    // some info before curl
     if (response.statusCode) {
-        msg.push(bgWhite(black(response.statusCode)));
+        const statusCodeStringify = String(response.statusCode);
+        let bgColor = bgWhite;
+
+        if ((/^(1|2)/).test(statusCodeStringify)) {
+            bgColor = bgGreen;
+        } else if (statusCodeStringify.startsWith('3')) {
+            bgColor = bgYellow;
+        } else if ((/^(4|5)/).test(statusCodeStringify)) {
+            bgColor = bgRed;
+        }
+
+        msg.push(bgColor(black(bold(response.statusCode))));
     }
 
-    if (response.timings) {
-        msg.push(`[${response.timings.phases.total} ms]`);
+    if (response.timings?.phases?.total) {
+        msg.push(gray(`[response: ${response.timings.phases.total} ms]`));
     }
 
     if (response.headers?.['content-length']) {
-        msg.push(`[${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}]`));
     }
 
-    msg.push(white('curl -v -X'), green(method));
+    // begin verbose curl with method and url
+    msg.push('\ncurl -v');
+
+    if (reqOptions?.method) {
+        msg.push(cyan(`-X ${reqOptions.method}`));
+    }
 
-    if (username && password) {
-        msg.push(dim(red(`-u ${username}:${password}`)));
+    if (reqOptions?.url) {
+        msg.push(blue(reqOptions.url));
     }
 
-    msg.push(blue(fullUrl));
+    // headers
+    const headersParams = Object.entries(response.request?.options?.headers || {});
+
+    if (headersParams.length > 0) {
+        const headersStringify = headersParams
+            .map(([key, value]) => {
+                const keyValue = `${key}: ${value}`;
+
+                if (!SKIP_HEADERS.has(keyValue)) {
+                    return `-H "${keyValue}"`;
+                }
+            })
+            .filter(Boolean)
+            .join(' ');
+
+        msg.push(dim(magenta(headersStringify)));
+    }
 
+    // body flags and formatted data
     let bodyParams;
 
     if (json) {
-        headers['content-type'] = 'application/json';
         bodyParams = `-d '${JSON.stringify(json)}'`;
     } else if (form) {
-        headers['content-type'] = 'application/x-www-form-urlencoded';
         bodyParams = `-d '${new URLSearchParams(form).toString()}'`;
     } else if (body) {
         bodyParams = `-d '${body}'`;
     }
 
-    const headersParams = Object.entries(headers);
-
-    if (headersParams.length > 0) {
-        msg.push(dim(magenta(headersParams.map(([key, value]) => `-H "${key}: ${value}"`).join(' '))));
-    }
-
     if (bodyParams) {
         msg.push(dim(yellow(bodyParams)));
     }
 
-    if (response) {
+    // response if any and small length
+    if (!skipResponse && response) {
         const message = JSON.stringify(response.body || response.message);
 
-        if (message?.length < 1500) {
+        if (message?.length < MIN_RESPONSE_SYM_LENGTH_TO_PRINT) {
             msg.push(`\n${dim(green(message))}`);
         }
     }

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,36 +41,33 @@ 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 {}
         }
 
-        debug(getCurl(url, opts, response));
+        debug(getCurl(response, opts));
         return response;
     } catch (err) {
-        debug(getCurl(url, opts, err));
-
-        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.1.1",
+  "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.3",
+    "@k03mad/eslint-config": "17.13.0",
     "eslint": "8.56.0",
     "husky": "8.0.3"
   },