@jayfong/x-server 2.12.5 → 2.12.7

package/lib/_cjs/services/request.js

@@ -3,26 +3,51 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 exports.__esModule = true;
-exports.RequestService = exports.RequestFormUrlencoded = exports.RequestFormStream = exports.RequestFormData = void 0;
+exports.RequestService = exports.RequestFormUrlencoded = exports.RequestFormStream = exports.RequestFormFile = exports.RequestFormData = 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 RequestFormUrlencoded extends URLSearchParams {}
 
 exports.RequestFormUrlencoded = RequestFormUrlencoded;
 
 class RequestFormData extends _formData.default {
-  constructor(cb) {
+  constructor(cbOrObject) {
     super();
 
-    if (cb) {
-      cb(this);
+    if (cbOrObject) {
+      if (typeof cbOrObject === 'function') {
+        cbOrObject(this);
+      } else {
+        Object.keys(cbOrObject).forEach(key => {
+          const value = cbOrObject[key];
+
+          if (value instanceof RequestFormFile) {
+            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
+            });
+          } else {
+            this.append(key, value);
+          }
+        });
+      }
     }
   }
 
@@ -31,11 +56,31 @@ class RequestFormData extends _formData.default {
 exports.RequestFormData = RequestFormData;
 
 class RequestFormStream extends _formstream.default {
-  constructor(cb) {
+  constructor(cbOrObject) {
     super();
 
-    if (cb) {
-      cb(this);
+    if (cbOrObject) {
+      if (typeof cbOrObject === 'function') {
+        cbOrObject(this);
+      } else {
+        Object.keys(cbOrObject).forEach(key => {
+          const value = cbOrObject[key];
+
+          if (value instanceof RequestFormFile) {
+            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);
+            } else if (value.file instanceof _stream.Readable) {
+              this.stream(key, value.file, value.options.name, value.options.type);
+            }
+          } else {
+            this.field(key, value);
+          }
+        });
+      }
     }
   }
 
@@ -43,16 +88,30 @@ class RequestFormStream extends _formstream.default {
 
 exports.RequestFormStream = RequestFormStream;
 
-class RequestService {
-  constructor(options) {
+class RequestFormFile {
+  constructor(file, options) {
+    this.file = file;
     this.options = options;
-    this.serviceName = 'request';
+
+    if (Buffer.isBuffer(file) || file instanceof _stream.Readable) {
+      (0, _assert.default)(options == null ? void 0 : options.name, 'options.name is required');
+    }
   }
 
+}
+
+exports.RequestFormFile = RequestFormFile;
+
+class RequestService {
   static getGotOptions(options, responseType) {
+    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
+
     const gotOptions = {
+      url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
-      rejectUnauthorized: false,
+      https: {
+        rejectUnauthorized: false
+      },
       isStream: responseType === 'stream'
     };
 
@@ -79,16 +138,18 @@ class RequestService {
       };
     }
 
-    if (options.encoding) {
-      gotOptions.encoding = options.encoding;
-    }
-
     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;
     }
 
-    gotOptions.headers = gotOptions.headers || {};
-    gotOptions.headers['User-Agent'] = 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';
     return gotOptions;
   }
 
@@ -104,8 +165,8 @@ class RequestService {
       url = _url.toString();
     }
 
+    options.url = url;
     const res = (0, _got.default)({
-      url: url,
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
@@ -129,7 +190,6 @@ class RequestService {
     }
 
     const res = (0, _got.default)({
-      url: options.url,
       method: 'POST',
       ...(options.data == null ? {
         body: ''
@@ -186,6 +246,11 @@ class RequestService {
     return err instanceof _got.default.TimeoutError;
   }
 
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'request';
+  }
+
   getRaw(options, responseType) {
     var _this$options;
 

package/lib/services/request.d.ts

@@ -1,26 +1,51 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import FormData from 'form-data';
 import FormStream from 'formstream';
 import Request from 'got/dist/source/core';
 import { BaseService } from './base';
 import { CookieJar } from 'tough-cookie';
+import { OmitStrict } from 'vtils/types';
+import { Readable } from 'stream';
 export interface RequestServiceOptions {
+    /**
+     * 请求地址
+     */
+    url: string;
+    /**
+     * 代理地址
+     */
     proxyUrl?: string;
+    /**
+     * 超时毫秒数
+     */
     timeoutMs?: number;
+    /**
+     * 头
+     */
     headers?: Record<string, any>;
     /**
+     * 是否跟随跳转
+     *
      * @default true
      */
     followRedirect?: boolean;
     /**
-     * @default "utf-8"
+     * COOKIE 容器
      */
-    encoding?: BufferEncoding;
     cookieJar?: CookieJar;
     /**
+     * 用户代理
+     *
      * @default "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"
      */
     userAgent?: string;
+    /**
+     * 是否自动设置来源地址，设为 true 后若未手动设置来源页则将把请求地址设为来源地址
+     *
+     * @default false
+     */
+    autoReferer?: boolean;
 }
 export interface RequestServiceResponse<T> {
     status: number;
@@ -28,33 +53,47 @@ export interface RequestServiceResponse<T> {
     data: T;
 }
 export interface RequestServiceGetOptions extends RequestServiceOptions {
-    url: string;
     data?: Record<string, any>;
 }
 export interface RequestServicePostOptions extends RequestServiceOptions {
-    url: string;
     data?: Record<string, any> | FormData | URLSearchParams;
 }
 export interface RequestServiceGetStreamOptions extends RequestServiceOptions {
-    url: string;
     data?: Record<string, any>;
 }
 export interface RequestServicePostStreamOptions extends RequestServiceOptions {
-    url: string;
     data?: Record<string, any> | FormData | URLSearchParams | FormStream;
 }
 export declare class RequestFormUrlencoded extends URLSearchParams {
 }
 export declare class RequestFormData extends FormData {
-    constructor(cb?: (formData: FormData) => FormData);
+    constructor(cbOrObject?: ((formData: FormData) => FormData) | Record<string, any>);
 }
 export declare class RequestFormStream extends FormStream {
-    constructor(cb?: (formStream: FormStream) => FormStream);
+    constructor(cbOrObject?: ((formStream: FormStream) => FormStream) | Record<string, any>);
+}
+export declare class RequestFormFile {
+    file: any;
+    options?: {
+        name?: string;
+        type?: string;
+    };
+    constructor(file: Buffer, options: {
+        name: string;
+        type?: string;
+    });
+    constructor(file: Readable, options: {
+        name: string;
+        type?: string;
+    });
+    constructor(file: string, options?: {
+        name?: string;
+        type?: string;
+    });
 }
 export declare class RequestService implements BaseService {
     private options?;
     serviceName: string;
-    constructor(options?: RequestServiceOptions);
     private static getGotOptions;
     static getRaw(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<Buffer>>;
     static getRaw(options: RequestServiceGetStreamOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
@@ -73,6 +112,7 @@ export declare class RequestService implements BaseService {
     static getStream(options: RequestServiceGetOptions): Request;
     static postStream(options: RequestServicePostStreamOptions): Request;
     static isTimeoutError(err: any): boolean;
+    constructor(options?: OmitStrict<RequestServiceOptions, 'url'>);
     getRaw(options: RequestServiceGetStreamOptions): Promise<RequestServiceResponse<Buffer>>;
     getRaw(options: RequestServiceGetStreamOptions, responseType: 'buffer'): Promise<RequestServiceResponse<Buffer>>;
     getRaw(options: RequestServiceGetStreamOptions, responseType: 'text'): Promise<RequestServiceResponse<string>>;

package/lib/services/request.js

@@ -1,38 +1,90 @@
+import assert from 'assert';
 import FormData from 'form-data';
 import FormStream from 'formstream';
+import fs from 'fs';
 import got from 'got';
+import { mapKeys } from 'vtils';
 import { ProxyAgent } from 'proxy-agent';
+import { Readable } from 'stream';
 export class RequestFormUrlencoded extends URLSearchParams {}
 export class RequestFormData extends FormData {
-  constructor(cb) {
+  constructor(cbOrObject) {
     super();
 
-    if (cb) {
-      cb(this);
+    if (cbOrObject) {
+      if (typeof cbOrObject === 'function') {
+        cbOrObject(this);
+      } else {
+        Object.keys(cbOrObject).forEach(key => {
+          const value = cbOrObject[key];
+
+          if (value instanceof RequestFormFile) {
+            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
+            });
+          } else {
+            this.append(key, value);
+          }
+        });
+      }
     }
   }
 
 }
 export class RequestFormStream extends FormStream {
-  constructor(cb) {
+  constructor(cbOrObject) {
     super();
 
-    if (cb) {
-      cb(this);
+    if (cbOrObject) {
+      if (typeof cbOrObject === 'function') {
+        cbOrObject(this);
+      } else {
+        Object.keys(cbOrObject).forEach(key => {
+          const value = cbOrObject[key];
+
+          if (value instanceof RequestFormFile) {
+            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);
+            } else if (value.file instanceof Readable) {
+              this.stream(key, value.file, value.options.name, value.options.type);
+            }
+          } else {
+            this.field(key, value);
+          }
+        });
+      }
     }
   }
 
 }
-export class RequestService {
-  constructor(options) {
+export class RequestFormFile {
+  constructor(file, options) {
+    this.file = file;
     this.options = options;
-    this.serviceName = 'request';
+
+    if (Buffer.isBuffer(file) || file instanceof Readable) {
+      assert(options == null ? void 0 : options.name, 'options.name is required');
+    }
   }
 
+}
+export class RequestService {
   static getGotOptions(options, responseType) {
+    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
+
     const gotOptions = {
+      url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
-      rejectUnauthorized: false,
+      https: {
+        rejectUnauthorized: false
+      },
       isStream: responseType === 'stream'
     };
 
@@ -59,16 +111,18 @@ export class RequestService {
       };
     }
 
-    if (options.encoding) {
-      gotOptions.encoding = options.encoding;
-    }
-
     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;
     }
 
-    gotOptions.headers = gotOptions.headers || {};
-    gotOptions.headers['User-Agent'] = 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';
     return gotOptions;
   }
 
@@ -84,8 +138,8 @@ export class RequestService {
       url = _url.toString();
     }
 
+    options.url = url;
     const res = got({
-      url: url,
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
@@ -109,7 +163,6 @@ export class RequestService {
     }
 
     const res = got({
-      url: options.url,
       method: 'POST',
       ...(options.data == null ? {
         body: ''
@@ -166,6 +219,11 @@ export class RequestService {
     return err instanceof got.TimeoutError;
   }
 
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'request';
+  }
+
   getRaw(options, responseType) {
     var _this$options;
 

package/package.json

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