@wiajs/request 3.0.25 → 3.0.27

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.25
+  * wia request v3.0.27
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -469,6 +469,7 @@ const log$1 = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefi
  * @prop {number} [maxRedirects=21]
  * @prop {number} [maxBodyLength = 0]
  * @prop {*} [trackRedirects]
+ * @prop {*} [data]
  */
 
 /** @typedef {object} ResponseExt
@@ -848,6 +849,35 @@ class Request extends stream.Duplex {
     return this
   }
 
+  /**
+   * 发送数据
+   */
+  send() {
+    const m = this;
+    const {data} = m.opt;
+    // 发送数据
+    if (utils.isStream(data)) {
+
+      data.on('end', () => {
+      });
+
+      data.once(
+        'error',
+        /** @param {*} err */ err => {
+          // req.destroy(err)
+        }
+      );
+
+      data.on('close', () => {
+        // if (!ended && !errored) {
+        //   throw new WritebBeenAbortedError()
+        // }
+      });
+
+      data.pipe(m); // 写入数据流
+    } else m.end(data);
+  }
+
   /**
    * Writes buffered data to the current native request
    * 如 request 不存在，则创建连接，pipe 时可写入 header
@@ -1542,7 +1572,7 @@ function isSubdomain(subdomain, domain) {
 
 const log = log$2.log({env: `wia:req:${log$2.name((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('request.cjs', document.baseURI).href)))}`}); // __filename
 
-const WritebBeenAbortedError = utils.createErrorType(
+utils.createErrorType(
   'ERR_STREAM_WRITE_BEEN_ABORTED',
   'Request stream has been aborted'
 )
@@ -1623,7 +1653,39 @@ function request(uri, options, callback) {
   try {
     const {opts, cb} = init(uri, options, callback);
     // log({uri, options, opts}, 'request')
-    R = new Request(opts, cb);
+    const req = new Request(opts, cb);
+    const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
+    if (!stream) {
+      // 发送数据
+      if (utils.isStream(data)) {
+        // Send the request
+        let ended = false;
+        let errored = false;
+
+        data.on('end', () => {
+          ended = true;
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            errored = true;
+            // req.destroy(err)
+          }
+        );
+
+        data.on('close', () => {
+          if (!ended && !errored) {
+            // throw new WritebBeenAbortedError()
+          }
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
+
+    R = req;
   } catch (e) {
     log.err(e, 'request');
   }
@@ -1648,29 +1710,22 @@ function fn(verb) {
     opts.method = method;
     const req = new Request(opts, cb);
     const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
       // 发送数据
       if (utils.isStream(data)) {
-        // Send the request
-        let ended = false;
-        let errored = false;
 
         data.on('end', () => {
-          ended = true;
         });
 
         data.once(
           'error',
           /** @param {*} err */ err => {
-            errored = true;
-            req.destroy(err);
+            // req.destroy(err)
           }
         );
 
         data.on('close', () => {
-          if (!ended && !errored) {
-            throw new WritebBeenAbortedError()
-          }
         });
 
         data.pipe(req); // 写入数据流

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.25
+  * wia request v3.0.27
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -466,6 +466,7 @@ const log$1 = log$2({env: `wia:req:${name(import.meta.url)}`}); // __filename
  * @prop {number} [maxRedirects=21]
  * @prop {number} [maxBodyLength = 0]
  * @prop {*} [trackRedirects]
+ * @prop {*} [data]
  */
 
 /** @typedef {object} ResponseExt
@@ -845,6 +846,35 @@ class Request extends Duplex {
     return this
   }
 
+  /**
+   * 发送数据
+   */
+  send() {
+    const m = this;
+    const {data} = m.opt;
+    // 发送数据
+    if (utils.isStream(data)) {
+
+      data.on('end', () => {
+      });
+
+      data.once(
+        'error',
+        /** @param {*} err */ err => {
+          // req.destroy(err)
+        }
+      );
+
+      data.on('close', () => {
+        // if (!ended && !errored) {
+        //   throw new WritebBeenAbortedError()
+        // }
+      });
+
+      data.pipe(m); // 写入数据流
+    } else m.end(data);
+  }
+
   /**
    * Writes buffered data to the current native request
    * 如 request 不存在，则创建连接，pipe 时可写入 header
@@ -1539,7 +1569,7 @@ function isSubdomain(subdomain, domain) {
 
 const log = log$2({env: `wia:req:${name(import.meta.url)}`}); // __filename
 
-const WritebBeenAbortedError = utils.createErrorType(
+utils.createErrorType(
   'ERR_STREAM_WRITE_BEEN_ABORTED',
   'Request stream has been aborted'
 )
@@ -1620,7 +1650,39 @@ function request(uri, options, callback) {
   try {
     const {opts, cb} = init(uri, options, callback);
     // log({uri, options, opts}, 'request')
-    R = new Request(opts, cb);
+    const req = new Request(opts, cb);
+    const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
+    if (!stream) {
+      // 发送数据
+      if (utils.isStream(data)) {
+        // Send the request
+        let ended = false;
+        let errored = false;
+
+        data.on('end', () => {
+          ended = true;
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            errored = true;
+            // req.destroy(err)
+          }
+        );
+
+        data.on('close', () => {
+          if (!ended && !errored) {
+            // throw new WritebBeenAbortedError()
+          }
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
+
+    R = req;
   } catch (e) {
     log.err(e, 'request');
   }
@@ -1645,29 +1707,22 @@ function fn(verb) {
     opts.method = method;
     const req = new Request(opts, cb);
     const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
       // 发送数据
       if (utils.isStream(data)) {
-        // Send the request
-        let ended = false;
-        let errored = false;
 
         data.on('end', () => {
-          ended = true;
         });
 
         data.once(
           'error',
           /** @param {*} err */ err => {
-            errored = true;
-            req.destroy(err);
+            // req.destroy(err)
           }
         );
 
         data.on('close', () => {
-          if (!ended && !errored) {
-            throw new WritebBeenAbortedError()
-          }
         });
 
         data.pipe(req); // 写入数据流

package/lib/index.js

@@ -76,7 +76,32 @@ const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABOR
     try {
         const { opts, cb } = init(uri, options, callback);
         // log({uri, options, opts}, 'request')
-        R = new Request(opts, cb);
+        const req = new Request(opts, cb);
+        const { data, stream } = opts;
+        // 非流模式，自动发送请求，流模式通过流写入发送
+        if (!stream) {
+            // 发送数据
+            if (utils.isStream(data)) {
+                // Send the request
+                let ended = false;
+                let errored = false;
+                data.on('end', ()=>{
+                    ended = true;
+                });
+                data.once('error', /** @param {*} err */ (err)=>{
+                    errored = true;
+                // req.destroy(err)
+                });
+                data.on('close', ()=>{
+                    if (!ended && !errored) {
+                    // throw new WritebBeenAbortedError()
+                    }
+                });
+                data.pipe(req) // 写入数据流
+                ;
+            } else req.end(data);
+        }
+        R = req;
     } catch (e) {
         log.err(e, 'request');
     }
@@ -97,6 +122,7 @@ const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABOR
         opts.method = method;
         const req = new Request(opts, cb);
         const { data, stream } = opts;
+        // 非流模式，自动发送请求，流模式通过流写入发送
         if (!stream) {
             // 发送数据
             if (utils.isStream(data)) {
@@ -108,11 +134,11 @@ const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABOR
                 });
                 data.once('error', /** @param {*} err */ (err)=>{
                     errored = true;
-                    req.destroy(err);
+                // req.destroy(err)
                 });
                 data.on('close', ()=>{
                     if (!ended && !errored) {
-                        throw new WritebBeenAbortedError();
+                    // throw new WritebBeenAbortedError()
                     }
                 });
                 data.pipe(req) // 写入数据流

package/lib/request.js

@@ -35,6 +35,7 @@ const log = Log({
  * @prop {number} [maxRedirects=21]
  * @prop {number} [maxBodyLength = 0]
  * @prop {*} [trackRedirects]
+ * @prop {*} [data]
  */ /** @typedef {object} ResponseExt
  * @prop {*[]} [redirects]
  * @prop {string} [responseUrl]
@@ -321,6 +322,32 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         return this;
     }
     /**
+   * 发送数据
+   */ send() {
+        const m = this;
+        const { data } = m.opt;
+        // 发送数据
+        if (utils.isStream(data)) {
+            // Send the request
+            let ended = false;
+            let errored = false;
+            data.on('end', ()=>{
+                ended = true;
+            });
+            data.once('error', /** @param {*} err */ (err)=>{
+                errored = true;
+            // req.destroy(err)
+            });
+            data.on('close', ()=>{
+            // if (!ended && !errored) {
+            //   throw new WritebBeenAbortedError()
+            // }
+            });
+            data.pipe(m) // 写入数据流
+            ;
+        } else m.end(data);
+    }
+    /**
    * Writes buffered data to the current native request
    * 如 request 不存在，则创建连接，pipe 时可写入 header
    * @override -  重写父类方法

package/package.json

@@ -2,7 +2,7 @@
   "name": "@wiajs/request",
   "description": "Stream HTTP request client.",
   "keywords": ["http", "simple", "util", "utility"],
-  "version": "3.0.25",
+  "version": "3.0.27",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",