@jayfong/x-request 2.28.1 → 2.30.0

package/lib/_cjs/index.js

@@ -77,12 +77,14 @@ exports.XRequestFormFile = XRequestFormFile;
 class XRequest {
   static getGotOptions(options, responseType) {
     var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-    if (options.query) {
-      const url = new URL(options.url);
-      const query = options.query instanceof URLSearchParams ? options.query : new URLSearchParams(options.query);
-      query.forEach((v, k) => {
-        url.searchParams.set(k, v);
-      });
+    if (options.baseUrl || options.query) {
+      const url = new URL(options.url, options.baseUrl);
+      if (options.query) {
+        const query = options.query instanceof URLSearchParams ? options.query : new URLSearchParams(options.query);
+        query.forEach((v, k) => {
+          url.searchParams.set(k, v);
+        });
+      }
       options.url = url.toString();
     }
     const gotOptions = {
@@ -147,7 +149,7 @@ class XRequest {
       method: options.method || 'POST',
       ...(options.data == null ? {
         body: ''
-      } : options.data instanceof _formData.default ? {
+      } : options.data instanceof _formData.default || Buffer.isBuffer(options.data) ? {
         body: options.data
       } : options.data instanceof URLSearchParams ? {
         form: options.data

package/lib/index.d.ts

@@ -7,6 +7,27 @@ import { Readable } from 'stream';
 import { CookieJar } from 'tough-cookie';
 import { OmitStrict } from 'vtils/types';
 export interface XRequestOptions {
+    /**
+     * 基础请求地址
+     *
+     * ```
+     * new URL('1111', 'https://baidu.com')
+     * // => https://baidu.com/1111
+     *
+     * new URL('1111', 'https://baidu.com/ddd')
+     * // => https://baidu.com/1111
+     *
+     * new URL('./1111', 'https://baidu.com/ddd/')
+     * // => https://baidu.com/ddd/1111
+     *
+     * new URL('/1111', 'https://baidu.com/ddd/')
+     * // => https://baidu.com/1111
+     *
+     * new URL('https://dddd.ddd', 'https://baidu.com/ddd/')
+     * // => https://dddd.ddd/
+     * ```
+     */
+    baseUrl?: string;
     /**
      * 请求地址
      */
@@ -60,11 +81,11 @@ export interface XRequestGetOptions extends XRequestOptions {
 }
 export interface XRequestPostOptions extends XRequestOptions {
     method?: string;
-    data?: Record<string, any> | FormData | URLSearchParams;
+    data?: Record<string, any> | FormData | URLSearchParams | Buffer;
 }
 export interface XRequestPostStreamOptions extends XRequestOptions {
     method?: string;
-    data?: Record<string, any> | FormData | URLSearchParams | FormStream;
+    data?: Record<string, any> | FormData | URLSearchParams | Buffer | FormStream;
 }
 export declare class XRequestFormUrlencoded extends URLSearchParams {
 }

package/lib/index.js

@@ -68,12 +68,14 @@ export class XRequestFormFile {
 export class XRequest {
   static getGotOptions(options, responseType) {
     var _gotOptions$headers, _userAgent, _gotOptions$headers$_, _options$userAgent;
-    if (options.query) {
-      const url = new URL(options.url);
-      const query = options.query instanceof URLSearchParams ? options.query : new URLSearchParams(options.query);
-      query.forEach((v, k) => {
-        url.searchParams.set(k, v);
-      });
+    if (options.baseUrl || options.query) {
+      const url = new URL(options.url, options.baseUrl);
+      if (options.query) {
+        const query = options.query instanceof URLSearchParams ? options.query : new URLSearchParams(options.query);
+        query.forEach((v, k) => {
+          url.searchParams.set(k, v);
+        });
+      }
       options.url = url.toString();
     }
     const gotOptions = {
@@ -138,7 +140,7 @@ export class XRequest {
       method: options.method || 'POST',
       ...(options.data == null ? {
         body: ''
-      } : options.data instanceof FormData ? {
+      } : options.data instanceof FormData || Buffer.isBuffer(options.data) ? {
         body: options.data
       } : options.data instanceof URLSearchParams ? {
         form: options.data

package/package.json

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