@@ -17,15 +17,15 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
17
17
}
18
18
19
19
public sendRequest ( config :Configuration , method :string , path :string , data :string , callback : ( status :number , message :string , data ?:string , headers ?:Object ) => void ) : void {
20
- function complete ( response :http . IncomingMessage , data :string , headers :Object ) {
20
+ function complete ( response :http . IncomingMessage , responseBody :string , responseHeaders :Object ) {
21
21
var message :string ;
22
22
if ( response . statusCode === 0 ) {
23
23
message = 'Unable to connect to server.' ;
24
24
} else if ( response . statusCode < 200 || response . statusCode > 299 ) {
25
25
message = response . statusMessage || ( < any > response ) . message ;
26
26
}
27
27
28
- callback ( response . statusCode || 500 , message , data , headers ) ;
28
+ callback ( response . statusCode || 500 , message , responseBody , responseHeaders ) ;
29
29
}
30
30
31
31
var parsedHost = url . parse ( config . serverUrl ) ;
@@ -35,7 +35,7 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
35
35
hostname : parsedHost . hostname ,
36
36
method : method ,
37
37
port : parsedHost . port && parseInt ( parsedHost . port ) ,
38
- path : path ,
38
+ path : path
39
39
} ;
40
40
41
41
if ( method === 'POST' ) {
@@ -44,21 +44,16 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
44
44
'Content-Length' : data . length
45
45
}
46
46
}
47
-
47
+
48
48
options . headers [ 'User-Agent' ] = config . userAgent ;
49
49
var request :http . ClientRequest = ( parsedHost . protocol === 'https' ? https : http ) . request ( options , ( response :http . IncomingMessage ) => {
50
50
var body = '' ;
51
- response . on ( 'data' , chunk => body += chunk ) ;
52
- response . on ( 'end' , ( ) => {
53
- complete ( response , body , response . headers ) ;
54
- } ) ;
55
- } ) ;
56
-
57
- request . on ( 'error' , function ( e ) {
58
- callback ( 500 , e . message ) ;
51
+ response . setEncoding ( 'utf8' ) ;
52
+ response . on ( 'data' , ( chunk ) => body += chunk ) ;
53
+ response . on ( 'end' , ( ) => complete ( response , body , response . headers ) ) ;
59
54
} ) ;
60
55
61
- ! ! data && request . write ( data ) ;
62
- request . end ( ) ;
56
+ request . on ( 'error' , ( error : Error ) => callback ( 500 , error . message ) ) ;
57
+ request . end ( data ) ;
63
58
}
64
59
}
0 commit comments