Skip to content

Implementing new structures for DateTime in Bolt 5.0 #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default class BoltProtocol {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v2.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class BoltProtocol extends BoltProtocolV1 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v3.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default class BoltProtocol extends BoltProtocolV2 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v4x0.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default class BoltProtocol extends BoltProtocolV3 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v4x1.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default class BoltProtocol extends BoltProtocolV4 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v4x2.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class BoltProtocol extends BoltProtocolV41 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down
52 changes: 50 additions & 2 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x3.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@
*/
import BoltProtocolV42 from './bolt-protocol-v4x2'
import RequestMessage from './request-message'
import { RouteObserver } from './stream-observers'
import { LoginObserver, RouteObserver } from './stream-observers'

import transformersFactories from './bolt-protocol-v4x3.transformer'
import utcTransformersFactories from './bolt-protocol-v5x0.utc.transformer'
import Transformer from './transformer'

import { internal } from 'neo4j-driver-core'
Expand All @@ -37,7 +38,7 @@ export default class BoltProtocol extends BoltProtocolV42 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down Expand Up @@ -75,4 +76,51 @@ export default class BoltProtocol extends BoltProtocolV42 {

return observer
}

/**
* Initialize a connection with the server
*
* @param {Object} param0 The params
* @param {string} param0.userAgent The user agent
* @param {any} param0.authToken The auth token
* @param {function(error)} param0.onError On error callback
* @param {function(onComplte)} param0.onComplete On complete callback
* @returns {LoginObserver} The Login observer
*/
initialize ({ userAgent, authToken, onError, onComplete } = {}) {
const observer = new LoginObserver({
onError: error => this._onLoginError(error, onError),
onCompleted: metadata => {
if (metadata.patch_bolt !== undefined) {
this._applyPatches(metadata.patch_bolt)
}
return this._onLoginCompleted(metadata, onComplete)
}
})

this.write(
RequestMessage.hello(userAgent, authToken, this._serversideRouting, ['utc']),
observer,
true
)

return observer
}

/**
*
* @param {string[]} patches Patches to be applied to the protocol
*/
_applyPatches (patches) {
if (patches.includes('utc')) {
this._applyUtcPatch()
}
}

_applyUtcPatch () {
this._transformer = new Transformer(Object.values({
...transformersFactories,
...utcTransformersFactories
}).map(create => create(this._config, this._log)))
}
}
10 changes: 9 additions & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v4x4.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import RequestMessage from './request-message'
import { RouteObserver, ResultStreamObserver } from './stream-observers'

import transformersFactories from './bolt-protocol-v4x4.transformer'
import utcTransformersFactories from './bolt-protocol-v5x0.utc.transformer'
import Transformer from './transformer'

const {
Expand All @@ -37,7 +38,7 @@ export default class BoltProtocol extends BoltProtocolV43 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}
Expand Down Expand Up @@ -163,4 +164,11 @@ export default class BoltProtocol extends BoltProtocolV43 {

return observer
}

_applyUtcPatch () {
this._transformer = new Transformer(Object.values({
...transformersFactories,
...utcTransformersFactories
}).map(create => create(this._config, this._log)))
}
}
29 changes: 28 additions & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v5x0.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import BoltProtocolV44 from './bolt-protocol-v4x4'

import transformersFactories from './bolt-protocol-v5x0.transformer'
import Transformer from './transformer'
import RequestMessage from './request-message'
import { LoginObserver } from './stream-observers'

import { internal } from 'neo4j-driver-core'

Expand All @@ -34,8 +36,33 @@ export default class BoltProtocol extends BoltProtocolV44 {

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
}
return this._transformer
}

/**
* Initialize a connection with the server
*
* @param {Object} param0 The params
* @param {string} param0.userAgent The user agent
* @param {any} param0.authToken The auth token
* @param {function(error)} param0.onError On error callback
* @param {function(onComplte)} param0.onComplete On complete callback
* @returns {LoginObserver} The Login observer
*/
initialize ({ userAgent, authToken, onError, onComplete } = {}) {
const observer = new LoginObserver({
onError: error => this._onLoginError(error, onError),
onCompleted: metadata => this._onLoginCompleted(metadata, onComplete)
})

this.write(
RequestMessage.hello(userAgent, authToken, this._serversideRouting),
observer,
true
)

return observer
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@
*/

import { structure } from '../packstream'
import { Node, Relationship, UnboundRelationship } from 'neo4j-driver-core'
import {
Node,
Relationship,
UnboundRelationship
} from 'neo4j-driver-core'

import v4x4 from './bolt-protocol-v4x4.transformer'
import v5x0Utc from './bolt-protocol-v5x0.utc.transformer'

const NODE_STRUCT_SIZE = 4
const RELATIONSHIP_STRUCT_SIZE = 8
Expand Down Expand Up @@ -118,6 +124,7 @@ function createUnboundRelationshipTransformer (config) {

export default {
...v4x4,
...v5x0Utc,
createNodeTransformer,
createRelationshipTransformer,
createUnboundRelationshipTransformer
Expand Down
Loading