Remove ConnectionManagerState

SAP · Jan 10, 2018 · 33f6c94 · 33f6c94
1 parent 58be327
commit 33f6c94
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 312 deletions.
diff --git a/lib/Client.js b/lib/Client.js
@@ -121,8 +121,7 @@ Client.prototype.connect = function connect(options, cb) {
     options = {};
   }
 
-  this._connManager.updateState(options);
-  var connectOptions = this._connManager.getConnectOptions();
+  var connectOptions = this._connManager.updateConnectOptions(options);
 
   // SAML assertion can only be used once
   if (this._settings.assertion) {

diff --git a/lib/protocol/ConnectionManager.js b/lib/protocol/ConnectionManager.js
@@ -13,52 +13,49 @@
 // language governing permissions and limitations under the License.
 'use strict';
 
-var State = require('./ConnectionManagerState');
 var util = require('../util');
 var debug = util.debuglog('hdb_conn');
 
 module.exports = ConnectionManager;
 
 function ConnectionManager(settings) {
-  this.state = new State(settings);
+  this._settings = settings;
 }
 
-ConnectionManager.prototype.updateState = function updateState(newOptions) {
-  this.state.update(newOptions);
-};
-
-ConnectionManager.prototype.getConnectOptions = function getConnectOptions() {
-  return this.state.options.connect;
+ConnectionManager.prototype.updateConnectOptions = function updateConnectOptions(settings) {
+  return util.extend(this._settings, settings);
 };
 
 ConnectionManager.prototype.openConnection = function openConnection(conn, cb) {
-  var dbHosts = this.state.dbHosts;
+  var s = this._settings;
+  var dbHosts = (Array.isArray(s.hosts) && s.hosts.slice()) || [{'host': s.host, 'port': s.port}]
   debug('Opening connection. Hosts:', dbHosts);
 
-  this._openConnectionToHost(conn, dbHosts, 0, [], cb);
-};
+  var errorStats = [];
+  var self = this;
 
-ConnectionManager.prototype._openConnectionToHost = function _openConnectionToHost(conn, dbHosts, whichHost, errorStats, cb) {
-  if (whichHost === dbHosts.length) {
-    return cb(couldNotOpenConnectionError(errorStats));
+  function _tryConnect() {
+    if (dbHosts.length === 0) {
+      return cb(couldNotOpenConnectionError(errorStats));
+    }
+    var settings = util.extend({}, self._settings, dbHosts.shift());
+    self._openConnection(conn, settings, function (err) {
+      if (err) {
+        debug('Connection to %s:%d failed with:', settings.host, settings.port, err.message);
+        errorStats.push({ host: settings.host, port: settings.port, err: err });
+        _tryConnect();
+      } else {
+        debug('Successful connection to %s:%d', settings.host, settings.port);
+        return cb(null);
+      }
+    });
   }
 
-  var self = this;
-  var currentHostOptions = dbHosts[whichHost];
-  var openOptions = util.extend({}, currentHostOptions, this.state.options.encryption);
-  this._openConnection(conn, openOptions, function (err) {
-    if (!err) {
-      debug('Successful connection to %s:%d', openOptions.host, openOptions.port);
-      return cb(null);
-    }
-    debug('Connection to %s:%d failed with:', openOptions.host, openOptions.port, err.message);
-    errorStats.push({ host: openOptions.host, port: openOptions.port, err: err });
-    self._openConnectionToHost(conn, dbHosts, (whichHost + 1), errorStats, cb);
-  });
+  _tryConnect();
 };
 
 ConnectionManager.prototype._openConnection = function _openConnection(conn, openOptions, cb) {
-  var dbName = this.state.options.multiDb.databaseName;
+  var dbName = openOptions.databaseName;
   if (util.isString(dbName) && dbName.length) {
     this._openConnectionMultiDbCase(conn, openOptions, cb);
   } else {
@@ -67,10 +64,8 @@ ConnectionManager.prototype._openConnection = function _openConnection(conn, ope
 };
 
 ConnectionManager.prototype._openConnectionMultiDbCase = function _openConnectionMultiDbCase(conn, openOptions, cb) {
-  var multiDbOptions = this.state.options.multiDb;
-
   if (!openOptions.port) {
-    var instanceNum = extractInstanceNumber(multiDbOptions.instanceNumber);
+    var instanceNum = extractInstanceNumber(openOptions.instanceNumber);
     if (isNaN(instanceNum)) {
       return cb(new Error('Instance Number is not valid'));
     } else {
@@ -88,7 +83,8 @@ ConnectionManager.prototype._openConnectionMultiDbCase = function _openConnectio
       return handleError(err);
     }
 
-    conn.fetchDbConnectInfo(multiDbOptions, function (err, info) {
+    var self = this;
+    conn.fetchDbConnectInfo({databaseName: openOptions.databaseName}, function (err, info) {
       if (err) {
         return handleError(err);
       }
@@ -99,7 +95,7 @@ ConnectionManager.prototype._openConnectionMultiDbCase = function _openConnectio
         conn._closeSilently();
         openOptions.host = info.host;
         openOptions.port = info.port;
-        debug('Connecting to tenant-db %s on %s:%d', multiDbOptions.databaseName, openOptions.host, openOptions.port);
+        debug('Connecting to tenant-db %s on %s:%d', openOptions.databaseName, openOptions.host, openOptions.port);
         conn.open(openOptions, cb);
       }
     });

diff --git a/lib/protocol/ConnectionManagerState.js b/lib/protocol/ConnectionManagerState.js
diff --git a/lib/protocol/request/index.js b/lib/protocol/request/index.js
@@ -186,7 +186,7 @@ function prepare(options) {
 }
 
 function dbConnectInfo(options) {
-  var segment = createSegment(MessageType.DB_CONNECT_INFO, options);
+  var segment = createSegment(MessageType.DB_CONNECT_INFO);
   segment.add(PartKind.DB_CONNECT_INFO, [{
     name: DbConnectInfoOption.DATABASE_NAME,
     type: TypeCode.STRING,

diff --git a/test/hdb.Client.js b/test/hdb.Client.js
@@ -716,6 +716,7 @@ describe('hdb', function () {
           instanceNumber: 4,
           databaseName: 'DB0'
         });
+        client._settings.port = undefined;
         client._connection.errors.open = true;
 
         client.connect(function (err) {