JS driver v1.4.1: Checking in transpiled files for bower

Author: lutovich

lib/browser/neo4j-web.js

@@ -28771,7 +28771,12 @@ var USER_AGENT = "neo4j-javascript/" + _version2.default;
  *       // {@link Session#readTransaction()} and {@link Session#writeTransaction()} functions. These functions
  *       // will retry the given unit of work on `ServiceUnavailable`, `SessionExpired` and transient errors with
  *       // exponential backoff using initial delay of 1 second. Default value is 30000 which is 30 seconds.
- *       maxTransactionRetryTime: 30000,
+ *       maxTransactionRetryTime: 30000, // 30 seconds
+ *
+ *       // Specify socket connection timeout in milliseconds. Non-numeric, negative and zero values are treated as an
+ *       // infinite timeout. Connection will be then bound by the timeout configured on the operating system level.
+ *       // Timeout value should be numeric and greater or equal to zero.
+ *       connectionTimeout: 5000, // 5 seconds
  *     }
  *
  * @param {string} url The URL for the Neo4j database, for instance "bolt://localhost"
@@ -30808,10 +30813,6 @@ var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _createClass2 = require('babel-runtime/helpers/createClass');
-
-var _createClass3 = _interopRequireDefault(_createClass2);
-
 var _features = require('./features');
 
 var _features2 = _interopRequireDefault(_features);
@@ -30839,54 +30840,56 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * limitations under the License.
  */
 
-var ChannelConfig = function () {
-  function ChannelConfig(host, port, driverConfig, connectionErrorCode) {
-    (0, _classCallCheck3.default)(this, ChannelConfig);
+var DEFAULT_CONNECTION_TIMEOUT_MILLIS = 0; // turned off by default
 
-    this.host = host;
-    this.port = port;
-    this.encrypted = ChannelConfig._extractEncrypted(driverConfig);
-    this.trust = ChannelConfig._extractTrust(driverConfig);
-    this.trustedCertificates = ChannelConfig._extractTrustedCertificates(driverConfig);
-    this.knownHostsPath = ChannelConfig._extractKnownHostsPath(driverConfig);
-    this.connectionErrorCode = connectionErrorCode || _error.SERVICE_UNAVAILABLE;
-  }
+var ChannelConfig = function ChannelConfig(host, port, driverConfig, connectionErrorCode) {
+  (0, _classCallCheck3.default)(this, ChannelConfig);
 
-  (0, _createClass3.default)(ChannelConfig, null, [{
-    key: '_extractEncrypted',
-    value: function _extractEncrypted(driverConfig) {
-      // check if encryption was configured by the user, use explicit null check because we permit boolean value
-      var encryptionConfigured = driverConfig.encrypted == null;
-      // default to using encryption if trust-all-certificates is available
-      return encryptionConfigured ? (0, _features2.default)('trust_all_certificates') : driverConfig.encrypted;
-    }
-  }, {
-    key: '_extractTrust',
-    value: function _extractTrust(driverConfig) {
-      if (driverConfig.trust) {
-        return driverConfig.trust;
-      }
-      // default to using TRUST_ALL_CERTIFICATES if it is available
-      return (0, _features2.default)('trust_all_certificates') ? 'TRUST_ALL_CERTIFICATES' : 'TRUST_CUSTOM_CA_SIGNED_CERTIFICATES';
-    }
-  }, {
-    key: '_extractTrustedCertificates',
-    value: function _extractTrustedCertificates(driverConfig) {
-      return driverConfig.trustedCertificates || [];
-    }
-  }, {
-    key: '_extractKnownHostsPath',
-    value: function _extractKnownHostsPath(driverConfig) {
-      return driverConfig.knownHosts || null;
-    }
-  }]);
-  return ChannelConfig;
-}();
+  this.host = host;
+  this.port = port;
+  this.encrypted = extractEncrypted(driverConfig);
+  this.trust = extractTrust(driverConfig);
+  this.trustedCertificates = extractTrustedCertificates(driverConfig);
+  this.knownHostsPath = extractKnownHostsPath(driverConfig);
+  this.connectionErrorCode = connectionErrorCode || _error.SERVICE_UNAVAILABLE;
+  this.connectionTimeout = extractConnectionTimeout(driverConfig);
+};
 
 exports.default = ChannelConfig;
-;
 
-},{"../error":292,"./features":305,"babel-runtime/helpers/classCallCheck":28,"babel-runtime/helpers/createClass":29}],299:[function(require,module,exports){
+
+function extractEncrypted(driverConfig) {
+  // check if encryption was configured by the user, use explicit null check because we permit boolean value
+  var encryptionConfigured = driverConfig.encrypted == null;
+  // default to using encryption if trust-all-certificates is available
+  return encryptionConfigured ? (0, _features2.default)('trust_all_certificates') : driverConfig.encrypted;
+}
+
+function extractTrust(driverConfig) {
+  if (driverConfig.trust) {
+    return driverConfig.trust;
+  }
+  // default to using TRUST_ALL_CERTIFICATES if it is available
+  return (0, _features2.default)('trust_all_certificates') ? 'TRUST_ALL_CERTIFICATES' : 'TRUST_CUSTOM_CA_SIGNED_CERTIFICATES';
+}
+
+function extractTrustedCertificates(driverConfig) {
+  return driverConfig.trustedCertificates || [];
+}
+
+function extractKnownHostsPath(driverConfig) {
+  return driverConfig.knownHosts || null;
+}
+
+function extractConnectionTimeout(driverConfig) {
+  var configuredTimeout = parseInt(driverConfig.connectionTimeout, 10);
+  if (!configuredTimeout || configuredTimeout < 0) {
+    return DEFAULT_CONNECTION_TIMEOUT_MILLIS;
+  }
+  return configuredTimeout;
+}
+
+},{"../error":292,"./features":305,"babel-runtime/helpers/classCallCheck":28}],299:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -31208,6 +31211,8 @@ var NodeChannel = function () {
         self.write(pending[i]);
       }
     }, this._handleConnectionError);
+
+    this._setupConnectionTimeout(config, this._conn);
   }
 
   (0, _createClass3.default)(NodeChannel, [{
@@ -31227,6 +31232,33 @@ var NodeChannel = function () {
         this.onerror(this._error);
       }
     }
+
+    /**
+     * Setup connection timeout on the socket, if configured.
+     * @param {ChannelConfig} config - configuration of this channel.
+     * @param {object} socket - `net.Socket` or `tls.TLSSocket` object.
+     * @private
+     */
+
+  }, {
+    key: '_setupConnectionTimeout',
+    value: function _setupConnectionTimeout(config, socket) {
+      var timeout = config.connectionTimeout;
+      if (timeout) {
+        socket.on('connect', function () {
+          // connected - clear connection timeout
+          socket.setTimeout(0);
+        });
+
+        socket.on('timeout', function () {
+          // timeout fired - not connected within configured time. cancel timeout and destroy socket
+          socket.setTimeout(0);
+          socket.destroy((0, _error.newError)('Failed to establish connection in ' + timeout + 'ms', config.connectionErrorCode));
+        });
+
+        socket.setTimeout(timeout);
+      }
+    }
   }, {
     key: 'isEncrypted',
     value: function isEncrypted() {
@@ -31330,9 +31362,7 @@ var WebSocketChannel = function () {
     this._pending = [];
     this._error = null;
     this._handleConnectionError = this._handleConnectionError.bind(this);
-    this._connectionErrorCode = config.connectionErrorCode;
-
-    this._encrypted = config.encrypted;
+    this._config = config;
 
     var scheme = "ws";
     //Allow boolean for backwards compatibility
@@ -31357,6 +31387,9 @@ var WebSocketChannel = function () {
       }
     };
     this._ws.onopen = function () {
+      // Connected! Cancel connection timeout
+      clearTimeout(self._connectionTimeoutId);
+
       // Drain all pending messages
       var pending = self._pending;
       self._pending = null;
@@ -31372,15 +31405,28 @@ var WebSocketChannel = function () {
     };
 
     this._ws.onerror = this._handleConnectionError;
+
+    this._connectionTimeoutFired = false;
+    this._connectionTimeoutId = this._setupConnectionTimeout(config);
   }
 
   (0, _createClass3.default)(WebSocketChannel, [{
     key: '_handleConnectionError',
     value: function _handleConnectionError() {
+      if (this._connectionTimeoutFired) {
+        // timeout fired - not connected within configured time
+        this._error = (0, _error.newError)('Failed to establish connection in ' + this._config.connectionTimeout + 'ms', this._config.connectionErrorCode);
+
+        if (this.onerror) {
+          this.onerror(this._error);
+        }
+        return;
+      }
+
       // onerror triggers on websocket close as well.. don't get me started.
       if (this._open) {
         // http://stackoverflow.com/questions/25779831/how-to-catch-websocket-connection-to-ws-xxxnn-failed-connection-closed-be
-        this._error = (0, _error.newError)("WebSocket connection failure. Due to security " + "constraints in your web browser, the reason for the failure is not available " + "to this Neo4j Driver. Please use your browsers development console to determine " + "the root cause of the failure. Common reasons include the database being " + "unavailable, using the wrong connection URL or temporary network problems. " + "If you have enabled encryption, ensure your browser is configured to trust the " + "certificate Neo4j is configured to use. WebSocket `readyState` is: " + this._ws.readyState, this._connectionErrorCode);
+        this._error = (0, _error.newError)("WebSocket connection failure. Due to security " + "constraints in your web browser, the reason for the failure is not available " + "to this Neo4j Driver. Please use your browsers development console to determine " + "the root cause of the failure. Common reasons include the database being " + "unavailable, using the wrong connection URL or temporary network problems. " + "If you have enabled encryption, ensure your browser is configured to trust the " + 'certificate Neo4j is configured to use. WebSocket `readyState` is: ' + this._ws.readyState, this._config.connectionErrorCode);
         if (this.onerror) {
           this.onerror(this._error);
         }
@@ -31389,7 +31435,7 @@ var WebSocketChannel = function () {
   }, {
     key: 'isEncrypted',
     value: function isEncrypted() {
-      return this._encrypted;
+      return this._config.encrypted;
     }
 
     /**
@@ -31427,6 +31473,31 @@ var WebSocketChannel = function () {
       this._ws.close();
       this._ws.onclose = cb;
     }
+
+    /**
+     * Set connection timeout on the given WebSocket, if configured.
+     * @return {number} the timeout id or null.
+     * @private
+     */
+
+  }, {
+    key: '_setupConnectionTimeout',
+    value: function _setupConnectionTimeout() {
+      var _this = this;
+
+      var timeout = this._config.connectionTimeout;
+      if (timeout) {
+        var webSocket = this._ws;
+
+        return setTimeout(function () {
+          if (webSocket.readyState !== WebSocket.OPEN) {
+            _this._connectionTimeoutFired = true;
+            webSocket.close();
+          }
+        }, timeout);
+      }
+      return null;
+    }
   }]);
   return WebSocketChannel;
 }(); /**
@@ -33875,6 +33946,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _keys = require("babel-runtime/core-js/object/keys");
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -33970,11 +34045,11 @@ var Pool = function () {
   }, {
     key: "purgeAll",
     value: function purgeAll() {
-      for (var key in this._pools.keys) {
-        if (this._pools.hasOwnPropertykey) {
-          this.purge(key);
-        }
-      }
+      var _this = this;
+
+      (0, _keys2.default)(this._pools).forEach(function (key) {
+        return _this.purge(key);
+      });
     }
   }, {
     key: "has",
@@ -33986,7 +34061,8 @@ var Pool = function () {
     value: function _release(key, resource) {
       var pool = this._pools[key];
       if (!pool) {
-        //key has been purged, don't put it back
+        // key has been purged, don't put it back, just destroy the resource
+        this._destroy(resource);
         return;
       }
       if (pool.length >= this._maxIdle || !this._validate(resource)) {
@@ -34001,7 +34077,7 @@ var Pool = function () {
 
 exports.default = Pool;
 
-},{"babel-runtime/helpers/classCallCheck":28,"babel-runtime/helpers/createClass":29}],309:[function(require,module,exports){
+},{"babel-runtime/core-js/object/keys":22,"babel-runtime/helpers/classCallCheck":28,"babel-runtime/helpers/createClass":29}],309:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -35161,7 +35237,7 @@ exports.default = platformObj;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ENCRYPTION_OFF = exports.ENCRYPTION_ON = exports.parseRoutingContext = exports.parsePort = exports.parseHost = exports.parseUrl = exports.parseScheme = exports.assertString = exports.isString = exports.isEmptyObjectOrNull = undefined;
+exports.ENCRYPTION_OFF = exports.ENCRYPTION_ON = exports.parseRoutingContext = exports.parsePort = exports.parseHost = exports.parseUrl = exports.parseScheme = exports.assertCypherStatement = exports.assertString = exports.isString = exports.isEmptyObjectOrNull = undefined;
 
 var _stringify = require("babel-runtime/core-js/json/stringify");
 
@@ -35232,6 +35308,14 @@ function assertString(obj, objName) {
   return obj;
 }
 
+function assertCypherStatement(obj) {
+  assertString(obj, 'Cypher statement');
+  if (obj.trim().length == 0) {
+    throw new TypeError('Cypher statement is expected to be a non-empty string.');
+  }
+  return obj;
+}
+
 function isString(str) {
   return Object.prototype.toString.call(str) === '[object String]';
 }
@@ -35291,6 +35375,7 @@ function trimAndVerify(string, name, url) {
 exports.isEmptyObjectOrNull = isEmptyObjectOrNull;
 exports.isString = isString;
 exports.assertString = assertString;
+exports.assertCypherStatement = assertCypherStatement;
 exports.parseScheme = parseScheme;
 exports.parseUrl = parseUrl;
 exports.parseHost = parseHost;
@@ -36294,7 +36379,7 @@ var Session = function () {
 
   /**
    * Run Cypher statement
-   * Could be called with a statement object i.e.: {statement: "MATCH ...", parameters: {param: 1}}
+   * Could be called with a statement object i.e.: {text: "MATCH ...", parameters: {param: 1}}
    * or with the statement and parameters as separate arguments.
    * @param {mixed} statement - Cypher statement to execute
    * @param {Object} parameters - Map with parameters to use in statement
@@ -36311,7 +36396,7 @@ var Session = function () {
         parameters = statement.parameters || {};
         statement = statement.text;
       }
-      (0, _util.assertString)(statement, 'Cypher statement');
+      (0, _util.assertCypherStatement)(statement);
 
       return this._run(statement, parameters, function (connection, streamObserver) {
         return connection.run(statement, parameters, streamObserver);
@@ -36620,7 +36705,7 @@ var Transaction = function () {
 
   /**
    * Run Cypher statement
-   * Could be called with a statement object i.e.: <code>{statement: "MATCH ...", parameters: {param: 1}}</code>
+   * Could be called with a statement object i.e.: <code>{text: "MATCH ...", parameters: {param: 1}}</code>
    * or with the statement and parameters as separate arguments.
    * @param {mixed} statement - Cypher statement to execute
    * @param {Object} parameters - Map with parameters to use in statement
@@ -36635,7 +36720,7 @@ var Transaction = function () {
         parameters = statement.parameters || {};
         statement = statement.text;
       }
-      (0, _util.assertString)(statement, "Cypher statement");
+      (0, _util.assertCypherStatement)(statement);
 
       return this._state.run(this._connectionHolder, new _TransactionStreamObserver(this), statement, parameters);
     }