@@ -17,15 +17,15 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
1717 }
1818
1919 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 ) {
2121 var message :string ;
2222 if ( response . statusCode === 0 ) {
2323 message = 'Unable to connect to server.' ;
2424 } else if ( response . statusCode < 200 || response . statusCode > 299 ) {
2525 message = response . statusMessage || ( < any > response ) . message ;
2626 }
2727
28- callback ( response . statusCode || 500 , message , data , headers ) ;
28+ callback ( response . statusCode || 500 , message , responseBody , responseHeaders ) ;
2929 }
3030
3131 var parsedHost = url . parse ( config . serverUrl ) ;
@@ -35,7 +35,7 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
3535 hostname : parsedHost . hostname ,
3636 method : method ,
3737 port : parsedHost . port && parseInt ( parsedHost . port ) ,
38- path : path ,
38+ path : path
3939 } ;
4040
4141 if ( method === 'POST' ) {
@@ -44,21 +44,16 @@ export class NodeSubmissionClient extends DefaultSubmissionClient {
4444 'Content-Length' : data . length
4545 }
4646 }
47-
47+
4848 options . headers [ 'User-Agent' ] = config . userAgent ;
4949 var request :http . ClientRequest = ( parsedHost . protocol === 'https' ? https : http ) . request ( options , ( response :http . IncomingMessage ) => {
5050 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 ) ) ;
5954 } ) ;
6055
61- ! ! data && request . write ( data ) ;
62- request . end ( ) ;
56+ request . on ( 'error' , ( error : Error ) => callback ( 500 , error . message ) ) ;
57+ request . end ( data ) ;
6358 }
6459}
0 commit comments