Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "neokit"]
+	path = neokit
+	url = https://github.com/neo-technology/neokit.git

gulpfile.js

@@ -165,46 +165,8 @@ gulp.task('watch-n-test', ['test-nodejs'], function () {
   return gulp.watch(['src/**/*.js', "test/**/*.js"], ['test-nodejs'] );
 });
 
-var neo4jLinuxUrl = 'http://alpha.neohq.net/dist/neo4j-enterprise-3.1.0-NIGHTLY-unix.tar.gz';
-var neo4jWinUrl   = 'http://alpha.neohq.net/dist/neo4j-enterprise-3.1.0-NIGHTLY-windows.zip';
-var neo4jHome     = './build/neo4j-enterprise-3.1.0';
-var isWin         = /^win/.test(process.platform);
-
-gulp.task('download-neo4j', function() {
-  if( !fs.existsSync(neo4jHome) ) {
-    // Need to download
-    if(isWin) {
-        return download(neo4jWinUrl)
-              .pipe(decompress({strip: 1}))
-              .pipe(gulp.dest(neo4jHome));
-    }
-    else {
-        return download(neo4jLinuxUrl)
-              .pipe(decompress({strip: 1}))
-              .pipe(gulp.dest(neo4jHome));
-    }
-  }
-});
-
-gulp.task('set-password', ['download-neo4j'], function() {
-  var setPassword = gulp.src('test/resources/auth')
-  .pipe(gulp.dest(neo4jHome + "/data/dbms/"));
-
-  if(isWin)
-  {
-    var setServerName = gulp.src('test/resources/neo4j-wrapper.conf')
-    .pipe(gulp.dest(neo4jHome + "/conf/"));
-
-    return merge(setPassword, setServerName);
-  }
-  else
-  {
-    return setPassword;
-  }
-});
-
 var featureFiles   = 'https://s3-eu-west-1.amazonaws.com/remoting.neotechnology.com/driver-compliance/tck.tar.gz';
-var featureHome     = './build/tck';
+var featureHome    = './build/tck';
 
 gulp.task('download-tck', function() {
   return download(featureFiles)
@@ -220,21 +182,6 @@ gulp.task('run-tck', ['download-tck', 'nodejs'], function() {
     }));
 });
 
-var runPowershell = function( cmd ) {
-    var spawn = childProcess.spawn, child;
-    child = spawn("powershell.exe",[cmd]);
-    child.stdout.on("data",function(data){
-        console.log("Powershell Data: " + data);
-    });
-    child.stderr.on("data",function(data){
-        console.error("Powershell Errors: " + data);
-    });
-    child.on("exit",function(){
-        console.log("Powershell Script finished");
-    });
-    child.stdin.end(); //end input
-};
-
 /** Set the project version, controls package.json and version.js */
 gulp.task('set', function() {
   // Get the --version arg from command line
@@ -247,28 +194,44 @@ gulp.task('set', function() {
 
 });
 
-gulp.task('start-neo4j', ['set-password'], function() {
-  if(isWin) {
-    return runPowershell(neo4jHome + '/bin/neo4j.bat install-service;' + neo4jHome + '/bin/neo4j.bat start');
-  }
-  else {
-    return gulp.src('').pipe(shell([
-      'mkdir -p ' + neo4jHome + '/logs',
-      'mkdir -p ' + neo4jHome + '/run',
-      'mkdir -p ' + neo4jHome + '/plugins',
-      'mkdir -p ' + neo4jHome + '/import',
-      'chmod +x ' + neo4jHome + '/bin/neo4j',
-      neo4jHome + '/bin/neo4j start',
-    ]));
-  }
+
+var neo4jHome  = path.resolve('./build/neo4j');
+var neorunPath = path.resolve('./neokit/neorun.py');
+var neorunStartArgsName = "--neorun.start.args"; // use this args to provide additional args for running neorun.start
+
+gulp.task('start-neo4j', function() {
+
+    var neorunStartArgs = '-p neo4j'; // default args to neorun.start: change the default password to neo4j
+    process.argv.slice(2).forEach(function (val) {
+        if(val.startsWith(neorunStartArgsName))
+        {
+            neorunStartArgs = val.split("=")[1];
+        }
+    });
+
+    neorunStartArgs = neorunStartArgs.match(/\S+/g) || '';
+
+    return runScript([
+        neorunPath, '--start=' + neo4jHome
+    ].concat( neorunStartArgs ) );
 });
 
 gulp.task('stop-neo4j', function() {
-  if(isWin) {
-    return runPowershell(neo4jHome + '/bin/neo4j.bat stop;' + neo4jHome + '/bin/neo4j.bat uninstall-service');
-  } else {
-    return gulp.src('').pipe(shell([
-      neo4jHome + '/bin/neo4j stop',
-    ]));
-  }
-});
+    return runScript([
+        neorunPath, '--stop=' + neo4jHome
+    ]);
+});
+
+var runScript = function(cmd) {
+    var spawnSync = childProcess.spawnSync, child, code;
+    child = spawnSync('python', cmd);
+    console.log("Script Outputs:\n" + child.stdout.toString());
+    var error = child.stderr.toString();
+    if (error.trim() !== "")
+        console.log("Script Errors:\n"+ error);
+    code = child.status;
+    if( code !==0 )
+    {
+        throw "Script finished with code " + code
+    }
+};

lib/browser/neo4j-web.js

@@ -27986,6 +27986,9 @@ var Connection = (function () {
         if (buf.hasRemaining()) {
           self._dechunker.write(buf.readSlice(buf.remaining()));
         }
+      } else if (proposed == 1213486160) {
+        //server responded 1213486160 == 0x48545450 == "HTTP"
+        self._handleFatalError((0, _error.newError)("Server responded HTTP. Make sure you are not trying to connect to the http endpoint " + "(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)"));
       } else {
         self._handleFatalError((0, _error.newError)("Unknown Bolt protocol version: " + proposed));
       }

lib/browser/neo4j-web.min.js

@@ -241,6 +241,9 @@ var Connection = (function () {
         if (buf.hasRemaining()) {
           self._dechunker.write(buf.readSlice(buf.remaining()));
         }
+      } else if (proposed == 1213486160) {
+        //server responded 1213486160 == 0x48545450 == "HTTP"
+        self._handleFatalError((0, _error.newError)("Server responded HTTP. Make sure you are not trying to connect to the http endpoint " + "(HTTP defaults to port 7474 whereas BOLT defaults to port 7687)"));
       } else {
         self._handleFatalError((0, _error.newError)("Unknown Bolt protocol version: " + proposed));
       }

lib/browser/neo4j-web.test.js

@@ -1,15 +1,31 @@
 npm install
-npm run start-neo4j
-npm test
 
-if(-Not ($?)) #failed to execute npm test
-{
-    $ErrorFound = $True
-}
+$ErrorFound = $False
 
-npm run stop-neo4j
+try
+{
+	If ($args.Length -eq 0)
+	{
+		npm run start-neo4j
+	}
+	else
+	{
+		npm run start-neo4j -- --neorun.start.args="$args"
+	}
 
-if($ErrorFound -eq $True)
+	npm test
+	if(-Not ($?)) #failed to execute npm test
+	{
+		$ErrorFound = $True
+	}
+}
+finally
 {
-	exit 1
-}
+	npm run stop-neo4j
+	if($ErrorFound -eq $True)
+	{
+		Write-Host "Exit with code 1"
+		exit 1
+	}
+	Write-Host "Exit with code 0"
+}

lib/v1/internal/connector.js

@@ -6,6 +6,13 @@ function finish {
 trap finish EXIT
 
 npm install
-npm run start-neo4j
+
+if [ "$1" == "" ]; then
+    npm run start-neo4j
+else
+    # Example: ./runTests.sh '-v 3.0.1 -p neo4j'
+    npm run start-neo4j -- --neorun.start.args=\'"$1"\'
+fi
+
 sleep 2
 npm test

neokit

@@ -57,7 +57,7 @@ describe('trust-signed-certificates', function() {
     driver = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), {
       encrypted: true,
       trust: "TRUST_SIGNED_CERTIFICATES",
-      trustedCertificates: ["build/neo4j-enterprise-3.1.0/certificates/neo4j.cert"]
+      trustedCertificates: ["build/neo4j/certificates/neo4j.cert"]
     });
 
     // When

runTests.ps1

@@ -1,21 +1,24 @@
 var neo4j = require("../../../../lib/v1");
 var util = require("./util");
 
+var CALLBACK_TIMEOUT = 60 * 1000;
+
 module.exports = function () {
 
-  this.Given(/^a running Neo(\d+)j Database$/, {timeout: 60 * 1000}, function (ignored, callback) {
+  this.Given(/^a running Neo(\d+)j Database$/, {timeout: CALLBACK_TIMEOUT}, function (ignored, callback) {
     if (this.driver1) this.driver1.close();
     if (this.driver2) this.driver2.close();
     util.changeCertificates('./test/resources/derived.key', './test/resources/derived.cert');
-    util.restart(callback);
+    util.restart();
+    callback();
   });
 
   this.When(/^I connect via a TLS\-enabled transport for the first time for the given hostname and port$/, function (callback) {
     this.driver1 = _connectWithHostFile(this.knownHosts1);
     callback();
   });
 
-  this.Then(/^sessions should simply work$/, {timeout: 60 * 1000},  function (callback) {
+  this.Then(/^sessions should simply work$/, {timeout: CALLBACK_TIMEOUT},  function (callback) {
     var session = this.driver1.session();
     session.run("RETURN 1").then(function (result) {
       session.close();
@@ -26,15 +29,14 @@ module.exports = function () {
   });
 
   this.Given(/^a running Neo(\d+)j Database that I have connected to with a TLS\-enabled transport in the past$/,
-    {timeout: 60 * 1000}, function (arg1, callback) {
+    {timeout: CALLBACK_TIMEOUT}, function (arg1, callback) {
       util.changeCertificates('./test/resources/derived.key', './test/resources/derived.cert');
       var self = this;
-      util.restart(function () {
-        var driver = _connectWithHostFile(self.knownHosts1);
-        driver.session().run("RETURN 1").then(function (result) {
-          driver.close();
-          callback();
-        });
+      util.restart();
+      var driver = _connectWithHostFile(self.knownHosts1);
+      driver.session().run("RETURN 1").then(function (result) {
+        driver.close();
+        callback();
       });
     });
 
@@ -43,9 +45,10 @@ module.exports = function () {
     callback();
   });
 
-  this.Given(/^the database has changed which certificate it uses$/, {timeout: 60 * 1000}, function (callback) {
+  this.Given(/^the database has changed which certificate it uses$/, {timeout: CALLBACK_TIMEOUT}, function (callback) {
     util.changeCertificates('./test/resources/other.key', './test/resources/other.cert');
-    util.restart(callback);
+    util.restart();
+    callback();
   });
 
   this.Then(/^creating sessions should fail$/, function (callback) {
@@ -114,17 +117,18 @@ module.exports = function () {
   });
 
   this.Given(/^a running Neo(\d+)j Database using a certificate signed by the same trusted certificate$/,
-    {timeout: 60 * 1000}, function (arg1, callback) {
+    {timeout: CALLBACK_TIMEOUT}, function (arg1, callback) {
       util.changeCertificates('./test/resources/derived.key', './test/resources/derived.cert');
-      util.restart(callback);
+      util.restart();
+      callback();
     });
 
   this.When(/^I connect via a TLS\-enabled transport$/, function (callback) {
     this.driver1 = neo4j.driver("bolt://localhost", neo4j.auth.basic("neo4j", "neo4j"), this.config);
     callback();
   });
 
-  this.Given(/^a running Neo(\d+)j Database using that exact trusted certificate$/, {timeout: 60 * 1000}, function (arg1, callback) {
+  this.Given(/^a running Neo(\d+)j Database using that exact trusted certificate$/, {timeout: CALLBACK_TIMEOUT}, function (arg1, callback) {
     //will have to hack a little bit here since the root cert cannot be used by the server since its
     //common name is not set to localhost
     this.config = {
@@ -135,13 +139,15 @@ module.exports = function () {
     };
 
     util.changeCertificates('./test/resources/other.key', './test/resources/other.cert');
-    util.restart(callback);
+    util.restart();
+    callback();
   });
 
-  this.Given(/^a running Neo(\d+)j Database using a certificate not signed by the trusted certificate$/, {timeout: 60 * 1000},
+  this.Given(/^a running Neo(\d+)j Database using a certificate not signed by the trusted certificate$/, {timeout: CALLBACK_TIMEOUT},
     function (arg1, callback) {
       util.changeCertificates('./test/resources/other.key', './test/resources/other.cert');
-      util.restart(callback);
+      util.restart();
+      callback();
     });
 
   this.Then(/^I should get a helpful error explaining that no trusted certificate found$/, function (callback) {
@@ -165,4 +171,4 @@ module.exports = function () {
       encrypted: true
     });
   }
-};
+};