超时增加reson参数

.gitignore

@@ -1,6 +1,9 @@
 *.min.js
 *.min.css
 
+demo.html
+.httpserver
+
 node_modules/
 dist/
 

Readme.md

@@ -55,7 +55,7 @@ f1('/get_list', {body: {page: 1}})
 
 ### APIs
 
-#### 1. fetch(url[, options<Object>])
+#### 1. fetch(url[, options`<Object>`])
 > 发起一个网络请求, options的参数如下。 同时支持配置公共域名, 公共参数。
 
   + method`<String>` 默认GET, 可选GET/POST/PUT/DELETE...

Readme@1.x.md

@@ -55,7 +55,7 @@ f1('/get_list', {body: {page: 1}})
 
 ### APIs
 
-#### 1. fetch(url[, options<Object>])
+#### 1. fetch(url[, options`<Object>`])
 > 发起一个网络请求, options的参数如下。 同时支持配置公共域名, 公共参数。
 
   + method`<String>` 默认GET, 可选GET/POST/PUT/DELETE...

package.json

@@ -1,8 +1,8 @@
 {
   "name": "@bytedo/fetch",
-  "version": "2.1.3",
+  "version": "2.1.9",
   "description": "全新的ajax封装。分2个版本, 一个基于XMLHttpRequest, 一个基于window.fetch",
-  "main": "dist/index.js",
+  "main": "dist/next.js",
   "files": [
     "dist/*"
   ],

src/index.js

@@ -4,7 +4,7 @@
  * @date 2020/08/03 17:05:10
  */
 
-import { Format, toS } from './lib/format.js'
+import { Format, getType } from './lib/format.js'
 
 const NOBODY_METHODS = ['GET', 'HEAD']
 const FORM_TYPES = {
@@ -25,7 +25,7 @@ const ERRORS = {
 }
 
 Promise.defer = function () {
-  var _ = {}
+  let _ = {}
   _.promise = new Promise(function (y, n) {
     _.resolve = y
     _.reject = n
@@ -66,7 +66,7 @@ class _Request {
     }
 
     if (!options.signal) {
-      var control = new AbortController()
+      let control = new AbortController()
       options.signal = control.signal
     }
     this.defer.promise.abort = function () {
@@ -90,10 +90,10 @@ class _Request {
   }
 
   __next__() {
-    var options = this.options
-    var params = null
-    var hasAttach = false // 是否有附件
-    var noBody = NOBODY_METHODS.includes(options.method)
+    let options = this.options
+    let params = null
+    let hasAttach = false // 是否有附件
+    let noBody = NOBODY_METHODS.includes(options.method)
 
     /* ------------------------  1»» 处理signal  ---------------------- */
     options.signal.onabort = _ => {
@@ -103,7 +103,7 @@ class _Request {
 
     /* --------------------------  2»» 请求的内容 --------------------- */
     if (options.body) {
-      var type = typeof options.body
+      let type = typeof options.body
       switch (type) {
         case 'number':
         case 'string':
@@ -111,6 +111,11 @@ class _Request {
           params = options.body
           break
         case 'object':
+          let _type = getType(options.body)
+
+          if (_type === 'ArrayBuffer' || _type === 'Uint8Array') {
+            break
+          }
           // 解析表单DOM
           if (options.body.nodeName === 'FORM') {
             options.method = options.body.method.toUpperCase() || 'POST'
@@ -127,14 +132,19 @@ class _Request {
             params = options.body
           } else {
             for (let k in options.body) {
-              if (
-                toS.call(options.body[k]) === '[object File]' ||
-                toS.call(options.body[k]) === '[object Blob]'
-              ) {
-                hasAttach = true
-                break
+              if (Array.isArray(options.body[k]) || getType(options.body[k]) === 'FileList') {
+                options.body[k] = Array.from(options.body[k])
+                hasAttach = options.body[k].some(
+                  it => getType(it) === 'File' || getType(it) === 'Blob'
+                )
+              } else {
+                if (getType(options.body[k]) === 'File' || getType(options.body[k]) === 'Blob') {
+                  hasAttach = true
+                  break
+                }
               }
             }
+
             // 有附件,则改为FormData
             if (hasAttach) {
               if (noBody) {
@@ -176,16 +186,17 @@ class _Request {
     if (noBody) {
       params = Format.param(params)
       if (params) {
-        options.url += (~options.url.indexOf('?') ? '&' : '?') + params
+        options.url += (options.url.includes('?') ? '&' : '?') + params
       }
       if (options.cache === 'no-store') {
-        options.url += (~options.url.indexOf('?') ? '&' : '?') + '_t_=' + Date.now()
+        options.url += (options.url.includes('?') ? '&' : '?') + '_t_=' + Date.now()
       }
     } else {
-      if (!hasAttach) {
-        if (~options.headers['content-type'].indexOf('json')) {
+      if (options.body && !hasAttach) {
+        if (options.headers['content-type'].includes('json')) {
           params = JSON.stringify(params)
-        } else {
+        }
+        if (options.headers['content-type'].includes('form')) {
           params = Format.param(params)
         }
       }
@@ -283,19 +294,19 @@ class _Request {
   }
 
   __success__(isSucc, result) {
-    var { body, status, statusText, headers } = result
-    var response = new Response(body, { status, statusText, headers })
-    var _type
+    let { body, status, statusText, headers } = result
+    let response = new Response(body, { status, statusText, headers })
+    let _type
 
     if (this._owner._inject_res) {
       response = this._owner._inject_res(response)
-      _type = toS.call(response)
+      _type = getType(it)(response)
     }
 
     if (isSucc) {
       this.defer.resolve(response)
     } else {
-      if (_type === '[object Promise]') {
+      if (_type === 'Promise') {
         return response.then(_ => this.defer.reject(_)).catch(_ => this.defer.reject(_))
       } else {
         this.defer.reject(response)
@@ -307,7 +318,7 @@ class _Request {
   }
 
   __cancel__(result) {
-    var response = new Response('', {
+    let response = new Response('', {
       status: 0,
       statusText: ERRORS[10100]
     })
@@ -320,7 +331,7 @@ class _Request {
   }
 
   __timeout__(result) {
-    var response = new Response('', {
+    let response = new Response('', {
       status: 504,
       statusText: ERRORS[10504]
     })
@@ -348,7 +359,7 @@ const _fetch = function (url, options) {
 }
 
 _fetch.create = function () {
-  var another = function (url, options) {
+  let another = function (url, options) {
     return new _Request(url, options, another)
   }
   inject(another)

src/lib/format.js

@@ -5,15 +5,17 @@
  *
  */
 
-export const toS = Object.prototype.toString
 export const encode = encodeURIComponent
 export const decode = decodeURIComponent
 
+export function getType(val) {
+  return Object.prototype.toString.call(val).slice(8, -1)
+}
 /**
  * 表单序列化
  */
 function serialize(p, obj, query) {
-  var k
+  let k
   if (Array.isArray(obj)) {
     obj.forEach(function (it, i) {
       k = p ? `${p}[${Array.isArray(it) ? i : ''}]` : i
@@ -82,13 +84,17 @@ export const Format = {
   mkFormData(data) {
     let form = new FormData()
     for (let i in data) {
-      let el = data[i]
-      if (Array.isArray(el)) {
-        el.forEach(function (it) {
+      let val = data[i]
+      if (val === void 0) {
+        val = ''
+      }
+
+      if (Array.isArray(val)) {
+        val.forEach(function (it) {
           form.append(i + '[]', it)
         })
       } else {
-        form.append(i, data[i])
+        form.append(i, val)
       }
     }
     return form
@@ -104,8 +110,14 @@ export const Format = {
         return
       }
 
+      if (v === void 0) {
+        v = ''
+      }
+
+      let _type = getType(v)
+
       v = typeof v === 'function' ? v() : v
-      v = toS.call(v) === '[object File]' || toS.call(v) === '[object Blob]' ? v : encode(v)
+      v = _type === 'File' || _type === 'Blob' ? v : encode(v)
 
       arr.push(encode(k) + '=' + v)
     }

src/next.js

@@ -4,7 +4,7 @@
  * @date 2020/07/31 18:59:47
  */
 
-import { Format, toS } from './lib/format.js'
+import { Format, getType } from './lib/format.js'
 
 const nativeFetch = window.fetch
 const NOBODY_METHODS = ['GET', 'HEAD']
@@ -75,19 +75,25 @@ class _Request {
   }
 
   __next__() {
-    var options = this.options
-    var hasAttach = false // 是否有附件
-    var noBody = NOBODY_METHODS.includes(options.method)
+    let options = this.options
+    let hasAttach = false // 是否有附件
+    let noBody = NOBODY_METHODS.includes(options.method)
 
     /* --------------------------  1»» 请求的内容 --------------------- */
     if (options.body) {
-      var type = typeof options.body
+      let type = typeof options.body
       switch (type) {
         case 'number':
         case 'string':
           this.__type__('text')
           break
         case 'object':
+          let _type = getType(options.body)
+
+          if (_type === 'ArrayBuffer' || _type === 'Uint8Array') {
+            break
+          }
+
           // 解析表单DOM
           if (options.body.nodeName === 'FORM') {
             options.method = options.body.method.toUpperCase() || 'POST'
@@ -104,12 +110,16 @@ class _Request {
             }
           } else {
             for (let k in options.body) {
-              if (
-                toS.call(options.body[k]) === '[object File]' ||
-                toS.call(options.body[k]) === '[object Blob]'
-              ) {
-                hasAttach = true
-                break
+              if (Array.isArray(options.body[k]) || getType(options.body[k]) === 'FileList') {
+                options.body[k] = Array.from(options.body[k])
+                hasAttach = options.body[k].some(
+                  it => getType(it) === 'File' || getType(it) === 'Blob'
+                )
+              } else {
+                if (getType(options.body[k]) === 'File' || getType(options.body[k]) === 'Blob') {
+                  hasAttach = true
+                  break
+                }
               }
             }
             // 有附件,则改为FormData
@@ -138,14 +148,14 @@ class _Request {
     if (noBody) {
       let tmp = Format.param(options.body)
       if (tmp) {
-        options.url += (~options.url.indexOf('?') ? '&' : '?') + tmp
+        options.url += (options.url.includes('?') ? '&' : '?') + tmp
       }
       delete options.body
     } else {
-      if (!hasAttach) {
-        if (~options.headers['content-type'].indexOf('json')) {
+      if (options.body && !hasAttach) {
+        if (options.headers['content-type'].includes('json')) {
           options.body = JSON.stringify(options.body)
-        } else {
+        } else if (options.headers['content-type'].includes('form')) {
           options.body = Format.param(options.body)
         }
       }
@@ -161,7 +171,7 @@ class _Request {
     }
 
     /* -----------------    5»» 构造请求    ------------------- */
-    var url = options.url
+    let url = options.url
     delete options.url
     for (let k in options) {
       if (options[k] === null || options[k] === undefined || options[k] === '') {
@@ -175,12 +185,12 @@ class _Request {
         let _type
         if (this._owner._inject_res) {
           r = this._owner._inject_res(r)
-          _type = toS.call(r)
+          _type = getType(r)
         }
         if (isSucc) {
           return r
         } else {
-          if (_type === '[object Promise]') {
+          if (_type === 'Promise') {
             return r.then(_ => Promise.reject(_))
           } else {
             return Promise.reject(r)
@@ -194,7 +204,7 @@ class _Request {
   }
 
   abort() {
-    this.control.abort()
+    this.control.abort(`Request timeout: ${~~(this.options.timeout / 1000)}s`)
   }
 
   __type__(type) {
@@ -218,7 +228,7 @@ const _fetch = function (url, options) {
 }
 
 _fetch.create = function () {
-  var another = function (url, options) {
+  let another = function (url, options) {
     return new _Request(url, options, another)
   }
   inject(another)