Merge pull request #1360 from acdibble/remove-url-parse

Remove calls to deprecated url.parse

Author: sidorares

benchmarks/FB/hello.js

@@ -61,8 +61,8 @@ function sequelizeQuery(callback) {
 }
 
 function handlePrepared(req, res) {
-  const values = url.parse(req.url, true);
-  const queries = values.query.queries || 1;
+  const values = new url.URL(req.url);
+  const queries = values.searchParams.get('queries') || 1;
   const results = [];
   for (let i = 0; i < queries; ++i) {
     mysql2conn.execute(

benchmarks/http-select-and-render.js

@@ -10,10 +10,10 @@ const port = process.env.PORT;
 
 http
   .createServer((req, res) => {
-    const q = url.parse(req.url, true);
+    const q = new url.URL(req.url);
     if (q.pathname === '/render') {
-      const sql = q.query.q;
-      const n = q.query.n;
+      const sql = q.searchParams.get('q');
+      const n = q.searchParams.get('n');
       let rowsTotal = [];
       const doQueries = function(number) {
         if (number === 0) {

lib/connection_config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const urlParse = require('url').parse;
+const { URL } = require('url');
 const ClientConstants = require('./constants/client');
 const Charsets = require('./constants/charsets');
 let SSLProfiles = null;
@@ -232,29 +232,23 @@ class ConnectionConfig {
   }
 
   static parseUrl(url) {
-    url = urlParse(url, true);
+    const parsedUrl = new URL(url);
     const options = {
-      host: url.hostname,
-      port: url.port,
-      database: url.pathname.substr(1)
+      host: parsedUrl.hostname,
+      port: parsedUrl.port,
+      database: parsedUrl.pathname.substr(1),
+      user: parsedUrl.username,
+      password: parsedUrl.password
     };
-    if (url.auth) {
-      const auth = url.auth.split(':');
-      options.user = auth[0];
-      options.password = auth[1];
-    }
-    if (url.query) {
-      for (const key in url.query) {
-        const value = url.query[key];
-        try {
-          // Try to parse this as a JSON expression first
-          options[key] = JSON.parse(value);
-        } catch (err) {
-          // Otherwise assume it is a plain string
-          options[key] = value;
-        }
+    parsedUrl.searchParams.forEach((value, key) => {
+      try {
+        // Try to parse this as a JSON expression first
+        options[key] = JSON.parse(value);
+      } catch (err) {
+        // Otherwise assume it is a plain string
+        options[key] = value;
       }
-    }
+    });
     return options;
   }
 }

test/unit/connection/test-connection_config.js

@@ -42,3 +42,10 @@ assert.doesNotThrow(() => {
     flags: ['-FOUND_ROWS']
   });
 }, 'Error, the constructor threw an exception due to a flags array');
+
+assert.strictEqual(
+  ConnectionConfig.parseUrl(
+    String.raw`fml://test:pass!@$%^&*()\word:@www.example.com/database`
+  ).password,
+  'pass!%40$%%5E&*()%5Cword%3A'
+);