Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix mqtt5 disconnect can have no property fields #98

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

Closed
wants to merge 3 commits into from
Closed

Fix mqtt5 disconnect can have no property fields #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c9be42
fix: mqtt5 disconnect can have no property fields
linwe2012 Apr 15, 2020
6dcb829
add mqtt5 disconnect test & generate disconnect without properties
linwe2012 Apr 16, 2020
49d683f
fix Style
ogis-yamazaki Feb 3, 2021
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: 6 additions & 4 deletions parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,12 @@ class Parser extends EventEmitter {
if (this.settings.protocolVersion === 5) {
// response code
packet.reasonCode = this._parseByte()
// properies mqtt 5
const properties = this._parseProperties()
if (Object.getOwnPropertyNames(properties).length) {
packet.properties = properties
if (packet.length > 1) {
// properies mqtt 5
const properties = this._parseProperties()
if (Object.getOwnPropertyNames(properties).length) {
packet.properties = properties
}
}
}

Expand Down
12 changes: 12 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,6 +1903,18 @@ testParseGenerate('disconnect MQTT 5', {
28, 0, 4, 116, 101, 115, 116// serverReference
]), { protocolVersion: 5 })

testParseGenerate('disconnect MQTT 5 with no properties', {
cmd: 'disconnect',
retain: false,
qos: 0,
dup: false,
length: 1,
reasonCode: 0
}, Buffer.from([
224, 1, // Header
0 // reason code
]), { protocolVersion: 5 })

testParseGenerate('auth MQTT 5', {
cmd: 'auth',
retain: false,
Expand Down
2 changes: 1 addition & 1 deletion writeToStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ function disconnect (packet, stream, opts) {

// properies mqtt 5
let propertiesData = null
if (version === 5) {
if (version === 5 && properties) {
propertiesData = getPropertiesByMaximumPacketSize(stream, properties, opts, length)
if (!propertiesData) { return false }
length += propertiesData.length
Expand Down