Skip to content

Commit 03a67fb

Browse files
committed
Merge pull request #179 from oskarhane/update-js-driver-1.0.2
Update Neo4j JS Driver to 1.0.2
2 parents bfaa764 + 3f498e3 commit 03a67fb

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

app/components/neo4j-driver/.bower.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@
3737
"url": "https://github.com/neo4j/neo4j-javascript-driver.git"
3838
},
3939
"homepage": "https://github.com/neo4j/neo4j-javascript-driver",
40-
"version": "1.0.1",
41-
"_release": "1.0.1",
40+
"version": "1.0.2",
41+
"_release": "1.0.2",
4242
"_resolution": {
4343
"type": "version",
44-
"tag": "1.0.1",
45-
"commit": "0d1c7826487d0b6b3bf9cbba19ae14fc3455f5db"
44+
"tag": "1.0.2",
45+
"commit": "a3aa23138c7272c20f7f7a6e4e018f09f6cf73bc"
4646
},
4747
"_source": "https://github.com/neo4j/neo4j-javascript-driver.git",
48-
"_target": "^1.0.1",
49-
"_originalSource": "neo4j-driver",
50-
"_direct": true
48+
"_target": "^1.0.0",
49+
"_originalSource": "neo4j-driver"
5150
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "neokit"]
2+
path = neokit
3+
url = https://github.com/neo-technology/neokit.git

app/components/neo4j-driver/lib/browser/neo4j-web.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27986,6 +27986,9 @@ var Connection = (function () {
2798627986
if (buf.hasRemaining()) {
2798727987
self._dechunker.write(buf.readSlice(buf.remaining()));
2798827988
}
27989+
} else if (proposed == 1213486160) {
27990+
//server responded 1213486160 == 0x48545450 == "HTTP"
27991+
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)"));
2798927992
} else {
2799027993
self._handleFatalError((0, _error.newError)("Unknown Bolt protocol version: " + proposed));
2799127994
}

app/components/neo4j-driver/lib/browser/neo4j-web.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/components/neo4j-driver/lib/v1/internal/connector.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,9 @@ var Connection = (function () {
241241
if (buf.hasRemaining()) {
242242
self._dechunker.write(buf.readSlice(buf.remaining()));
243243
}
244+
} else if (proposed == 1213486160) {
245+
//server responded 1213486160 == 0x48545450 == "HTTP"
246+
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)"));
244247
} else {
245248
self._handleFatalError((0, _error.newError)("Unknown Bolt protocol version: " + proposed));
246249
}

0 commit comments

Comments
 (0)