From 16f4b2bad2b278c5619c521e2fea46bd192a30a5 Mon Sep 17 00:00:00 2001 From: progre Date: Thu, 26 Mar 2015 22:02:03 +0900 Subject: [PATCH 1/5] fix ClientResponse to IncommingMessage --- node/node.d.ts | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 3838a29528..471cfd23bf 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -340,14 +340,18 @@ declare module "http" { end(str: string, encoding?: string, cb?: Function): void; end(data?: any, encoding?: string): void; } - export interface ClientResponse extends events.EventEmitter, stream.Readable { - statusCode: number; + export interface IncomingMessage extends events.EventEmitter, stream.Readable { httpVersion: string; headers: any; + rawHeaders: string[]; trailers: any; - setEncoding(encoding?: string): void; - pause(): void; - resume(): void; + rawTrailers: any; + setTimeout(msecs: number, callback: Function): NodeJS.Timer; + method: string; + url: string; + statusCode: number; + statusMessage: string; + socket: net.Socket; } export interface AgentOptions { @@ -392,8 +396,8 @@ declare module "http" { }; export function createServer(requestListener?: (request: ServerRequest, response: ServerResponse) =>void ): Server; export function createClient(port?: number, host?: string): any; - export function request(options: any, callback?: Function): ClientRequest; - export function get(options: any, callback?: Function): ClientRequest; + export function request(options: any, callback?: (res: IncomingMessage) => void): ClientRequest; + export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest; export var globalAgent: Agent; } @@ -563,8 +567,8 @@ declare module "https" { }; export interface Server extends tls.Server { } export function createServer(options: ServerOptions, requestListener?: Function): Server; - export function request(options: RequestOptions, callback?: (res: http.ClientResponse) =>void ): http.ClientRequest; - export function get(options: RequestOptions, callback?: (res: http.ClientResponse) =>void ): http.ClientRequest; + export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest; + export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest; export var globalAgent: Agent; } From 4f1e6ccc1b29593113e6eb9672fb27cc88d1c1ad Mon Sep 17 00:00:00 2001 From: progre Date: Thu, 26 Mar 2015 22:07:01 +0900 Subject: [PATCH 2/5] add ClientResponse for compatibility --- node/node.d.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/node/node.d.ts b/node/node.d.ts index 471cfd23bf..0e2aceb28e 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -353,6 +353,10 @@ declare module "http" { statusMessage: string; socket: net.Socket; } + /** + * @deprecated Use IncomingMessage + */ + export interface ClientResponse extends IncomingMessage { } export interface AgentOptions { /** From 7dd54357a8e379e5ee55f75d3b71a30fa316115e Mon Sep 17 00:00:00 2001 From: progre Date: Fri, 27 Mar 2015 19:42:43 +0900 Subject: [PATCH 3/5] fix ServerRequest to IncomingMessage --- node/node.d.ts | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 0e2aceb28e..5196123808 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -282,15 +282,10 @@ declare module "http" { address(): { port: number; family: string; address: string; }; maxHeadersCount: number; } - export interface ServerRequest extends events.EventEmitter, stream.Readable { - method: string; - url: string; - headers: any; - trailers: string; - httpVersion: string; - setEncoding(encoding?: string): void; - pause(): void; - resume(): void; + /** + * @deprecated Use IncomingMessage + */ + export interface ServerRequest extends IncomingMessage { connection: net.Socket; } export interface ServerResponse extends events.EventEmitter, stream.Writable { @@ -398,7 +393,7 @@ declare module "http" { [errorCode: number]: string; [errorCode: string]: string; }; - export function createServer(requestListener?: (request: ServerRequest, response: ServerResponse) =>void ): Server; + export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server; export function createClient(port?: number, host?: string): any; export function request(options: any, callback?: (res: IncomingMessage) => void): ClientRequest; export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest; From b552570fb87fbfb016e1905a9d2187c749f70d16 Mon Sep 17 00:00:00 2001 From: progre Date: Fri, 27 Mar 2015 19:55:43 +0900 Subject: [PATCH 4/5] fix ServerRequest to IncomingMessage --- formidable/formidable.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/formidable/formidable.d.ts b/formidable/formidable.d.ts index ba0ed81228..d1cbb16f6d 100644 --- a/formidable/formidable.d.ts +++ b/formidable/formidable.d.ts @@ -25,7 +25,7 @@ declare module "formidable" { onPart: (part: Part) => void; handlePart(part: Part): void; - parse(req: http.ServerRequest, callback?: (err: any, fields: Fields, files: Files) => any): void; + parse(req: http.IncomingMessage, callback?: (err: any, fields: Fields, files: Files) => any): void; } export interface Fields { From 9626637b273d607d4831e93cc092f43bf393c449 Mon Sep 17 00:00:00 2001 From: PROGRE Date: Mon, 30 Mar 2015 12:39:33 +0900 Subject: [PATCH 5/5] fix optionals --- node/node.d.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/node/node.d.ts b/node/node.d.ts index 5196123808..e3250e9edc 100644 --- a/node/node.d.ts +++ b/node/node.d.ts @@ -342,10 +342,22 @@ declare module "http" { trailers: any; rawTrailers: any; setTimeout(msecs: number, callback: Function): NodeJS.Timer; - method: string; - url: string; - statusCode: number; - statusMessage: string; + /** + * Only valid for request obtained from http.Server. + */ + method?: string; + /** + * Only valid for request obtained from http.Server. + */ + url?: string; + /** + * Only valid for response obtained from http.ClientRequest. + */ + statusCode?: number; + /** + * Only valid for response obtained from http.ClientRequest. + */ + statusMessage?: string; socket: net.Socket; } /**