@wiajs/request 3.0.26 → 3.0.28

package/dist/request.cjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.26
+  * wia request v3.0.28
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -1596,37 +1596,45 @@ utils.createErrorType(
 
 /**
  * 初始化参数
- * @param {*} uri
- * @param {*} options
- * @param {*} callback
+ * @param {*} uri/opts
+ * @param {*} opts/cb
+ * @param {*} cb/null
  * @returns
  */
-function init(uri, options, callback) {
+function init(uri, opts, cb) {
   let R;
   try {
     // Parse parameters, ensuring that input is an object
     if (utils.isURL(uri)) uri = utils.spreadUrlObject(uri);
     else if (utils.isString(uri)) uri = utils.spreadUrlObject(utils.parseUrl(uri));
     else {
-      callback = options;
-      options = utils.validateUrl(uri);
-      uri = {};
+      cb = opts;
+      opts = uri;
+      const {url} = opts;
+      if (url) {
+        delete opts.url;
+        if (utils.isURL(url)) uri = utils.spreadUrlObject(url);
+        else if (utils.isString(url)) uri = utils.spreadUrlObject(utils.parseUrl(url));
+      } else {
+        opts = utils.validateUrl(uri);
+        uri = {};
+      }
     }
 
-    if (utils.isFunction(options)) {
-      callback = options;
-      options = null;
+    if (utils.isFunction(opts)) {
+      cb = opts;
+      opts = null;
     }
 
     // copy options
-    options = {
+    opts = {
       ...uri,
-      ...options,
+      ...opts,
     };
 
-    if (!utils.isString(options.host) && !utils.isString(options.hostname)) options.hostname = '::1';
+    if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
 
-    R = {opts: options, cb: callback};
+    R = {opts: opts, cb: cb};
     // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
@@ -1709,6 +1717,28 @@ function fn(verb) {
     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)) {
+
+        data.on('end', () => {
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            // req.destroy(err)
+          }
+        );
+
+        data.on('close', () => {
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
     return req
   }
 }

package/dist/request.mjs

@@ -1,5 +1,5 @@
 /*!
-  * wia request v3.0.26
+  * wia request v3.0.28
   * (c) 2022-2024 Sibyl Yu and contributors
   * Released under the MIT License.
   */
@@ -1593,37 +1593,45 @@ utils.createErrorType(
 
 /**
  * 初始化参数
- * @param {*} uri
- * @param {*} options
- * @param {*} callback
+ * @param {*} uri/opts
+ * @param {*} opts/cb
+ * @param {*} cb/null
  * @returns
  */
-function init(uri, options, callback) {
+function init(uri, opts, cb) {
   let R;
   try {
     // Parse parameters, ensuring that input is an object
     if (utils.isURL(uri)) uri = utils.spreadUrlObject(uri);
     else if (utils.isString(uri)) uri = utils.spreadUrlObject(utils.parseUrl(uri));
     else {
-      callback = options;
-      options = utils.validateUrl(uri);
-      uri = {};
+      cb = opts;
+      opts = uri;
+      const {url} = opts;
+      if (url) {
+        delete opts.url;
+        if (utils.isURL(url)) uri = utils.spreadUrlObject(url);
+        else if (utils.isString(url)) uri = utils.spreadUrlObject(utils.parseUrl(url));
+      } else {
+        opts = utils.validateUrl(uri);
+        uri = {};
+      }
     }
 
-    if (utils.isFunction(options)) {
-      callback = options;
-      options = null;
+    if (utils.isFunction(opts)) {
+      cb = opts;
+      opts = null;
     }
 
     // copy options
-    options = {
+    opts = {
       ...uri,
-      ...options,
+      ...opts,
     };
 
-    if (!utils.isString(options.host) && !utils.isString(options.hostname)) options.hostname = '::1';
+    if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
 
-    R = {opts: options, cb: callback};
+    R = {opts: opts, cb: cb};
     // log({R}, 'init')
   } catch (e) {
     log.err(e, 'init');
@@ -1706,6 +1714,28 @@ function fn(verb) {
     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)) {
+
+        data.on('end', () => {
+        });
+
+        data.once(
+          'error',
+          /** @param {*} err */ err => {
+            // req.destroy(err)
+          }
+        );
+
+        data.on('close', () => {
+        });
+
+        data.pipe(req); // 写入数据流
+      } else req.end(data);
+    }
     return req
   }
 }

package/lib/index.js

@@ -25,34 +25,42 @@ const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABOR
  * 支持隧道及非隧道、http(s)代理
  */ /**
  * 初始化参数
- * @param {*} uri
- * @param {*} options
- * @param {*} callback
+ * @param {*} uri/opts
+ * @param {*} opts/cb
+ * @param {*} cb/null
  * @returns
- */ function init(uri, options, callback) {
+ */ function init(uri, opts, cb) {
     let R;
     try {
         // Parse parameters, ensuring that input is an object
         if (utils.isURL(uri)) uri = utils.spreadUrlObject(uri);
         else if (utils.isString(uri)) uri = utils.spreadUrlObject(utils.parseUrl(uri));
         else {
-            callback = options;
-            options = utils.validateUrl(uri);
-            uri = {};
+            cb = opts;
+            opts = uri;
+            const { url } = opts;
+            if (url) {
+                delete opts.url;
+                if (utils.isURL(url)) uri = utils.spreadUrlObject(url);
+                else if (utils.isString(url)) uri = utils.spreadUrlObject(utils.parseUrl(url));
+            } else {
+                opts = utils.validateUrl(uri);
+                uri = {};
+            }
         }
-        if (utils.isFunction(options)) {
-            callback = options;
-            options = null;
+        if (utils.isFunction(opts)) {
+            cb = opts;
+            opts = null;
         }
         // copy options
-        options = {
+        opts = {
             ...uri,
-            ...options
+            ...opts
         };
-        if (!utils.isString(options.host) && !utils.isString(options.hostname)) options.hostname = '::1';
+        if (!utils.isString(opts.host) && !utils.isString(opts.hostname)) opts.hostname = '::1';
         R = {
-            opts: options,
-            cb: callback
+            opts: opts,
+            cb: cb
         };
     // log({R}, 'init')
     } catch (e) {
@@ -121,6 +129,30 @@ const WritebBeenAbortedError = utils.createErrorType('ERR_STREAM_WRITE_BEEN_ABOR
         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)) {
+                // 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);
+        }
         return req;
     };
 }

package/package.json

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