bytedo
/
fetch
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Compare commits

base: bytedo:master
Branches Tags
bytedo:master
bytedo:2.1.7
bytedo:2.1.6
bytedo:2.1.3
bytedo:2.1.0
bytedo:2.0.0
bytedo:1.2.0
bytedo:1.1.0
..
compare: bytedo:2.1.6
Branches Tags
bytedo:master
bytedo:2.1.7
bytedo:2.1.6
bytedo:2.1.3
bytedo:2.1.0
bytedo:2.0.0
bytedo:1.2.0
bytedo:1.1.0

No commits in common. "master" and "2.1.6" have entirely different histories.
master ... 2.1.6

6 changed files with 35 additions and 56 deletions
Show Stats Expand all files Collapse all files

2
Readme.md
View File

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

2
Readme@1.x.md
View File

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

4
package.json
View File

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

40
src/index.js
View File

@ -25,7 +25,7 @@ const ERRORS = {
} }
Promise.defer = function () { Promise.defer = function () {
let _ = {} var _ = {}
_.promise = new Promise(function (y, n) { _.promise = new Promise(function (y, n) {
_.resolve = y _.resolve = y
_.reject = n _.reject = n
@ -66,7 +66,7 @@ class _Request {
} }
if (!options.signal) { if (!options.signal) {
let control = new AbortController() var control = new AbortController()
options.signal = control.signal options.signal = control.signal
} }
this.defer.promise.abort = function () { this.defer.promise.abort = function () {
@ -90,10 +90,10 @@ class _Request {
} }
__next__() { __next__() {
let options = this.options var options = this.options
let params = null var params = null
let hasAttach = false // 是否有附件 var hasAttach = false // 是否有附件
let noBody = NOBODY_METHODS.includes(options.method) var noBody = NOBODY_METHODS.includes(options.method)
/* ------------------------ 1»» 处理signal ---------------------- */ /* ------------------------ 1»» 处理signal ---------------------- */
options.signal.onabort = _ => { options.signal.onabort = _ => {
@ -103,7 +103,7 @@ class _Request {
/* -------------------------- 2»» 请求的内容 --------------------- */ /* -------------------------- 2»» 请求的内容 --------------------- */
if (options.body) { if (options.body) {
let type = typeof options.body var type = typeof options.body
switch (type) { switch (type) {
case 'number': case 'number':
case 'string': case 'string':
@ -111,11 +111,6 @@ class _Request {
params = options.body params = options.body
break break
case 'object': case 'object':
let _type = getType(options.body)
if (_type === 'ArrayBuffer' || _type === 'Uint8Array') {
break
}
// 解析表单DOM // 解析表单DOM
if (options.body.nodeName === 'FORM') { if (options.body.nodeName === 'FORM') {
options.method = options.body.method.toUpperCase() || 'POST' options.method = options.body.method.toUpperCase() || 'POST'
@ -186,17 +181,16 @@ class _Request {
if (noBody) { if (noBody) {
params = Format.param(params) params = Format.param(params)
if (params) { if (params) {
options.url += (options.url.includes('?') ? '&' : '?') + params options.url += (~options.url.indexOf('?') ? '&' : '?') + params
} }
if (options.cache === 'no-store') { if (options.cache === 'no-store') {
options.url += (options.url.includes('?') ? '&' : '?') + '_t_=' + Date.now() options.url += (~options.url.indexOf('?') ? '&' : '?') + '_t_=' + Date.now()
} }
} else { } else {
if (options.body && !hasAttach) { if (options.body && !hasAttach) {
if (options.headers['content-type'].includes('json')) { if (~options.headers['content-type'].indexOf('json')) {
params = JSON.stringify(params) params = JSON.stringify(params)
} } else {
if (options.headers['content-type'].includes('form')) {
params = Format.param(params) params = Format.param(params)
} }
} }
@ -294,9 +288,9 @@ class _Request {
} }
__success__(isSucc, result) { __success__(isSucc, result) {
let { body, status, statusText, headers } = result var { body, status, statusText, headers } = result
let response = new Response(body, { status, statusText, headers }) var response = new Response(body, { status, statusText, headers })
let _type var _type
if (this._owner._inject_res) { if (this._owner._inject_res) {
response = this._owner._inject_res(response) response = this._owner._inject_res(response)
@ -318,7 +312,7 @@ class _Request {
} }
__cancel__(result) { __cancel__(result) {
let response = new Response('', { var response = new Response('', {
status: 0, status: 0,
statusText: ERRORS[10100] statusText: ERRORS[10100]
}) })
@ -331,7 +325,7 @@ class _Request {
} }
__timeout__(result) { __timeout__(result) {
let response = new Response('', { var response = new Response('', {
status: 504, status: 504,
statusText: ERRORS[10504] statusText: ERRORS[10504]
}) })
@ -359,7 +353,7 @@ const _fetch = function (url, options) {
} }
_fetch.create = function () { _fetch.create = function () {
let another = function (url, options) { var another = function (url, options) {
return new _Request(url, options, another) return new _Request(url, options, another)
} }
inject(another) inject(another)

19
src/lib/format.js
View File

@ -15,7 +15,7 @@ export function getType(val) {
* 表单序列化 * 表单序列化
*/ */
function serialize(p, obj, query) { function serialize(p, obj, query) {
let k var k
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
obj.forEach(function (it, i) { obj.forEach(function (it, i) {
k = p ? `${p}[${Array.isArray(it) ? i : ''}]` : i k = p ? `${p}[${Array.isArray(it) ? i : ''}]` : i
@ -84,17 +84,13 @@ export const Format = {
mkFormData(data) { mkFormData(data) {
let form = new FormData() let form = new FormData()
for (let i in data) { for (let i in data) {
let val = data[i] let el = data[i]
if (val === void 0) { if (Array.isArray(el)) {
val = '' el.forEach(function (it) {
}
if (Array.isArray(val)) {
val.forEach(function (it) {
form.append(i + '[]', it) form.append(i + '[]', it)
}) })
} else { } else {
form.append(i, val) form.append(i, data[i])
} }
} }
return form return form
@ -109,11 +105,6 @@ export const Format = {
if (/native code/.test(v)) { if (/native code/.test(v)) {
return return
} }
if (v === void 0) {
v = ''
}
let _type = getType(v) let _type = getType(v)
v = typeof v === 'function' ? v() : v v = typeof v === 'function' ? v() : v

24
src/next.js
View File

@ -75,25 +75,19 @@ class _Request {
} }
__next__() { __next__() {
let options = this.options var options = this.options
let hasAttach = false // 是否有附件 var hasAttach = false // 是否有附件
let noBody = NOBODY_METHODS.includes(options.method) var noBody = NOBODY_METHODS.includes(options.method)
/* -------------------------- 1»» 请求的内容 --------------------- */ /* -------------------------- 1»» 请求的内容 --------------------- */
if (options.body) { if (options.body) {
let type = typeof options.body var type = typeof options.body
switch (type) { switch (type) {
case 'number': case 'number':
case 'string': case 'string':
this.__type__('text') this.__type__('text')
break break
case 'object': case 'object':
let _type = getType(options.body)
if (_type === 'ArrayBuffer' || _type === 'Uint8Array') {
break
}
// 解析表单DOM // 解析表单DOM
if (options.body.nodeName === 'FORM') { if (options.body.nodeName === 'FORM') {
options.method = options.body.method.toUpperCase() || 'POST' options.method = options.body.method.toUpperCase() || 'POST'
@ -148,14 +142,14 @@ class _Request {
if (noBody) { if (noBody) {
let tmp = Format.param(options.body) let tmp = Format.param(options.body)
if (tmp) { if (tmp) {
options.url += (options.url.includes('?') ? '&' : '?') + tmp options.url += (~options.url.indexOf('?') ? '&' : '?') + tmp
} }
delete options.body delete options.body
} else { } else {
if (options.body && !hasAttach) { if (options.body && !hasAttach) {
if (options.headers['content-type'].includes('json')) { if (~options.headers['content-type'].indexOf('json')) {
options.body = JSON.stringify(options.body) options.body = JSON.stringify(options.body)
} else if (options.headers['content-type'].includes('form')) { } else {
options.body = Format.param(options.body) options.body = Format.param(options.body)
} }
} }
@ -171,7 +165,7 @@ class _Request {
} }
/* ----------------- 5»» 构造请求 ------------------- */ /* ----------------- 5»» 构造请求 ------------------- */
let url = options.url var url = options.url
delete options.url delete options.url
for (let k in options) { for (let k in options) {
if (options[k] === null || options[k] === undefined || options[k] === '') { if (options[k] === null || options[k] === undefined || options[k] === '') {
@ -228,7 +222,7 @@ const _fetch = function (url, options) {
} }
_fetch.create = function () { _fetch.create = function () {
let another = function (url, options) { var another = function (url, options) {
return new _Request(url, options, another) return new _Request(url, options, another)
} }
inject(another) inject(another)