Skip to content

Commit 447c8c1

Browse files
committed
Remove magic numbers
1 parent ecc42ae commit 447c8c1

File tree

4 files changed

+50
-8
lines changed

4 files changed

+50
-8
lines changed

packages/bolt-connection/src/bolt/bolt-protocol-v1.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
// eslint-disable-next-line no-unused-vars
2525
import { Chunker } from '../channel'
2626
import { structure, v1 } from '../packstream'
27-
import RequestMessage from './request-message'
27+
import RequestMessage, { SIGNATURES } from './request-message'
2828
import {
2929
LoginObserver,
3030
LogoffObserver,
@@ -475,12 +475,12 @@ export default class BoltProtocol {
475475
}
476476

477477
isLastMessageLogon () {
478-
return this._lastMessageSignature === 0x01 ||
479-
this._lastMessageSignature === 0x6A
478+
return this._lastMessageSignature === SIGNATURES.HELLO ||
479+
this._lastMessageSignature === SIGNATURES.LOGON
480480
}
481481

482482
isLastMessageReset () {
483-
return this._lastMessageSignature === 0x0f
483+
return this._lastMessageSignature === SIGNATURES.RESET
484484
}
485485

486486
/**

packages/bolt-connection/src/bolt/request-message.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,23 @@ const READ_MODE = 'r'
5151

5252
const NO_STATEMENT_ID = -1
5353

54+
const SIGNATURES = Object.freeze({
55+
INIT,
56+
RESET,
57+
RUN,
58+
PULL_ALL,
59+
HELLO,
60+
GOODBYE,
61+
BEGIN,
62+
COMMIT,
63+
ROLLBACK,
64+
ROUTE,
65+
LOGON,
66+
LOGOFF,
67+
DISCARD,
68+
PULL
69+
})
70+
5471
export default class RequestMessage {
5572
constructor (signature, fields, toString) {
5673
this.signature = signature
@@ -376,3 +393,7 @@ const RESET_MESSAGE = new RequestMessage(RESET, [], () => 'RESET')
376393
const COMMIT_MESSAGE = new RequestMessage(COMMIT, [], () => 'COMMIT')
377394
const ROLLBACK_MESSAGE = new RequestMessage(ROLLBACK, [], () => 'ROLLBACK')
378395
const GOODBYE_MESSAGE = new RequestMessage(GOODBYE, [], () => 'GOODBYE')
396+
397+
export {
398+
SIGNATURES
399+
}

packages/neo4j-driver-deno/lib/bolt-connection/bolt/bolt-protocol-v1.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
// eslint-disable-next-line no-unused-vars
2525
import { Chunker } from '../channel/index.js'
2626
import { structure, v1 } from '../packstream/index.js'
27-
import RequestMessage from './request-message.js'
27+
import RequestMessage, { SIGNATURES } from './request-message.js'
2828
import {
2929
LoginObserver,
3030
LogoffObserver,
@@ -475,12 +475,12 @@ export default class BoltProtocol {
475475
}
476476

477477
isLastMessageLogon () {
478-
return this._lastMessageSignature === 0x01 ||
479-
this._lastMessageSignature === 0x6A
478+
return this._lastMessageSignature === SIGNATURES.HELLO ||
479+
this._lastMessageSignature === SIGNATURES.LOGON
480480
}
481481

482482
isLastMessageReset () {
483-
return this._lastMessageSignature === 0x0f
483+
return this._lastMessageSignature === SIGNATURES.RESET
484484
}
485485

486486
/**

packages/neo4j-driver-deno/lib/bolt-connection/bolt/request-message.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,23 @@ const READ_MODE = 'r'
5151

5252
const NO_STATEMENT_ID = -1
5353

54+
const SIGNATURES = Object.freeze({
55+
INIT,
56+
RESET,
57+
RUN,
58+
PULL_ALL,
59+
HELLO,
60+
GOODBYE,
61+
BEGIN,
62+
COMMIT,
63+
ROLLBACK,
64+
ROUTE,
65+
LOGON,
66+
LOGOFF,
67+
DISCARD,
68+
PULL
69+
})
70+
5471
export default class RequestMessage {
5572
constructor (signature, fields, toString) {
5673
this.signature = signature
@@ -376,3 +393,7 @@ const RESET_MESSAGE = new RequestMessage(RESET, [], () => 'RESET')
376393
const COMMIT_MESSAGE = new RequestMessage(COMMIT, [], () => 'COMMIT')
377394
const ROLLBACK_MESSAGE = new RequestMessage(ROLLBACK, [], () => 'ROLLBACK')
378395
const GOODBYE_MESSAGE = new RequestMessage(GOODBYE, [], () => 'GOODBYE')
396+
397+
export {
398+
SIGNATURES
399+
}

0 commit comments

Comments
 (0)