@mpxjs/api-proxy 2.9.20 → 2.9.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/api-proxy",
-  "version": "2.9.20",
+  "version": "2.9.22",
   "description": "convert miniprogram API at each end",
   "module": "src/index.js",
   "types": "@types/index.d.ts",
@@ -39,5 +39,5 @@
   "dependencies": {
     "axios": "^1.6.7"
   },
-  "gitHead": "2813da00b63ec85a3bcd4355979c5adb56c853fd"
+  "gitHead": "0ef19708a763b6e7a9338591618197d8d33adbfd"
 }

package/src/common/js/promisify.js

@@ -1,4 +1,4 @@
-import { getEnvObj, noop } from './utils'
+import { getEnvObj } from './utils'
 
 const envObj = getEnvObj()
 
@@ -68,29 +68,20 @@ function promisify (listObj, whiteList, customBlackList) {
     }
 
     result[key] = function (...args) {
-      if (promisifyFilter(key)) {
-        if (!args[0]) {
-          args.unshift({ success: noop, fail: noop })
-        }
-        const obj = args[0]
+      const obj = args[0] || {}
+      // 不需要转换 or 用户已定义回调，则不处理
+      if (!promisifyFilter(key) || obj.success || obj.fail) {
+        return listObj[key].apply(envObj, args)
+      } else { // 其他情况进行转换
+        if (!args[0]) args.unshift(obj)
         let returned
         const promise = new Promise((resolve, reject) => {
-          const originSuccess = obj.success
-          const originFail = obj.fail
-          obj.success = function (res) {
-            originSuccess && originSuccess.call(this, res)
-            resolve(res)
-          }
-          obj.fail = function (e) {
-            originFail && originFail.call(this, e)
-            reject(e)
-          }
+          obj.success = resolve
+          obj.fail = reject
           returned = listObj[key].apply(envObj, args)
         })
         promise.__returned = returned
         return promise
-      } else {
-        return listObj[key].apply(envObj, args)
       }
     }
   })