update interceptor loop

Author: Steffan

package.json

@@ -50,7 +50,7 @@
     "karma-safari-launcher": "^1.0.0",
     "karma-webpack": "^2.0.9",
     "replace-in-file": "^3.1.1",
-    "rollup": "^0.55.5",
+    "rollup": "^0.56.2",
     "rollup-plugin-buble": "^0.19.1",
     "uglify-js": "^3.3.10",
     "vue": "^2.5.13",

src/http/client/index.js

@@ -9,52 +9,45 @@ import {warn, when, isObject, isFunction, inBrowser} from '../../util';
 
 export default function (context) {
 
-    var reqHandlers = [sendRequest], resHandlers = [], handler;
+    const reqHandlers = [sendRequest], resHandlers = [];
 
     if (!isObject(context)) {
         context = null;
     }
 
     function Client(request) {
-        return new Promise((resolve, reject) => {
+        while (reqHandlers.length) {
 
-            function exec() {
+            const handler = reqHandlers.pop();
 
-                handler = reqHandlers.pop();
+            if (isFunction(handler)) {
 
-                if (isFunction(handler)) {
-                    handler.call(context, request, next);
-                } else {
-                    warn(`Invalid interceptor of type ${typeof handler}, must be a function`);
-                    next();
-                }
-            }
+                let response, next;
 
-            function next(response) {
+                response = handler.call(context, request, val => next = val) || next;
 
-                if (isFunction(response)) {
-
-                    resHandlers.unshift(response);
+                if (isObject(response)) {
+                    return new Promise((resolve, reject) => {
 
-                } else if (isObject(response)) {
+                        resHandlers.forEach(handler => {
+                            response = when(response, response => {
+                                return handler.call(context, response) || response;
+                            }, reject);
+                        });
 
-                    resHandlers.forEach(handler => {
-                        response = when(response, response => {
-                            return handler.call(context, response) || response;
-                        }, reject);
-                    });
+                        when(response, resolve, reject);
 
-                    when(response, resolve, reject);
+                    }, context);
+                }
 
-                    return;
+                if (isFunction(response)) {
+                    resHandlers.unshift(response);
                 }
 
-                exec();
+            } else {
+                warn(`Invalid interceptor of type ${typeof handler}, must be a function`);
             }
-
-            exec();
-
-        }, context);
+        }
     }
 
     Client.use = handler => {
@@ -66,7 +59,7 @@ export default function (context) {
 
 function sendRequest(request, resolve) {
 
-    var client = request.client || (inBrowser ? xhrClient : nodeClient);
+    const client = request.client || (inBrowser ? xhrClient : nodeClient);
 
     resolve(client(request));
 }

src/http/interceptor/before.js

@@ -4,11 +4,10 @@
 
 import {isFunction} from '../../util';
 
-export default function (request, next) {
+export default function (request) {
 
     if (isFunction(request.before)) {
         request.before.call(this, request);
     }
 
-    next();
 }

src/http/interceptor/cors.js

@@ -8,12 +8,12 @@ import {inBrowser} from '../../util';
 
 const SUPPORTS_CORS = inBrowser && 'withCredentials' in new XMLHttpRequest();
 
-export default function (request, next) {
+export default function (request) {
 
     if (inBrowser) {
 
-        var orgUrl = Url.parse(location.href);
-        var reqUrl = Url.parse(request.getUrl());
+        const orgUrl = Url.parse(location.href);
+        const reqUrl = Url.parse(request.getUrl());
 
         if (reqUrl.protocol !== orgUrl.protocol || reqUrl.host !== orgUrl.host) {
 
@@ -26,5 +26,4 @@ export default function (request, next) {
         }
     }
 
-    next();
 }

src/http/interceptor/form.js

@@ -5,17 +5,13 @@
 import Url from '../../url/index';
 import {isObject, isFormData} from '../../util';
 
-export default function (request, next) {
+export default function (request) {
 
     if (isFormData(request.body)) {
-
         request.headers.delete('Content-Type');
-
     } else if (isObject(request.body) && request.emulateJSON) {
-
         request.body = Url.params(request.body);
         request.headers.set('Content-Type', 'application/x-www-form-urlencoded');
     }
 
-    next();
 }

src/http/interceptor/header.js

@@ -5,9 +5,9 @@
 import Http from '../index';
 import {assign, each, toLower} from '../../util';
 
-export default function (request, next) {
+export default function (request) {
 
-    var headers = assign({}, Http.headers.common,
+    const headers = assign({}, Http.headers.common,
         !request.crossOrigin ? Http.headers.custom : {},
         Http.headers[toLower(request.method)]
     );
@@ -18,5 +18,4 @@ export default function (request, next) {
         }
     });
 
-    next();
 }

src/http/interceptor/json.js

@@ -4,19 +4,19 @@
 
 import {when, isObject} from '../../util';
 
-export default function (request, next) {
+export default function (request) {
 
-    var type = request.headers.get('Content-Type') || '';
+    const type = request.headers.get('Content-Type') || '';
 
     if (isObject(request.body) && type.indexOf('application/json') === 0) {
         request.body = JSON.stringify(request.body);
     }
 
-    next(response => {
+    return response => {
 
         return response.bodyText ? when(response.text(), text => {
 
-            type = response.headers.get('Content-Type') || '';
+            const type = response.headers.get('Content-Type') || '';
 
             if (type.indexOf('application/json') === 0 || isJson(text)) {
 
@@ -34,7 +34,7 @@ export default function (request, next) {
 
         }) : response;
 
-    });
+    };
 }
 
 function isJson(str) {

src/http/interceptor/jsonp.js

@@ -4,11 +4,10 @@
 
 import jsonpClient from '../client/jsonp';
 
-export default function (request, next) {
+export default function (request) {
 
     if (request.method == 'JSONP') {
         request.client = jsonpClient;
     }
 
-    next();
 }

src/http/interceptor/method.js

@@ -2,12 +2,11 @@
  * HTTP method override Interceptor.
  */
 
-export default function (request, next) {
+export default function (request) {
 
     if (request.emulateHTTP && /^(PUT|PATCH|DELETE)$/i.test(request.method)) {
         request.headers.set('X-HTTP-Method-Override', request.method);
         request.method = 'POST';
     }
 
-    next();
 }