@jayfong/x-request 2.12.14 → 2.12.16

package/lib/_cjs/index.js

@@ -1,44 +1,29 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 exports.__esModule = true;
 exports.XRequestFormUrlencoded = exports.XRequestFormStream = exports.XRequestFormFile = exports.XRequestFormData = exports.XRequest = void 0;
-
 var _assert = _interopRequireDefault(require("assert"));
-
 var _formData = _interopRequireDefault(require("form-data"));
-
 var _formstream = _interopRequireDefault(require("formstream"));
-
 var _fs = _interopRequireDefault(require("fs"));
-
 var _got = _interopRequireDefault(require("got"));
-
 var _vtils = require("vtils");
-
 var _proxyAgent = require("proxy-agent");
-
 var _stream = require("stream");
-
 class XRequestFormUrlencoded extends URLSearchParams {}
-
 exports.XRequestFormUrlencoded = XRequestFormUrlencoded;
-
 class XRequestFormData extends _formData.default {
   constructor(cbOrObject) {
     super();
-
     if (cbOrObject) {
       if (typeof cbOrObject === 'function') {
         cbOrObject(this);
       } else {
         Object.keys(cbOrObject).forEach(key => {
           const value = cbOrObject[key];
-
           if (value instanceof XRequestFormFile) {
             var _value$options, _value$options2;
-
             this.append(key, typeof value.file === 'string' ? _fs.default.createReadStream(value.file) : value.file, {
               filename: (_value$options = value.options) == null ? void 0 : _value$options.name,
               contentType: (_value$options2 = value.options) == null ? void 0 : _value$options2.type
@@ -50,26 +35,20 @@ class XRequestFormData extends _formData.default {
       }
     }
   }
-
 }
-
 exports.XRequestFormData = XRequestFormData;
-
 class XRequestFormStream extends _formstream.default {
   constructor(cbOrObject) {
     super();
-
     if (cbOrObject) {
       if (typeof cbOrObject === 'function') {
         cbOrObject(this);
       } else {
         Object.keys(cbOrObject).forEach(key => {
           const value = cbOrObject[key];
-
           if (value instanceof XRequestFormFile) {
             if (typeof value.file === 'string') {
               var _value$options3;
-
               this.file(key, value.file, (_value$options3 = value.options) == null ? void 0 : _value$options3.name);
             } else if (Buffer.isBuffer(value.file)) {
               this.buffer(key, value.file, value.options.name, value.options.type);
@@ -83,29 +62,21 @@ class XRequestFormStream extends _formstream.default {
       }
     }
   }
-
 }
-
 exports.XRequestFormStream = XRequestFormStream;
-
 class XRequestFormFile {
   constructor(file, options) {
     this.file = file;
     this.options = options;
-
     if (Buffer.isBuffer(file) || file instanceof _stream.Readable) {
       (0, _assert.default)(options == null ? void 0 : options.name, 'options.name is required');
     }
   }
-
 }
-
 exports.XRequestFormFile = XRequestFormFile;
-
 class XRequest {
   static getGotOptions(options, responseType) {
     var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-
     const gotOptions = {
       url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
@@ -114,19 +85,15 @@ class XRequest {
       },
       isStream: responseType === 'stream'
     };
-
     if (options.headers) {
       gotOptions.headers = options.headers;
     }
-
     if (options.followRedirect != null) {
       gotOptions.followRedirect = options.followRedirect;
     }
-
     if (options.timeoutMs) {
       gotOptions.timeout = options.timeoutMs;
     }
-
     if (options.proxyUrl) {
       const proxyAgent = new _proxyAgent.ProxyAgent({
         getProxyForUrl: () => options.proxyUrl
@@ -137,58 +104,46 @@ class XRequest {
         http2: proxyAgent
       };
     }
-
     if (options.cookieJar) {
       gotOptions.cookieJar = options.cookieJar;
-    } // 头处理
-
+    }
 
+    // 头处理
     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;
     }
-
     return gotOptions;
   }
-
   static getRaw(options, responseType) {
     let url = options.url;
-
     if (options.data) {
       const _url = new URL(url);
-
       Object.keys(options.data).forEach(key => {
         _url.searchParams.set(key, options.data[key]);
       });
       url = _url.toString();
     }
-
     options.url = url;
     const res = (0, _got.default)({
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
-
     if (responseType === 'stream') {
       return res;
     }
-
     return res.then(res => ({
       status: res.statusCode,
       headers: res.headers,
       data: res.body
     }));
   }
-
   static postRaw(options, responseType) {
     const gotOptions = this.getGotOptions(options, responseType || 'buffer');
-
     if (responseType === 'stream' && options.data instanceof _formstream.default) {
       gotOptions.headers = options.data.headers(gotOptions.headers);
     }
-
     const res = (0, _got.default)({
       method: 'POST',
       ...(options.data == null ? {
@@ -202,104 +157,84 @@ class XRequest {
       }),
       ...gotOptions
     });
-
     if (responseType === 'stream' && options.data instanceof _formstream.default) {
       options.data.pipe(res);
     }
-
     if (responseType === 'stream') {
       return res;
     }
-
     return res.then(res => ({
       status: res.statusCode,
       headers: res.headers,
       data: res.body
     }));
   }
-
   static async getText(options) {
     return this.getRaw(options, 'text');
   }
-
   static async postText(options) {
     return this.postRaw(options, 'text');
   }
-
   static async get(options) {
     return this.getRaw(options, 'json');
   }
-
   static async post(options) {
     return this.postRaw(options, 'json');
   }
-
   static getStream(options) {
     return this.getRaw(options, 'stream');
   }
-
   static postStream(options) {
     return this.postRaw(options, 'stream');
   }
-
   static isTimeoutError(err) {
     return err instanceof _got.default.TimeoutError;
   }
-
   constructor(options) {
     this.options = options;
   }
-
   getRaw(options, responseType) {
     var _this$options;
-
-    return XRequest.getRaw({ ...this.options,
+    return XRequest.getRaw({
+      ...this.options,
       ...options,
-      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
+      headers: {
+        ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
         ...options.headers
       }
     }, responseType);
   }
-
   postRaw(options, responseType) {
     var _this$options2;
-
-    return XRequest.postRaw({ ...this.options,
+    return XRequest.postRaw({
+      ...this.options,
       ...options,
-      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
+      headers: {
+        ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
         ...options.headers
       }
     }, responseType);
   }
-
   async getText(options) {
     return this.getRaw(options, 'text');
   }
-
   async postText(options) {
     return this.postRaw(options, 'text');
   }
-
   async get(options) {
     return this.getRaw(options, 'json');
   }
-
   async post(options) {
     return this.postRaw(options, 'json');
   }
-
   getStream(options) {
     return this.getRaw(options, 'stream');
   }
-
   postStream(options) {
     return this.postRaw(options, 'stream');
   }
-
   isTimeoutError(err) {
     return XRequest.isTimeoutError(err);
   }
-
 }
-
 exports.XRequest = XRequest;

package/lib/index.js

@@ -10,17 +10,14 @@ export class XRequestFormUrlencoded extends URLSearchParams {}
 export class XRequestFormData extends FormData {
   constructor(cbOrObject) {
     super();
-
     if (cbOrObject) {
       if (typeof cbOrObject === 'function') {
         cbOrObject(this);
       } else {
         Object.keys(cbOrObject).forEach(key => {
           const value = cbOrObject[key];
-
           if (value instanceof XRequestFormFile) {
             var _value$options, _value$options2;
-
             this.append(key, typeof value.file === 'string' ? fs.createReadStream(value.file) : value.file, {
               filename: (_value$options = value.options) == null ? void 0 : _value$options.name,
               contentType: (_value$options2 = value.options) == null ? void 0 : _value$options2.type
@@ -32,23 +29,19 @@ export class XRequestFormData extends FormData {
       }
     }
   }
-
 }
 export class XRequestFormStream extends FormStream {
   constructor(cbOrObject) {
     super();
-
     if (cbOrObject) {
       if (typeof cbOrObject === 'function') {
         cbOrObject(this);
       } else {
         Object.keys(cbOrObject).forEach(key => {
           const value = cbOrObject[key];
-
           if (value instanceof XRequestFormFile) {
             if (typeof value.file === 'string') {
               var _value$options3;
-
               this.file(key, value.file, (_value$options3 = value.options) == null ? void 0 : _value$options3.name);
             } else if (Buffer.isBuffer(value.file)) {
               this.buffer(key, value.file, value.options.name, value.options.type);
@@ -62,23 +55,19 @@ export class XRequestFormStream extends FormStream {
       }
     }
   }
-
 }
 export class XRequestFormFile {
   constructor(file, options) {
     this.file = file;
     this.options = options;
-
     if (Buffer.isBuffer(file) || file instanceof Readable) {
       assert(options == null ? void 0 : options.name, 'options.name is required');
     }
   }
-
 }
 export class XRequest {
   static getGotOptions(options, responseType) {
     var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-
     const gotOptions = {
       url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
@@ -87,19 +76,15 @@ export class XRequest {
       },
       isStream: responseType === 'stream'
     };
-
     if (options.headers) {
       gotOptions.headers = options.headers;
     }
-
     if (options.followRedirect != null) {
       gotOptions.followRedirect = options.followRedirect;
     }
-
     if (options.timeoutMs) {
       gotOptions.timeout = options.timeoutMs;
     }
-
     if (options.proxyUrl) {
       const proxyAgent = new ProxyAgent({
         getProxyForUrl: () => options.proxyUrl
@@ -110,58 +95,46 @@ export class XRequest {
         http2: proxyAgent
       };
     }
-
     if (options.cookieJar) {
       gotOptions.cookieJar = options.cookieJar;
-    } // 头处理
-
+    }
 
+    // 头处理
     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;
     }
-
     return gotOptions;
   }
-
   static getRaw(options, responseType) {
     let url = options.url;
-
     if (options.data) {
       const _url = new URL(url);
-
       Object.keys(options.data).forEach(key => {
         _url.searchParams.set(key, options.data[key]);
       });
       url = _url.toString();
     }
-
     options.url = url;
     const res = got({
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
-
     if (responseType === 'stream') {
       return res;
     }
-
     return res.then(res => ({
       status: res.statusCode,
       headers: res.headers,
       data: res.body
     }));
   }
-
   static postRaw(options, responseType) {
     const gotOptions = this.getGotOptions(options, responseType || 'buffer');
-
     if (responseType === 'stream' && options.data instanceof FormStream) {
       gotOptions.headers = options.data.headers(gotOptions.headers);
     }
-
     const res = got({
       method: 'POST',
       ...(options.data == null ? {
@@ -175,102 +148,83 @@ export class XRequest {
       }),
       ...gotOptions
     });
-
     if (responseType === 'stream' && options.data instanceof FormStream) {
       options.data.pipe(res);
     }
-
     if (responseType === 'stream') {
       return res;
     }
-
     return res.then(res => ({
       status: res.statusCode,
       headers: res.headers,
       data: res.body
     }));
   }
-
   static async getText(options) {
     return this.getRaw(options, 'text');
   }
-
   static async postText(options) {
     return this.postRaw(options, 'text');
   }
-
   static async get(options) {
     return this.getRaw(options, 'json');
   }
-
   static async post(options) {
     return this.postRaw(options, 'json');
   }
-
   static getStream(options) {
     return this.getRaw(options, 'stream');
   }
-
   static postStream(options) {
     return this.postRaw(options, 'stream');
   }
-
   static isTimeoutError(err) {
     return err instanceof got.TimeoutError;
   }
-
   constructor(options) {
     this.options = options;
   }
-
   getRaw(options, responseType) {
     var _this$options;
-
-    return XRequest.getRaw({ ...this.options,
+    return XRequest.getRaw({
+      ...this.options,
       ...options,
-      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
+      headers: {
+        ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
         ...options.headers
       }
     }, responseType);
   }
-
   postRaw(options, responseType) {
     var _this$options2;
-
-    return XRequest.postRaw({ ...this.options,
+    return XRequest.postRaw({
+      ...this.options,
       ...options,
-      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
+      headers: {
+        ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
         ...options.headers
       }
     }, responseType);
   }
-
   async getText(options) {
     return this.getRaw(options, 'text');
   }
-
   async postText(options) {
     return this.postRaw(options, 'text');
   }
-
   async get(options) {
     return this.getRaw(options, 'json');
   }
-
   async post(options) {
     return this.postRaw(options, 'json');
   }
-
   getStream(options) {
     return this.getRaw(options, 'stream');
   }
-
   postStream(options) {
     return this.postRaw(options, 'stream');
   }
-
   isTimeoutError(err) {
     return XRequest.isTimeoutError(err);
   }
-
 }

package/package.json

@@ -1,9 +1,6 @@
 {
   "name": "@jayfong/x-request",
-  "version": "2.12.14",
-  "publishConfig": {
-    "access": "public"
-  },
+  "version": "2.12.16",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -24,7 +21,10 @@
     "vtils": "^4.85.3"
   },
   "devDependencies": {
-    "get-port": "^7.0.0",
+    "get-port": "^5.1.1",
     "proxy": "^2.1.1"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }