Replaced deprecated function url.parse()

About deprecated function: https://nodejs.org/api/deprecations.html#deprecations_dep0116_legacy_url_api Updated engine node to 6.13 due to the use of a new function Update README.md
mahovich · Mar 9, 2019 · bb61aad · bb61aad
1 parent 9af89d3
commit bb61aad
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /node_modules
 package-lock.json
+yarn.lock
 
 # IDE
 .idea

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 ## Requirements
 - Koa@2+
-- Node@6+
+- Node@6.13+
 
 ## Installation 
 ```
@@ -13,11 +13,11 @@ $ npm install koa-force-https --save
 
 ## Options
 
-| Name             | Type    | Default     | Description                                                              |
-|------------------|---------|-------------|--------------------------------------------------------------------------|
-| `port`           | Integer | `443`       | Port of HTTPS server (port `:443` is automatically removed from the URL) |
-| `hostname`       | String  | `same host` | Hostname for redirect                                                    |
-| `httpStatusCode` | Integer | `301`       | HTTP status code for redirect                                            |
+| Name             | Type    | Default     | Description                                                    |
+|------------------|---------|-------------|----------------------------------------------------------------|
+| `port`           | Integer |             | HTTPS port (port `:443` is automatically removed from the URL) |
+| `hostname`       | String  | `same host` | Hostname for redirect                                          |
+| `httpStatusCode` | Integer | `301`       | HTTP status code for redirect                                  |
 
 ## Usage
 ```
@@ -62,8 +62,8 @@ https.createServer(options, app.callback()).listen(443);
 
 | Request URL                    | Status Code | Location                        |
 |--------------------------------|-------------|---------------------------------|
-| `http://example.com`           | `301`       | `https://example.com`           |
-| `http://www.example.com`       | `301`       | `https://www.example.com`       |
+| `http://example.com`           | `301`       | `https://example.com/`          |
+| `http://www.example.com`       | `301`       | `https://www.example.com/`      |
 | `http://www.example.com/news`  | `301`       | `https://www.example.com/news`  |
 | `http://www.example.com/?id=1` | `301`       | `https://www.example.com/?id=1` |
 | `http://example.com/news?id=1` | `301`       | `https://example.com/news?id=1` |
@@ -99,13 +99,13 @@ http2.createSecureServer(options, app.callback()).listen(443);
 
 | Request URL                    | Status Code | Location                        |
 |--------------------------------|-------------|---------------------------------|
-| `http://example.com`           | `307`       | `https://example.com`           |
-| `http://www.example.com`       | `307`       | `https://example.com`           |
+| `http://example.com`           | `307`       | `https://example.com/`          |
+| `http://www.example.com`       | `307`       | `https://example.com/`          |
 | `http://www.example.com/news`  | `307`       | `https://example.com/news`      |
 | `http://www.example.com/?id=1` | `307`       | `https://example.com/?id=1`     |
 | `http://example.com/news?id=1` | `307`       | `https://example.com/news?id=1` |
 | `https://example.com`          | `200`       | *no redirect*                   |
 | `https://www.example.com`      | `200`       | *no redirect*                   |
 
 ## License
-koa-force-https is [MIT licensed](https://github.com/mahovich/koa-force-https/blob/master/LICENSE).
+`koa-force-https` is [MIT licensed](https://github.com/mahovich/koa-force-https/blob/master/LICENSE).
diff --git a/index.js b/index.js
@@ -1,5 +1,3 @@
-const url = require('url');
-
 /**
  * Force HTTPS connection on any incoming requests
  *
@@ -10,12 +8,14 @@ const url = require('url');
  * @api    public
  */
 
-module.exports = (port = 443, hostname, httpStatusCode = 301) => (ctx, next) => {
+module.exports = (port, hostname, httpStatusCode = 301) => (ctx, next) => {
   if (ctx.secure) return next();
 
-  const httpsPort = (port === 443) ? '' : `:${port}`;
-  const httpsHost = hostname || url.parse(`http://${ctx.request.header.host}`).hostname;
+  const urlRedirect = ctx.request.URL;
+  urlRedirect.protocol = 'https';
+  if (port) urlRedirect.port = port;
+  if (hostname) urlRedirect.hostname = hostname;
 
   ctx.response.status = httpStatusCode;
-  ctx.response.redirect(`https://${httpsHost}${httpsPort}${ctx.request.url}`);
+  ctx.response.redirect(urlRedirect.href);
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "koa-force-https",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "Koa.js middleware to force HTTPS connection on any incoming requests",
   "main": "index.js",
   "homepage": "https://github.com/mahovich/koa-force-https",
@@ -22,13 +22,11 @@
     "ssl",
     "http2",
     "redirect",
-    "force",
-    "node",
-    "node.js"
+    "force"
   ],
   "author": "mahovich",
   "license": "MIT",
   "engines": {
-    "node": ">6.0.0"
+    "node": ">=6.13.0"
   }
 }