diff --git a/lib/apis.js b/lib/apis.js index 385be3b9ee57ea657146e9d64c0450e388b63e38..c0574e25047dd8fc66a02056eacfee7177de8cab 100644 --- a/lib/apis.js +++ b/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' ] diff --git a/src/core/helpers/interceptor.js b/src/core/helpers/interceptor.js index bf542cf0f1d340b06582d0a47b827c4431478099..b8af5f1fc396202b257b03e582e38ec1b6717dfc 100644 --- a/src/core/helpers/interceptor.js +++ b/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]) + } + }) }) } -} +} diff --git a/src/core/service/api/base/interceptor.js b/src/core/service/api/base/interceptor.js index f1bb52b87bbbb9ccf95548965852b14b32cdebb9..0b322c0783d0fcca28805e3ccc15aacaede4b31a 100644 --- a/src/core/service/api/base/interceptor.js +++ b/src/core/service/api/base/interceptor.js @@ -10,4 +10,4 @@ export { export const interceptors = { promiseInterceptor -} +}