Merge pull request #482 from ali-ince/1.7-connection-timeout-30s

Increase default connection timeout configuration value

Author: ali-ince

package-lock.json

@@ -40,27 +40,27 @@
   "jsdelivr": "lib/browser/neo4j-web.js",
   "types": "types/index.d.ts",
   "devDependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "@babel/register": "^7.4.4",
-    "async": "^3.0.0",
-    "babel-eslint": "^10.0.1",
+    "@babel/core": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@babel/register": "^7.5.5",
+    "async": "^3.1.0",
+    "babel-eslint": "^10.0.3",
     "babelify": "^10.0.0",
-    "browserify": "^16.2.3",
+    "browserify": "^16.5.0",
     "browserify-transform-tools": "^1.7.0",
     "esdoc": "^1.1.0",
     "esdoc-importpath-plugin": "^1.0.2",
     "esdoc-standard-plugin": "^1.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-standard": "^12.0.0",
-    "eslint-plugin-import": "^2.17.2",
+    "eslint": "^6.2.2",
+    "eslint-config-standard": "^14.0.1",
+    "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-jasmine": "^2.10.1",
-    "eslint-plugin-node": "^9.0.1",
-    "eslint-plugin-promise": "^4.1.1",
-    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
     "fancy-log": "^1.3.3",
-    "fs-extra": "^8.0.1",
+    "fs-extra": "^8.1.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
     "gulp-batch": "^1.0.5",
@@ -73,34 +73,34 @@
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^3.0.2",
     "gulp-watch": "^5.0.1",
-    "husky": "^2.3.0",
+    "husky": "^3.0.4",
     "jasmine-console-reporter": "^3.1.0",
-    "karma": "^4.1.0",
-    "karma-browserify": "^6.0.0",
-    "karma-chrome-launcher": "^2.2.0",
+    "karma": "^4.2.0",
+    "karma-browserify": "^6.1.0",
+    "karma-chrome-launcher": "^3.1.0",
     "karma-edge-launcher": "^0.4.2",
-    "karma-firefox-launcher": "^1.1.0",
+    "karma-firefox-launcher": "^1.2.0",
     "karma-ie-launcher": "^1.0.0",
     "karma-jasmine": "^2.0.1",
     "karma-source-map-support": "^1.4.0",
     "karma-spec-reporter": "^0.0.32",
-    "lint-staged": "^8.1.7",
-    "lodash": "^4.17.11",
-    "lolex": "^4.0.1",
+    "lint-staged": "^9.2.5",
+    "lodash": "^4.17.15",
+    "lolex": "^4.2.0",
     "minimist": "^1.2.0",
-    "mustache": "^3.0.1",
-    "prettier-eslint": "^8.8.2",
-    "prettier-eslint-cli": "^4.7.1",
+    "mustache": "^3.0.3",
+    "prettier-eslint": "^9.0.0",
+    "prettier-eslint-cli": "^5.0.0",
     "run-sequence": "^2.2.1",
-    "semver": "^6.0.0",
+    "semver": "^6.3.0",
     "tmp": "0.1.0",
-    "typescript": "^3.4.5",
+    "typescript": "^3.5.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
-    "webpack": "^4.32.0"
+    "webpack": "^4.39.3"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.4",
+    "@babel/runtime": "^7.5.5",
     "text-encoding-utf-8": "^1.0.2",
     "uri-js": "^4.2.2"
   }

package.json

@@ -211,8 +211,8 @@ const logging = {
  *
  *       // Specify socket connection timeout in milliseconds. Numeric values are expected. Negative and zero values
  *       // result in no timeout being applied. Connection establishment will be then bound by the timeout configured
- *       // on the operating system level. Default value is 5000, which is 5 seconds.
- *       connectionTimeout: 5000, // 5 seconds
+ *       // on the operating system level. Default value is 30000, which is 30 seconds.
+ *       connectionTimeout: 30000, // 30 seconds
  *
  *       // Make this driver always return native JavaScript numbers for integer values, instead of the
  *       // dedicated {@link Integer} class. Values that do not fit in native number bit range will be represented as

src/v1/index.js

@@ -21,13 +21,13 @@ import RequestMessage from './request-message'
 
 export default class BoltProtocol extends BoltProtocolV2 {
   transformMetadata (metadata) {
-    if (metadata.t_first) {
+    if ('t_first' in metadata) {
       // Bolt V3 uses shorter key 't_first' to represent 'result_available_after'
       // adjust the key to be the same as in Bolt V1 so that ResultSummary can retrieve the value
       metadata.result_available_after = metadata.t_first
       delete metadata.t_first
     }
-    if (metadata.t_last) {
+    if ('t_last' in metadata) {
       // Bolt V3 uses shorter key 't_last' to represent 'result_consumed_after'
       // adjust the key to be the same as in Bolt V1 so that ResultSummary can retrieve the value
       metadata.result_consumed_after = metadata.t_last

src/v1/internal/bolt-protocol-v3.js

@@ -20,7 +20,7 @@
 import { newError, SERVICE_UNAVAILABLE } from '../error'
 import { ENCRYPTION_OFF, ENCRYPTION_ON } from './util'
 
-const DEFAULT_CONNECTION_TIMEOUT_MILLIS = 5000 // 5 seconds by default
+const DEFAULT_CONNECTION_TIMEOUT_MILLIS = 30000 // 30 seconds by default
 
 const ALLOWED_VALUES_ENCRYPTED = [
   null,

src/v1/internal/channel-config.js

@@ -167,8 +167,8 @@ class ProfiledPlan {
     this.operatorType = profile.operatorType
     this.identifiers = profile.identifiers
     this.arguments = profile.args
-    this.dbHits = profile.args.DbHits.toInt()
-    this.rows = profile.args.Rows.toInt()
+    this.dbHits = intValue(profile.args.DbHits)
+    this.rows = intValue(profile.args.Rows)
     this.children = profile.children
       ? profile.children.map(child => new ProfiledPlan(child))
       : []
@@ -201,11 +201,9 @@ class StatementStatistics {
     }
     Object.keys(statistics).forEach(index => {
       // To camelCase
-      this._stats[index.replace(/(-\w)/g, m => m[1].toUpperCase())] = isInt(
+      this._stats[index.replace(/(-\w)/g, m => m[1].toUpperCase())] = intValue(
         statistics[index]
       )
-        ? statistics[index].toInt()
-        : statistics[index]
     })
   }
 
@@ -322,9 +320,9 @@ class Notification {
       return {}
     }
     return {
-      offset: pos.offset.toInt(),
-      line: pos.line.toInt(),
-      column: pos.column.toInt()
+      offset: intValue(pos.offset),
+      line: intValue(pos.line),
+      column: intValue(pos.column)
     }
   }
 }
@@ -347,6 +345,10 @@ class ServerInfo {
   }
 }
 
+function intValue (value) {
+  return isInt(value) ? value.toInt() : value
+}
+
 const statementType = {
   READ_ONLY: 'r',
   READ_WRITE: 'rw',

src/v1/result-summary.js

@@ -109,7 +109,7 @@ describe('ChannelConfig', () => {
   it('should have connection timeout by default', () => {
     const config = new ChannelConfig(null, {}, '')
 
-    expect(config.connectionTimeout).toEqual(5000)
+    expect(config.connectionTimeout).toEqual(30000)
   })
 
   it('should respect configured connection timeout', () => {

test/internal/channel-config.test.js

@@ -287,7 +287,7 @@ describe('direct driver with stub server', () => {
 
     boltStub.run(() => {
       const driver = boltStub.newDriver('bolt://127.0.0.1:9001')
-      const session = driver.session()
+      const session = driver.session(neo4j.session.READ)
       session.run('MATCH (n) RETURN n.name').catch(error => {
         expect(error.code).toEqual(neo4j.error.SERVICE_UNAVAILABLE)
 

test/internal/node/direct.driver.boltkit.test.js

@@ -503,15 +503,15 @@ describe('routing driver with stub server', () => {
       9001
     )
     const readServer = boltStub.start(
-      './test/resources/boltstub/dead_read_server.script',
+      './test/resources/boltstub/dead_write_server.script',
       9007
     )
 
     boltStub.run(() => {
       const driver = boltStub.newDriver('bolt+routing://127.0.0.1:9001')
       // When
       const session = driver.session(neo4j.session.WRITE)
-      session.run('MATCH (n) RETURN n.name').catch(err => {
+      session.run("CREATE (n {name:'Bob'})").catch(err => {
         expect(err.code).toEqual(neo4j.error.SESSION_EXPIRED)
         driver.close()
         seedServer.exit(code1 => {
@@ -1909,7 +1909,7 @@ describe('routing driver with stub server', () => {
 
     boltStub.run(() => {
       const driver = boltStub.newDriver('bolt+routing://127.0.0.1:9001')
-      const session = driver.session()
+      const session = driver.session(neo4j.session.READ)
       session.run('MATCH (n) RETURN n.name AS name').then(result => {
         const names = result.records.map(record => record.get('name'))
         expect(names).toEqual(['Alice', 'Bob', 'Eve'])
@@ -2758,7 +2758,7 @@ describe('routing driver with stub server', () => {
       './test/resources/boltstub/address_unavailable_template.script.mst'
     const server = boltStub.startWithTemplate(
       serverTemplateScript,
-      { query: query },
+      { query: query, mode: accessMode === READ ? '"mode": "r"' : '' },
       serverPort
     )
 

test/internal/node/routing.driver.boltkit.test.js

@@ -1,8 +1,10 @@
-!: AUTO INIT
+!: BOLT 3
+!: AUTO HELLO
 !: AUTO RESET
 !: AUTO PULL_ALL
+!: AUTO GOODBYE
 
-C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}}
+C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
    PULL_ALL
 S: SUCCESS {"fields": ["ttl", "servers"]}
    RECORD [9223372036854775807, [{"addresses": ["127.0.0.1:9007","127.0.0.1:9008"],"role": "WRITE"}, {"addresses": ["127.0.0.1:9005","127.0.0.1:9006"], "role": "READ"},{"addresses": ["127.0.0.1:9001","127.0.0.1:9002","127.0.0.1:9003"], "role": "ROUTE"}]]