@jayfong/x-server 2.12.4 → 2.12.6

package/lib/_cjs/services/request.js

@@ -11,6 +11,8 @@ var _formstream = _interopRequireDefault(require("formstream"));
 
 var _got = _interopRequireDefault(require("got"));
 
+var _vtils = require("vtils");
+
 var _proxyAgent = require("proxy-agent");
 
 class RequestFormUrlencoded extends URLSearchParams {}
@@ -44,13 +46,11 @@ class RequestFormStream extends _formstream.default {
 exports.RequestFormStream = RequestFormStream;
 
 class RequestService {
-  constructor(options) {
-    this.options = options;
-    this.serviceName = 'request';
-  }
-
   static getGotOptions(options, responseType) {
+    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
+
     const gotOptions = {
+      url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
       rejectUnauthorized: false,
       isStream: responseType === 'stream'
@@ -79,12 +79,16 @@ 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;
     }
 
     return gotOptions;
@@ -102,8 +106,8 @@ class RequestService {
       url = _url.toString();
     }
 
+    options.url = url;
     const res = (0, _got.default)({
-      url: url,
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
@@ -127,7 +131,6 @@ class RequestService {
     }
 
     const res = (0, _got.default)({
-      url: options.url,
       method: 'POST',
       ...(options.data == null ? {
         body: ''
@@ -184,15 +187,30 @@ class RequestService {
     return err instanceof _got.default.TimeoutError;
   }
 
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'request';
+  }
+
   getRaw(options, responseType) {
+    var _this$options;
+
     return RequestService.getRaw({ ...this.options,
-      ...options
+      ...options,
+      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
+        ...options.headers
+      }
     }, responseType);
   }
 
   postRaw(options, responseType) {
+    var _this$options2;
+
     return RequestService.postRaw({ ...this.options,
-      ...options
+      ...options,
+      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
+        ...options.headers
+      }
     }, responseType);
   }
 

package/lib/services/request.d.ts

@@ -4,19 +4,46 @@ 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';
 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;
@@ -24,19 +51,15 @@ 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 {
@@ -50,7 +73,6 @@ export declare class RequestFormStream extends FormStream {
 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>>;
@@ -69,6 +91,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,6 +1,7 @@
 import FormData from 'form-data';
 import FormStream from 'formstream';
 import got from 'got';
+import { mapKeys } from 'vtils';
 import { ProxyAgent } from 'proxy-agent';
 export class RequestFormUrlencoded extends URLSearchParams {}
 export class RequestFormData extends FormData {
@@ -24,13 +25,11 @@ export class RequestFormStream extends FormStream {
 
 }
 export class RequestService {
-  constructor(options) {
-    this.options = options;
-    this.serviceName = 'request';
-  }
-
   static getGotOptions(options, responseType) {
+    var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
+
     const gotOptions = {
+      url: options.url,
       responseType: responseType === 'stream' ? undefined : responseType,
       rejectUnauthorized: false,
       isStream: responseType === 'stream'
@@ -59,12 +58,16 @@ 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;
     }
 
     return gotOptions;
@@ -82,8 +85,8 @@ export class RequestService {
       url = _url.toString();
     }
 
+    options.url = url;
     const res = got({
-      url: url,
       method: 'GET',
       ...this.getGotOptions(options, responseType || 'buffer')
     });
@@ -107,7 +110,6 @@ export class RequestService {
     }
 
     const res = got({
-      url: options.url,
       method: 'POST',
       ...(options.data == null ? {
         body: ''
@@ -164,15 +166,30 @@ export class RequestService {
     return err instanceof got.TimeoutError;
   }
 
+  constructor(options) {
+    this.options = options;
+    this.serviceName = 'request';
+  }
+
   getRaw(options, responseType) {
+    var _this$options;
+
     return RequestService.getRaw({ ...this.options,
-      ...options
+      ...options,
+      headers: { ...((_this$options = this.options) == null ? void 0 : _this$options.headers),
+        ...options.headers
+      }
     }, responseType);
   }
 
   postRaw(options, responseType) {
+    var _this$options2;
+
     return RequestService.postRaw({ ...this.options,
-      ...options
+      ...options,
+      headers: { ...((_this$options2 = this.options) == null ? void 0 : _this$options2.headers),
+        ...options.headers
+      }
     }, responseType);
   }
 

package/package.json

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