@k03mad/request 1.3.3 → 2.1.0

package/app/lib/request.js

@@ -8,31 +8,11 @@ import getQueue from './queue.js';
 const {blue, cyan, dim, green, red, yellow} = chalk;
 const debug = _debug('mad:request');
 
-/**
- * @param {object} opts
- * @returns {object}
- */
-const prepareRequestOpts = (opts = {}) => {
-    const UA = 'curl/8.1.2';
-
-    const preparedOpts = {...opts};
-
-    if (preparedOpts.dnsCache === undefined) {
-        preparedOpts.dnsCache = true;
-    }
-
-    if (!preparedOpts.timeout) {
-        preparedOpts.timeout = {request: 15_000};
-    }
-
-    if (!preparedOpts.headers) {
-        preparedOpts.headers = {'user-agent': UA};
-    } else if (!preparedOpts.headers['user-agent']) {
-        preparedOpts.headers['user-agent'] = UA;
-    }
-
-    return preparedOpts;
-};
+const gotDefault = got.extend({
+    dnsCache: true,
+    timeout: {request: 15_000},
+    headers: {'user-agent': 'curl/8.1.2'},
+});
 
 /**
  * Отправить запрос
@@ -41,40 +21,39 @@ const prepareRequestOpts = (opts = {}) => {
  * @returns {object}
  */
 const sendRequest = async (url, opts) => {
-    const preparedOpts = prepareRequestOpts(opts);
-
     try {
-        const response = await got(url, preparedOpts);
+        const response = await gotDefault(url, opts);
 
-        if (!preparedOpts.responseType) {
+        if (!opts.responseType) {
             try {
                 response.body = JSON.parse(response.body);
             } catch {}
         }
 
-        debug(getCurl(url, preparedOpts, response));
+        debug(getCurl(url, opts, response));
         return response;
     } catch (err) {
-        debug(getCurl(url, preparedOpts, err));
+        debug(getCurl(url, opts, err));
 
-        err.__pretty = {};
-
-        err.__pretty.req = [
-            err?.response?.statusCode,
+        err.__req = [
+            err?.response?.statusCode || err?.code,
             err?.options?.method,
             url,
-            err?.response?.ip ? `(${err.response.ip})` : '',
-        ].join(' ');
+        ].join(' ').trim();
+
+        if (err?.response?.ip) {
+            err.__ip = err.response.ip;
+        }
 
         if (Object.keys(opts).length > 0) {
-            err.__pretty.opts = opts;
+            err.__opts = opts;
         }
 
         if (err?.response?.body) {
             try {
-                err.__pretty.body = JSON.parse(err.response.body);
+                err.__res = JSON.parse(err.response.body);
             } catch {
-                err.__pretty.body = err.response.body;
+                err.__res = err.response.body;
             }
         }
 
@@ -117,8 +96,6 @@ export const requestCache = (url, opts = {}, {cacheBy, expire = 43_200} = {}) =>
     const queue = getQueue(new URL(url).host, opts.method);
 
     return queue.add(async () => {
-        const preparedOpts = prepareRequestOpts(opts);
-
         const cacheGotResponseKeys = [
             'body',
             'headers',
@@ -128,7 +105,7 @@ export const requestCache = (url, opts = {}, {cacheBy, expire = 43_200} = {}) =>
             'timings',
         ];
 
-        const cacheKey = `${url}::${JSON.stringify(cacheBy || preparedOpts)}`;
+        const cacheKey = `${url}::${JSON.stringify(cacheBy || opts)}`;
         const log = `${blue(url)}\n${dim(cacheKey)}`;
 
         try {
@@ -151,7 +128,7 @@ export const requestCache = (url, opts = {}, {cacheBy, expire = 43_200} = {}) =>
             debug(`${red('CACHE ERROR')} :: ${dim(err)} :: ${log}`);
         }
 
-        const res = await request(url, preparedOpts, {skipQueue: true});
+        const res = await request(url, opts, {skipQueue: true});
 
         const cachedResponse = {};
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k03mad/request",
-  "version": "1.3.3",
+  "version": "2.1.0",
   "description": "Request library",
   "maintainers": [
     "Kirill Molchanov <k03.mad@gmail.com"

package/.github/workflows/publish.yml

@@ -1,41 +0,0 @@
-name: Publish
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '**.js'
-
-jobs:
-  eslint:
-    name: Publish
-    environment: npm
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install NodeJS
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Set credentials
-        run: git config user.email "auto@action.autoaction_1" && git config user.name "Action"
-
-      - name: Update version
-        run: npm version patch
-
-      - name: Publish version
-        uses: JS-DevTools/npm-publish@v2
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-
-      - name: Create PR
-        uses: peter-evans/create-pull-request@v5
-        with:
-          title: Patch package version