@wiajs/req 1.7.28 → 1.7.30

package/lib/adapters/http.js

@@ -1,29 +1,29 @@
-import request from '@wiajs/request';
 import { Agent } from '@wiajs/agent';
 import { log as Log, name } from '@wiajs/log';
-import utils from '../utils.js';
-import settle from '../core/settle.js';
+import request from '@wiajs/request';
 import buildFullPath from '../core/buildFullPath.js';
+import settle from '../core/settle.js';
 import buildURL from '../helpers/buildURL.js';
+import utils from '../utils.js';
 // import {getProxyForUrl} from 'proxy-from-env';
-import util from 'node:util';
+import util from 'util';
 // import followRedirects from 'follow-redirects';
 // import Redirect from '../request/index.js'
-import zlib from 'node:zlib';
-import { VERSION } from '../env/data.js';
-import transitionalDefaults from '../defaults/transitional.js';
-import AxiosError from '../core/AxiosError.js';
+import { EventEmitter } from 'events';
+import stream from 'stream';
+import zlib from 'zlib';
 import CanceledError from '../cancel/CanceledError.js';
-import platform from '../platform/index.js';
-import fromDataURI from '../helpers/fromDataURI.js';
-import stream from 'node:stream';
+import AxiosError from '../core/AxiosError.js';
 import AxiosHeaders from '../core/AxiosHeaders.js';
+import transitionalDefaults from '../defaults/transitional.js';
+import { VERSION } from '../env/data.js';
 import AxiosTransformStream from '../helpers/AxiosTransformStream.js';
-import { EventEmitter } from 'node:events';
+import callbackify from '../helpers/callbackify.js';
 import formDataToStream from '../helpers/formDataToStream.js';
+import fromDataURI from '../helpers/fromDataURI.js';
+import { asyncDecorator, progressEventDecorator, progressEventReducer } from '../helpers/progressEventReducer.js';
 import readBlob from '../helpers/readBlob.js';
-import callbackify from '../helpers/callbackify.js';
-import { progressEventReducer, progressEventDecorator, asyncDecorator } from '../helpers/progressEventReducer.js';
+import platform from '../platform/index.js';
 const px = {
     host: '114.98.163.61:17813'
 };
@@ -47,25 +47,11 @@ const supportedProtocols = platform.protocols.map((protocol)=>`${protocol}:`);
 const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(process) === 'process';
 /**
  * !+++
- * 将request 函数改为类，请求拆分为 init 初始化和 请求执行，
+ * 将request 函数改为类，request 拆分为 init 初始化和 请求执行，
  * 如需重新发起请求时，无需重新初始化
  */ let HttpAdapter = class HttpAdapter {
     /**
    *
-   * @param {*} config
-   */ constructor(config){
-        this.isDone = false;
-        this.rejected = false;
-        /** @type {*} */ this.req = null;
-        /** @type {*} */ this.config = null;
-        /** @type {*} */ this.data = null;
-        /** @type {*} */ this.transport = null;
-        this.config = config;
-        // temporary internal emitter until the AxiosRequest class will be implemented
-        this.emitter = new EventEmitter();
-    }
-    /**
-   *
    * @param {number} code
    * @returns
    */ noBody(code) {
@@ -81,10 +67,11 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         this.emitter.emit('abort', !reason || reason.type ? new CanceledError(null, this.config, this.req) : reason);
     }
     onFinished() {
+        var _config_cancelToken, _config_signal;
         const { config, emitter, abort } = this;
-        config?.cancelToken?.unsubscribe(abort);
-        config?.signal?.removeEventListener('abort', abort);
-        emitter?.removeAllListeners();
+        config == null ? void 0 : (_config_cancelToken = config.cancelToken) == null ? void 0 : _config_cancelToken.unsubscribe(abort);
+        config == null ? void 0 : (_config_signal = config.signal) == null ? void 0 : _config_signal.removeEventListener('abort', abort);
+        emitter == null ? void 0 : emitter.removeAllListeners();
     }
     /**
    *
@@ -103,9 +90,10 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
    * @param {*} isRejected
    * @returns
    */ done(value, isRejected) {
+        var _this;
         if (this.isDone) return;
         this.isDone = true;
-        this?.onDone(value, isRejected);
+        (_this = this) == null ? void 0 : _this.onDone(value, isRejected);
     }
     /**
    * 初始化，生成 options 供请求调用
@@ -137,7 +125,8 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
             };
         }
         if (config.cancelToken || config.signal) {
-            config.cancelToken?.subscribe(_.abort);
+            var _config_cancelToken;
+            (_config_cancelToken = config.cancelToken) == null ? void 0 : _config_cancelToken.subscribe(_.abort);
             if (config.signal) {
                 if (config.signal.aborted) _.abort();
                 else config.signal.addEventListener('abort', _.abort);
@@ -179,7 +168,7 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
             const userBoundary = headers.getContentType(/boundary=([-_\w\d]{10,70})/i);
             data = formDataToStream(data, /** @param {*} formHeaders */ (formHeaders)=>headers.set(formHeaders), {
                 tag: `axios-${VERSION}-boundary`,
-                boundary: userBoundary?.[1] || undefined
+                boundary: (userBoundary == null ? void 0 : userBoundary[1]) || undefined
             });
         // support for https://www.npmjs.com/package/form-data api
         } else if (utils.isFormData(data) && utils.isFunction(data.getHeaders)) {
@@ -289,13 +278,15 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         _.transport = config.transport;
         if (config.maxBodyLength > -1) options.maxBodyLength = config.maxBodyLength;
         else options.maxBodyLength = Number.POSITIVE_INFINITY;
+        var _config_maxRedirects;
         // maxRedirects 缺省 21，不跳转，直接使用系统http or https，不支持 stream
         // if (config.maxRedirects === 0 && !config.stream) transport = isHttpsRequest ? https : http;
         // 自动跳转
         // else {
         // 支持跳转或stream，需使用 http、https 封装类
-        options.maxRedirects = config.maxRedirects ?? 21;
-        options.followRedirects = config.followRedirects ?? true // 默认自动跳转
+        options.maxRedirects = (_config_maxRedirects = config.maxRedirects) != null ? _config_maxRedirects : 21;
+        var _config_followRedirects;
+        options.followRedirects = (_config_followRedirects = config.followRedirects) != null ? _config_followRedirects : true // 默认自动跳转
         ;
         if (config.maxRedirects === 0) options.followRedirects = false;
         if (config.beforeRedirect) options.beforeRedirects.config = config.beforeRedirect;
@@ -324,8 +315,9 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
             if (protocol === 'data:') {
                 /** @type {*} */ let convertedData;
                 try {
+                    var _config_env;
                     convertedData = fromDataURI(config.url, responseType === 'blob', {
-                        Blob: config.env?.Blob
+                        Blob: (_config_env = config.env) == null ? void 0 : _config_env.Blob
                     });
                 } catch (err) {
                     throw AxiosError.from(err, AxiosError.ERR_BAD_REQUEST, config);
@@ -358,8 +350,10 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
                 // 发起异步请求
                 R = await new Promise((resolve, reject)=>{
                     _.emitter.once('abort', reject);
-                    options.stream = config.stream ?? false;
-                    options.decompress = config.decompress ?? true;
+                    var _config_stream;
+                    options.stream = (_config_stream = config.stream) != null ? _config_stream : false;
+                    var _config_decompress;
+                    options.decompress = (_config_decompress = config.decompress) != null ? _config_decompress : true;
                     // Create the request，promise false: return stream
                     // log.debug('request', {options});
                     const req = transport ? transport.request(options) : request(options);
@@ -524,6 +518,20 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils.kindOf(pr
         }
         return R;
     }
+    /**
+   *
+   * @param {*} config
+   */ constructor(config){
+        this.isDone = false;
+        this.rejected = false;
+        /** @type {*} */ this.req = null;
+        /** @type {*} */ this.config = null;
+        /** @type {*} */ this.data = null;
+        /** @type {*} */ this.transport = null;
+        this.config = config;
+        // temporary internal emitter until the AxiosRequest class will be implemented
+        this.emitter = new EventEmitter();
+    }
 };
 /**
  * 排除对象字段

package/lib/adapters/xhr.js

@@ -36,12 +36,12 @@ function progressEventReducer(listener, isDownloadStream) {
 }
 const isXHRAdapterSupported = typeof XMLHttpRequest !== 'undefined';
 let XhrAdapter = class XhrAdapter {
-    constructor(config){
-        this.init(config);
-    }
     init(config) {}
     request() {}
     stream() {}
+    constructor(config){
+        this.init(config);
+    }
 };
 export default isXHRAdapterSupported && XhrAdapter;
 function req(config) {

package/lib/cancel/CancelToken.js

@@ -7,46 +7,6 @@ import CanceledError from './CanceledError.js';
  *
  * @returns {CancelToken}
  */ let CancelToken = class CancelToken {
-    constructor(executor){
-        if (typeof executor !== 'function') {
-            throw new TypeError('executor must be a function.');
-        }
-        let resolvePromise;
-        this.promise = new Promise(function promiseExecutor(resolve) {
-            resolvePromise = resolve;
-        });
-        const token = this;
-        // eslint-disable-next-line func-names
-        this.promise.then((cancel)=>{
-            if (!token._listeners) return;
-            let i = token._listeners.length;
-            while(i-- > 0){
-                token._listeners[i](cancel);
-            }
-            token._listeners = null;
-        });
-        // eslint-disable-next-line func-names
-        this.promise.then = (onfulfilled)=>{
-            let _resolve;
-            // eslint-disable-next-line func-names
-            const promise = new Promise((resolve)=>{
-                token.subscribe(resolve);
-                _resolve = resolve;
-            }).then(onfulfilled);
-            promise.cancel = function reject() {
-                token.unsubscribe(_resolve);
-            };
-            return promise;
-        };
-        executor(function cancel(message, config, request) {
-            if (token.reason) {
-                // Cancellation has already been requested
-                return;
-            }
-            token.reason = new CanceledError(message, config, request);
-            resolvePromise(token.reason);
-        });
-    }
     /**
    * Throws a `CanceledError` if cancellation has been requested.
    */ throwIfRequested() {
@@ -102,5 +62,45 @@ import CanceledError from './CanceledError.js';
             cancel
         };
     }
+    constructor(executor){
+        if (typeof executor !== 'function') {
+            throw new TypeError('executor must be a function.');
+        }
+        let resolvePromise;
+        this.promise = new Promise(function promiseExecutor(resolve) {
+            resolvePromise = resolve;
+        });
+        const token = this;
+        // eslint-disable-next-line func-names
+        this.promise.then((cancel)=>{
+            if (!token._listeners) return;
+            let i = token._listeners.length;
+            while(i-- > 0){
+                token._listeners[i](cancel);
+            }
+            token._listeners = null;
+        });
+        // eslint-disable-next-line func-names
+        this.promise.then = (onfulfilled)=>{
+            let _resolve;
+            // eslint-disable-next-line func-names
+            const promise = new Promise((resolve)=>{
+                token.subscribe(resolve);
+                _resolve = resolve;
+            }).then(onfulfilled);
+            promise.cancel = function reject() {
+                token.unsubscribe(_resolve);
+            };
+            return promise;
+        };
+        executor(function cancel(message, config, request) {
+            if (token.reason) {
+                // Cancellation has already been requested
+                return;
+            }
+            token.reason = new CanceledError(message, config, request);
+            resolvePromise(token.reason);
+        });
+    }
 };
 export default CancelToken;

package/lib/core/Axios.js

@@ -14,17 +14,6 @@ const { validators } = validator;
  *
  * @return {Axios} A new instance of Axios
  */ let Axios = class Axios {
-    constructor(instanceConfig){
-        this.defaults = instanceConfig;
-        this.config = this.defaults // !+++
-        ;
-        this.interceptors = {
-            request: new InterceptorManager(),
-            response: new InterceptorManager()
-        };
-        this.init() // !+++
-        ;
-    }
     /**
    * !+++
    * config 属性直接挂在到实例上，方便读取、设置、修改
@@ -275,6 +264,17 @@ const { validators } = validator;
         const fullPath = buildFullPath(config.baseURL, config.url);
         return buildURL(fullPath, config.params, config.paramsSerializer);
     }
+    constructor(instanceConfig){
+        this.defaults = instanceConfig;
+        this.config = this.defaults // !+++
+        ;
+        this.interceptors = {
+            request: new InterceptorManager(),
+            response: new InterceptorManager()
+        };
+        this.init() // !+++
+        ;
+    }
 };
 // Provide aliases for supported request methods
 utils.forEach([

package/lib/core/AxiosHeaders.js

@@ -59,9 +59,6 @@ function buildAccessors(obj, header) {
 }
 _computedKey = Symbol.iterator, _computedKey1 = Symbol.toStringTag;
 let AxiosHeaders = class AxiosHeaders {
-    constructor(headers){
-        headers && this.set(headers);
-    }
     /**
    *
    * @param {*} header
@@ -220,6 +217,9 @@ let AxiosHeaders = class AxiosHeaders {
         utils.isArray(header) ? header.forEach(defineAccessor) : defineAccessor(header);
         return this;
     }
+    constructor(headers){
+        headers && this.set(headers);
+    }
 };
 AxiosHeaders.accessor([
     'Content-Type',

package/lib/core/InterceptorManager.js

@@ -1,8 +1,5 @@
 import utils from '../utils.js';
 let InterceptorManager = class InterceptorManager {
-    constructor(){
-        this.handlers = [];
-    }
     /**
    * Add a new interceptor to the stack
    *
@@ -55,5 +52,8 @@ let InterceptorManager = class InterceptorManager {
             }
         });
     }
+    constructor(){
+        this.handlers = [];
+    }
 };
 export default InterceptorManager;

package/lib/helpers/AxiosTransformStream.js

@@ -3,40 +3,6 @@ import stream from 'stream';
 import utils from '../utils.js';
 const kInternals = Symbol('internals');
 let AxiosTransformStream = class AxiosTransformStream extends stream.Transform {
-    constructor(options){
-        options = utils.toFlatObject(options, {
-            maxRate: 0,
-            chunkSize: 64 * 1024,
-            minChunkSize: 100,
-            timeWindow: 500,
-            ticksRate: 2,
-            samplesCount: 15
-        }, null, (prop, source)=>{
-            return !utils.isUndefined(source[prop]);
-        });
-        super({
-            readableHighWaterMark: options.chunkSize
-        });
-        const internals = this[kInternals] = {
-            timeWindow: options.timeWindow,
-            chunkSize: options.chunkSize,
-            maxRate: options.maxRate,
-            minChunkSize: options.minChunkSize,
-            bytesSeen: 0,
-            isCaptured: false,
-            notifiedBytesLoaded: 0,
-            ts: Date.now(),
-            bytes: 0,
-            onReadCallback: null
-        };
-        this.on('newListener', (event)=>{
-            if (event === 'progress') {
-                if (!internals.isCaptured) {
-                    internals.isCaptured = true;
-                }
-            }
-        });
-    }
     _read(size) {
         const internals = this[kInternals];
         if (internals.onReadCallback) {
@@ -112,5 +78,39 @@ let AxiosTransformStream = class AxiosTransformStream extends stream.Transform {
             }
         });
     }
+    constructor(options){
+        options = utils.toFlatObject(options, {
+            maxRate: 0,
+            chunkSize: 64 * 1024,
+            minChunkSize: 100,
+            timeWindow: 500,
+            ticksRate: 2,
+            samplesCount: 15
+        }, null, (prop, source)=>{
+            return !utils.isUndefined(source[prop]);
+        });
+        super({
+            readableHighWaterMark: options.chunkSize
+        });
+        const internals = this[kInternals] = {
+            timeWindow: options.timeWindow,
+            chunkSize: options.chunkSize,
+            maxRate: options.maxRate,
+            minChunkSize: options.minChunkSize,
+            bytesSeen: 0,
+            isCaptured: false,
+            notifiedBytesLoaded: 0,
+            ts: Date.now(),
+            bytes: 0,
+            onReadCallback: null
+        };
+        this.on('newListener', (event)=>{
+            if (event === 'progress') {
+                if (!internals.isCaptured) {
+                    internals.isCaptured = true;
+                }
+            }
+        });
+    }
 };
 export default AxiosTransformStream;

package/lib/helpers/formDataToStream.js

@@ -1,28 +1,13 @@
-import { TextEncoder } from 'node:util';
 import { Readable } from 'stream';
-import utils from "../utils.js";
-import readBlob from "./readBlob.js";
+import { TextEncoder } from 'util';
+import utils from '../utils.js';
+import readBlob from './readBlob.js';
 const BOUNDARY_ALPHABET = utils.ALPHABET.ALPHA_DIGIT + '-_';
 const textEncoder = new TextEncoder();
 const CRLF = '\r\n';
 const CRLF_BYTES = textEncoder.encode(CRLF);
 const CRLF_BYTES_COUNT = 2;
 let FormDataPart = class FormDataPart {
-    constructor(name, value){
-        const { escapeName } = this.constructor;
-        const isStringValue = utils.isString(value);
-        let headers = `Content-Disposition: form-data; name="${escapeName(name)}"${!isStringValue && value.name ? `; filename="${escapeName(value.name)}"` : ''}${CRLF}`;
-        if (isStringValue) {
-            value = textEncoder.encode(String(value).replace(/\r?\n|\r\n?/g, CRLF));
-        } else {
-            headers += `Content-Type: ${value.type || "application/octet-stream"}${CRLF}`;
-        }
-        this.headers = textEncoder.encode(headers + CRLF);
-        this.contentLength = isStringValue ? value.byteLength : value.size;
-        this.size = this.headers.byteLength + this.contentLength + CRLF_BYTES_COUNT;
-        this.name = name;
-        this.value = value;
-    }
     async *encode() {
         yield this.headers;
         const { value } = this;
@@ -40,6 +25,21 @@ let FormDataPart = class FormDataPart {
                 '"': '%22'
             })[match]);
     }
+    constructor(name, value){
+        const { escapeName } = this.constructor;
+        const isStringValue = utils.isString(value);
+        let headers = `Content-Disposition: form-data; name="${escapeName(name)}"${!isStringValue && value.name ? `; filename="${escapeName(value.name)}"` : ''}${CRLF}`;
+        if (isStringValue) {
+            value = textEncoder.encode(String(value).replace(/\r?\n|\r\n?/g, CRLF));
+        } else {
+            headers += `Content-Type: ${value.type || 'application/octet-stream'}${CRLF}`;
+        }
+        this.headers = textEncoder.encode(headers + CRLF);
+        this.contentLength = isStringValue ? value.byteLength : value.size;
+        this.size = this.headers.byteLength + this.contentLength + CRLF_BYTES_COUNT;
+        this.name = name;
+        this.value = value;
+    }
 };
 const formDataToStream = (form, headersHandler, options)=>{
     const { tag = 'form-data-boundary', size = 25, boundary = tag + '-' + utils.generateString(size, BOUNDARY_ALPHABET) } = options || {};

package/lib/platform/node/classes/URLSearchParams.js

@@ -1,3 +1,3 @@
 'use strict';
-import url from 'node:url';
+import url from 'url';
 export default url.URLSearchParams;