@wiajs/req 1.7.28 → 1.7.30

package/dist/node/req.cjs

@@ -1,20 +1,19 @@
 /*!
-  * @wia/req v1.7.28
-  * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
+  * @wia/req v1.7.30
+  * (c) 2024-2025 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */
 'use strict';
 
 const FormData$1 = require('form-data');
-const url = require('node:url');
-const request = require('@wiajs/request');
+const url = require('url');
 const agent = require('@wiajs/agent');
 const log$1 = require('@wiajs/log');
-const util = require('node:util');
-const zlib = require('node:zlib');
-const stream$1 = require('node:stream');
+const request = require('@wiajs/request');
+const util = require('util');
+const events = require('events');
 const stream = require('stream');
-const node_events = require('node:events');
+const zlib = require('zlib');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function bind(fn, thisArg) {
@@ -2023,32 +2022,6 @@ utils$1.inherits(CanceledError, AxiosError, {
   __CANCEL__: true
 });
 
-/**
- * Resolve or reject a Promise based on response status.
- *
- * @param {Function} resolve A function that resolves the promise.
- * @param {Function} reject A function that rejects the promise.
- * @param {object} response The response.
- *
- * @returns {object} The response.
- */
-function settle(resolve, reject, response) {
-  const validateStatus = response.config.validateStatus;
-  if (!response.status || !validateStatus || validateStatus(response.status)) {
-    resolve(response);
-  } else {
-    reject(
-      new AxiosError(
-        'Request failed with status code ' + response.status,
-        [AxiosError.ERR_BAD_REQUEST, AxiosError.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4],
-        response.config,
-        response.request,
-        response
-      )
-    );
-  }
-}
-
 /**
  * Determines whether the specified URL is absolute
  *
@@ -2094,61 +2067,34 @@ function buildFullPath(baseURL, requestedURL) {
   return requestedURL;
 }
 
-const VERSION = "1.7.7";
-
-function parseProtocol(url) {
-  const match = /^([-+\w]{1,25})(:?\/\/|:)/.exec(url);
-  return match && match[1] || '';
-}
-
-const DATA_URL_PATTERN = /^(?:([^;]+);)?(?:[^;]+;)?(base64|),([\s\S]*)$/;
-
 /**
- * Parse data uri to a Buffer or Blob
+ * Resolve or reject a Promise based on response status.
  *
- * @param {String} uri
- * @param {?Boolean} asBlob
- * @param {?Object} options
- * @param {?Function} options.Blob
+ * @param {Function} resolve A function that resolves the promise.
+ * @param {Function} reject A function that rejects the promise.
+ * @param {object} response The response.
  *
- * @returns {Buffer|Blob}
+ * @returns {object} The response.
  */
-function fromDataURI(uri, asBlob, options) {
-  const _Blob = options && options.Blob || platform.classes.Blob;
-  const protocol = parseProtocol(uri);
-
-  if (asBlob === undefined && _Blob) {
-    asBlob = true;
-  }
-
-  if (protocol === 'data') {
-    uri = protocol.length ? uri.slice(protocol.length + 1) : uri;
-
-    const match = DATA_URL_PATTERN.exec(uri);
-
-    if (!match) {
-      throw new AxiosError('Invalid URL', AxiosError.ERR_INVALID_URL);
-    }
-
-    const mime = match[1];
-    const isBase64 = match[2];
-    const body = match[3];
-    const buffer = Buffer.from(decodeURIComponent(body), isBase64 ? 'base64' : 'utf8');
-
-    if (asBlob) {
-      if (!_Blob) {
-        throw new AxiosError('Blob is not supported', AxiosError.ERR_NOT_SUPPORT);
-      }
-
-      return new _Blob([buffer], {type: mime});
-    }
-
-    return buffer;
+function settle(resolve, reject, response) {
+  const validateStatus = response.config.validateStatus;
+  if (!response.status || !validateStatus || validateStatus(response.status)) {
+    resolve(response);
+  } else {
+    reject(
+      new AxiosError(
+        'Request failed with status code ' + response.status,
+        [AxiosError.ERR_BAD_REQUEST, AxiosError.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4],
+        response.config,
+        response.request,
+        response
+      )
+    );
   }
-
-  throw new AxiosError('Unsupported protocol ' + protocol, AxiosError.ERR_NOT_SUPPORT);
 }
 
+const VERSION = "1.7.7";
+
 const kInternals = Symbol('internals');
 
 class AxiosTransformStream extends stream.Transform {
@@ -2286,6 +2232,19 @@ class AxiosTransformStream extends stream.Transform {
   }
 }
 
+const callbackify = (fn, reducer) => {
+  return utils$1.isAsyncFn(fn) ? function (...args) {
+    const cb = args.pop();
+    fn.apply(this, args).then((value) => {
+      try {
+        reducer ? cb(null, ...reducer(value)) : cb(null, value);
+      } catch (err) {
+        cb(err);
+      }
+    }, cb);
+  } : fn;
+};
+
 const {asyncIterator} = Symbol;
 
 const readBlob = async function* (blob) {
@@ -2320,7 +2279,7 @@ class FormDataPart {
     if (isStringValue) {
       value = textEncoder.encode(String(value).replace(/\r?\n|\r\n?/g, CRLF));
     } else {
-      headers += `Content-Type: ${value.type || "application/octet-stream"}${CRLF}`;
+      headers += `Content-Type: ${value.type || 'application/octet-stream'}${CRLF}`;
     }
 
     this.headers = textEncoder.encode(headers + CRLF);
@@ -2333,12 +2292,12 @@ class FormDataPart {
     this.value = value;
   }
 
-  async *encode(){
+  async *encode() {
     yield this.headers;
 
     const {value} = this;
 
-    if(utils$1.isTypedArray(value)) {
+    if (utils$1.isTypedArray(value)) {
       yield value;
     } else {
       yield* readBlob(value);
@@ -2348,11 +2307,15 @@ class FormDataPart {
   }
 
   static escapeName(name) {
-      return String(name).replace(/[\r\n"]/g, (match) => ({
-        '\r' : '%0D',
-        '\n' : '%0A',
-        '"' : '%22',
-      }[match]));
+    return String(name).replace(
+      /[\r\n"]/g,
+      match =>
+        ({
+          '\r': '%0D',
+          '\n': '%0A',
+          '"': '%22',
+        })[match]
+    )
   }
 }
 
@@ -2360,11 +2323,11 @@ const formDataToStream = (form, headersHandler, options) => {
   const {
     tag = 'form-data-boundary',
     size = 25,
-    boundary = tag + '-' + utils$1.generateString(size, BOUNDARY_ALPHABET)
+    boundary = tag + '-' + utils$1.generateString(size, BOUNDARY_ALPHABET),
   } = options || {};
 
-  if(!utils$1.isFormData(form)) {
-    throw TypeError('FormData instance required');
+  if (!utils$1.isFormData(form)) {
+    throw TypeError('FormData instance required')
   }
 
   if (boundary.length < 1 || boundary.length > 70) {
@@ -2378,7 +2341,7 @@ const formDataToStream = (form, headersHandler, options) => {
   const parts = Array.from(form.entries()).map(([name, value]) => {
     const part = new FormDataPart(name, value);
     contentLength += part.size;
-    return part;
+    return part
   });
 
   contentLength += boundaryBytes.byteLength * parts.length;
@@ -2386,7 +2349,7 @@ const formDataToStream = (form, headersHandler, options) => {
   contentLength = utils$1.toFiniteNumber(contentLength);
 
   const computedHeaders = {
-    'Content-Type': `multipart/form-data; boundary=${boundary}`
+    'Content-Type': `multipart/form-data; boundary=${boundary}`,
   };
 
   if (Number.isFinite(contentLength)) {
@@ -2395,28 +2358,70 @@ const formDataToStream = (form, headersHandler, options) => {
 
   headersHandler && headersHandler(computedHeaders);
 
-  return stream.Readable.from((async function *() {
-    for(const part of parts) {
-      yield boundaryBytes;
-      yield* part.encode();
-    }
+  return stream.Readable.from(
+    (async function* () {
+      for (const part of parts) {
+        yield boundaryBytes;
+        yield* part.encode();
+      }
 
-    yield footerBytes;
-  })());
+      yield footerBytes;
+    })()
+  )
 };
 
-const callbackify = (fn, reducer) => {
-  return utils$1.isAsyncFn(fn) ? function (...args) {
-    const cb = args.pop();
-    fn.apply(this, args).then((value) => {
-      try {
-        reducer ? cb(null, ...reducer(value)) : cb(null, value);
-      } catch (err) {
-        cb(err);
+function parseProtocol(url) {
+  const match = /^([-+\w]{1,25})(:?\/\/|:)/.exec(url);
+  return match && match[1] || '';
+}
+
+const DATA_URL_PATTERN = /^(?:([^;]+);)?(?:[^;]+;)?(base64|),([\s\S]*)$/;
+
+/**
+ * Parse data uri to a Buffer or Blob
+ *
+ * @param {String} uri
+ * @param {?Boolean} asBlob
+ * @param {?Object} options
+ * @param {?Function} options.Blob
+ *
+ * @returns {Buffer|Blob}
+ */
+function fromDataURI(uri, asBlob, options) {
+  const _Blob = options && options.Blob || platform.classes.Blob;
+  const protocol = parseProtocol(uri);
+
+  if (asBlob === undefined && _Blob) {
+    asBlob = true;
+  }
+
+  if (protocol === 'data') {
+    uri = protocol.length ? uri.slice(protocol.length + 1) : uri;
+
+    const match = DATA_URL_PATTERN.exec(uri);
+
+    if (!match) {
+      throw new AxiosError('Invalid URL', AxiosError.ERR_INVALID_URL);
+    }
+
+    const mime = match[1];
+    const isBase64 = match[2];
+    const body = match[3];
+    const buffer = Buffer.from(decodeURIComponent(body), isBase64 ? 'base64' : 'utf8');
+
+    if (asBlob) {
+      if (!_Blob) {
+        throw new AxiosError('Blob is not supported', AxiosError.ERR_NOT_SUPPORT);
       }
-    }, cb);
-  } : fn;
-};
+
+      return new _Blob([buffer], {type: mime});
+    }
+
+    return buffer;
+  }
+
+  throw new AxiosError('Unsupported protocol ' + protocol, AxiosError.ERR_NOT_SUPPORT);
+}
 
 /**
  * Calculate data maxRate
@@ -2590,7 +2595,7 @@ const isHttpAdapterSupported = typeof process !== 'undefined' && utils$1.kindOf(
 
 /**
  * !+++
- * 将request 函数改为类，请求拆分为 init 初始化和 请求执行，
+ * 将request 函数改为类，request 拆分为 init 初始化和 请求执行，
  * 如需重新发起请求时，无需重新初始化
  */
 class HttpAdapter {
@@ -2616,7 +2621,7 @@ class HttpAdapter {
   constructor(config) {
     this.config = config;
     // temporary internal emitter until the AxiosRequest class will be implemented
-    this.emitter = new node_events.EventEmitter();
+    this.emitter = new events.EventEmitter();
   }
 
   /**
@@ -2798,7 +2803,7 @@ class HttpAdapter {
     } else if (utils$1.isBlob(data)) {
       data.size && headers.setContentType(data.type || 'application/octet-stream');
       headers.setContentLength(data.size || 0);
-      data = stream$1.Readable.from(readBlob(data));
+      data = stream.Readable.from(readBlob(data));
     } else if (data && !utils$1.isStream(data)) {
       if (Buffer.isBuffer(data)) ; else if (utils$1.isArrayBuffer(data)) {
         data = Buffer.from(new Uint8Array(data));
@@ -2838,10 +2843,10 @@ class HttpAdapter {
 
     if (data && (onUploadProgress || maxUploadRate)) {
       if (!utils$1.isStream(data)) {
-        data = stream$1.Readable.from(data, {objectMode: false});
+        data = stream.Readable.from(data, {objectMode: false});
       }
 
-      data = stream$1.pipeline(
+      data = stream.pipeline(
         [
           data,
           new AxiosTransformStream({
@@ -3001,7 +3006,7 @@ class HttpAdapter {
             convertedData = utils$1.stripBOM(convertedData);
           }
         } else if (responseType === 'stream') {
-          convertedData = stream$1.Readable.from(convertedData);
+          convertedData = stream.Readable.from(convertedData);
         }
 
         // 返回响应

package/dist/req.js

@@ -1,6 +1,6 @@
 /*!
-  * @wia/req v1.7.28
-  * (c) 2024 Sibyl Yu, Matt Zabriskie and contributors
+  * @wia/req v1.7.30
+  * (c) 2024-2025 Sibyl Yu, Matt Zabriskie and contributors
   * Released under the MIT License.
   */
 (function (global, factory) {
@@ -998,9 +998,6 @@
   }
 
   let InterceptorManager = class InterceptorManager {
-      constructor(){
-          this.handlers = [];
-      }
       /**
      * Add a new interceptor to the stack
      *
@@ -1053,6 +1050,9 @@
               }
           });
       }
+      constructor(){
+          this.handlers = [];
+      }
   };
   var InterceptorManager$1 = InterceptorManager;
 
@@ -1793,8 +1793,11 @@
   	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
   }
 
+  /* eslint-env browser */
+
   var browser = typeof self == 'object' ? self.FormData : window.FormData;
-  var FormData$2 = /*@__PURE__*/ getDefaultExportFromCjs(browser);
+
+  var FormData$2 = /*@__PURE__*/getDefaultExportFromCjs(browser);
 
   /**
    * Determines if the given thing is a array or js object.
@@ -2421,9 +2424,6 @@
       });
   }
   let AxiosHeaders = class AxiosHeaders {
-      constructor(headers){
-          headers && this.set(headers);
-      }
       /**
      *
      * @param {*} header
@@ -2582,6 +2582,9 @@
           utils$2.isArray(header) ? header.forEach(defineAccessor) : defineAccessor(header);
           return this;
       }
+      constructor(headers){
+          headers && this.set(headers);
+      }
   };
   AxiosHeaders.accessor([
       'Content-Type',
@@ -2686,12 +2689,12 @@
 
   const isXHRAdapterSupported = typeof XMLHttpRequest !== 'undefined';
   let XhrAdapter = class XhrAdapter {
-      constructor(config){
-          this.init(config);
-      }
       init(config) {}
       request() {}
       stream() {}
+      constructor(config){
+          this.init(config);
+      }
   };
   var XhrAdapter$1 = isXHRAdapterSupported && XhrAdapter;
 
@@ -3004,17 +3007,6 @@
    *
    * @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$1(),
-              response: new InterceptorManager$1()
-          };
-          this.init() // !+++
-          ;
-      }
       /**
      * !+++
      * config 属性直接挂在到实例上，方便读取、设置、修改
@@ -3264,6 +3256,17 @@
           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$1(),
+              response: new InterceptorManager$1()
+          };
+          this.init() // !+++
+          ;
+      }
   };
   // Provide aliases for supported request methods
   utils$2.forEach([
@@ -3354,46 +3357,6 @@
    *
    * @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() {
@@ -3449,6 +3412,46 @@
               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);
+          });
+      }
   };
   var CancelToken$1 = CancelToken;