@wiajs/request 3.0.23 → 3.0.26

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.23
+  * wia request v3.0.26
   * (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
@@ -661,7 +662,7 @@ class Request extends stream.Duplex {
     for (const method of writeMethods) {
       // @ts-ignore
       m[method] = (a, b) => {
-        log$1(method, {a, b});
+        // log(method, {a, b})
         // @ts-ignore
         m._currentRequest?.[method](a, b);
       };
@@ -765,7 +766,7 @@ class Request extends stream.Duplex {
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1({opt, protocol}, 'request');
+      // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
       const req = httpModule.request(opt, m._onResponse);
@@ -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
@@ -1208,7 +1238,9 @@ class Request extends stream.Duplex {
 
     // Create the redirected request
     const redirectUrl = utils.resolveUrl(location, currentUrl);
+
     log$1({redirectUrl}, 'redirecting to');
+
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
     utils.spreadUrlObject(redirectUrl, m.opt);
@@ -1540,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'
 )
@@ -1621,31 +1653,9 @@ function request(uri, options, callback) {
   try {
     const {opts, cb} = init(uri, options, callback);
     // log({uri, options, opts}, 'request')
-    R = new Request(opts, cb);
-  } catch (e) {
-    log.err(e, 'request');
-  }
-
-  return R
-}
-
-/**
- * 执行简单的数据（支持strean）请求
- * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
- * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
- * organize params for patch, post, put, head, del
- * @param {string} verb
- * @returns {Request} Duplex 流
- */
-function fn(verb) {
-  const method = verb.toUpperCase();
-
-  // @ts-ignore
-  return (uri, options, callback) => {
-    const {opts, cb} = init(uri, options, callback);
-    opts.method = method;
     const req = new Request(opts, cb);
     const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
       // 发送数据
       if (utils.isStream(data)) {
@@ -1661,19 +1671,44 @@ function fn(verb) {
           '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); // 写入数据流
       } else req.end(data);
     }
+
+    R = req;
+  } catch (e) {
+    log.err(e, 'request');
+  }
+
+  return R
+}
+
+/**
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
+ * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
+ * organize params for patch, post, put, head, del
+ * @param {string} verb
+ * @returns {Request} Duplex 流
+ */
+function fn(verb) {
+  const method = verb.toUpperCase();
+
+  // @ts-ignore
+  return (uri, options, callback) => {
+    const {opts, cb} = init(uri, options, callback);
+    opts.method = method;
+    const req = new Request(opts, cb);
     return req
   }
 }

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.23
+  * wia request v3.0.26
   * (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
@@ -658,7 +659,7 @@ class Request extends Duplex {
     for (const method of writeMethods) {
       // @ts-ignore
       m[method] = (a, b) => {
-        log$1(method, {a, b});
+        // log(method, {a, b})
         // @ts-ignore
         m._currentRequest?.[method](a, b);
       };
@@ -762,7 +763,7 @@ class Request extends Duplex {
       const httpModule = httpModules[protocol];
       if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`)
 
-      log$1({opt, protocol}, 'request');
+      // log({opt, protocol}, 'request')
       // Create the native request and set up its event handlers
       // @ts-ignore
       const req = httpModule.request(opt, m._onResponse);
@@ -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
@@ -1205,7 +1235,9 @@ class Request extends Duplex {
 
     // Create the redirected request
     const redirectUrl = utils.resolveUrl(location, currentUrl);
+
     log$1({redirectUrl}, 'redirecting to');
+
     m._isRedirect = true;
     // 覆盖原 url 解析部分，包括 protocol、hostname、port等
     utils.spreadUrlObject(redirectUrl, m.opt);
@@ -1537,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'
 )
@@ -1618,31 +1650,9 @@ function request(uri, options, callback) {
   try {
     const {opts, cb} = init(uri, options, callback);
     // log({uri, options, opts}, 'request')
-    R = new Request(opts, cb);
-  } catch (e) {
-    log.err(e, 'request');
-  }
-
-  return R
-}
-
-/**
- * 执行简单的数据（支持strean）请求
- * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
- * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
- * organize params for patch, post, put, head, del
- * @param {string} verb
- * @returns {Request} Duplex 流
- */
-function fn(verb) {
-  const method = verb.toUpperCase();
-
-  // @ts-ignore
-  return (uri, options, callback) => {
-    const {opts, cb} = init(uri, options, callback);
-    opts.method = method;
     const req = new Request(opts, cb);
     const {data, stream} = opts;
+    // 非流模式，自动发送请求，流模式通过流写入发送
     if (!stream) {
       // 发送数据
       if (utils.isStream(data)) {
@@ -1658,19 +1668,44 @@ function fn(verb) {
           '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); // 写入数据流
       } else req.end(data);
     }
+
+    R = req;
+  } catch (e) {
+    log.err(e, 'request');
+  }
+
+  return R
+}
+
+/**
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
+ * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
+ * organize params for patch, post, put, head, del
+ * @param {string} verb
+ * @returns {Request} Duplex 流
+ */
+function fn(verb) {
+  const method = verb.toUpperCase();
+
+  // @ts-ignore
+  return (uri, options, callback) => {
+    const {opts, cb} = init(uri, options, callback);
+    opts.method = method;
+    const req = new Request(opts, cb);
     return req
   }
 }

package/lib/index.js

@@ -76,27 +76,9 @@ 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);
-    } catch (e) {
-        log.err(e, 'request');
-    }
-    return R;
-}
-/**
- * 执行简单的数据（支持strean）请求
- * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
- * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
- * organize params for patch, post, put, head, del
- * @param {string} verb
- * @returns {Request} Duplex 流
- */ function fn(verb) {
-    const method = verb.toUpperCase();
-    // @ts-ignore
-    return (uri, options, callback)=>{
-        const { opts, cb } = init(uri, options, callback);
-        opts.method = method;
         const req = new Request(opts, cb);
         const { data, stream } = opts;
+        // 非流模式，自动发送请求，流模式通过流写入发送
         if (!stream) {
             // 发送数据
             if (utils.isStream(data)) {
@@ -108,17 +90,37 @@ 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) // 写入数据流
                 ;
             } else req.end(data);
         }
+        R = req;
+    } catch (e) {
+        log.err(e, 'request');
+    }
+    return R;
+}
+/**
+ * 执行简单的数据（支持strean）请求
+ * 非流模式，直接写入数据流，流模式，由管道触发，或手动调用 end() data.pipe 写入数据
+ * 复杂数据，请使用 @wiajs/req库（fork from axios），该库封装了当前库，提供了更多功能
+ * organize params for patch, post, put, head, del
+ * @param {string} verb
+ * @returns {Request} Duplex 流
+ */ function fn(verb) {
+    const method = verb.toUpperCase();
+    // @ts-ignore
+    return (uri, options, callback)=>{
+        const { opts, cb } = init(uri, options, callback);
+        opts.method = method;
+        const req = new Request(opts, cb);
         return 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]
@@ -174,10 +175,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
         for (const method of writeMethods){
             // @ts-ignore
             m[method] = (a, b)=>{
-                log(method, {
-                    a,
-                    b
-                });
+                // log(method, {a, b})
                 // @ts-ignore
                 m._currentRequest?.[method](a, b);
             };
@@ -259,10 +257,7 @@ const WriteAfterEndError = utils.createErrorType('ERR_STREAM_WRITE_AFTER_END', '
             }
             const httpModule = httpModules[protocol];
             if (!httpModule) throw TypeError(`Unsupported protocol: ${protocol}`);
-            log({
-                opt,
-                protocol
-            }, 'request');
+            // log({opt, protocol}, 'request')
             // Create the native request and set up its event handlers
             // @ts-ignore
             const req = httpModule.request(opt, m._onResponse);
@@ -327,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.23",
+  "version": "3.0.26",
   "type": "module",
   "main": "index.js",
   "types": "types/index.d.ts",