Making the HTTP response a full-fledged Readable stream.
This commit is contained in:
parent
dcffb51e5e
commit
42bae9d71d
2 changed files with 30 additions and 3 deletions
|
@ -368,7 +368,7 @@ void URLRequest::OnResponseData(
|
||||||
if (!buffer || !buffer->data() || !buffer->size()) {
|
if (!buffer || !buffer->data() || !buffer->size()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
EmitResponseEvent(false, "data", buffer);
|
Emit("data", buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void URLRequest::OnResponseCompleted() {
|
void URLRequest::OnResponseCompleted() {
|
||||||
|
@ -381,7 +381,7 @@ void URLRequest::OnResponseCompleted() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
response_state_.SetFlag(ResponseStateFlags::kEnded);
|
response_state_.SetFlag(ResponseStateFlags::kEnded);
|
||||||
EmitResponseEvent(false, "end");
|
Emit("end");
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
const url = require('url')
|
const url = require('url')
|
||||||
const {EventEmitter} = require('events')
|
const {EventEmitter} = require('events')
|
||||||
const util = require('util')
|
const util = require('util')
|
||||||
|
const Readable = require('stream').Readable
|
||||||
const binding = process.atomBinding('net')
|
const binding = process.atomBinding('net')
|
||||||
const {net, Net} = binding
|
const {net, Net} = binding
|
||||||
const {URLRequest} = net
|
const {URLRequest} = net
|
||||||
|
@ -14,10 +15,20 @@ let kSupportedProtocols = new Set()
|
||||||
kSupportedProtocols.add('http:')
|
kSupportedProtocols.add('http:')
|
||||||
kSupportedProtocols.add('https:')
|
kSupportedProtocols.add('https:')
|
||||||
|
|
||||||
class IncomingMessage extends EventEmitter {
|
class IncomingMessage extends Readable {
|
||||||
constructor (urlRequest) {
|
constructor (urlRequest) {
|
||||||
super()
|
super()
|
||||||
this._url_request = urlRequest
|
this._url_request = urlRequest
|
||||||
|
this._shouldPush = false;
|
||||||
|
this._data = [];
|
||||||
|
this._url_request.on('data', (event, chunk) => {
|
||||||
|
this._storeInternalData(chunk)
|
||||||
|
this._pushInternalData()
|
||||||
|
})
|
||||||
|
this._url_request.on('end', () => {
|
||||||
|
this._storeInternalData(null)
|
||||||
|
this._pushInternalData()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
get statusCode () {
|
get statusCode () {
|
||||||
|
@ -48,6 +59,22 @@ class IncomingMessage extends EventEmitter {
|
||||||
return this._url_request.rawResponseHeaders
|
return this._url_request.rawResponseHeaders
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_storeInternalData(chunk) {
|
||||||
|
this._data.push(chunk)
|
||||||
|
}
|
||||||
|
|
||||||
|
_pushInternalData() {
|
||||||
|
while (this._shouldPush && this._data.length > 0) {
|
||||||
|
const chunk = this._data.shift()
|
||||||
|
this._shouldPush = this.push(chunk)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_read() {
|
||||||
|
this._shouldPush = true
|
||||||
|
this._pushInternalData()
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
URLRequest.prototype._emitRequestEvent = function (async, ...rest) {
|
URLRequest.prototype._emitRequestEvent = function (async, ...rest) {
|
||||||
|
|
Loading…
Reference in a new issue