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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.8.23-alpha",
+  "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": "3a6dff432fd46bab36a9866f92cffb6501e69909"
+  "gitHead": "fed88f10a76c55cc2be19369b4b754191984d3a3"
 }

package/src/tenon/api/event-channel/index.js

@@ -1,57 +1,48 @@
+const notifyCenter = Hummer.notifyCenter
+const { Memory } = __GLOBAL__
+// 通过Memory 和 notifyCenter实现跨页面事件通道
+// FIXME:可能存在的问题once订阅的移除   emit事件传参数量
 class EventChannel {
-  constructor () {
-    this.listener = {}
-  }
-
   emit (eventName, ...args) {
-    const cbs = this.listener[eventName]
-    if (cbs) {
-      cbs.forEach((item, index) => {
-        try {
-          item.fn.apply(this, args)
-        } catch (e) {
-          console.log(`event "${eventName}" error ${e}`)
-        }
-        if (item.type === 'once') {
-          cbs.splice(index, 1)
-        }
-      })
+    notifyCenter.triggerEvent(eventName, args)
+    if (Memory.exist(`_ENENT_ONCE_${eventName}`)) {
+      // 订阅和发送可能不是一个上下文 暂时只能全部移除
+      this.off(eventName)
+      Memory.remove(`_ENENT_ONCE_${eventName}`)
     }
   }
 
   off (eventName, EventCallback) {
-    if (EventCallback) {
-      const cbs = this.listener[eventName]
-      const copyCbs = []
-      if (cbs) {
-        cbs.forEach((item, index) => {
-          if (item.fn !== EventCallback) {
-            copyCbs.push(item)
-          }
-        })
-      }
-      this.listener[eventName] = copyCbs
-    } else {
-      this.listener[eventName] && (this.listener[eventName].length = 0)
-    }
+    notifyCenter.removeEventListener(eventName, EventCallback)
   }
 
   on (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
+    notifyCenter.addEventListener(eventName, EventCallback)
   }
 
   once (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
+    notifyCenter.addEventListener(eventName, EventCallback)
+    Memory.set(`_ENENT_ONCE_${eventName}`, 1)
   }
 
   _addListener (eventName, EventCallback, type) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
+    switch (type) {
+      case 'on':
+        this.on(eventName, EventCallback)
+        break
+      case 'once':
+        this.once(eventName, EventCallback)
+        break
+      default:
+        this.on(eventName, EventCallback)
+        break
+    }
   }
 
   _addListeners (events) {
     if (Object.prototype.toString.call(events) === '[object Object]') {
       Object.keys(events).forEach((eventName) => {
-        (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: events[eventName], type: 'on' })
+        this.on(eventName, events[eventName])
       })
     }
   }

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.param = data
   requestFn.header = header
-  requestFn.params = data
-  requestFn.send((response) => {
-    let { status, header: resHeader, data: resData, error } = response
-    // 返回的数据处理
-
-    if (responseType === 'text' && dataType === 'json') {
-      try {
-        resData = JSON.parse(resData)
-      } catch (e) {}
-    }
 
-    if (status >= 200 && status < 300) {
-      const result = {
-        errMsg: 'request:ok',
-        data: resData,
-        statusCode: status,
-        header: resHeader
+  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)
       }
-      webHandleSuccess(result, success, complete)
-      return result
-    } else {
-      const res = { errMsg: `request:fail ${error.msg}` }
-      webHandleFail(res, fail, complete)
-      if (!fail) {
-        return Promise.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
+}

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

@@ -2,14 +2,39 @@ import { webHandleSuccess } from '../../../common/js'
 import { EventChannel } from '../event-channel'
 const { Navigator } = __GLOBAL__
 
+function handleUrl (url) {
+  const [urlString, queryString] = url.split('?')
+  const queryObj = {}
+
+  if (!queryString) {
+    return {
+      query: queryObj,
+      url: urlString
+    }
+  }
+
+  const paramsArray = queryString.split('&')
+  for (const pair of paramsArray) {
+    const [key, value] = pair.split('=')
+    queryObj[key] = decodeURIComponent(value)
+  }
+
+  return {
+    query: queryObj,
+    url: urlString
+  }
+}
+
 function redirectTo (options = {}) {
+  const { url, query } = handleUrl(options.url || '')
   if (Navigator) {
-    Navigator.__mpxAction = { type: 'redirect' }
     return new Promise((resolve, reject) => {
       // 关闭本页面的跳转
       Navigator.openPage(
         {
-          url: options.url,
+          url,
+          animated: false,
+          params: query,
           closeSelf: true
         },
         // 执行环境变了 得不到执行的机会 故回调无效
@@ -23,25 +48,22 @@ function redirectTo (options = {}) {
 }
 
 function navigateTo (options = {}) {
+  const { url, query } = handleUrl(options.url || '')
+  const events = options.events
+
   if (Navigator) {
     const eventChannel = new EventChannel()
-    Navigator.__mpxAction = {
-      type: 'to',
-      eventChannel
-    }
-    if (options.events) {
-      eventChannel._addListeners(options.events)
+    if (events) {
+      eventChannel._addListeners(events)
     }
     return new Promise((resolve, reject) => {
       // 不关闭本页面的跳转
-      Navigator.openPage(
-        {
-          url: options.url
-        },
-        // 执行环境变了 得不到执行的机会 故回调无效
-        () => {}
-      )
-      const res = { errMsg: 'redirectTo:ok' }
+      Navigator.openPage({
+        url,
+        animated: true,
+        params: query
+      }, () => {})
+      const res = { errMsg: 'redirectTo:ok', eventChannel }
       webHandleSuccess(res, options.success, options.complete)
       resolve(res)
     })
@@ -51,12 +73,9 @@ function navigateTo (options = {}) {
 function navigateBack (options = {}) {
   if (Navigator) {
     const delta = options.delta || 1
-    Navigator.__mpxAction = {
-      type: 'back',
-      delta
-    }
-    // popBack方法
-    Navigator.popBack(delta, { animated: true })
+    Navigator.popBack(delta, {
+      animated: true
+    })
     const res = { errMsg: 'navigateBack:ok' }
     webHandleSuccess(res, options.success, options.complete)
     return Promise.resolve(res)

package/src/tenon/api/set-navigation-bar/index.js

@@ -0,0 +1,17 @@
+import { webHandleSuccess } from '../../../common/js'
+const {
+  Hummer
+} = __GLOBAL__
+
+function setNavigationBarTitle (options = {}) {
+  const { title, success, complete } = options
+  Hummer.setTitle(title)
+  webHandleSuccess({ errMsg: 'setTitle:ok' }, success, complete)
+}
+
+function setNavigationBarColor (options = {}) {}
+
+export {
+  setNavigationBarTitle,
+  setNavigationBarColor
+}