Comparing version 0.3.2-beta1 to 0.3.2-beta2
@@ -7,2 +7,3 @@ 'use strict'; | ||
const mergeConfig = require('./utils/mergeConfig'); | ||
const p = require('./utils/promise'); | ||
const WrappedResponse = require('./wrappedResponse'); | ||
@@ -82,3 +83,3 @@ | ||
function waitForResponseEnd(httpRequest, httpResponse) { | ||
return new Promise((resolve, reject) => { | ||
return new p.Promise((resolve, reject) => { | ||
httpResponse.on('error', reject); | ||
@@ -97,13 +98,13 @@ httpResponse.on('end', () => resolve()); | ||
function waitForResponseHandler(requestConfig, httpResponse) { | ||
try { | ||
return new p.Promise((resolve, reject) => { | ||
const wrappedResponse = new WrappedResponse(httpResponse, requestConfig.responseBufferSize); | ||
if (requestConfig.responseValidator(wrappedResponse)) { | ||
return requestConfig.responseHandler(wrappedResponse); | ||
requestConfig.responseHandler(wrappedResponse) | ||
.then(resolve, reject); | ||
} else { | ||
return requestConfig.errorResponseHandler(wrappedResponse) | ||
.then((response) => throwResponseError(requestConfig, response)); | ||
requestConfig.errorResponseHandler(wrappedResponse) | ||
.then((response) => throwResponseError(requestConfig, response)) | ||
.catch(reject); | ||
} | ||
} catch (err) { | ||
return Promise.reject(err); | ||
} | ||
}); | ||
} | ||
@@ -123,3 +124,3 @@ | ||
function makeRequest(requestConfig) { | ||
return new Promise((resolve, reject) => { | ||
return new p.Promise((resolve, reject) => { | ||
const httpRequest = beginHttpRequest(requestConfig); | ||
@@ -129,3 +130,3 @@ httpRequest.on('error', reject); | ||
httpRequest.on('response', (httpResponse) => { | ||
Promise.all([ | ||
p.Promise.all([ | ||
waitForResponseEnd(httpRequest, httpResponse), | ||
@@ -132,0 +133,0 @@ waitForResponseHandler(requestConfig, httpResponse) |
'use strict'; | ||
const makeRequest = require('./makeRequest'); | ||
const p = require('./utils/promise'); | ||
@@ -15,4 +16,4 @@ function executePipeline(requestConfig) { | ||
return Promise.resolve(requestConfig).then(startFilter); | ||
return p.Promise.resolve(requestConfig).then(startFilter); | ||
} | ||
module.exports = executePipeline; |
'use strict'; | ||
const crypto = require('crypto'); | ||
const p = require('./utils/promise'); | ||
@@ -31,3 +32,3 @@ class WrappedResponse { | ||
let byteCount = 0; | ||
return new Promise((resolve, reject) => { | ||
return new p.Promise((resolve, reject) => { | ||
this.httpResponse.once('error', reject); | ||
@@ -55,3 +56,7 @@ this.httpResponse.once('end', () => { | ||
return this.bufferBody() | ||
.then((buffer) => JSON.parse(buffer)); | ||
.then((buffer) => { | ||
if (buffer.length > 0) { | ||
return JSON.parse(buffer); | ||
} | ||
}); | ||
} | ||
@@ -66,3 +71,3 @@ | ||
const hash = this.httpResponse.pipe(crypto.createHash(algorithm)); | ||
return new Promise((resolve) => { | ||
return new p.Promise((resolve) => { | ||
hash.once('readable', () => { | ||
@@ -80,3 +85,3 @@ return resolve(hash.read()); | ||
pipe(into, opts) { | ||
return new Promise((resolve, reject) => { | ||
return new p.Promise((resolve, reject) => { | ||
this.httpResponse.on('end', () => resolve(this)); | ||
@@ -94,3 +99,3 @@ this.httpResponse.on('error', reject); | ||
discard() { | ||
return new Promise((resolve, reject) => { | ||
return new p.Promise((resolve, reject) => { | ||
this.httpResponse.on('end', () => resolve(this)); | ||
@@ -97,0 +102,0 @@ this.httpResponse.on('error', reject); |
{ | ||
"name": "httplease", | ||
"version": "0.3.2-beta1", | ||
"version": "0.3.2-beta2", | ||
"description": "HTTP client library with support for pluggable filters, including Zipkin, ASAP, etc", | ||
@@ -37,2 +37,6 @@ "main": "index.js", | ||
"license": "Apache-2.0", | ||
"files": [ | ||
"index.js", | ||
"lib" | ||
], | ||
"devDependencies": { | ||
@@ -39,0 +43,0 @@ "concat-stream": "^1.5.1", |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
29358
17
672
3