feat: add uni.interceptors.promiseInterceptor

lib/apis.js

@@ -2,7 +2,8 @@ const base = [
   'base64ToArrayBuffer',
   'arrayBufferToBase64',
   'addInterceptor',
-  'removeInterceptor'
+  'removeInterceptor',
+  'interceptors'
 ]
 
 const network = [
@@ -242,7 +243,7 @@ const third = [
 const ad = [
   'createRewardedVideoAd',
   'createFullScreenVideoAd',
-  'createInterstitialAd',
+  'createInterstitialAd',
   'createInteractiveAd'
 ]
 

src/core/helpers/interceptor.js

@@ -105,7 +105,7 @@ function queue (hooks, data) {
       }
       if (res === false) {
         return {
-          then () {}
+          then () { }
         }
       }
     }
@@ -153,15 +153,15 @@ function getApiInterceptorHooks (method) {
     if (hook !== 'returnValue') {
       interceptor[hook] = globalInterceptors[hook].slice()
     }
-  })
-  const scopedInterceptor = scopedInterceptors[method]
-  if (scopedInterceptor) {
-    Object.keys(scopedInterceptor).forEach(hook => {
-      if (hook !== 'returnValue') {
-        interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook])
-      }
-    })
-  }
+  })
+  const scopedInterceptor = scopedInterceptors[method]
+  if (scopedInterceptor) {
+    Object.keys(scopedInterceptor).forEach(hook => {
+      if (hook !== 'returnValue') {
+        interceptor[hook] = (interceptor[hook] || []).concat(scopedInterceptor[hook])
+      }
+    })
+  }
   return interceptor
 }
 
@@ -185,10 +185,14 @@ export const promiseInterceptor = {
     if (!isPromise(res)) {
       return res
     }
-    return res.then(res => {
-      return res[1]
-    }).catch(res => {
-      return res[0]
+    return new Promise((resolve, reject) => {
+      res.then(res => {
+        if (res[0]) {
+          reject(res[0])
+        } else {
+          resolve(res[1])
+        }
+      })
     })
   }
-}
+}

src/core/service/api/base/interceptor.js

@@ -10,4 +10,4 @@ export {
 
 export const interceptors = {
   promiseInterceptor
-}
+}