Skip to content
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

Introduce driver level Hydration and Dehydration hooks #1157

Draft
wants to merge 2 commits into
base: 5.0
Choose a base branch
from
Draft
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
8 changes: 6 additions & 2 deletions packages/bolt-connection/src/bolt/bolt-protocol-v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ export default class BoltProtocol {
{ disableLosslessIntegers, useBigInt } = {},
createResponseHandler = () => null,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
) {
this._server = server || {}
this._chunker = chunker
Expand All @@ -86,11 +88,13 @@ export default class BoltProtocol {
this._fatalError = null
this._lastMessageSignature = null
this._config = { disableLosslessIntegers, useBigInt }
this._hydrationHooks = hydrationHooks
this._dehydrationHooks = dehydrationHooks
}

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down
8 changes: 6 additions & 2 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x1.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ export default class BoltProtocol extends BoltProtocolV4 {
createResponseHandler = () => null,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
) {
super(
Expand All @@ -57,7 +59,9 @@ export default class BoltProtocol extends BoltProtocolV4 {
packstreamConfig,
createResponseHandler,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
)
this._serversideRouting = serversideRouting
}
Expand All @@ -68,7 +72,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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down
4 changes: 2 additions & 2 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x3.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down Expand Up @@ -126,6 +126,6 @@ export default class BoltProtocol extends BoltProtocolV42 {
this._transformer = new Transformer(Object.values({
...transformersFactories,
...utcTransformersFactories
}).map(create => create(this._config, this._log)))
}).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
}
4 changes: 2 additions & 2 deletions packages/bolt-connection/src/bolt/bolt-protocol-v4x4.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down Expand Up @@ -178,6 +178,6 @@ export default class BoltProtocol extends BoltProtocolV43 {
this._transformer = new Transformer(Object.values({
...transformersFactories,
...utcTransformersFactories
}).map(create => create(this._config, this._log)))
}).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
}
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v5x0.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ 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._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/bolt/bolt-protocol-v5x1.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class BoltProtocol extends BoltProtocolV5x0 {

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

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

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

get transformer () {
if (this._transformer === undefined) {
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)))
this._transformer = new Transformer(Object.values(transformersFactories).map(create => create(this._config, this._log)), this._hydrationHooks, this._dehydrationHooks)
}
return this._transformer
}
Expand Down
48 changes: 41 additions & 7 deletions packages/bolt-connection/src/bolt/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import ResponseHandler from './response-handler'
* @param {boolean} config.disableLosslessIntegers Disable the lossless integers
* @param {boolean} packstreamConfig.useBigInt if this connection should convert all received integers to native BigInt numbers.
* @param {boolean} config.serversideRouting It's using server side routing
* @param {HydatrationHooks} config.hydrationHooks Hydatration hooks used to map types
* @param {DehydrationHooks} config.dehydrationHooks Hydatration hooks used to map types
*/
export default function create ({
version,
Expand All @@ -59,7 +61,9 @@ export default function create ({
serversideRouting,
server, // server info
log,
observer
observer,
hydrationHooks,
dehydrationHooks
} = {}) {
const createResponseHandler = protocol => {
const responseHandler = new ResponseHandler({
Expand Down Expand Up @@ -94,7 +98,9 @@ export default function create ({
serversideRouting,
createResponseHandler,
observer.onProtocolError.bind(observer),
log
log,
hydrationHooks,
dehydrationHooks
)
}

Expand All @@ -106,7 +112,9 @@ function createProtocol (
serversideRouting,
createResponseHandler,
onProtocolError,
log
log,
hydrationHooks,
dehydrationHooks
) {
switch (version) {
case 1:
Expand All @@ -116,7 +124,9 @@ function createProtocol (
packingConfig,
createResponseHandler,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
)
case 2:
return new BoltProtocolV2(
Expand All @@ -125,7 +135,9 @@ function createProtocol (
packingConfig,
createResponseHandler,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
)
case 3:
return new BoltProtocolV3(
Expand All @@ -134,7 +146,9 @@ function createProtocol (
packingConfig,
createResponseHandler,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
)
case 4.0:
return new BoltProtocolV4x0(
Expand All @@ -143,7 +157,9 @@ function createProtocol (
packingConfig,
createResponseHandler,
log,
onProtocolError
onProtocolError,
hydrationHooks,
dehydrationHooks
)
case 4.1:
return new BoltProtocolV4x1(
Expand All @@ -153,6 +169,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 4.2:
Expand All @@ -163,6 +181,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 4.3:
Expand All @@ -173,6 +193,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 4.4:
Expand All @@ -183,6 +205,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 5.0:
Expand All @@ -193,6 +217,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 5.1:
Expand All @@ -203,6 +229,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 5.2:
Expand All @@ -213,6 +241,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting
)
case 5.3:
Expand All @@ -222,6 +252,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting)
case 5.4:
return new BoltProtocolV5x4(server,
Expand All @@ -230,6 +262,8 @@ function createProtocol (
createResponseHandler,
log,
onProtocolError,
hydrationHooks,
dehydrationHooks,
serversideRouting)
default:
throw newError('Unknown Bolt protocol version: ' + version)
Expand Down
Loading