nock 9.4.4 → 10.0.0

package/.github/ISSUE_TEMPLATE/01_bug_report.md

@@ -0,0 +1,26 @@
+---
+name: 🐛 Bug report
+about: If something isn't working 🤕
+
+---
+
+**What is the expected behavior?**
+
+**What is the actual behavior?**
+
+**Possible solution**
+
+**How to reproduce the issue**
+
+Runkit: *[Example link](https://runkit.com/gr2m/node-nock-nock-768)*
+
+_Having problem producing a test case? Try and ask the community for help. If the test case cannot be reproduced, the Nock community might not be able to help you._
+
+**Does the bug have a test case?**
+
+**Versions**
+
+| Software | Version(s) |
+|----------|------------|
+| Nock     |            |
+| Node     |            |

package/.github/ISSUE_TEMPLATE/02_feature_request.md

@@ -0,0 +1,21 @@
+---
+name: 🚀 Feature request
+about: Let us know if you have a feature request 💡
+
+---
+
+**Context**
+
+What are you trying to do and how would you want to do it differently? Is it something you currently you cannot do? Is this related to an issue/problem?
+
+**Alternatives**
+
+Can you achieve the same result doing it in an alternative way? Is the alternative considerable?
+
+**Has the feature been requested before?**
+
+Please provide a link to the issue.
+
+**If the feature request is accepted, would you be willing to submit a PR?**
+
+Yes / No _(Help can be provided if you need assistance submitting a PR)_

package/.github/ISSUE_TEMPLATE/03_support.md

@@ -0,0 +1,24 @@
+---
+name: ❓ Support
+about: If you need support, check out Nock on StackOverflow
+
+---
+
+<!--                 👆 Click "Preview" for a nicer view! -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+We primarily use GitHub as an issue tracker; for usage and support questions we primairly use StackOverflow. Please tag the questions with `nock` so the community can easily find it. [Go to StackOverflow](https://stackoverflow.com/questions/tagged/nock).
+
+If you want to submit a feature request you can do that [here](https://github.com/nock/nock/issues/new?template=feature_request.md) or bug reports [here](https://github.com/nock/nock/issues/new?template=bug_report.md).

package/.github/ISSUE_TEMPLATE/04_thanks.md

@@ -0,0 +1,21 @@
+---
+name: ❤️ Say thank you
+about: Tell us how you use nock & support our efforts in maintaining Nock
+
+---
+
+# ❤️ I'm using Nock
+
+If you (or your company) are using Nock - please let us know. We'd love to hear from you!
+
+Nock is a community driven project, which means it's not maintained by a company. If you would like to help Nock - any of the following is greatly appreciated.
+
+- [ ] Give the repository a star ⭐️
+- [ ] Help out with issues
+- [ ] Review pull requests
+- [ ] Blog about Nock
+- [ ] Make tutorials
+- [ ] Give talks
+- [ ] Support us on [https://opencollective.com/nock](https://opencollective.com/nock)
+
+Thank you! 💐

package/.github/lock.yml

@@ -0,0 +1,19 @@
+# Configuration for lock-threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 14
+
+# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
+exemptLabels: []
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue and
+  add a reference to this one if it’s related. Thank you!
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true

package/.github/stale.yml

@@ -0,0 +1,25 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. We try to
+  do our best, but nock is maintained by volunteers and there is only so much
+  we can do at a time. Thank you for your contributions.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1

package/.travis.yml

@@ -23,14 +23,12 @@ jobs:
       env: linting
       script: npm run lint
     - stage: test
-      node_js: 9
+      node_js: 10
       script: npm run unit
     - node_js: 8
       script: npm run unit
     - node_js: 6
       script: npm run unit
-    - node_js: 4
-      script: npm run unit
     - stage: release
       node_js: lts/*
       env: semantic-release

package/CONTRIBUTING.md

@@ -12,10 +12,12 @@ Please note that this project is released with a [Contributor Code of Conduct](.
 - [Generate README TOC](#generate-readme-toc)
 - [Running tests](#running-tests)
   * [Airplane mode](#airplane-mode)
+- [Release Process](#release-process)
+- [Becoming a maintainer](#becoming-a-maintainer)
 
 <!-- tocstop -->
 
-### Commit Message conventions
+## Commit Message conventions
 
 `nock` releases are automated using [semantic-release](https://github.com/semantic-release/semantic-release).
 To automatically calculate the correct version number as well as changelogs,
@@ -36,7 +38,7 @@ Other helpful conventions are
 
 The commit message(s) of a pull request can be fixed using the `squash & merge` button.
 
-### Generate README TOC
+## Generate README TOC
 
 Make sure to update the README's table of contents whenever you update the README using the following npm script.
 
@@ -44,17 +46,40 @@ Make sure to update the README's table of contents whenever you update the READM
 $ npm run toc
 ```
 
-### Running tests
+## Running tests
 
 ```
 $ npm test
 ```
 
-#### Airplane mode
+### Airplane mode
 
 Some of the tests depend on online connectivity. To skip them, set the `AIRPLANE` environment variable to some value.
 
 ```
 $ export AIRPLANE=true
 $ npm test
-```
+```
+
+## Release Process
+
+All of our releases are automated using [semantic-release](https://github.com/semantic-release/semantic-release). The commit messages pushed to the master branch trigger new releases. Semantic-release requires that commits follow certain convetions, [described above](#commit-message-conventions). semantic-release creates a GitHub release, adds release notes and publishes the new version to npm. This is why we do not store release notes in the [`CHANGELOG`](CHANGELOG.md) file - they're already on GitHub.
+
+We use @nockbot as a separate account for releases, because npm tokens cannot be scoped to a single package. This improves our security model in case of a data breach involving npm tokens. @nockbot's credentials were set up by @gr2m; contact him if for any reason you need to change this in the future.
+
+## Becoming a maintainer
+
+So you want to do more than file a bug or submit a PR? Awesome!
+
+Nock is actively interested in having more maintainers. That means that we would love to have you (yes, you) get more involved if you want to! We don't have strict tests that you need to pass to become a maintainer. Instead, all we want is to find people who are frequent contributors, understand what Nock does, and are eager to help make this tool better.
+
+Here are some things you can do today to actively show the Nock team that you're interested in helping out in the long term:
+
+* **Triage issues!** We have more issues than we have bandwidth to deal with. For some of these issues, there are no labels, no comments suggesting how the issue could be resolved, and no follow-up after months or years of silence. It would be great if the issues actively reflected the state of the project. Go through old issues and suggesting labels in comments, ask for more information, and generally help out with the resolution process. This would be a great help!
+* **Review PRs.** We have a lot of open PRs! Some of these are probably ready to merge, and some of them probably need more work. Any extra eyes on PRs are encouraged. Comment on code patterns you think need work, suggest extra tests, and let us know if a PR 'LGTM' ("looks good to me"). The more reviewers we have, the faster we can merge issues, the better this project becomes.
+* **Help out!** If someone files a bug and no one has responded yet, see if you can resolve it! Suggest PRs, or file them yourself. While most contributors are going to only be interested in their own bugs, great maintainers help out with other people's bugs. This is one of the best ways to become an expert at Nock (and Node.js, JavaScript, or pretty much any project) - helping others.
+* **Write docs.** Are our docs missing something important? Are they not clear? Could they be better? Open a PR!
+* **Suggest examples.** Right now, we have a few examples, but we could always have more. Submit small example files and tutorials. At some point, we'll have to work on a better way to display these - for now, it's great to show others how to solve difficult mocking problems easily with Nock.
+* **Refactor.** This is one of the hardest things to do, but one of the most useful. Go through the code, and find examples where it could be written better - with better variable names, more useful abstractions, and more elegant patterns. Taking away ten lines of code that are unnecessary is more valuable than submitting a hundred new lines, sometimes. Open a PR or a comment and defend your position; ask for feedback.
+
+Once you've been around for a bit, ask a current Maintainer - one of [the team members](https://github.com/orgs/nock/people) - whether you can be elevated to Maintainer status and given permissions to close issues and merge PRs. We're interested in how well you know what Nock is about, and how involved you are in the community - not where you're from, how good your English is, or whether or not you can pass a whiteboard test blindfolded. If you think that you've been helpful, let us know. We're friendly, promise. :)

package/README.md

@@ -3,6 +3,8 @@
 [![Build Status](https://travis-ci.org/nock/nock.svg?branch=master)](https://travis-ci.org/nock/nock)
 [![Coverage Status](https://coveralls.io/repos/github/nock/nock/badge.svg?branch=master)](https://coveralls.io/github/nock/nock?branch=master)
 [![Greenkeeper](https://badges.greenkeeper.io/nock/nock.svg)](https://greenkeeper.io/)
+[![Backers on Open Collective](https://opencollective.com/nock/backers/badge.svg)](#backers) 
+[![Sponsors on Open Collective](https://opencollective.com/nock/sponsors/badge.svg)](#sponsors) 
 
 > HTTP server mocking and expectations library for Node.js
 
@@ -59,7 +61,10 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
 - [Restoring](#restoring)
 - [Activating](#activating)
 - [Turning Nock Off (experimental!)](#turning-nock-off-experimental)
-- [Enable/Disable real HTTP request](#enabledisable-real-http-request)
+- [Enable/Disable real HTTP requests](#enabledisable-real-http-requests)
+  * [Disabling requests](#disabling-requests)
+  * [Enabling requests](#enabling-requests)
+  * [Resetting NetConnect](#resetting-netconnect)
 - [Recording](#recording)
   * [`dont_print` option](#dont_print-option)
   * [`output_objects` option](#output_objects-option)
@@ -78,6 +83,12 @@ For instance, if a module performs HTTP requests to a CouchDB server or makes HT
 - [Debugging](#debugging)
 - [PROTIP](#protip)
 - [Contributing](#contributing)
+- [Commit Message conventions](#commit-message-conventions)
+- [Generate README TOC](#generate-readme-toc)
+- [Running tests](#running-tests)
+  * [Airplane mode](#airplane-mode)
+- [Backers](#backers)
+- [Sponsors](#sponsors)
 - [License](#license)
 
 <!-- tocstop -->
@@ -183,7 +194,7 @@ var scope = nock('http://www.example.com')
 
 ### Specifying request body
 
-You can specify the request body to be matched as the second argument to the `get`, `post`, `put` or `delete` specifications. There are four types of second argument allowed:
+You can specify the request body to be matched as the second argument to the `get`, `post`, `put` or `delete` specifications. There are five types of second argument allowed:
 
 **String**: nock will exact match the stringified request body with the provided string
 
@@ -193,6 +204,14 @@ nock('http://www.example.com')
   .reply(200, { id: '123ABC' });
 ```
 
+**Buffer**: nock will exact match the stringified request body with the provided buffer
+
+```js
+nock('http://www.example.com')
+  .post('/login', Buffer.from([0xff, 0x11]))
+  .reply(200, { id: '123ABC' });
+```
+
 **RegExp**: nock will test the stringified request body against the provided RegExp
 
 ```js
@@ -621,7 +640,7 @@ nock('http://my.server.com')
   .reply(200, '<html></html>')
 ```
 
-NOTE: the [`'response'`](http://nodejs.org/api/http.html#http_event_response) event will occur immediately, but the [IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage) will not emit it's `'end'` event until after the delay.
+NOTE: the [`'response'`](http://nodejs.org/api/http.html#http_event_response) event will occur immediately, but the [IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage) will not emit its `'end'` event until after the delay.
 
 ### Delay the response
 
@@ -832,6 +851,19 @@ example.pendingMocks() // []
 
 example.get("/pathB").optionally().reply(200);
 example.pendingMocks() // []
+
+// You can also pass a boolean argument to `optionally()`. This
+// is useful if you want to conditionally make a mocked request
+// optional.
+var getMock = function(optional) {
+  return example.get("/pathC").optionally(optional).reply(200);
+}
+
+getMock(true);
+example.pendingMocks() // []
+getMock(false);
+example.pendingMocks() // ["GET http://example.com:80/pathC"]
+
 ```
 
 ### Allow __unmocked__ requests on a mocked hostname
@@ -1000,17 +1032,19 @@ This way you can have your tests hit the real servers just by switching on this
 $ NOCK_OFF=true node my_test.js
 ```
 
-## Enable/Disable real HTTP request
+## Enable/Disable real HTTP requests
 
 By default, any requests made to a host that is not mocked will be executed normally. If you want to block these requests, nock allows you to do so.
 
+### Disabling requests
+
 For disabling real http requests.
 
 ```js
 nock.disableNetConnect();
 ```
 
-So, if you try to request any host not 'nocked', it will thrown an `NetConnectNotAllowedError`.
+So, if you try to request any host not 'nocked', it will throw a `NetConnectNotAllowedError`.
 
 ```js
 nock.disableNetConnect();
@@ -1020,40 +1054,45 @@ req.on('error', function(err){
 });
 // The returned `http.ClientRequest` will emit an error event (or throw if you're not listening for it)
 // This code will log a NetConnectNotAllowedError with message:
-// Nock: Not allow net connect for "google.com:80"
+// Nock: Disallowed net connect for "google.com:80"
 ```
 
-For enabling real HTTP requests (the default behaviour).
+### Enabling requests
+
+For enabling any real HTTP requests (the default behavior):
 
 ```js
 nock.enableNetConnect();
 ```
 
-You could allow real HTTP request for certain host names by providing a string or a regular expression for the hostname:
+You could allow real HTTP requests for certain host names by providing a string or a regular expression for the hostname:
 
 ```js
-// using a string
+// Using a string
 nock.enableNetConnect('amazon.com');
 
-// or a RegExp
-nock.enableNetConnect(/(amazon|github).com/);
+// Or a RegExp
+nock.enableNetConnect(/(amazon|github)\.com/);
 
 http.get('http://www.amazon.com/');
-http.get('http://github.com/'); // only for second example
+http.get('http://github.com/');
 
-// This request will be done!
 http.get('http://google.com/');
-// this will throw NetConnectNotAllowedError with message:
-// Nock: Not allow net connect for "google.com:80"
+// This will throw NetConnectNotAllowedError with message:
+// Nock: Disallowed net connect for "google.com:80"
 ```
 
-A common use case when testing local endpoints would be to disable all but local host, then adding in additional nocks for external requests:
+A common use case when testing local endpoints would be to disable all but localhost, then add in additional nocks for external requests:
 
 ```js
 nock.disableNetConnect();
-nock.enableNetConnect('127.0.0.1'); //Allow localhost connections so we can test local routes and mock servers.
+// Allow localhost connections so we can test local routes and mock servers.
+nock.enableNetConnect('127.0.0.1');
 ```
-Then when you're done with the test, you probably want to set everything back to normal:
+
+### Resetting NetConnect
+
+When you're done with the test, you probably want to set everything back to normal:
 
 ```js
 nock.cleanAll();
@@ -1163,7 +1202,7 @@ var nocks = nock.define(nockDefs);
 
 ### `enable_reqheaders_recording` option
 
-Recording request headers by default is deemed more trouble than its worth as some of them depend on the timestamp or other values that may change after the tests have been recorder thus leading to complex postprocessing of recorded tests. Thus by default the request headers are not recorded.
+Recording request headers by default is deemed more trouble than it's worth as some of them depend on the timestamp or other values that may change after the tests have been recorder thus leading to complex postprocessing of recorded tests. Thus by default the request headers are not recorded.
 
 The genuine use cases for recording request headers (e.g. checking authorization) can be handled manually or by using `enable_reqheaders_recording` in `recorder.rec()` options.
 
@@ -1192,7 +1231,7 @@ nock.recorder.rec({
 
 ### `use_separator` option
 
-By default, nock will wrap it's output with the separator string `<<<<<<-- cut here -->>>>>>` before and after anything it prints, whether to the console or a custom log function given with the `logging` option.
+By default, nock will wrap its output with the separator string `<<<<<<-- cut here -->>>>>>` before and after anything it prints, whether to the console or a custom log function given with the `logging` option.
 
 To disable this, set `use_separator` to false.
 
@@ -1380,6 +1419,72 @@ Thanks for wanting to contribute! Take a look at our [Contributing Guide](CONTRI
 Please note that this project is released with a [Contributor Code of Conduct](./CODE_OF_CONDUCT.md).
 By participating in this project you agree to abide by its terms.
 
+## Commit Message conventions
+
+`nock` releases are automated using [semantic-release](https://github.com/semantic-release/semantic-release).
+To automatically calculate the correct version number as well as changelogs,
+three commit message conventions need to be followed
+
+- Commit bug fixes with `fix: ...` or `fix(scope): ...` prefix in commit subject
+- Commit new features with `feat: ...` or `feat(scope): ...` prefix in commit subject
+- Commit breaking changes by adding `BREAKING CHANGE: ` in the commit body
+  (not the subject line)
+
+Other helpful conventions are
+
+- Commit test files with `test: ...` or `test(scope): ...` prefix
+- Commit changes to `package.json`, `.gitignore` and other meta files with
+  `chore(filename-without-ext): ...`
+- Commit changes to README files or comments with `docs: ...`
+- Code style changes with `style: standard`
+
+The commit message(s) of a pull request can be fixed using the `squash & merge` button.
+
+## Generate README TOC
+
+Make sure to update the README's table of contents whenever you update the README using the following npm script.
+
+```
+$ npm run toc
+```
+
+## Running tests
+
+```
+$ npm test
+```
+
+### Airplane mode
+
+Some of the tests depend on online connectivity. To skip them, set the `AIRPLANE` environment variable to some value.
+
+```
+$ export AIRPLANE=true
+$ npm test
+```
+
+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/nock#backer)]
+
+<a href="https://opencollective.com/nock#backers" target="_blank"><img src="https://opencollective.com/nock/backers.svg?width=890"></a>
+
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/nock#sponsor)]
+
+<a href="https://opencollective.com/nock/sponsor/0/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/1/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/2/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/3/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/4/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/5/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/6/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/7/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/8/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/nock/sponsor/9/website" target="_blank"><img src="https://opencollective.com/nock/sponsor/9/avatar.svg"></a>
+
 ## License
 
 [MIT](LICENSE)

package/lib/common.js

@@ -50,7 +50,7 @@ var isBinaryBuffer = function(buffer) {
 
   //  Test if the buffer can be reconstructed verbatim from its utf8 encoding.
   var utfEncodedBuffer = buffer.toString('utf8');
-  var reconstructedBuffer = new Buffer(utfEncodedBuffer, 'utf8');
+  var reconstructedBuffer = Buffer.from(utfEncodedBuffer, 'utf8');
   var compareBuffers = function(lhs, rhs) {
     if(lhs.length !== rhs.length) {
       return false;
@@ -80,7 +80,7 @@ var isBinaryBuffer = function(buffer) {
 var mergeChunks = function(chunks) {
 
   if(_.isEmpty(chunks)) {
-    return new Buffer(0);
+    return Buffer.alloc(0);
   }
 
   //  We assume that all chunks are Buffer objects if the first is buffer object.

package/lib/intercept.js

@@ -33,7 +33,7 @@ function NetConnectNotAllowedError(host, path) {
 
   this.name    = 'NetConnectNotAllowedError';
   this.code    = 'ENETUNREACH'
-  this.message = 'Nock: Not allow net connect for "' + host + path + '"';
+  this.message = 'Nock: Disallowed net connect for "' + host + path + '"';
 
   Error.captureStackTrace(this, this.constructor);
 }

package/lib/interceptor.js

@@ -43,8 +43,12 @@ function Interceptor(scope, uri, method, requestBody, interceptorOptions) {
     this.optional = false;
 }
 
-Interceptor.prototype.optionally = function optionally() {
-    this.optional = true;
+Interceptor.prototype.optionally = function optionally(value) {
+    // The default behaviour of optionally() with no arguments is to make the mock optional.
+    value = (typeof value === 'undefined') ? true : value;
+
+    this.optional = value;
+
     return this;
 }
 
@@ -401,7 +405,7 @@ Interceptor.prototype.basicAuth = function basicAuth(options) {
     var username = options['user'];
     var password = options['pass'] || '';
     var name = 'authorization';
-    var value = 'Basic ' + new Buffer(username + ':' + password).toString('base64');
+    var value = 'Basic ' + Buffer.from(username + ':' + password).toString('base64');
     this.interceptorMatchHeaders.push({ name: name, value: value });
     return this;
 };

package/lib/match_body.js

@@ -3,6 +3,7 @@
 var deepEqual = require('deep-equal');
 var qs = require('qs');
 var _ = require('lodash')
+var common = require('./common');
 
 module.exports =
 function matchBody(spec, body) {
@@ -15,6 +16,14 @@ function matchBody(spec, body) {
     body = body.toString();
   }
 
+  if (Buffer.isBuffer(spec)) {
+    if (common.isBinaryBuffer(spec)) {
+      spec = spec.toString('hex');
+    } else {
+      spec = spec.toString('utf8');
+    }
+  }
+
   var contentType = (
     options.headers &&
     (options.headers['Content-Type'] || options.headers['content-type']) ||

package/lib/recorder.js

@@ -56,7 +56,7 @@ var getBodyFromChunks = function(chunks, headers) {
       body: _.map(chunks, function(chunk) {
         if(!Buffer.isBuffer(chunk)) {
           if (typeof chunk === 'string') {
-            chunk = new Buffer(chunk);
+            chunk = Buffer.from(chunk);
           } else {
             throw new Error('content-encoded responses must all be binary buffers');
           }
@@ -330,7 +330,7 @@ function record(rec_options) {
       res.push = function(data) {
         if (data) {
           if (encoding) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           dataChunks.push(data);
         }
@@ -358,7 +358,7 @@ function record(rec_options) {
         if (data) {
           debug(thisRecordingId, 'new', proto, 'body chunk');
           if (! Buffer.isBuffer(data)) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           bodyChunks.push(data);
         }
@@ -373,7 +373,7 @@ function record(rec_options) {
         if (data) {
           debug(thisRecordingId, 'new', proto, 'body chunk');
           if (! Buffer.isBuffer(data)) {
-            data = new Buffer(data, encoding);
+            data = Buffer.from(data, encoding);
           }
           bodyChunks.push(data);
         }

package/lib/request_overrider.js

@@ -111,7 +111,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
 
   /// options.auth
   if (options.auth && (! options.headers || ! options.headers.authorization)) {
-    setHeader(req, 'Authorization', 'Basic ' + (new Buffer(options.auth)).toString('base64'));
+    setHeader(req, 'Authorization', 'Basic ' + (Buffer.from(options.auth)).toString('base64'));
   }
 
   if (! req.connection) {
@@ -125,14 +125,13 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
   };
 
   req.socket = response.socket = Socket({ proto: options.proto });
-  req.socket.connecting = true;
 
   req.write = function(buffer, encoding, callback) {
     debug('write', arguments);
     if (!req.aborted) {
       if (buffer) {
         if (!Buffer.isBuffer(buffer)) {
-          buffer = new Buffer(buffer, encoding);
+          buffer = Buffer.from(buffer, encoding);
         }
         requestBodyBuffers.push(buffer);
       }
@@ -319,13 +318,13 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
             emitError(new Error('Gzip encoding is currently not supported in this version of Node.'));
             return;
           }
-          requestBody = String(zlib.gunzipSync(new Buffer(requestBody, 'hex')), 'hex')
+          requestBody = String(zlib.gunzipSync(Buffer.from(requestBody, 'hex')), 'hex')
         } else if (requestBody && common.contentEncoding(req.headers, 'deflate')) {
           if (typeof zlib.deflateSync !== 'function') {
             emitError(new Error('Deflate encoding is currently not supported in this version of Node.'));
             return;
           }
-          requestBody = String(zlib.inflateSync(new Buffer(requestBody, 'hex')), 'hex')
+          requestBody = String(zlib.inflateSync(Buffer.from(requestBody, 'hex')), 'hex')
         }
 
         requestBody = JSON.parse(requestBody);
@@ -357,7 +356,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
         }
 
         responseBuffers = _.map(buffers, function(buffer) {
-          return new Buffer(buffer, 'hex');
+          return Buffer.from(buffer, 'hex');
         });
 
       } else {
@@ -369,7 +368,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
         if(isBinaryRequestBodyBuffer && typeof(responseBody) === 'string') {
           //  Try to create the buffer from the interceptor's body response as hex.
           try {
-            responseBody = new Buffer(responseBody, 'hex');
+            responseBody = Buffer.from(responseBody, 'hex');
           } catch(err) {
             debug('exception during Buffer construction from hex data:', responseBody, '-', err);
           }
@@ -377,7 +376,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
           // Creating buffers does not necessarily throw errors, check for difference in size
           if (!responseBody || (interceptor.body.length > 0 && responseBody.length === 0)) {
             //  We fallback on constructing buffer from utf8 representation of the body.
-            responseBody = new Buffer(interceptor.body, 'utf8');
+            responseBody = Buffer.from(interceptor.body, 'utf8');
           }
         }
       }
@@ -403,23 +402,27 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
       if (responseBody) {
         debug('transform the response body');
 
-        if (Array.isArray(responseBody) &&
-            responseBody.length >= 2 &&
-            responseBody.length <= 3 &&
-            typeof responseBody[0] == 'number')
-        {
+        if (Array.isArray(responseBody)) {
           debug('response body is array: %j', responseBody);
-          response.statusCode = Number(responseBody[0]);
-          debug('new headers: %j', responseBody[2]);
-          if (! response.headers) response.headers = {};
-          _.assign(response.headers, responseBody[2] || {});
-          debug('response.headers after: %j', response.headers);
-          responseBody = responseBody[1];
-
-          response.rawHeaders = response.rawHeaders || [];
-          Object.keys(response.headers).forEach(function(key) {
-            response.rawHeaders.push(key, response.headers[key]);
-          });
+
+          if (!isNaN(Number(responseBody[0])))
+          {
+            response.statusCode = Number(responseBody[0]);
+          }
+
+          if (responseBody.length >= 2 && responseBody.length <= 3)
+          {
+            debug('new headers: %j', responseBody[2]);
+            if (!response.headers) response.headers = {};
+            _.assign(response.headers, responseBody[2] || {});
+            debug('response.headers after: %j', response.headers);
+            responseBody = responseBody[1];
+
+            response.rawHeaders = response.rawHeaders || [];
+            Object.keys(response.headers).forEach(function(key) {
+              response.rawHeaders.push(key, response.headers[key]);
+            });
+          }
         }
 
         if (interceptor.delayInMs) {
@@ -443,7 +446,7 @@ function RequestOverrider(req, options, interceptors, remove, cb) {
           });
         } else if (responseBody && !Buffer.isBuffer(responseBody)) {
           if (typeof responseBody === 'string') {
-            responseBody = new Buffer(responseBody);
+            responseBody = Buffer.from(responseBody);
           } else {
             responseBody = JSON.stringify(responseBody);
             response.headers['content-type'] = 'application/json';

package/lib/socket.js

@@ -22,6 +22,7 @@ function Socket(options) {
   this.writable = true;
   this.readable = true;
   this.destroyed = false;
+  this.connecting = false;
 
   this.setNoDelay = noop;
   this.setKeepAlive = noop;
@@ -57,7 +58,7 @@ Socket.prototype.applyDelay = function applyDelay(delayMs) {
 };
 
 Socket.prototype.getPeerCertificate = function getPeerCertificate() {
-  return new Buffer((Math.random() * 10000 + Date.now()).toString()).toString('base64');
+  return Buffer.from((Math.random() * 10000 + Date.now()).toString()).toString('base64');
 };
 
 Socket.prototype.destroy = function destroy() {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "9.4.4",
+  "version": "10.0.0",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "contributors": [
     {
@@ -185,7 +185,7 @@
     "hyperquest": "^2.1.3",
     "isomorphic-fetch": "^2.2.0",
     "markdown-toc": "^1.2.0",
-    "needle": "^2.2.0",
+    "needle": "^2.2.2",
     "nyc": "^12.0.1",
     "request": "^2.83.0",
     "request-promise": "^4.2.2",
@@ -201,7 +201,7 @@
     "test": "npm run -s unit",
     "coverage": "nyc tap --harmony ./tests/test_*.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "lint": "eslint '**/*.js'",
+    "lint": "eslint \"**/*.js\"",
     "toc": "markdown-toc -i README.md && markdown-toc -i CONTRIBUTING.md ",
     "semantic-release": "semantic-release"
   },