push.rocks/smartrequest
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(core): update

Browse Source
This commit is contained in:
Philipp Kunz 2023-04-19 14:38:28 +02:00
parent 0a83d8b476
commit deb25a3068
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/test.ts
View File

@ -13,13 +13,18 @@ tap.test('should request a JSON document over https', async () => {
.toEqual(1); .toEqual(1);
}); });
tap.skip.test('should post a JSON document over http', async () => { tap.test('should post a JSON document over http', async () => {
await expectAsync(smartrequest.postJson('http://md5.jsontest.com/?text=example_text')) await expectAsync(smartrequest.postJson('http://md5.jsontest.com/?text=example_text'))
.property('body') .property('body')
.property('md5') .property('md5')
.toEqual('fa4c6baa0812e5b5c80ed8885e55a8a6'); .toEqual('fa4c6baa0812e5b5c80ed8885e55a8a6');
}); });
tap.test('should safe get stuff', async () => {
smartrequest.safeGet('http://coffee.link/');
smartrequest.safeGet('https://coffee.link/');
});
tap.skip.test('should deal with unix socks', async () => { tap.skip.test('should deal with unix socks', async () => {
const socketResponse = await smartrequest.request( const socketResponse = await smartrequest.request(
'http://unix:/var/run/docker.sock:/containers/json', 'http://unix:/var/run/docker.sock:/containers/json',

2
ts/00_commitinfo_data.ts
View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@pushrocks/smartrequest', name: '@pushrocks/smartrequest',
version: '2.0.14', version: '2.0.15',
description: 'dropin replacement for request' description: 'dropin replacement for request'
} }

1
ts/smartrequest.interfaces.ts
View File

@ -6,4 +6,5 @@ export interface ISmartRequestOptions extends https.RequestOptions {
requestBody?: any; requestBody?: any;
autoJsonParse?: boolean; autoJsonParse?: boolean;
queryParams?: { [key: string]: string }; queryParams?: { [key: string]: string };
hardDataCuttingTimeout?: number;
} }

16
ts/smartrequest.request.ts
View File

@ -166,11 +166,18 @@ 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 (resArg) => {
if (optionsArg.hardDataCuttingTimeout) {
setTimeout(() => {
resArg.destroy();
done.reject(new Error('Request timed out'));
}, optionsArg.hardDataCuttingTimeout)
}
if (responseStreamArg) { if (responseStreamArg) {
done.resolve(response as IExtendedIncomingMessage); done.resolve(resArg as IExtendedIncomingMessage);
} else { } else {
const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse); const builtResponse = await buildUtf8Response(resArg, optionsArg.autoJsonParse);
done.resolve(builtResponse); done.resolve(builtResponse);
} }
}); });
@ -209,12 +216,13 @@ export let request = async (
}; };
export const safeGet = async (urlArg: string) => { export const safeGet = async (urlArg: string) => {
const agentToUse = urlArg.startsWith('http') ? plugins.http.globalAgent : plugins.https.globalAgent; const agentToUse = urlArg.startsWith('http://') ? new plugins.http.Agent() : new plugins.https.Agent();
try { try {
const response = await request(urlArg, { const response = await request(urlArg, {
method: 'GET', method: 'GET',
agent: agentToUse, agent: agentToUse,
timeout: 5000, timeout: 5000,
hardDataCuttingTimeout: 5000,
autoJsonParse: false, autoJsonParse: false,
}); });
return response; return response;