use native Node.js HTTP Agent #544

Author: ehennum

lib/marklogic.js

@@ -16,7 +16,6 @@
 'use strict';
 var http                 = require('http');
 var https                = require('https');
-var YAgent               = require('yakaa');
 
 var mlutil               = require('./mlutil.js');
 var mllog                = require('./mllog.js');
@@ -765,22 +764,22 @@ function initClient(client, inputParams) {
   if (isSSL) {
     client.request = https.request;
     if (noAgent) {
-      ['ca', 'cert', 'ciphers', 'key', 'passphrase', 'pfx',
-       'rejectUnauthorized', 'secureProtocol'].
-      forEach(function certificateKeyCopier(key) {
-        var value = inputParams[key];
-        if (value != null) {
-          agentOptions[key] = value;
-        }
-      });
-      connectionParams.agent = new YAgent.SSL(agentOptions);
+      mlutil.copyProperties(inputParams, agentOptions, [
+        'ca', 'cert', 'ciphers', 'keepAliveMsecs', 'key', 'maxSockets',
+        'maxFreeSockets', 'passphrase', 'pfx', 'rejectUnauthorized',
+        'secureProtocol', 'timeout'
+      ]);
+      connectionParams.agent = new https.Agent(agentOptions);
     } else {
       connectionParams.agent = inputParams.agent;
     }
   } else {
     client.request = http.request;
     if (noAgent) {
-      connectionParams.agent = new YAgent(agentOptions);
+      mlutil.copyProperties(inputParams, agentOptions, [
+        'keepAliveMsecs', 'maxSockets', 'maxFreeSockets', 'timeout'
+      ]);
+      connectionParams.agent = new http.Agent(agentOptions);
     } else {
       connectionParams.agent = inputParams.agent;
     }

lib/mlutil.js

@@ -43,15 +43,19 @@ function asArray() {
     return args;
   }
 }
-function copyProperties(source, target) {
-  var dest = (arguments.length > 1) ? target : {};
+function copyProperties(source, target, srcKeys) {
+  var dest    = (arguments.length > 1) ? target  : {};
+  var isNamed = Array.isArray(srcKeys);
+  var keys    = isNamed ? srcKeys : Object.keys(source);
 
   // for...in not currently optimized by v8
-  var keys = Object.keys(source);
   var keyLen = keys.length;
   for (var i=0; i < keyLen; i++) {
     var key = keys[i];
-    dest[key] = source[key];
+    var val = source[key];
+    if (!isNamed || (val !== void 0 && val !== null)) {
+      dest[key] = val;
+    }
   }
 
   return dest;

npm-shrinkwrap.json

@@ -35,8 +35,7 @@
     "multipart-stream": "^2.0.1",
     "qs": "^6.9.1",
     "through2": "^3.0.1",
-    "www-authenticate": "^0.6.2",
-    "yakaa": "^1.0.1"
+    "www-authenticate": "^0.6.2"
   },
   "repository": {
     "type": "git",

package.json

@@ -16,13 +16,13 @@
 var assert = require('assert');
 var should = require('should');
 
+var http = require('http');
+
 var testconfig = require('../etc/test-config.js');
 
 var marklogic = require('../');
 var q = marklogic.queryBuilder;
 
-var YAgent = require('yakaa');
-
 // 'rest-evaluator' user can evaluate against an alternate db:
 // http://docs.marklogic.com/guide/rest-dev/intro#id_72318
 var connection = {
@@ -48,8 +48,13 @@ Object.keys(connection).forEach(function(key){
 var otherDb = marklogic.createDatabaseClient(otherConnection);
 
 var agentConnection = {
+<<<<<<< HEAD
   agent: new YAgent({keepAlive: true, keepAliveTimeoutMsecs: 1000})
 }
+=======
+  agent: new http.Agent({keepAlive: true, keepAliveTimeoutMsecs: 1000})
+};
+>>>>>>> 1ad64b6... use native Node.js HTTP Agent #544
 Object.keys(otherConnection).forEach(function(key){
   if (agentConnection[key] === undefined) {
     agentConnection[key] = otherConnection[key];