Skip to content

Commit b83d1d8

Browse files
hiscohisco
authored
Merge pull request #19 from hisco/fix-abort
synced interface with http1
2 parents 6231573 + 06e6557 commit b83d1d8

3 files changed

Lines changed: 236 additions & 26 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ deploy:
1515
provider: npm
1616
email: hisco@googlegroups.com
1717
api_key:
18-
secure: nRUpJEI+FDAse92QoPxaJMPpKzaoAZXyt7h2isaJrDCanuAw+vQL7cJDsTWCYEqtezduiUJ+CmxnhVnJKoqAyA1QyTpqrlHQ+wyMMXFkv1iAs37f+h9F/3dPSiwI06DJJiZ5BLh8RFcBQjYQRDotfr39vaj3SbGmQKNhIoOfQJlBQK5Xn0EKMOJepPKLKs/YTcjhwqGlyC+DaPRiuzRwFq6hJaGM4HU+avHh6jC7hm5oqnQY3EsM7SSmXSc6ZynY+lX4lONdMVl2AJpxeMwXIbphRfHfZB9vESJ2/MfAos25NnTna9OAt7m9VHunmKviGRxyqDbRuLcizs+LBHp3xCvW3cF2CJGi4K6hAN/AtCJhHCMwy5kCIamgcW9cBbJhOeJyXs9CjZhFMIznr7BD8wBiEXkieqHKCmiL0i8xBLE/hact1ZTd8H2cE/x/dDzm2lywnqa/Taud5xmblTjCtu09xFEeye2ON8xYSnrVaqKxxn26mNkejG5RIbG0a+54VrEkYIMbJT1x81S7tcW6dva4ZeqrrbcfbJrnB7Ldn7D4oM5Cv+X5+RBXU1zRX+mmP50S0OQvJevVCpV35VgTMmRbAkTLUEUk9JnNBE6+0UUYs0hwv0h5LzCietOGS3Lrw+rjRBYmxL7OvQqVO6JIzQ4bEA5vDa0lzQ4ECNP2JKM=
18+
secure: OaMiQbh8vZLWjQ3uoALTwSFiWO0lOKFZUR6m2+g00UwIgukXev9CF/WQGWeW3Z4Gj57fZyuyHTys7NsGNmfSvwPqm63HTLGTy8aUuG7xVEDdjcGepqPf19J0s0TGW1Y7vxzvwkBDmV3x9qBFGwmjRjsQ+vQ/jQ2XX5DlCy2NqSyTwcGDsMM09worRAmfc/Q5PGn+sngl0LQFd0vSVWAI9M5kztUTxl2xQFH80Nt6j11r8R1+aqkHhHuJLuYHZGAV9Xf6VjrJ3e2b29SeeTmii1EnphJsljHzjoEpluuGwfQIdOEpbSfXqVxQR1RyFfVR/KE0kJppKLucykPz4PA+e5Ak9hTFt5D44/wHDsDNPpGAlLCdKSzkPciPk3gPHR310m0B5Mb01fAEkCZ9AEQuc/Q7rJtthE9eriK7741Zin5rtxfInMyrwTfVpKyuwBoqlMZjBzuo9EfnaUXZ0VrccX9cu0yz4qXGzziYoMmBDZ/wYaXnzWT9d6Q95nFxetC9l7KoLBUQM/TtEhmiPTJcd3hj75/cuAA6/XWTs6yQ7il5DgstvnHPxbpCnH/eedFTubRv5amSmI97r3als0B4m7bCWFG3M8ZJB1WovZ+Rymzw0Fqb9nt4eeiJE1m1qqZLUn0/eo4T0wbAUyPx2Zq0RKFvjqKfRaQXDE/TeJSGOfc=
1919
on:
2020
tags: true
2121
repo: hisco/http2-client

‎lib/request.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,25 @@ const {DebounceTimers , assertIsObject , ERR_INVALID_ARG_TYPE} = require('./util
66
const {initializeTLSOptions } = require('./request-options');
77
const http = require('http');
88
const https = require('https');
9+
const {Stream} = require('stream');
10+
function addFunctions(container , obj){
11+
const proto = obj.prototype;
12+
Object.keys(proto).forEach((name)=>{
13+
if (container.indexOf(name)!=-1)
14+
return;
15+
if (name.indexOf('_')!=0 && typeof proto[name] == 'function'){
16+
container.push(name);
17+
}
18+
})
19+
}
20+
const STUBBED_METHODS_NAME = [
21+
]
22+
//We need to proxy all v1 function
23+
addFunctions(STUBBED_METHODS_NAME, http.ClientRequest);
24+
addFunctions(STUBBED_METHODS_NAME, http.OutgoingMessage);
25+
addFunctions(STUBBED_METHODS_NAME, EventEmitter);
26+
addFunctions(STUBBED_METHODS_NAME, Stream);
927

10-
const STUBBED_METHODS_NAME = [
11-
'emit',
12-
'write',
13-
'end',
14-
'pipe',
15-
'removeListener',
16-
'removeListeners',
17-
'setTimeout',
18-
'setEncoding',
19-
'close',
20-
'abort',
21-
'priority',
22-
'sendTrailers',
23-
'setNoDelay',
24-
'setSocketKeepAlive',
25-
'clearTimeout'
26-
];
2728
const PROPERTIES_TO_PROXY = [
2829
'httpVersionMajor',
2930
'httpVersionMinor',
@@ -38,9 +39,11 @@ function ClientRequest(){
3839
this[$stubs] = [];
3940
for (var i=0;i<STUBBED_METHODS_NAME.length;i++){
4041
let name = STUBBED_METHODS_NAME[i];
41-
this[name] = function method(){
42-
return this.genericStubber(name , arguments);
43-
}.bind(this);
42+
if (!ClientRequest.prototype[name]){
43+
this[name] = function method(){
44+
return this.genericStubber(name , arguments);
45+
}.bind(this);
46+
}
4447
}
4548

4649
var requestOptions , cb,url , args;
@@ -151,9 +154,6 @@ ClientRequest.prototype = {
151154
this.genericStubber('once' , arguments);
152155

153156
},
154-
abort(cb){
155-
this.close(0x08 , cb);
156-
},
157157
take(stream){
158158
//We forward all functions to the stream
159159
for (var i=0;i<STUBBED_METHODS_NAME.length;i++){

‎test/e2e/request.js‎

Lines changed: 212 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,18 @@ const onHttpServerReady = new Promise((resolve , reject)=>{
5858
}
5959
});
6060
const onHTTP2ServerReady = new Promise((resolve , reject)=>{
61-
http2Debug = new Http2Debug;
61+
class HTTP2StubServer extends Http2Debug{
62+
onStream(stream , headers){
63+
const args = arguments;
64+
if (headers[':path'].indexOf('delay')!=-1){
65+
setTimeout(()=> super.onStream.apply(this,args),100 )
66+
}
67+
else{
68+
super.onStream.apply(this,args);
69+
}
70+
}
71+
}
72+
http2Debug = new HTTP2StubServer;
6273
http2Debug.createServer((err)=>{
6374
if (err)
6475
return reject(err);
@@ -258,7 +269,13 @@ describe('e2e' , ()=>{
258269
})
259270
req.end();
260271
req.setTimeout(1,()=>{
261-
req.abort()
272+
try{
273+
req.abort();
274+
resolve();
275+
}
276+
catch(err){
277+
reject(err)
278+
}
262279
})
263280
})
264281
});
@@ -294,6 +311,36 @@ describe('e2e' , ()=>{
294311
req.end();
295312
})
296313
});
314+
315+
it('Should be able to abort immediately' , ()=>{
316+
return new Promise((resolve , reject)=>{
317+
const req = request({
318+
path : '/delay',
319+
host : SERVER_HOST,
320+
port : HTTP2_PORT,
321+
method : 'delete',
322+
headers : {
323+
'tesT-me' :'90'
324+
}
325+
} , (res)=>{
326+
reject(new Error('Rejected request shouldn\'t respond'))
327+
});
328+
req.on('error' , (err)=>{
329+
try{
330+
expect(err.code).eq('ECONNRESET');
331+
resolve();
332+
}
333+
catch(err){
334+
reject(err);
335+
}
336+
})
337+
req.end();
338+
req.setTimeout(1,()=>{
339+
req.abort()
340+
})
341+
})
342+
});
343+
297344
it('Should be able to make request with request options and url as string' , ()=>{
298345
return new Promise((resolve , reject)=>{
299346
const req = request(HTTP2_URL , {
@@ -342,6 +389,169 @@ describe('e2e' , ()=>{
342389
});
343390
});
344391
});
392+
393+
describe('validate http1 interface as assumed' , ()=>{
394+
describe('http1' , ()=>{
395+
it('Should be able to make request with request options as a string' , ()=>{
396+
return new Promise((resolve , reject)=>{
397+
const req = require('http').request(`${HTTP_URL}/test1` , (res)=>{
398+
getBody(res)
399+
.then((bodyRaw)=>{
400+
const json = JSON.parse(bodyRaw);
401+
expect(res.statusCode).eq(200);
402+
expect(json.path).eq('/test1');
403+
expect(json.method).eq('GET');
404+
resolve();
405+
})
406+
.catch((err)=>{
407+
reject(err)
408+
})
409+
});
410+
req.end();
411+
})
412+
});
413+
/*
414+
For now disabled the following test after verified that
415+
It's working on various machines and on travis only it doesn't.
416+
If someone have idea why only travis then help is welcome.
417+
*/
418+
// it('Should be able to make request with request options and url as a string' , ()=>{
419+
// return new Promise((resolve , reject)=>{
420+
// const req = require('http').request(
421+
// `${HTTP_URL}/test1` ,
422+
// { method : 'POST'},
423+
// (res)=>{
424+
// getBody(res)
425+
// .then((bodyRaw)=>{
426+
// const json = JSON.parse(bodyRaw);
427+
// expect(res.statusCode).eq(200);
428+
// expect(json.path).eq('/test1');
429+
// expect(json.method).eq('POST');
430+
// expect(json.body.test).eq(1);
431+
// resolve();
432+
// })
433+
// .catch((err)=>{
434+
// reject(err)
435+
// })
436+
// });
437+
// req.write('{"test":1}')
438+
// req.end();
439+
// })
440+
// });
441+
it('Should be able to make request with request options and method lowercase' , ()=>{
442+
return new Promise((resolve , reject)=>{
443+
const req = require('http').request({
444+
path : '/test1',
445+
host : SERVER_HOST,
446+
port : HTTP_PORT,
447+
method : 'post'
448+
} , (res)=>{
449+
getBody(res)
450+
.then((bodyRaw)=>{
451+
const json = JSON.parse(bodyRaw);
452+
expect(res.statusCode).eq(200);
453+
expect(json.path).eq('/test1');
454+
expect(json.method).eq('POST');
455+
resolve();
456+
})
457+
.catch((err)=>{
458+
reject(err)
459+
})
460+
});
461+
req.end();
462+
})
463+
});
464+
it('Should be able to make request with request options and headers' , ()=>{
465+
return new Promise((resolve , reject)=>{
466+
const req = require('http').request({
467+
path : '/test1',
468+
host : SERVER_HOST,
469+
port : HTTP_PORT,
470+
method : 'delete',
471+
headers : {
472+
'tesT-me' :'90'
473+
}
474+
} , (res)=>{
475+
getBody(res)
476+
.then((bodyRaw)=>{
477+
const json = JSON.parse(bodyRaw);
478+
expect(json.headers['test-me']).eq('90');
479+
expect(res.statusCode).eq(200);
480+
expect(json.path).eq('/test1');
481+
expect(json.method).eq('DELETE');
482+
resolve();
483+
})
484+
.catch((err)=>{
485+
reject(err)
486+
})
487+
});
488+
req.end();
489+
})
490+
});
491+
it('Should be able to abort immediately' , ()=>{
492+
return new Promise((resolve , reject)=>{
493+
const req = require('http').request({
494+
path : '/delay',
495+
host : SERVER_HOST,
496+
port : HTTP_PORT,
497+
method : 'delete',
498+
headers : {
499+
'tesT-me' :'90'
500+
}
501+
} , (res)=>{
502+
reject(new Error('Rejected request shouldn\'t respond'))
503+
});
504+
req.on('error' , (err)=>{
505+
try{
506+
expect(err.code).eq('ECONNRESET');
507+
resolve();
508+
}
509+
catch(err){
510+
reject(err);
511+
}
512+
})
513+
req.end();
514+
req.setTimeout(1,()=>{
515+
req.abort()
516+
})
517+
})
518+
});
519+
it('Should emit' , ()=>{
520+
return new Promise((resolve , reject)=>{
521+
const req = require('http').request({
522+
path : '/delay',
523+
host : SERVER_HOST,
524+
port : HTTP_PORT,
525+
method : 'delete',
526+
headers : {
527+
'tesT-me' :'90'
528+
}
529+
} , (res)=>{
530+
reject(new Error('Rejected request shouldn\'t respond'))
531+
});
532+
req.on('error' , (err)=>{
533+
try{
534+
expect(err.code).eq('ECONNRESET');
535+
resolve();
536+
}
537+
catch(err){
538+
reject(err);
539+
}
540+
})
541+
req.end();
542+
req.setTimeout(1,()=>{
543+
try{
544+
req.abort();
545+
resolve();
546+
}
547+
catch(err){
548+
reject(err)
549+
}
550+
})
551+
})
552+
});
553+
});
554+
});
345555

346556
describe('get' , ()=>{
347557
before(()=>{

0 commit comments

Comments
 (0)