Fix: forever on command line

.taprc

@@ -1,6 +1,8 @@
-esm: false
 ts: false
 jsx: false
 flow: false
 timeout: 900
-coverage: true
+branches: 86
+functions: 84
+lines: 87
+statements: 87

autocannon.js

@@ -239,9 +239,17 @@ function start (argv) {
  })
  })
  } else {
- initJob(argv).catch((err) => {
+ // if forever is true then a promise is not returned and we need to try ... catch errors
+ try {
+ const tracker = initJob(argv)
+ if (tracker.then) {
+ tracker.catch((err) => {
+ console.error(err.message)
+ })
+ }
+ } catch (err) {
  console.error(err.message)
- })
+ }
  }
 }
 

lib/validate.js

@@ -11,7 +11,7 @@ const isValidFn = (opt) => (!opt || typeof opt === 'function' || typeof opt ===
 
 const lessThanOneError = (label) => new Error(`${label} can not be less than 1`)
 const greaterThanZeroError = (label) => new Error(`${label} must be greater than 0`)
-const minIfPresent = (val, min) => val && val < min
+const minIfPresent = (val, min) => val !== null && val < min
 
 function safeRequire (path) {
  if (typeof path === 'string') {
@@ -83,8 +83,15 @@ module.exports = function validateOpts (opts, cbPassedIn) {
  }
 
  if (typeof opts.duration === 'string') {
- if (/[a-zA-Z]/.exec(opts.duration)) opts.duration = timestring(opts.duration)
- else opts.duration = Number(opts.duration.trim())
+ if (/[a-zA-Z]/.exec(opts.duration)) {
+ try {
+ opts.duration = timestring(opts.duration)
+ } catch (error) {
+ return error
+ }
+ } else {
+ opts.duration = Number(opts.duration.trim())
+ }
  }
 
  if (typeof opts.duration !== 'number') {

package.json

@@ -45,7 +45,7 @@
  "sinon": "^10.0.1",
  "split2": "^3.2.2",
  "standard": "^16.0.3",
- "tap": "^14.10.8"
+ "tap": "^15.0.2"
  },
  "dependencies": {
  "chalk": "^4.1.0",

test/basic-auth.test.js

@@ -40,7 +40,7 @@ const child = childProcess.spawn(process.execPath, [path.join(__dirname, '..'),
  detached: false
 })
 
-t.tearDown(() => {
+t.teardown(() => {
  child.kill()
 })
 

test/cli-ipc.test.js

@@ -38,7 +38,7 @@ if (!win) {
 }
 
 t.autoend(false)
-t.tearDown(function () {
+t.teardown(function () {
  child.kill()
 })
 

test/cli.test.js

@@ -44,7 +44,7 @@ test('should run benchmark against server', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 
@@ -97,7 +97,7 @@ test('should parse HAR file and run requests', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 
@@ -121,7 +121,7 @@ test('should throw on unknown HAR file', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 
@@ -150,7 +150,7 @@ test('should throw on invalid HAR file', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 
@@ -182,7 +182,7 @@ test('should write warning about unused HAR requests', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 
@@ -234,7 +234,7 @@ test('run with workers', { skip: !hasWorkerSupport }, (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 

test/envPort.test.js

@@ -43,7 +43,7 @@ const child = childProcess.spawn(process.execPath, [path.join(__dirname, '..'),
  detached: false
 })
 
-t.tearDown(() => {
+t.teardown(() => {
  child.kill()
 })
 

test/httpClient.test.js

@@ -98,7 +98,7 @@ test('client calls a tls server without SNI servername twice', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', '', 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', '', 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -116,7 +116,7 @@ test('client calls a tls server with SNI servername twice', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', opts.servername, 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', opts.servername, 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -134,7 +134,7 @@ test('client uses SNI servername from URL hostname by default', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', opts.hostname, 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', opts.hostname, 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -153,7 +153,7 @@ test('client prefers SNI servername from opts over URL hostname', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', opts.servername, 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', opts.servername, 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -171,7 +171,7 @@ test('client ignores IP address in hostname-derived SNI servername', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', '', 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', '', 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -189,7 +189,7 @@ test('client ignores falsy SNI servername', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', '', 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', '', 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -211,7 +211,7 @@ test('client passes through tlsOptions to connect', (t) => {
 
  client.on('headers', (response) => {
  t.equal(response.statusCode, 200, 'status code matches')
- t.deepEqual(response.headers, ['X-servername', '', 'X-email', 'tes@test.com', 'Content-Length', '0'])
+ t.same(response.headers, ['X-servername', '', 'X-email', 'tes@test.com', 'Content-Length', '0'])
  if (count++ > 0) {
  client.destroy()
  }
@@ -362,7 +362,7 @@ test('client supports sending a body', (t) => {
  server.once('request', (req, res) => {
  req.pipe(bl((err, body) => {
  t.error(err)
- t.deepEqual(body.toString(), opts.body.toString(), 'body matches')
+ t.same(body.toString(), opts.body.toString(), 'body matches')
  }))
  })
 
@@ -385,7 +385,7 @@ test('client supports sending a body which is a string', (t) => {
  server.once('request', (req, res) => {
  req.pipe(bl((err, body) => {
  t.error(err)
- t.deepEqual(body.toString(), opts.body, 'body matches')
+ t.same(body.toString(), opts.body, 'body matches')
  }))
  })
 
@@ -718,21 +718,21 @@ test('client exposes response bodies and statuses', (t) => {
  switch (number) {
  case 1:
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, ...opts.requests[0] }), 'first request')
- t.deepEqual(responses, [{
+ t.same(responses, [{
  status: 200,
  body: 'hello!'
  }])
  break
  case 2:
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, ...opts.requests[1] }), 'second request')
- t.deepEqual(responses, [{
+ t.same(responses, [{
  status: 200,
  body: 'hello!'
  }])
  break
  case 3:
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, ...opts.requests[2] }), 'third request')
- t.deepEqual(responses, [{
+ t.same(responses, [{
  status: 200,
  body: 'hello!'
  }, {
@@ -742,7 +742,7 @@ test('client exposes response bodies and statuses', (t) => {
  break
  case 4:
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, ...opts.requests[0] }), 'first request')
- t.deepEqual(responses, [{
+ t.same(responses, [{
  status: 200,
  body: 'hello!'
  }, {
@@ -771,7 +771,7 @@ test('client keeps context and reset it when looping on requests', (t) => {
  body: 'hello world again',
  onResponse: (status, body, context) => {
  if (number < 3) {
- t.deepEqual(context, {}, 'context was supposed to be null')
+ t.same(context, {}, 'context was supposed to be null')
  context.previousRes = body
  }
  }
@@ -780,7 +780,7 @@ test('client keeps context and reset it when looping on requests', (t) => {
  method: 'PUT',
  setupRequest: (req, context) => {
  if (number < 3) {
- t.deepEqual(context, { previousRes: expectedResponse }, 'context was supposed to contain previous response')
+ t.same(context, { previousRes: expectedResponse }, 'context was supposed to contain previous response')
  }
  return Object.assign({}, req, { body: context.previousRes })
  }
@@ -913,22 +913,22 @@ test('client invokes appropriate onResponse when using pipelining', (t) => {
  case 1:
  // 1st & 2nd were sent, receiving 1st
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, method: 'GET' }), 'current should be second request')
- t.deepEqual(responses, ['POST'])
+ t.same(responses, ['POST'])
  break
  case 2:
  // 3rd was sent as 1st is finished, receiving 2nd
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, method: 'PUT' }), 'current should be third request')
- t.deepEqual(responses, ['POST', 'GET'])
+ t.same(responses, ['POST', 'GET'])
  break
  case 3:
  // 1st was resent, receiving 3rd
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, method: 'POST' }), 'current should be first request')
- t.deepEqual(responses, ['POST', 'GET', 'PUT'])
+ t.same(responses, ['POST', 'GET', 'PUT'])
  break
  case 4:
  // 2nd was resent, receiving 1st
  t.same(client.getRequestBuffer().toString(), makeResponseFromBody({ server, method: 'GET' }), 'current should be second request')
- t.deepEqual(responses, ['POST', 'GET', 'PUT', 'POST'])
+ t.same(responses, ['POST', 'GET', 'PUT', 'POST'])
  client.destroy()
  t.end()
  break

test/httpRequestBuilder.test.js

@@ -154,6 +154,6 @@ test('should throw error if body is not a string or a buffer', (t) => {
  try {
  build({ body: [] })
  } catch (error) {
- t.is(error.message, 'body must be either a string or a buffer')
+ t.equal(error.message, 'body must be either a string or a buffer')
  }
 })

test/onPort.test.js

@@ -44,7 +44,7 @@ test('--on-port flag', { skip: !hasAsyncHooks() }, (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 

test/pipelinedRequestsQueue.test.js

@@ -68,7 +68,7 @@ test('PipelinedRequestsQueue methods set values to the request in first-in-last-
  const req1 = queue.terminateRequest()
  t.equal(req1.req, 1)
  t.equal(req1.body, '1')
- t.deepEqual(req1.headers, { val: '1' })
+ t.same(req1.headers, { val: '1' })
 
  queue.addBody('2')
  queue.addByteCount(2)
@@ -77,5 +77,5 @@ test('PipelinedRequestsQueue methods set values to the request in first-in-last-
  const req2 = queue.terminateRequest()
  t.equal(req2.req, 2)
  t.equal(req2.body, '2')
- t.deepEqual(req2.headers, { val: '2' })
+ t.same(req2.headers, { val: '2' })
 })

test/printResult-renderStatusCodes.test.js

@@ -45,7 +45,7 @@ test('should stdout (print) the result', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 

test/printResult.test.js

@@ -34,7 +34,7 @@ test('should stdout (print) the result', (t) => {
  detached: false
  })
 
- t.tearDown(() => {
+ t.teardown(() => {
  child.kill()
  })
 

test/progressTracker.test.js

@@ -19,7 +19,7 @@ test(`should not emit warnings when using >= ${defaultMaxListeners} workers`, {
 
  setTimeout(() => {
  instance.stop()
- t.false(emitWarningSpy.called)
+ t.notOk(emitWarningSpy.called)
  emitWarningSpy.restore()
  t.end()
  }, 2000)