Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
7b49bba0d2 | |||
6600a23a00 | |||
e2845c9992 | |||
5e6f2c6fbf | |||
d3d0649b73 | |||
fba43df3c4 | |||
c6fa540543 | |||
1891b54389 |
2428
package-lock.json
generated
2428
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/smartrequest",
|
"name": "@pushrocks/smartrequest",
|
||||||
"version": "2.0.6",
|
"version": "2.0.10",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "dropin replacement for request",
|
"description": "dropin replacement for request",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
@ -26,16 +26,16 @@
|
|||||||
"homepage": "https://gitlab.com/pushrocks/smartrequest#README",
|
"homepage": "https://gitlab.com/pushrocks/smartrequest#README",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartpromise": "^3.1.7",
|
"@pushrocks/smartpromise": "^3.1.7",
|
||||||
"@pushrocks/smarturl": "^3.0.2",
|
"@pushrocks/smarturl": "^3.0.3",
|
||||||
"agentkeepalive": "^4.2.1",
|
"agentkeepalive": "^4.2.1",
|
||||||
"form-data": "^4.0.0"
|
"form-data": "^4.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.63",
|
"@gitzone/tsbuild": "^2.1.65",
|
||||||
"@gitzone/tsrun": "^1.2.37",
|
"@gitzone/tsrun": "^1.2.37",
|
||||||
"@gitzone/tstest": "^1.0.72",
|
"@gitzone/tstest": "^1.0.73",
|
||||||
"@pushrocks/tapbundle": "^5.0.4",
|
"@pushrocks/tapbundle": "^5.0.4",
|
||||||
"@types/node": "^18.6.2"
|
"@types/node": "^18.6.4"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/**/*",
|
"ts/**/*",
|
||||||
|
@ -3,6 +3,6 @@
|
|||||||
*/
|
*/
|
||||||
export const commitinfo = {
|
export const commitinfo = {
|
||||||
name: '@pushrocks/smartrequest',
|
name: '@pushrocks/smartrequest',
|
||||||
version: '2.0.6',
|
version: '2.0.10',
|
||||||
description: 'dropin replacement for request'
|
description: 'dropin replacement for request'
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,7 @@ export let request = async (
|
|||||||
responseStreamArg: boolean = false,
|
responseStreamArg: boolean = false,
|
||||||
requestDataFunc: (req: plugins.http.ClientRequest) => void = null
|
requestDataFunc: (req: plugins.http.ClientRequest) => void = null
|
||||||
): Promise<IExtendedIncomingMessage> => {
|
): Promise<IExtendedIncomingMessage> => {
|
||||||
const done = plugins.smartpromise.defer<any>();
|
const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
|
||||||
|
|
||||||
// merge options
|
// merge options
|
||||||
const defaultOptions: interfaces.ISmartRequestOptions = {
|
const defaultOptions: interfaces.ISmartRequestOptions = {
|
||||||
@ -135,16 +135,16 @@ export let request = async (
|
|||||||
// lets determine the request module to use
|
// lets determine the request module to use
|
||||||
const requestModule = (() => {
|
const requestModule = (() => {
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case parsedUrl.protocol === 'https' && optionsArg.keepAlive:
|
case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
|
||||||
optionsArg.agent = httpsAgent;
|
optionsArg.agent = httpsAgent;
|
||||||
return plugins.https;
|
return plugins.https;
|
||||||
case parsedUrl.protocol === 'https' && !optionsArg.keepAlive:
|
case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
|
||||||
optionsArg.agent = httpsAgentKeepAliveFalse;
|
optionsArg.agent = httpsAgentKeepAliveFalse;
|
||||||
return plugins.https;
|
return plugins.https;
|
||||||
case parsedUrl.protocol === 'http' && optionsArg.keepAlive:
|
case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
|
||||||
optionsArg.agent = httpAgent;
|
optionsArg.agent = httpAgent;
|
||||||
return plugins.http;
|
return plugins.http;
|
||||||
case parsedUrl.protocol === 'http' && !optionsArg.keepAlive:
|
case parsedUrl.protocol === 'http:' && !optionsArg.keepAlive:
|
||||||
optionsArg.agent = httpAgentKeepAliveFalse;
|
optionsArg.agent = httpAgentKeepAliveFalse;
|
||||||
return plugins.http;
|
return plugins.http;
|
||||||
}
|
}
|
||||||
@ -158,7 +158,7 @@ export let request = async (
|
|||||||
// lets perform the actual request
|
// lets perform the actual request
|
||||||
const requestToFire = requestModule.request(optionsArg, async (response) => {
|
const requestToFire = requestModule.request(optionsArg, async (response) => {
|
||||||
if (responseStreamArg) {
|
if (responseStreamArg) {
|
||||||
done.resolve(response);
|
done.resolve(response as IExtendedIncomingMessage);
|
||||||
} else {
|
} else {
|
||||||
const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
|
const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
|
||||||
done.resolve(builtResponse);
|
done.resolve(builtResponse);
|
||||||
@ -187,8 +187,13 @@ export let request = async (
|
|||||||
// lets handle an error
|
// lets handle an error
|
||||||
requestToFire.on('error', (e) => {
|
requestToFire.on('error', (e) => {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
|
requestToFire.destroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
const result = await done.promise;
|
const response = await done.promise;
|
||||||
return result;
|
response.on('error', (err) => {
|
||||||
|
console.log(err);
|
||||||
|
response.destroy();
|
||||||
|
})
|
||||||
|
return response;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user