@jayfong/x-request 2.54.0 → 2.55.0

package/lib/_cjs/index.js

@@ -4,12 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.xr = exports.XRequestFormUrlencoded = exports.XRequestFormStream = exports.XRequestFormFile = exports.XRequestFormData = exports.XRequest = void 0;
 var _assert = _interopRequireDefault(require("assert"));
+var _fs = _interopRequireDefault(require("fs"));
+var _stream = require("stream");
 var _formData = _interopRequireDefault(require("form-data"));
 var _formstream = _interopRequireDefault(require("formstream"));
-var _fs = _interopRequireDefault(require("fs"));
 var _got = _interopRequireDefault(require("got"));
 var _proxyAgent = require("proxy-agent");
-var _stream = require("stream");
 var _vtils = require("vtils");
 class XRequestFormUrlencoded extends URLSearchParams {}
 exports.XRequestFormUrlencoded = XRequestFormUrlencoded;
@@ -93,7 +93,8 @@ class XRequest {
       https: {
         rejectUnauthorized: false
       },
-      isStream: responseType === 'stream'
+      isStream: responseType === 'stream',
+      throwHttpErrors: !options.noThrowHttpErrors
     };
     if (options.headers) {
       gotOptions.headers = options.headers;
@@ -119,10 +120,10 @@ class XRequest {
     }
 
     // 头处理
-    gotOptions.headers = (0, _vtils.mapKeys)(gotOptions.headers || {}, (v, k) => k.toLowerCase());
+    gotOptions.headers = (0, _vtils.mapKeys)(gotOptions.headers || {}, (_v, k) => k.toLowerCase());
     (_gotOptions$headers$_ = (_gotOptions$headers = gotOptions.headers)[_userAgent = 'user-agent']) != null ? _gotOptions$headers$_ : _gotOptions$headers[_userAgent] = (_options$userAgent = options.userAgent) != null ? _options$userAgent : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36';
-    if (options.autoReferer && gotOptions.headers['referer'] == null) {
-      gotOptions.headers['referer'] = options.url;
+    if (options.autoReferer && gotOptions.headers.referer == null) {
+      gotOptions.headers.referer = options.url;
     }
     return gotOptions;
   }

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { Readable } from 'stream';
 import FormData from 'form-data';
 import FormStream from 'formstream';
 import Request from 'got/dist/source/core';
-import { Readable } from 'stream';
 import { CookieJar } from 'tough-cookie';
 import { OmitStrict } from 'vtils/types';
 export interface XRequestOptions {
@@ -70,6 +70,12 @@ export interface XRequestOptions {
      * @default false
      */
     autoReferer?: boolean;
+    /**
+     * 是否不抛出 HTTP 错误
+     *
+     * @default false
+     */
+    noThrowHttpErrors?: boolean;
 }
 export interface XRequestResponse<T> {
     status: number;

package/lib/index.js

@@ -1,10 +1,10 @@
 import assert from 'assert';
+import fs from 'fs';
+import { Readable } from 'stream';
 import FormData from 'form-data';
 import FormStream from 'formstream';
-import fs from 'fs';
 import got from 'got';
 import { ProxyAgent } from 'proxy-agent';
-import { Readable } from 'stream';
 import { mapKeys } from 'vtils';
 export class XRequestFormUrlencoded extends URLSearchParams {}
 export class XRequestFormData extends FormData {
@@ -84,7 +84,8 @@ export class XRequest {
       https: {
         rejectUnauthorized: false
       },
-      isStream: responseType === 'stream'
+      isStream: responseType === 'stream',
+      throwHttpErrors: !options.noThrowHttpErrors
     };
     if (options.headers) {
       gotOptions.headers = options.headers;
@@ -110,10 +111,10 @@ export class XRequest {
     }
 
     // 头处理
-    gotOptions.headers = mapKeys(gotOptions.headers || {}, (v, k) => k.toLowerCase());
+    gotOptions.headers = mapKeys(gotOptions.headers || {}, (_v, k) => k.toLowerCase());
     (_gotOptions$headers$_ = (_gotOptions$headers = gotOptions.headers)[_userAgent = 'user-agent']) != null ? _gotOptions$headers$_ : _gotOptions$headers[_userAgent] = (_options$userAgent = options.userAgent) != null ? _options$userAgent : 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.127 Safari/537.36';
-    if (options.autoReferer && gotOptions.headers['referer'] == null) {
-      gotOptions.headers['referer'] = options.url;
+    if (options.autoReferer && gotOptions.headers.referer == null) {
+      gotOptions.headers.referer = options.url;
     }
     return gotOptions;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-request",
-  "version": "2.54.0",
+  "version": "2.55.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",