@jayfong/x-request 2.66.0 → 2.68.0

package/lib/_cjs/index.js

@@ -5,6 +5,7 @@ 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 _nodeUtil = require("node:util");
 var _stream = require("stream");
 var _formData = _interopRequireDefault(require("form-data"));
 var _formstream = _interopRequireDefault(require("formstream"));
@@ -89,7 +90,7 @@ class XRequest {
     }
     const gotOptions = {
       url: options.url,
-      responseType: responseType === 'stream' ? undefined : responseType,
+      responseType: responseType === 'stream' ? undefined : responseType === 'text' && options.autoTransformEncoding ? 'buffer' : responseType,
       https: {
         rejectUnauthorized: false
       },
@@ -127,6 +128,29 @@ class XRequest {
     }
     return gotOptions;
   }
+  static afterResponse(options, responseType, res) {
+    if (responseType === 'text' && options.autoTransformEncoding) {
+      if (options.autoTransformEncoding === true) {
+        const contentType = String(res.headers['content-type']);
+        if (contentType.includes('charset=')) {
+          const charset = contentType.match(/charset=([^;]+)/)[1].toLowerCase();
+          if (charset !== 'utf-8' && charset !== 'utf8') {
+            try {
+              res.data = new _nodeUtil.TextDecoder(charset).decode(res.data);
+            } catch {}
+          }
+        }
+      } else {
+        try {
+          res.data = new _nodeUtil.TextDecoder(options.autoTransformEncoding).decode(res.data);
+        } catch {}
+      }
+      if (Buffer.isBuffer(res.data)) {
+        res.data = res.data.toString('utf-8');
+      }
+    }
+    return res;
+  }
   static get(options, responseType) {
     const res = (0, _got.default)({
       method: options.method || 'GET',
@@ -135,7 +159,7 @@ class XRequest {
     if (responseType === 'stream') {
       return res;
     }
-    return res.then(res => ({
+    return res.then(res => this.afterResponse(options, responseType, {
       status: res.statusCode,
       headers: res.headers,
       data: res.body
@@ -165,7 +189,7 @@ class XRequest {
     if (responseType === 'stream') {
       return res;
     }
-    return res.then(res => ({
+    return res.then(res => this.afterResponse(options, responseType, {
       status: res.statusCode,
       headers: res.headers,
       data: res.body

package/lib/index.d.ts

@@ -74,6 +74,12 @@ export interface XRequestOptions {
      * @default false
      */
     noThrowHttpErrors?: boolean;
+    /**
+     * 是否自动转换编码
+     *
+     * @default false
+     */
+    autoTransformEncoding?: boolean | string;
 }
 export interface XRequestResponse<T> {
     status: number;
@@ -121,6 +127,7 @@ export declare class XRequestFormFile {
 export declare class XRequest {
     private options?;
     private static getGotOptions;
+    private static afterResponse;
     static get(options: XRequestGetOptions): Promise<XRequestResponse<Buffer>>;
     static get(options: XRequestGetOptions, responseType: 'buffer'): Promise<XRequestResponse<Buffer>>;
     static get(options: XRequestGetOptions, responseType: 'text'): Promise<XRequestResponse<string>>;

package/lib/index.js

@@ -1,5 +1,6 @@
 import assert from 'assert';
 import fs from 'fs';
+import { TextDecoder } from 'node:util';
 import { Readable } from 'stream';
 import FormData from 'form-data';
 import FormStream from 'formstream';
@@ -80,7 +81,7 @@ export class XRequest {
     }
     const gotOptions = {
       url: options.url,
-      responseType: responseType === 'stream' ? undefined : responseType,
+      responseType: responseType === 'stream' ? undefined : responseType === 'text' && options.autoTransformEncoding ? 'buffer' : responseType,
       https: {
         rejectUnauthorized: false
       },
@@ -118,6 +119,29 @@ export class XRequest {
     }
     return gotOptions;
   }
+  static afterResponse(options, responseType, res) {
+    if (responseType === 'text' && options.autoTransformEncoding) {
+      if (options.autoTransformEncoding === true) {
+        const contentType = String(res.headers['content-type']);
+        if (contentType.includes('charset=')) {
+          const charset = contentType.match(/charset=([^;]+)/)[1].toLowerCase();
+          if (charset !== 'utf-8' && charset !== 'utf8') {
+            try {
+              res.data = new TextDecoder(charset).decode(res.data);
+            } catch {}
+          }
+        }
+      } else {
+        try {
+          res.data = new TextDecoder(options.autoTransformEncoding).decode(res.data);
+        } catch {}
+      }
+      if (Buffer.isBuffer(res.data)) {
+        res.data = res.data.toString('utf-8');
+      }
+    }
+    return res;
+  }
   static get(options, responseType) {
     const res = got({
       method: options.method || 'GET',
@@ -126,7 +150,7 @@ export class XRequest {
     if (responseType === 'stream') {
       return res;
     }
-    return res.then(res => ({
+    return res.then(res => this.afterResponse(options, responseType, {
       status: res.statusCode,
       headers: res.headers,
       data: res.body
@@ -156,7 +180,7 @@ export class XRequest {
     if (responseType === 'stream') {
       return res;
     }
-    return res.then(res => ({
+    return res.then(res => this.afterResponse(options, responseType, {
       status: res.statusCode,
       headers: res.headers,
       data: res.body

package/package.json

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