Skip to content

Fix connection receive timeout for single requests #1166

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.

Sign up for GitHub

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
bigmontz merged 1 commit into from
Dec 20, 2023
Merged

Fix connection receive timeout for single requests #1166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions packages/bolt-connection/src/bolt/response-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default class ResponseHandler {
this._transformMetadata = transformMetadata || NO_OP_IDENTITY
this._observer = Object.assign(
{
onPendingObserversChange: NO_OP,
onObserversCountChange: NO_OP,
onError: NO_OP,
onFailure: NO_OP,
onErrorApplyTransformation: NO_OP_IDENTITY
Expand Down Expand Up @@ -156,7 +156,11 @@ export default class ResponseHandler {
*/
_updateCurrentObserver () {
this._currentObserver = this._pendingObservers.shift()
this._observer.onPendingObserversChange(this._pendingObservers.length)
this._observer.onObserversCountChange(this._observersCount)
}

get _observersCount () {
return this._currentObserver == null ? this._pendingObservers.length : this._pendingObservers.length + 1
}

_queueObserver (observer) {
Expand All @@ -169,7 +173,7 @@ export default class ResponseHandler {
} else {
this._pendingObservers.push(observer)
}
this._observer.onPendingObserversChange(this._pendingObservers.length)
this._observer.onObserversCountChange(this._observersCount)
return true
}

Expand Down
2 changes: 1 addition & 1 deletion packages/bolt-connection/src/connection/connection-channel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function createChannelConnection (
server: conn.server,
log: conn.logger,
observer: {
onPendingObserversChange: conn._handleOngoingRequestsNumberChange.bind(conn),
onObserversCountChange: conn._handleOngoingRequestsNumberChange.bind(conn),
onError: conn._handleFatalError.bind(conn),
onFailure: conn._resetOnFailure.bind(conn),
onProtocolError: conn._handleProtocolError.bind(conn),
Expand Down
33 changes: 33 additions & 0 deletions packages/bolt-connection/test/bolt/response-handler.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const {
logger: { Logger }
} = internal

const SUCCESS = 0x70 // 0111 0000 // SUCCESS <metadata>
const FAILURE = 0x7f // 0111 1111 // FAILURE <metadata>

describe('response-handler', () => {
Expand Down Expand Up @@ -69,4 +70,36 @@ describe('response-handler', () => {
expect(receivedError.code).toBe(expectedError.code)
})
})

it('should keep track of observers and notify onObserversCountChange()', () => {
const observer = {
onObserversCountChange: jest.fn()
}
const responseHandler = new ResponseHandler({ observer, log: Logger.noOp() })

responseHandler._queueObserver({})
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(1)

responseHandler._queueObserver({})
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(2)

responseHandler._queueObserver({})
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(3)

const success = {
signature: SUCCESS,
fields: [{}]
}

responseHandler.handleResponse(success)
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(2)

responseHandler.handleResponse(success)
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(1)

responseHandler.handleResponse(success)
expect(observer.onObserversCountChange).toHaveBeenLastCalledWith(0)

expect(observer.onObserversCountChange).toHaveBeenCalledTimes(6)
})
})
10 changes: 7 additions & 3 deletions packages/neo4j-driver-deno/lib/bolt-connection/bolt/response-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default class ResponseHandler {
this._transformMetadata = transformMetadata || NO_OP_IDENTITY
this._observer = Object.assign(
{
onPendingObserversChange: NO_OP,
onObserversCountChange: NO_OP,
onError: NO_OP,
onFailure: NO_OP,
onErrorApplyTransformation: NO_OP_IDENTITY
Expand Down Expand Up @@ -156,7 +156,11 @@ export default class ResponseHandler {
*/
_updateCurrentObserver () {
this._currentObserver = this._pendingObservers.shift()
this._observer.onPendingObserversChange(this._pendingObservers.length)
this._observer.onObserversCountChange(this._observersCount)
}

get _observersCount () {
return this._currentObserver == null ? this._pendingObservers.length : this._pendingObservers.length + 1
}

_queueObserver (observer) {
Expand All @@ -169,7 +173,7 @@ export default class ResponseHandler {
} else {
this._pendingObservers.push(observer)
}
this._observer.onPendingObserversChange(this._pendingObservers.length)
this._observer.onObserversCountChange(this._observersCount)
return true
}

Expand Down
2 changes: 1 addition & 1 deletion packages/neo4j-driver-deno/lib/bolt-connection/connection/connection-channel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export function createChannelConnection (
server: conn.server,
log: conn.logger,
observer: {
onPendingObserversChange: conn._handleOngoingRequestsNumberChange.bind(conn),
onObserversCountChange: conn._handleOngoingRequestsNumberChange.bind(conn),
onError: conn._handleFatalError.bind(conn),
onFailure: conn._resetOnFailure.bind(conn),
onProtocolError: conn._handleProtocolError.bind(conn),
Expand Down