Skip to content

Commit

Permalink
chore: backports to v2.x (#70)
Browse files Browse the repository at this point in the history
* Adds support for ArrayBuffer, Uint8Array and Buffer to send(body) (#45)

* Adds support for ArrayBuffer, Uint8Array and Buffer to send(body)

XMLHttpRequet supports BufferSource as a send parameter, and this is used to transmit binary to the server as part of the POST method.

Node also supports transmitting binary in its HttpClient, which is the underlying implementation in w3c-xmlhttprequest. To utilise this you pass a Buffer into the client.write() method, but w3c-xmlhttprequest only writes String or FormData.

The first patch modifies the check to support Buffer as a body. The second path detect ArrayBuffer or Uint8Array as a body, and then converts to Buffer using Buffer.from(). This means that you can now use the XHR in-place of XMLHttpRequests which pass ArrayBuffer or Uint8Array.

Being able to use Buffer as well in Node is a pleasant side-effect.

Improvements: Buffer.from() actually supports many more types, which could be used. Also, it is possible to convert typed-arrays to Buffer directly.

* delint

* Fix syntax

Co-authored-by: Stuart Espey <[email protected]>
Co-authored-by: Yamagishi Kazutoshi <[email protected]>

* Add content length (#46)

* Adds support for ArrayBuffer, Uint8Array and Buffer to send(body)

XMLHttpRequet supports BufferSource as a send parameter, and this is used to transmit binary to the server as part of the POST method.

Node also supports transmitting binary in its HttpClient, which is the underlying implementation in w3c-xmlhttprequest. To utilise this you pass a Buffer into the client.write() method, but w3c-xmlhttprequest only writes String or FormData.

The first patch modifies the check to support Buffer as a body. The second path detect ArrayBuffer or Uint8Array as a body, and then converts to Buffer using Buffer.from(). This means that you can now use the XHR in-place of XMLHttpRequests which pass ArrayBuffer or Uint8Array.

Being able to use Buffer as well in Node is a pleasant side-effect.

Improvements: Buffer.from() actually supports many more types, which could be used. Also, it is possible to convert typed-arrays to Buffer directly.

* add Content-Length to requests with a body
Some servers do not accept unbounded requests. Add the Content-Length header to rectify

* Fix lint error
```
/Users/stux/git/node-xmlhttprequest/lib/xmlhttprequest.js
  342:7  error  Keyword "if" must be followed by whitespace  space-after-keywords

✖ 1 problem (1 error, 0 warnings)
```

Fixed.

Co-authored-by: Stuart Espey <[email protected]>
Co-authored-by: Yamagishi Kazutoshi <[email protected]>

Co-authored-by: Stuart Espey <[email protected]>
Co-authored-by: Stuart Espey <[email protected]>
  • Loading branch information
3 people authored Jul 22, 2020
1 parent 88c315b commit 9b0d1cf
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/xmlhttprequest.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,11 @@ class XMLHttpRequest extends XMLHttpRequestEventTarget {
client.setHeader(key, value);
});
_readyStateChange.call(this, XMLHttpRequest.HEADERS_RECEIVED);
if (typeof body === 'string' || body instanceof FormData) {
if (body instanceof Uint8Array || body instanceof ArrayBuffer) {
body = Buffer.from(body);
}
if (typeof body === 'string' || body instanceof Buffer || body instanceof FormData) {
client.setHeader('Content-Length', Buffer.isBuffer(body) ? body.length : Buffer.byteLength(body));
client.on('socket', _setDispatchProgressEvents.bind(this.upload));
client.write(body);
}
Expand Down

0 comments on commit 9b0d1cf

Please sign in to comment.