@mpxjs/api-proxy 2.9.0-beta.0 → 2.9.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.0-beta.0",
+  "version": "2.9.0-beta.2",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -31,7 +31,7 @@
     "promise"
   ],
   "author": "httpsxiao",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/didi/mpx/issues"
   },
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^0.21.1"
   },
-  "gitHead": "67b611aeae99f916d46ca8d5d9ed784ddf53f05c"
+  "gitHead": "2d61bab77c50eccb7470b9b9bd644e7bd6510467"
 }

package/src/index.js

@@ -9,8 +9,7 @@ export default function install (target, options = {}) {
     platform = {},
     exclude = ['shareImageMessage'], // 强制不进行代理的api，临时fix微信分享朋友圈白屏
     custom = {}, // 自定义转化规则
-    fallbackMap = {}, // 对于不支持的API，允许配置一个映射表，接管不存在的API
-    optimize = false // 内部一些实验优化的开关，外部用户慎用
+    fallbackMap = {} // 对于不支持的API，允许配置一个映射表，接管不存在的API
   } = options
 
   let { from = '', to = '' } = platform
@@ -40,8 +39,7 @@ export default function install (target, options = {}) {
     exclude,
     from,
     to,
-    custom,
-    optimize
+    custom
   })
 
   const promisedApi = usePromise ? promisify(transedApi, whiteList, blackList) : {}

package/src/mini/platform/wxToAli.js

@@ -6,10 +6,7 @@ const TIPS_NAME = '支付宝环境 mpx'
 // canvas api 用
 const CANVAS_MAP = {}
 
-// optimize case avoid call api multi times with getSystemInfoSync
-let systemInfo
-
-const getWxToAliApi = ({ optimize = false }) => {
+const getWxToAliApi = () => {
   return {
     /**
      * 基础
@@ -34,10 +31,6 @@ const getWxToAliApi = ({ optimize = false }) => {
     },
 
     getSystemInfoSync () {
-      if (optimize) {
-        if (systemInfo) return systemInfo
-      }
-
       const res = ALI_OBJ.getSystemInfoSync() || {}
 
       res.system = `${res.platform} ${res.system}`
@@ -48,8 +41,6 @@ const getWxToAliApi = ({ optimize = false }) => {
         res.windowHeight = Math.floor(res.screenHeight * res.windowWidth / res.screenWidth) - 50
       }
 
-      if (optimize) systemInfo = res
-
       return res
     },
 

package/src/mini/transform.js

@@ -14,7 +14,7 @@ function transformApi (options) {
   const from = options.from
   const to = options.to
   const fromTo = joinName(from, to)
-  const wxToAliApi = getWxToAliApi({ optimize: options.optimize })
+  const wxToAliApi = getWxToAliApi()
   const wxToQqApi = getWxToQqApi()
   const wxToTtApi = getWxToTtApi()
   const platformMap = {

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

@@ -19,13 +19,13 @@ class EventChannel {
     }
   }
 
-  off (eventName, EventCallback) {
-    if (EventCallback) {
+  off (eventName, listener) {
+    if (listener) {
       const cbs = this.listener[eventName]
       const copyCbs = []
       if (cbs) {
         cbs.forEach((item) => {
-          if (item.fn !== EventCallback) {
+          if (item.fn !== listener) {
             copyCbs.push(item)
           }
         })
@@ -36,26 +36,25 @@ class EventChannel {
     }
   }
 
-  on (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'on' })
+  on (eventName, listener) {
+    this._addListener(eventName, listener, 'on')
   }
 
-  once (eventName, EventCallback) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type: 'once' })
+  once (eventName, listener) {
+    this._addListener(eventName, listener, 'once')
   }
 
-  _addListener (eventName, EventCallback, type) {
-    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: EventCallback, type })
+  _addListener (eventName, listener, type) {
+    (this.listener[eventName] || (this.listener[eventName] = [])).push({ fn: listener, type })
   }
 
   _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' })
-      })
-    }
+    Object.keys(events).forEach((eventName) => {
+      this.on(eventName, events[eventName])
+    })
   }
 }
+
 export {
   EventChannel
 }