Enable support for bolt v4.1 protocol, remove v1 support

Author: Peter Wilhelmsson

src/internal/bolt-protocol-v4x1.js

@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2002-2020 "Neo4j,"
+ * Neo4j Sweden AB [http://neo4j.com]
+ *
+ * This file is part of Neo4j.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import BoltProtocolV4 from './bolt-protocol-v4x0'
+import RequestMessage, { ALL } from './request-message'
+import { ResultStreamObserver } from './stream-observers'
+import { BOLT_PROTOCOL_V4_1 } from './constants'
+
+export default class BoltProtocol extends BoltProtocolV4 {
+  get version () {
+    return BOLT_PROTOCOL_V4_1
+  }
+}

src/internal/constants.js

@@ -24,12 +24,14 @@ const BOLT_PROTOCOL_V1 = 1
 const BOLT_PROTOCOL_V2 = 2
 const BOLT_PROTOCOL_V3 = 3
 const BOLT_PROTOCOL_V4_0 = 4.0
+const BOLT_PROTOCOL_V4_1 = 4.1
 
 export {
   ACCESS_MODE_READ,
   ACCESS_MODE_WRITE,
   BOLT_PROTOCOL_V1,
   BOLT_PROTOCOL_V2,
   BOLT_PROTOCOL_V3,
-  BOLT_PROTOCOL_V4_0
+  BOLT_PROTOCOL_V4_0,
+  BOLT_PROTOCOL_V4_1
 }

src/internal/protocol-handshaker.js

@@ -23,6 +23,7 @@ import BoltProtocolV1 from './bolt-protocol-v1'
 import BoltProtocolV2 from './bolt-protocol-v2'
 import BoltProtocolV3 from './bolt-protocol-v3'
 import BoltProtocolV4x0 from './bolt-protocol-v4x0'
+import BoltProtocolV4x1 from './bolt-protocol-v4x1'
 
 const BOLT_MAGIC_PREAMBLE = 0x6060b017
 
@@ -108,6 +109,12 @@ export default class ProtocolHandshaker {
           this._chunker,
           this._disableLosslessIntegers
         )
+      case 4.1:
+        return new BoltProtocolV4x1(
+          this._connection,
+          this._chunker,
+          this._disableLosslessIntegers
+        )
       default:
         throw newError('Unknown Bolt protocol version: ' + version)
     }
@@ -125,10 +132,10 @@ function newHandshakeBuffer () {
   handshakeBuffer.writeInt32(BOLT_MAGIC_PREAMBLE)
 
   // proposed versions
+  handshakeBuffer.writeInt32((1 << 8) | 4)
   handshakeBuffer.writeInt32(4)
   handshakeBuffer.writeInt32(3)
   handshakeBuffer.writeInt32(2)
-  handshakeBuffer.writeInt32(1)
 
   // reset the reader position
   handshakeBuffer.reset()

test/internal/connection-channel.test.js

@@ -123,12 +123,12 @@ describe('#integration ChannelConnection', () => {
     connection._negotiateProtocol()
 
     const boltMagicPreamble = '60 60 b0 17'
-    const protocolVersion4 = '00 00 00 04'
+    const protocolVersion4x1 = '00 00 01 04'
+    const protocolVersion4x0 = '00 00 00 04'
     const protocolVersion3 = '00 00 00 03'
     const protocolVersion2 = '00 00 00 02'
-    const protocolVersion1 = '00 00 00 01'
     expect(channel.toHex()).toBe(
-      `${boltMagicPreamble} ${protocolVersion4} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1}`
+      `${boltMagicPreamble} ${protocolVersion4x1} ${protocolVersion4x0} ${protocolVersion3} ${protocolVersion2}`
     )
   })
 

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

@@ -430,7 +430,6 @@ describe('#stub-direct direct driver with stub server', () => {
       await server.exit()
     }
 
-    it('v1', () => verifySupportsMultiDb('v1', false))
     it('v2', () => verifySupportsMultiDb('v2', false))
     it('v3', () => verifySupportsMultiDb('v3', false))
     it('v4', () => verifySupportsMultiDb('v4', true))
@@ -468,7 +467,6 @@ describe('#stub-direct direct driver with stub server', () => {
       await server.exit()
     }
 
-    it('v1', () => verifySupportsTransactionConfig('v1', false))
     it('v2', () => verifySupportsTransactionConfig('v2', false))
     it('v3', () => verifySupportsTransactionConfig('v3', true))
     it('v4', () => verifySupportsTransactionConfig('v4', true))

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

@@ -2375,11 +2375,9 @@ describe('#stub-routing routing driver with stub server', () => {
       await server.exit()
     }
 
-    it('v1', () => verifySupportsMultiDb('v1', false))
     it('v2', () => verifySupportsMultiDb('v2', false))
     it('v3', () => verifySupportsMultiDb('v3', false))
     it('v4', () => verifySupportsMultiDb('v4', true))
-    it('v1 with resolver', () => verifySupportsMultiDbWithResolver('v1', false))
     it('v2 with resolver', () => verifySupportsMultiDbWithResolver('v2', false))
     it('v3 with resolver', () => verifySupportsMultiDbWithResolver('v3', false))
     it('v4 with resolver', () => verifySupportsMultiDbWithResolver('v4', true))
@@ -2446,12 +2444,9 @@ describe('#stub-routing routing driver with stub server', () => {
       await server.exit()
     }
 
-    it('v1', () => verifySupportsTransactionConfig('v1', false))
     it('v2', () => verifySupportsTransactionConfig('v2', false))
     it('v3', () => verifySupportsTransactionConfig('v3', true))
     it('v4', () => verifySupportsTransactionConfig('v4', true))
-    it('v1 with resolver', () =>
-      verifySupportsTransactionConfigWithResolver('v1', false))
     it('v2 with resolver', () =>
       verifySupportsTransactionConfigWithResolver('v2', false))
     it('v3 with resolver', () =>

test/internal/protocol-handshaker.test.js

@@ -42,13 +42,13 @@ describe('#unit ProtocolHandshaker', () => {
     expect(writtenBuffers.length).toEqual(1)
 
     const boltMagicPreamble = '60 60 b0 17'
-    const protocolVersion4 = '00 00 00 04'
+    const protocolVersion4x1 = '00 00 01 04'
+    const protocolVersion4x0 = '00 00 00 04'
     const protocolVersion3 = '00 00 00 03'
     const protocolVersion2 = '00 00 00 02'
-    const protocolVersion1 = '00 00 00 01'
 
     expect(writtenBuffers[0].toHex()).toEqual(
-      `${boltMagicPreamble} ${protocolVersion4} ${protocolVersion3} ${protocolVersion2} ${protocolVersion1}`
+      `${boltMagicPreamble} ${protocolVersion4x1} ${protocolVersion4x0} ${protocolVersion3} ${protocolVersion2}`
     )
   })