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.

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

Jump to bottom

Non-Zero MessageID when QoS > 0 #251

Merged
merged 5 commits into from
Jul 11, 2019
Merged

Non-Zero MessageID when QoS > 0 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
665cfad
Non-Zero MessageId when QoS > 0
gnought Jul 11, 2019
a8beee5
Prolong waiting time (#252)
gnought Jul 11, 2019
c0d5bd5
Replace istanbul with nyc (#253)
gnought Jul 11, 2019
34695fb
Non-Zero MessageId when QoS > 0
gnought Jul 11, 2019
7440fe6
Merge branch 'hotfix/non_zero_messageId_when_qos_gt_0' of https://git…
gnought Jul 11, 2019
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ pids
# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
# Coverage directory used by tools like nyc
coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
Expand Down
2 changes: 1 addition & 1 deletion lib/qos-packet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function QoSPacket (original, client) {
if (!original.messageId) {
this.messageId = client._nextId
if (client._nextId === 65535) {
client._nextId = 0
client._nextId = 1
} else {
client._nextId++
}
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"typescript-test": "npm run typescript-compile-test && npm run typescript-compile-execute",
"test": "tape test/*.js test/*/*.js | faucet",
"ci": "npm run lint && npm run typescript-test && npm run coverage",
"coverage": "istanbul cover tape test/*.js test/*/*.js",
"coverage": "nyc --reporter=lcov tape test/*.js test/*/*.js",
"coveralls": "cat coverage/lcov.info | coveralls"
},
"pre-commit": [
Expand Down Expand Up @@ -46,9 +46,9 @@
"coveralls": "^3.0.4",
"duplexify": "^4.1.1",
"faucet": "0.0.1",
"istanbul": "^0.4.5",
"mqtt": "^3.0.0",
"mqtt-connection": "^4.0.0",
"nyc": "^14.1.1",
"pre-commit": "^1.2.2",
"standard": "^12.0.1",
"tape": "^4.10.2",
Expand Down
4 changes: 2 additions & 2 deletions test/keep-alive.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ test('disconnect if a connect does not arrive in time', function (t) {
t.timeoutAfter(200)

var s = setup(aedes({
connectTimeout: 50
connectTimeout: 100
}))
var start = Date.now()

eos(s.conn, function () {
t.ok(Date.now() >= start + 50, 'waits waitConnectTimeout before ending')
t.ok(Date.now() >= start + 100, 'waits waitConnectTimeout before ending')
t.pass('ended')
})
})