Only urlParse once.

Author: pluma

src/connection.js

@@ -19,7 +19,7 @@ function Connection(config) {
   if (!this.config.headers['x-arango-version']) {
     this.config.headers['x-arango-version'] = this.config.arangoVersion;
   }
-  this._request = createRequest(this.config.agent, this.config.agentOptions);
+  this._request = createRequest(this.config.url, this.config.agent, this.config.agentOptions);
   this.promisify = promisify(this.config.promise);
 }
 
@@ -36,13 +36,13 @@ Connection.agentDefaults = {
 
 extend(Connection.prototype, {
   _resolveUrl(opts) {
-    var url = this.config.url;
+    var url = {pathname: ''};
     if (!opts.absolutePath) {
-      url += '/_db/' + this.config.databaseName;
-      if (opts.basePath) url += '/' + opts.basePath;
+      url.pathname += '/_db/' + this.config.databaseName;
+      if (opts.basePath) url.pathname += '/' + opts.basePath;
     }
-    url += opts.path ? (opts.path.charAt(0) === '/' ? '' : '/') + opts.path : '';
-    if (opts.qs) url += '?' + (typeof opts.qs === 'string' ? opts.qs : qs.stringify(opts.qs));
+    url.pathname += opts.path ? (opts.path.charAt(0) === '/' ? '' : '/') + opts.path : '';
+    if (opts.qs) url.search = '?' + (typeof opts.qs === 'string' ? opts.qs : qs.stringify(opts.qs));
     return url;
   },
   route(path) {

src/util/request.js

@@ -1,15 +1,26 @@
 'use strict';
 var http = require('http');
 var parseUrl = require('url').parse;
-var extend = require('extend');
 var once = require('./once');
+var joinPath = require('path').join;
 
-module.exports = function (agent, agentOptions) {
+function rawCopy(obj) {
+  var data = {};
+  for (var k in obj) {
+    if (obj.hasOwnProperty(k)) {
+      data[k] = obj[k];
+    }
+  }
+  return data;
+}
+
+module.exports = function (baseUrl, agent, agentOptions) {
   if (!agent && http.Agent) agent = new http.Agent(agentOptions); // server only
 
   var queue = [];
   var maxTasks = typeof agent.maxSockets === 'number' ? agent.maxSockets * 2 : Infinity;
   var activeTasks = 0;
+  var baseUrlParts = rawCopy(parseUrl(baseUrl));
 
   function drainQueue() {
     if (!queue.length || activeTasks >= maxTasks) return;
@@ -22,7 +33,17 @@ module.exports = function (agent, agentOptions) {
   }
 
   return function request({method, url, headers, body}, cb) {
-    var options = extend(parseUrl(url), {method, headers, agent});
+    var path = baseUrlParts.pathname ? (
+      url.pathname ? joinPath(baseUrlParts.pathname, url.pathname) : baseUrlParts.pathname
+    ) : url.pathname;
+    var search = url.search ? (
+      baseUrlParts.search ? baseUrlParts.search + '&' + url.search.slice(1) : url.search
+    ) : baseUrlParts.search;
+    if (search) path += search;
+    var options = {path, method, headers, agent};
+    options.hostname = baseUrlParts.hostname;
+    options.port = baseUrlParts.port;
+    options.auth = baseUrlParts.auth;
 
     queue.push(function (next) {
       var callback = once(function () {