New improvements in U.request().

petersirka · petersirka · commit cf53fd5808d1 · 2017-03-22T15:47:33.000+01:00
diff --git a/builders.js b/builders.js
@@ -3423,6 +3423,7 @@ function RESTBuilder(url) {
 	// this.$nodnscache = true;
 	// this.$cache_expire;
 	// this.$cache_nocache;
+	// this.$redirect
 }
 
 RESTBuilder.make = function(fn) {
@@ -3614,6 +3615,11 @@ RESTBuilder.prototype.xml = function(data) {
 	return this;
 };
 
+RESTBuilder.prototype.redirect = function(value) {
+	this.$redirect = value;
+	return this;
+};
+
 RESTBuilder.prototype.raw = function(value) {
 	this.$data = value && value.$clean ? value.$clean() : value;
 	return this;
@@ -3692,6 +3698,7 @@ RESTBuilder.prototype.exec = function(callback) {
 
 		!self.$nodnscache && flags.push('dnscache');
 		self.$length && flags.push('<' + self.$length);
+		self.$redirect === false && flags.push('noredirect');
 
 		switch (self.$type) {
 			case 1:
@@ -3701,7 +3708,6 @@ RESTBuilder.prototype.exec = function(callback) {
 				flags.push('xml');
 				break;
 		}
-
 		self.$flags = flags;
 	}
 
@@ -3723,7 +3729,7 @@ RESTBuilder.prototype.exec = function(callback) {
 
 	return U.request(self.$url, flags, self.$data, function(err, response, status, headers, hostname) {
 
-		var type = err ? '' : headers['content-type'];
+		var type = err ? '' : headers['content-type'] || '';
 		var output = new RESTBuilderResponse();
 
 		output.value = type.indexOf('/xml') === -1 ? response.isJSON() ? F.onParseJSON(response) : F.onParseQuery(response) : response.parseXML();
diff --git a/changes.txt b/changes.txt
@@ -31,6 +31,8 @@
 - updated: middleware `next(false)` cancels calling of next middleware and controller
 - updated: `OPERATION(name, value, [callback(err, response, param)], [param])` added a new (helper) argument `param`
 - updated: Mail error handling (added Message instance)
+- updated: `U.request()` add a new flag `noredirect`
+- updated: `RESTBuilder.redirect(true/false)` enables/disables auto-redirect (default: enabled)
 
 - fixed: routing with `upload` flag
 - fixed: workers timeout
diff --git a/utils.js b/utils.js
@@ -485,6 +485,10 @@ exports.request = function(url, flags, data, callback, cookies, headers, encodin
 					method = flags[i].toUpperCase();
 					break;
 
+				case 'noredirect':
+					options.noredirect = true;
+					break;
+
 				case 'upload':
 					headers['Content-Type'] = 'multipart/form-data';
 					break;
@@ -589,6 +593,26 @@ function request_response(res, uri, options) {
 	// We have redirect
 	if (res.statusCode === 301 || res.statusCode === 302) {
 
+		if (options.noredirect) {
+
+			if (options.callback) {
+				options.callback(null, '', res.statusCode, res.headers, uri.host);
+				options.callback = null;
+			}
+
+			if (options.evt) {
+				options.evt.removeAllListeners();
+				options.evt = null;
+			}
+
+			res.req.removeAllListeners();
+			res.req = null;
+			res.removeAllListeners();
+			res = null;
+
+			return;
+		}
+
 		if (options.redirect > 3) {
 
 			if (options.callback) {
