From 902f5417258ac5adcacb5c03a76b6c9b09e30419 Mon Sep 17 00:00:00 2001
From: XadillaX <i@2333.moe>
Date: Thu, 28 May 2020 18:27:37 +0800
Subject: [PATCH 1/3] http: add res.req and res.redirect()

Add `res.req` and `res.redirect()` in http server for convenience.

Fixes: https://github.com/nodejs/node/issues/28673
---
 doc/api/http.md                              | 28 +++++++++
 lib/_http_outgoing.js                        | 20 +++++++
 lib/_http_server.js                          |  1 +
 test/parallel/test-http-response-redirect.js | 62 ++++++++++++++++++++
 test/parallel/test-http-server.js            |  2 +
 5 files changed, 113 insertions(+)
 create mode 100644 test/parallel/test-http-response-redirect.js

diff --git a/doc/api/http.md b/doc/api/http.md
index 357d8b16928d47..a19d0df91c7a82 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -1350,6 +1350,13 @@ deprecated: v13.0.0
 
 See [`response.socket`][].
 
+### `response.req`
+
+* {IncomingMessage|undefined}
+
+If it's a response object in an HTTP request, this object will be it's
+`request` object.
+
 ### `response.cork()`
 <!-- YAML
 added:
@@ -1383,6 +1390,27 @@ If `data` is specified, it is similar in effect to calling
 If `callback` is specified, it will be called when the response stream
 is finished.
 
+### `response.send()`
+
+This is an alias for `response.end()`.
+
+### `response.redirect(url[, statusCode][, body][, callback])`
+
+* `url` {string}
+* `statusCode` {number}
+* `body` {string|Buffer}
+* `callback` {Function}
+
+Do `30x` redirection for current response.
+
+If no `statusCode` is specified, the redirection status code will be leaved for
+302.
+
+if no `body` is specified, the response body will be empty.
+
+If `callback` is specified, it will be called when the response stream is
+finished.
+
 ### `response.finished`
 <!-- YAML
 added: v0.0.2
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index dade9a11014c01..b634d510b80436 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -827,6 +827,26 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
 
   return this;
 };
+OutgoingMessage.prototype.send = OutgoingMessage.prototype.end;
+
+OutgoingMessage.prototype.redirect = function redirect(url, statusCode, body, callback) {
+  statusCode = 302;
+  body = '';
+  callback = undefined;
+
+  for (let i = 1; i < arguments.length; i++) {
+    switch (typeof arguments[i]) {
+      case 'number': statusCode = arguments[i]; break;
+      case 'string': body = arguments[i]; break;
+      case 'function': callback = arguments[i]; break;
+      default: break;
+    }
+  }
+
+  this.setHeader('Location', url);
+  this.statusCode = statusCode;
+  this.end(body, callback);
+};
 
 
 OutgoingMessage.prototype._finish = function _finish() {
diff --git a/lib/_http_server.js b/lib/_http_server.js
index f11c74ff7c4303..fc66e91655cadd 100644
--- a/lib/_http_server.js
+++ b/lib/_http_server.js
@@ -160,6 +160,7 @@ function ServerResponse(req) {
 
   if (req.method === 'HEAD') this._hasBody = false;
 
+  this.req = req;
   this.sendDate = true;
   this._sent100 = false;
   this._expect_continue = false;
diff --git a/test/parallel/test-http-response-redirect.js b/test/parallel/test-http-response-redirect.js
new file mode 100644
index 00000000000000..cccf8730d5f71d
--- /dev/null
+++ b/test/parallel/test-http-response-redirect.js
@@ -0,0 +1,62 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const http = require('http');
+
+const server = http.Server(common.mustCall(function(req, res) {
+  const time = req.url[req.url.length - 1];
+  switch (time) {
+    case '0': res.redirect('https://google.com/', 307, 'foo'); break;
+    case '1': res.redirect('https://alipay.com/', 301); break;
+    case '2': res.redirect('https://nodejs.org/'); break;
+    case '3': res.redirect('https://foo.bar/', common.mustCall(function() {}));
+  }
+}, 4));
+
+const finished = [];
+server.listen(0, function() {
+  for (let i = 0; i < 4; i++) {
+    const time = i.toString();
+    http.get({ port: this.address().port, path: `/?time=${time}` }, function(res) {
+      finished.push(res);
+
+      let data = '';
+
+      res.on('data', function(chunk) {
+        data += chunk;
+      });
+
+      res.on('end', () => {
+        switch (time) {
+          case '0':
+            assert.strictEqual(data, 'foo');
+            assert.strictEqual(res.statusCode, 307);
+            assert.strictEqual(res.headers.location, 'https://google.com/');
+            break;
+
+          case '1':
+            assert.strictEqual(data, '');
+            assert.strictEqual(res.statusCode, 301);
+            assert.strictEqual(res.headers.location, 'https://alipay.com/');
+            break;
+
+          case '2':
+            assert.strictEqual(data, '');
+            assert.strictEqual(res.statusCode, 302);
+            assert.strictEqual(res.headers.location, 'https://nodejs.org/');
+            break;
+
+          case '3':
+            assert.strictEqual(data, '');
+            assert.strictEqual(res.statusCode, 302);
+            assert.strictEqual(res.headers.location, 'https://foo.bar/');
+            break;
+
+          default: break;
+        }
+      });
+
+      if (finished.length >= 4) server.close();
+    });
+  }
+});
diff --git a/test/parallel/test-http-server.js b/test/parallel/test-http-server.js
index f591cd59fc63c2..dcefc761728d36 100644
--- a/test/parallel/test-http-server.js
+++ b/test/parallel/test-http-server.js
@@ -49,6 +49,8 @@ const server = http.createServer(function(req, res) {
   res.id = request_number;
   req.id = request_number++;
 
+  assert.strictEqual(res.req, req);
+
   if (req.id === 0) {
     assert.strictEqual(req.method, 'GET');
     assert.strictEqual(url.parse(req.url).pathname, '/hello');

From 7b4c759be35c20def7cef0bd89466199d144e30b Mon Sep 17 00:00:00 2001
From: XadillaX <i@2333.moe>
Date: Fri, 29 May 2020 10:47:14 +0800
Subject: [PATCH 2/3] f

---
 lib/_http_outgoing.js                        | 7 ++++++-
 test/parallel/test-http-response-redirect.js | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
index b634d510b80436..ce9bf4e3dda176 100644
--- a/lib/_http_outgoing.js
+++ b/lib/_http_outgoing.js
@@ -829,7 +829,12 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
 };
 OutgoingMessage.prototype.send = OutgoingMessage.prototype.end;
 
-OutgoingMessage.prototype.redirect = function redirect(url, statusCode, body, callback) {
+OutgoingMessage.prototype.redirect = function redirect(
+  url,
+  statusCode,
+  body,
+  callback
+) {
   statusCode = 302;
   body = '';
   callback = undefined;
diff --git a/test/parallel/test-http-response-redirect.js b/test/parallel/test-http-response-redirect.js
index cccf8730d5f71d..ffdda22837aae1 100644
--- a/test/parallel/test-http-response-redirect.js
+++ b/test/parallel/test-http-response-redirect.js
@@ -17,7 +17,10 @@ const finished = [];
 server.listen(0, function() {
   for (let i = 0; i < 4; i++) {
     const time = i.toString();
-    http.get({ port: this.address().port, path: `/?time=${time}` }, function(res) {
+    http.get({
+      port: this.address().port,
+      path: `/?time=${time}`
+    }, function(res) {
       finished.push(res);
 
       let data = '';

From 98689fa6f583dc98b4fcf674911db89d3f9f7c71 Mon Sep 17 00:00:00 2001
From: XadillaX <i@2333.moe>
Date: Fri, 29 May 2020 14:21:01 +0800
Subject: [PATCH 3/3] f

---
 doc/api/http.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/api/http.md b/doc/api/http.md
index a19d0df91c7a82..f14430e96401c9 100644
--- a/doc/api/http.md
+++ b/doc/api/http.md
@@ -1351,8 +1351,11 @@ deprecated: v13.0.0
 See [`response.socket`][].
 
 ### `response.req`
+<!-- YAML
+added: REPLACEME
+-->
 
-* {IncomingMessage|undefined}
+* {http.IncomingMessage|undefined}
 
 If it's a response object in an HTTP request, this object will be it's
 `request` object.
@@ -1391,10 +1394,16 @@ If `callback` is specified, it will be called when the response stream
 is finished.
 
 ### `response.send()`
+<!-- YAML
+added: REPLACEME
+-->
 
 This is an alias for `response.end()`.
 
 ### `response.redirect(url[, statusCode][, body][, callback])`
+<!-- YAML
+added: REPLACEME
+-->
 
 * `url` {string}
 * `statusCode` {number}