Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
16a97a420c | |||
a73c78e54b | |||
1f408b5123 | |||
284f4967f4 | |||
55c80c1403 | |||
7a3e565dbb | |||
6f5d10ccd3 | |||
f1ddab72f6 | |||
376225888c | |||
63e8660f6c |
900
package-lock.json
generated
900
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
14
package.json
14
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smartrequest",
|
||||
"version": "1.1.19",
|
||||
"version": "1.1.24",
|
||||
"private": false,
|
||||
"description": "dropin replacement for request",
|
||||
"main": "dist/index.js",
|
||||
@ -28,11 +28,13 @@
|
||||
"form-data": "^2.3.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@gitzone/tsbuild": "^2.1.8",
|
||||
"@gitzone/tsrun": "^1.2.5",
|
||||
"@gitzone/tstest": "^1.0.20",
|
||||
"@pushrocks/tapbundle": "^3.0.9",
|
||||
"@types/node": "^11.13.6"
|
||||
"@gitzone/tsbuild": "^2.1.17",
|
||||
"@gitzone/tsrun": "^1.2.8",
|
||||
"@gitzone/tstest": "^1.0.24",
|
||||
"@pushrocks/tapbundle": "^3.0.13",
|
||||
"@types/node": "^11.13.6",
|
||||
"tslint": "^5.19.0",
|
||||
"tslint-config-prettier": "^1.18.0"
|
||||
},
|
||||
"files": [
|
||||
"ts/*",
|
||||
|
@ -2,6 +2,7 @@ import * as plugins from './smartrequest.plugins';
|
||||
import * as https from 'https';
|
||||
|
||||
export interface ISmartRequestOptions extends https.RequestOptions {
|
||||
keepAlive?: boolean;
|
||||
requestBody?: any;
|
||||
autoJsonParse?: boolean;
|
||||
}
|
||||
|
@ -1,4 +1,3 @@
|
||||
import * as https from 'https';
|
||||
import * as plugins from './smartrequest.plugins';
|
||||
import * as interfaces from './smartrequest.interfaces';
|
||||
|
||||
@ -12,14 +11,14 @@ const buildUtf8Response = (
|
||||
incomingMessageArg: IncomingMessage,
|
||||
autoJsonParse = true
|
||||
): Promise<IExtendedIncomingMessage> => {
|
||||
let done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
|
||||
const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
|
||||
// Continuously update stream with data
|
||||
let body = '';
|
||||
incomingMessageArg.on('data', function(chunkArg) {
|
||||
incomingMessageArg.on('data', (chunkArg) => {
|
||||
body += chunkArg;
|
||||
});
|
||||
|
||||
incomingMessageArg.on('end', function() {
|
||||
incomingMessageArg.on('end', () => {
|
||||
if (autoJsonParse) {
|
||||
try {
|
||||
(incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
|
||||
@ -55,16 +54,50 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
|
||||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
|
||||
*/
|
||||
const httpAgent = new plugins.http.Agent({
|
||||
keepAlive: true,
|
||||
keepAliveMsecs: 600000
|
||||
});
|
||||
|
||||
/**
|
||||
* a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
|
||||
*/
|
||||
const httpAgentKeepAliveFalse = new plugins.http.Agent({
|
||||
keepAlive: false,
|
||||
keepAliveMsecs: 600000
|
||||
});
|
||||
|
||||
/**
|
||||
* a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
|
||||
*/
|
||||
const httpsAgent = new plugins.https.Agent({
|
||||
keepAlive: true,
|
||||
keepAliveMsecs: 600000
|
||||
});
|
||||
|
||||
/**
|
||||
* a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
|
||||
*/
|
||||
const httpsAgentKeepAliveFalse = new plugins.https.Agent({
|
||||
keepAlive: false,
|
||||
keepAliveMsecs: 600000
|
||||
});
|
||||
|
||||
export let request = async (
|
||||
domainArg: string,
|
||||
optionsArg: interfaces.ISmartRequestOptions = {},
|
||||
streamArg: boolean = false
|
||||
): Promise<IExtendedIncomingMessage> => {
|
||||
let done = plugins.smartpromise.defer<any>();
|
||||
const done = plugins.smartpromise.defer<any>();
|
||||
|
||||
// merge options
|
||||
const defaultOptions: interfaces.ISmartRequestOptions = {
|
||||
autoJsonParse: true
|
||||
// agent: agent,
|
||||
autoJsonParse: true,
|
||||
keepAlive:true,
|
||||
};
|
||||
|
||||
optionsArg = {
|
||||
@ -73,11 +106,10 @@ export let request = async (
|
||||
};
|
||||
|
||||
// parse url
|
||||
let parsedUrl: plugins.url.Url;
|
||||
parsedUrl = plugins.url.parse(domainArg);
|
||||
const parsedUrl = plugins.url.parse(domainArg);
|
||||
optionsArg.hostname = parsedUrl.hostname;
|
||||
if (parsedUrl.port) {
|
||||
optionsArg.port = parseInt(parsedUrl.port);
|
||||
optionsArg.port = parseInt(parsedUrl.port, 10);
|
||||
}
|
||||
optionsArg.path = parsedUrl.path;
|
||||
|
||||
@ -92,9 +124,25 @@ export let request = async (
|
||||
|
||||
// lets determine the request module to use
|
||||
const requestModule = (() => {
|
||||
if (parsedUrl.protocol === 'https:') {
|
||||
switch (true) {
|
||||
case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
|
||||
optionsArg.agent = httpsAgent;
|
||||
return plugins.https;
|
||||
case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
|
||||
optionsArg.agent = httpsAgentKeepAliveFalse;
|
||||
return plugins.https;
|
||||
case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
|
||||
optionsArg.agent = httpAgent;
|
||||
return plugins.http;
|
||||
case parsedUrl.protocol === 'http:' && !optionsArg.keepAlive:
|
||||
optionsArg.agent = httpAgentKeepAliveFalse;
|
||||
return plugins.http;
|
||||
}
|
||||
if () {
|
||||
optionsArg.agent = httpsAgent;
|
||||
return plugins.https;
|
||||
} else if (parsedUrl.protocol === 'http:') {
|
||||
optionsArg.agent = httpAgent;
|
||||
return plugins.http;
|
||||
} else {
|
||||
throw new Error(`unsupported protocol: ${parsedUrl.protocol}`);
|
||||
@ -102,7 +150,7 @@ export let request = async (
|
||||
})() as typeof plugins.https;
|
||||
|
||||
// lets perform the actual request
|
||||
let request = requestModule.request(optionsArg);
|
||||
const requestToFire = requestModule.request(optionsArg);
|
||||
|
||||
// lets write the requestBody
|
||||
if (optionsArg.requestBody) {
|
||||
@ -110,24 +158,24 @@ export let request = async (
|
||||
if (typeof optionsArg.requestBody !== 'string') {
|
||||
optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
|
||||
}
|
||||
request.write(optionsArg.requestBody);
|
||||
request.end();
|
||||
requestToFire.write(optionsArg.requestBody);
|
||||
requestToFire.end();
|
||||
} else if (optionsArg.requestBody instanceof plugins.formData) {
|
||||
optionsArg.requestBody.pipe(request).on('finish', event => {
|
||||
request.end();
|
||||
optionsArg.requestBody.pipe(requestToFire).on('finish', event => {
|
||||
requestToFire.end();
|
||||
});
|
||||
}
|
||||
} else {
|
||||
request.end();
|
||||
requestToFire.end();
|
||||
}
|
||||
|
||||
// lets handle an error
|
||||
request.on('error', e => {
|
||||
requestToFire.on('error', e => {
|
||||
console.error(e);
|
||||
});
|
||||
|
||||
// lets handle the response
|
||||
request.on('response', async response => {
|
||||
requestToFire.on('response', async response => {
|
||||
if (streamArg) {
|
||||
done.resolve(response);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user