@mpxjs/api-proxy 2.8.25-alpha.18 → 2.8.25-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.25-alpha.18",
+  "version": "2.8.25-alpha.19",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "14a16b3d7995ce01989d2b516038b381678006b3"
+  "gitHead": "fed88f10a76c55cc2be19369b4b754191984d3a3"
 }

package/src/tenon/api/request/index.js

@@ -1,70 +1,84 @@
 import { webHandleSuccess, webHandleFail } from '../../../common/js'
+import { buildQueryStringUrl, parseHeader, tryJsonParse } from './utils'
 const { Request } = __GLOBAL__
+const requestFn = new Request()
 
-function request (options = { url: '' }) {
+function request (options = {}) {
   let {
     data = {},
     method = 'GET',
-    dataType = 'json',
-    responseType = 'text',
+    dataType = 'form',
+    responseType = 'json',
     timeout = 60 * 1000,
     header = {},
     success = null,
     fail = null,
-    complete = null
+    complete = null,
+    url = ''
   } = options
 
   method = method.toUpperCase()
 
-  if (
-    method === 'POST' &&
-    typeof data !== 'string' && // string 不做处理
-    (header['Content-Type'] === 'application/x-www-form-urlencoded' ||
-      header['content-type'] === 'application/x-www-form-urlencoded')
-  ) {
-    // 重新设置data
-    data = Object.keys(data)
-      .reduce((pre, curKey) => {
-        return `${pre}&${encodeURIComponent(curKey)}=${encodeURIComponent(
-          data[curKey]
-        )}`
-      }, '')
-      .slice(1)
+  if (['GET', 'PUT', 'DELETE'].indexOf(method) > -1) {
+    url = buildQueryStringUrl(data, url)
+
+    if (method === 'GET') {
+      data = {}
+    }
   }
 
-  const requestFn = new Request()
+  switch (dataType) {
+    case 'form':
+      header = {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        ...header
+      }
+      break
+
+    case 'json':
+      header = {
+        'Content-Type': 'application/json',
+        ...header
+      }
+      break
+  }
 
-  requestFn.url = options.url
+  requestFn.url = url
   requestFn.method = method
   requestFn.timeout = timeout
-  requestFn.header = header
   requestFn.param = data
-  requestFn.send((response) => {
-    let { status, header: resHeader, data: resData, error } = response
-    // 返回的数据处理
-
-    if (responseType === 'text' && dataType === 'json') {
-      try {
-        resData = JSON.parse(resData)
-      } catch (e) {}
-    }
+  requestFn.header = header
 
-    if (status >= 200 && status < 300) {
-      const result = {
-        errMsg: 'request:ok',
-        data: resData,
-        statusCode: status,
-        header: resHeader
-      }
-      webHandleSuccess(result, success, complete)
-      return result
-    } else {
-      const res = { errMsg: `request:fail ${error.msg}` }
-      webHandleFail(res, fail, complete)
-      if (!fail) {
-        return Promise.reject(res)
+  return new Promise((resolve, reject) => {
+    requestFn.send((response) => {
+      let { status, header: resHeader, data: resData, error } = response
+      // 返回的数据处理
+      if (status >= 200 && status < 300) {
+        if (responseType === 'json' && typeof resData === 'string') {
+          try {
+            resData = JSON.parse(resData)
+          } catch (e) {
+            console.log('resDataType默认为"json", 尝试对返回内容进行JSON.parse, 但似乎出了些问题(若不希望对结果进行parse, 可传入resDataType: "text"): ', e)
+          }
+        }
+        const result = {
+          errMsg: 'request:ok',
+          data: resData,
+          statusCode: status,
+          header: resHeader
+        }
+        webHandleSuccess(result, success, complete)
+        resolve(result)
+      } else {
+        if (responseType === 'json') {
+          resData = tryJsonParse(resData)
+        }
+        header = parseHeader(header)
+        const res = { errMsg: `request:fail ${error.msg}`, data: resData, header }
+        webHandleFail(res, fail, complete)
+        reject(res)
       }
-    }
+    })
   })
 }
 

package/src/tenon/api/request/utils.js

@@ -0,0 +1,80 @@
+function typeEqual (obj, type) {
+  return Object.prototype.toString.call(obj) === '[object ' + type + ']'
+}
+
+function isStr (obj) {
+  return typeEqual(obj, 'String')
+}
+
+export function queryParse (search = '') {
+  const arr = search.split(/(\?|&)/)
+  const parmsObj = {}
+
+  for (let i = 0; i < arr.length; i++) {
+    if (arr[i].indexOf('=') !== -1) {
+      const keyValue = arr[i].match(/([^=]*)=(.*)/)
+      parmsObj[keyValue[1]] = decodeURIComponent(keyValue[2])
+    }
+  }
+
+  if (JSON.stringify(parmsObj) === '{}') {
+    // 如果解析失败，返回原值
+    return search
+  }
+
+  return parmsObj
+}
+
+export function tryJsonParse (some) {
+  // 这里eslint提示也先别删除\[\]
+  // eslint-disable-next-line no-useless-escape
+  if (isStr(some) && /[\{\[].*[\}\]]/.test(some)) {
+    try {
+      some = JSON.parse(some)
+    } catch (err) {}
+  }
+
+  return some
+}
+
+export function parseHeader (headers) {
+  // fetch中的headers value为数组形式,其他端为字符串形式， 统一为字符串
+  // header的key值统一为小写
+  const result = {}
+  Object.keys(headers).forEach(key => {
+    let value = headers[key]
+
+    if (value instanceof Array) {
+      value = value[0]
+    }
+
+    result[key.toLowerCase()] = value
+  })
+  return JSON.stringify(result)
+}
+
+export function queryStringify (obj) {
+  const strArr = []
+  let keys = null
+
+  if (obj && Object.keys(obj).length > 0) {
+    keys = Object.keys(obj)
+
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i]
+      strArr.push(`${key}=${encodeURIComponent(obj[key])}`)
+    }
+  }
+
+  return strArr.join('&')
+}
+export function buildQueryStringUrl (params, url = '') {
+  if (!url) return queryStringify(params)
+  let retUrl = url
+
+  if (queryStringify(params)) {
+    retUrl = url.indexOf('?') > -1 ? `${url}&${queryStringify(params)}` : `${url}?${queryStringify(params)}`
+  }
+
+  return retUrl
+}