Skip to content

Commit 25adb14

Browse files
blakeembreyblakeembrey
committed
Improve HTTP interfaces and structure
1 parent 4fbb2e3 commit 25adb14

File tree

4 files changed

+55
-150
lines changed

4 files changed

+55
-150
lines changed

‎0.10/node.d.ts‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ declare module "http" {
438438
rawHeaders: string[];
439439
trailers: IncomingHeaders;
440440
rawTrailers: string[];
441-
setTimeout(msecs: number, callback: Function): NodeJS.Timer;
441+
setTimeout(msecs: number, callback?: () => void): this;
442442
destroy(error?: Error): void;
443443
/**
444444
* Only valid for request obtained from http.Server.
@@ -459,42 +459,32 @@ declare module "http" {
459459
socket: net.Socket;
460460
}
461461

462-
export class ServerResponse extends stream.Writable {
462+
export class OutgoingMessage extends stream.Writable {
463463
finished: boolean;
464-
headersSent: boolean;
465-
statusCode: number;
466464
sendDate: boolean;
465+
headersSent: boolean;
467466

468-
// Extended base methods
469-
write(buffer: Buffer): boolean;
470-
write(buffer: Buffer, cb?: Function): boolean;
471-
write(str: string, cb?: Function): boolean;
472-
write(str: string, encoding?: string, cb?: Function): boolean;
473-
write(str: string, encoding?: string, fd?: string): boolean;
474-
475-
writeContinue(): void;
476-
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
477-
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
467+
setTimeout(msecs: number, callback?: () => void): this;
478468
setHeader(name: string, value: string): void;
479-
setTimeout(msecs: number, callback: () => void): this;
480469
getHeader(name: string): string;
481470
removeHeader(name: string): void;
482-
write(chunk: any, encoding?: string): any;
483471
addTrailers(headers: OutgoingHeaders): void;
472+
setTimeout(msecs: number, callback?: () => void): this;
473+
}
484474

485-
// Extended base methods
486-
end(): void;
487-
end(buffer: Buffer, cb?: Function): void;
488-
end(str: string, cb?: Function): void;
489-
end(str: string, encoding?: string, cb?: Function): void;
475+
export class ServerResponse extends OutgoingMessage {
476+
statusCode: number;
477+
478+
writeContinue(): void;
479+
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
480+
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
490481
}
491482

492483
/**
493484
* Object returned by http.request()
494485
*/
495-
export class ClientRequest extends stream.Writable {
486+
export class ClientRequest extends OutgoingMessage {
496487
abort(): void;
497-
setTimeout(timeout: number, callback?: Function): void;
498488
setNoDelay(noDelay?: boolean): void;
499489
setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
500490
}

‎0.12/node.d.ts‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -622,57 +622,32 @@ declare module "http" {
622622
maxHeadersCount: number;
623623
}
624624

625-
export class ServerResponse extends stream.Writable {
625+
export class OutgoingMessage extends stream.Writable {
626626
finished: boolean;
627-
headersSent: boolean;
628-
statusCode: number;
629-
statusMessage: string;
630627
sendDate: boolean;
628+
headersSent: boolean;
631629

632-
// Extended base methods
633-
write(buffer: Buffer): boolean;
634-
write(buffer: Buffer, cb?: Function): boolean;
635-
write(str: string, cb?: Function): boolean;
636-
write(str: string, encoding?: string, cb?: Function): boolean;
637-
write(str: string, encoding?: string, fd?: string): boolean;
638-
639-
writeContinue(): void;
640-
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
641-
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
630+
setTimeout(msecs: number, callback?: () => void): this;
642631
setHeader(name: string, value: string): void;
643-
setTimeout(msecs: number, callback: () => void): this;
644632
getHeader(name: string): string;
645633
removeHeader(name: string): void;
646-
write(chunk: any, encoding?: string): any;
647634
addTrailers(headers: OutgoingHeaders): void;
648-
649-
// Extended base methods
650-
end(): void;
651-
end(buffer: Buffer, cb?: Function): void;
652-
end(str: string, cb?: Function): void;
653-
end(str: string, encoding?: string, cb?: Function): void;
635+
setTimeout(msecs: number, callback?: () => void): this;
654636
}
655637

656-
export class ClientRequest extends stream.Writable {
657-
// Extended base methods
658-
write(buffer: Buffer): boolean;
659-
write(buffer: Buffer, cb?: Function): boolean;
660-
write(str: string, cb?: Function): boolean;
661-
write(str: string, encoding?: string, cb?: Function): boolean;
662-
write(str: string, encoding?: string, fd?: string): boolean;
638+
export class ServerResponse extends OutgoingMessage {
639+
statusCode: number;
640+
statusMessage: string;
663641

664-
write(chunk: any, encoding?: string): void;
642+
writeContinue(): void;
643+
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
644+
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
645+
}
646+
647+
export class ClientRequest extends OutgoingMessage {
665648
abort(): void;
666-
setTimeout(timeout: number, callback?: Function): void;
667649
setNoDelay(noDelay?: boolean): void;
668650
setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
669-
670-
// Extended base methods
671-
end(): void;
672-
end(buffer: Buffer, cb?: Function): void;
673-
end(str: string, cb?: Function): void;
674-
end(str: string, encoding?: string, cb?: Function): void;
675-
end(data?: any, encoding?: string): void;
676651
}
677652

678653
export class IncomingMessage extends stream.Readable {
@@ -681,7 +656,7 @@ declare module "http" {
681656
rawHeaders: string[];
682657
trailers: IncomingHeaders;
683658
rawTrailers: string[];
684-
setTimeout(msecs: number, callback: Function): NodeJS.Timer;
659+
setTimeout(msecs: number, callback: () => void): this;
685660
destroy(error?: Error): void;
686661
/**
687662
* Only valid for request obtained from http.Server.

‎4.0/node.d.ts‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -750,62 +750,32 @@ declare module "http" {
750750
timeout: number;
751751
}
752752

753-
export class ServerResponse extends stream.Writable {
753+
export class OutgoingMessage extends stream.Writable {
754754
finished: boolean;
755+
sendDate: boolean;
755756
headersSent: boolean;
757+
758+
setTimeout(msecs: number, callback?: () => void): this;
759+
setHeader(name: string, value: string): void;
760+
getHeader(name: string): string;
761+
removeHeader(name: string): void;
762+
addTrailers(headers: OutgoingHeaders): void;
763+
setTimeout(msecs: number, callback?: () => void): this;
764+
}
765+
766+
export class ServerResponse extends OutgoingMessage {
756767
statusCode: number;
757768
statusMessage: string;
758-
sendDate: boolean;
759-
760-
// Extended base methods
761-
write(buffer: Buffer): boolean;
762-
write(buffer: Buffer, cb?: Function): boolean;
763-
write(str: string, cb?: Function): boolean;
764-
write(str: string, encoding?: string, cb?: Function): boolean;
765-
write(str: string, encoding?: string, fd?: string): boolean;
766769

767770
writeContinue(): void;
768771
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
769772
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
770-
setHeader(name: string, value: string | string[]): void;
771-
setTimeout(msecs: number, callback: () => void): this;
772-
getHeader(name: string): string;
773-
removeHeader(name: string): void;
774-
write(chunk: any, encoding?: string): any;
775-
addTrailers(headers: OutgoingHeaders): void;
776-
777-
// Extended base methods
778-
end(): void;
779-
end(buffer: Buffer, cb?: Function): void;
780-
end(str: string, cb?: Function): void;
781-
end(str: string, encoding?: string, cb?: Function): void;
782773
}
783774

784-
export class ClientRequest extends stream.Writable {
785-
// Extended base methods
786-
write(buffer: Buffer): boolean;
787-
write(buffer: Buffer, cb?: Function): boolean;
788-
write(str: string, cb?: Function): boolean;
789-
write(str: string, encoding?: string, cb?: Function): boolean;
790-
write(str: string, encoding?: string, fd?: string): boolean;
791-
792-
write(chunk: any, encoding?: string): void;
775+
export class ClientRequest extends OutgoingMessage {
793776
abort(): void;
794-
setTimeout(timeout: number, callback?: Function): void;
795777
setNoDelay(noDelay?: boolean): void;
796778
setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
797-
798-
setHeader(name: string, value: string | string[]): void;
799-
getHeader(name: string): string;
800-
removeHeader(name: string): void;
801-
addTrailers(headers: OutgoingHeaders): void;
802-
803-
// Extended base methods
804-
end(): void;
805-
end(buffer: Buffer, cb?: Function): void;
806-
end(str: string, cb?: Function): void;
807-
end(str: string, encoding?: string, cb?: Function): void;
808-
end(data?: any, encoding?: string): void;
809779
}
810780

811781
export class IncomingMessage extends stream.Readable {
@@ -816,7 +786,7 @@ declare module "http" {
816786
rawHeaders: string[];
817787
trailers: IncomingHeaders;
818788
rawTrailers: string[];
819-
setTimeout(msecs: number, callback: Function): NodeJS.Timer;
789+
setTimeout(msecs: number, callback: () => void): this;
820790
destroy(error?: Error): void;
821791
/**
822792
* Only valid for request obtained from http.Server.

‎6.0/node.d.ts‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -779,62 +779,32 @@ declare module "http" {
779779
listening: boolean;
780780
}
781781

782-
export class ServerResponse extends stream.Writable {
782+
export class OutgoingMessage extends stream.Writable {
783783
finished: boolean;
784+
sendDate: boolean;
784785
headersSent: boolean;
786+
787+
setTimeout(msecs: number, callback?: () => void): this;
788+
setHeader(name: string, value: string): void;
789+
getHeader(name: string): string;
790+
removeHeader(name: string): void;
791+
addTrailers(headers: OutgoingHeaders): void;
792+
setTimeout(msecs: number, callback?: () => void): this;
793+
}
794+
795+
export class ServerResponse extends OutgoingMessage {
785796
statusCode: number;
786797
statusMessage: string;
787-
sendDate: boolean;
788-
789-
// Extended base methods
790-
write(buffer: Buffer): boolean;
791-
write(buffer: Buffer, cb?: Function): boolean;
792-
write(str: string, cb?: Function): boolean;
793-
write(str: string, encoding?: string, cb?: Function): boolean;
794-
write(str: string, encoding?: string, fd?: string): boolean;
795798

796799
writeContinue(): void;
797800
writeHead(statusCode: number, statusText?: string, headers?: OutgoingHeaders): void;
798801
writeHead(statusCode: number, headers?: OutgoingHeaders): void;
799-
setHeader(name: string, value: string | string[]): void;
800-
setTimeout(msecs: number, callback: () => void): this;
801-
getHeader(name: string): string;
802-
removeHeader(name: string): void;
803-
write(chunk: any, encoding?: string): any;
804-
addTrailers(headers: OutgoingHeaders): void;
805-
806-
// Extended base methods
807-
end(): void;
808-
end(buffer: Buffer, cb?: Function): void;
809-
end(str: string, cb?: Function): void;
810-
end(str: string, encoding?: string, cb?: Function): void;
811802
}
812803

813-
export class ClientRequest extends stream.Writable {
814-
// Extended base methods
815-
write(buffer: Buffer): boolean;
816-
write(buffer: Buffer, cb?: Function): boolean;
817-
write(str: string, cb?: Function): boolean;
818-
write(str: string, encoding?: string, cb?: Function): boolean;
819-
write(str: string, encoding?: string, fd?: string): boolean;
820-
821-
write(chunk: any, encoding?: string): void;
804+
export class ClientRequest extends OutgoingMessage {
822805
abort(): void;
823-
setTimeout(timeout: number, callback?: Function): void;
824806
setNoDelay(noDelay?: boolean): void;
825807
setSocketKeepAlive(enable?: boolean, initialDelay?: number): void;
826-
827-
setHeader(name: string, value: string | string[]): void;
828-
getHeader(name: string): string;
829-
removeHeader(name: string): void;
830-
addTrailers(headers: any): void;
831-
832-
// Extended base methods
833-
end(): void;
834-
end(buffer: Buffer, cb?: Function): void;
835-
end(str: string, cb?: Function): void;
836-
end(str: string, encoding?: string, cb?: Function): void;
837-
end(data?: any, encoding?: string): void;
838808
}
839809

840810
export class IncomingMessage extends stream.Readable {
@@ -843,7 +813,7 @@ declare module "http" {
843813
rawHeaders: string[];
844814
trailers: IncomingHeaders;
845815
rawTrailers: string[];
846-
setTimeout(msecs: number, callback: Function): NodeJS.Timer;
816+
setTimeout(msecs: number, callback?: () => void): this;
847817
destroy(error?: Error): void;
848818
/**
849819
* Only valid for request obtained from http.Server.

0 commit comments

Comments
 (0)