Skip to content

Commit

Permalink
[node] re-add export to http2 (DefinitelyTyped#39992)
Browse files Browse the repository at this point in the history 
Add export for http2 types again which were removed in DefinitelyTyped#39914

I don't know why test haven't discovered this nor why export is needed there.

Refs: DefinitelyTyped#39914
Fixes: DefinitelyTyped#39986
  • Loading branch information
@Flarna @jessetrinity
Flarna authored and jessetrinity committed Oct 30, 2019
1 parent 2056d9c commit 5bf2bc3
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 41 deletions.
81 changes: 41 additions & 40 deletions types/node/http2.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ declare module "http2" {
import * as url from "url";

import { IncomingHttpHeaders as Http1IncomingHttpHeaders, OutgoingHttpHeaders, IncomingMessage, ServerResponse } from "http";
export { OutgoingHttpHeaders } from "http";

interface IncomingHttpStatusHeader {
export interface IncomingHttpStatusHeader {
":status"?: number;
}

interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
export interface IncomingHttpHeaders extends Http1IncomingHttpHeaders {
":path"?: string;
":method"?: string;
":authority"?: string;
Expand All @@ -21,14 +22,14 @@ declare module "http2" {

// Http2Stream

interface StreamPriorityOptions {
export interface StreamPriorityOptions {
exclusive?: boolean;
parent?: number;
weight?: number;
silent?: boolean;
}

interface StreamState {
export interface StreamState {
localWindowSize?: number;
state?: number;
localClose?: number;
Expand All @@ -37,28 +38,28 @@ declare module "http2" {
weight?: number;
}

interface ServerStreamResponseOptions {
export interface ServerStreamResponseOptions {
endStream?: boolean;
waitForTrailers?: boolean;
}

interface StatOptions {
export interface StatOptions {
offset: number;
length: number;
}

interface ServerStreamFileResponseOptions {
export interface ServerStreamFileResponseOptions {
statCheck?(stats: fs.Stats, headers: OutgoingHttpHeaders, statOptions: StatOptions): void | boolean;
waitForTrailers?: boolean;
offset?: number;
length?: number;
}

interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
export interface ServerStreamFileResponseOptionsWithError extends ServerStreamFileResponseOptions {
onError?(err: NodeJS.ErrnoException): void;
}

interface Http2Stream extends stream.Duplex {
export interface Http2Stream extends stream.Duplex {
readonly aborted: boolean;
readonly bufferSize: number;
readonly closed: boolean;
Expand Down Expand Up @@ -179,7 +180,7 @@ declare module "http2" {
prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
}

interface ClientHttp2Stream extends Http2Stream {
export interface ClientHttp2Stream extends Http2Stream {
addListener(event: "continue", listener: () => {}): this;
addListener(event: "headers", listener: (headers: IncomingHttpHeaders & IncomingHttpStatusHeader, flags: number) => void): this;
addListener(event: "push", listener: (headers: IncomingHttpHeaders, flags: number) => void): this;
Expand Down Expand Up @@ -217,7 +218,7 @@ declare module "http2" {
prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
}

interface ServerHttp2Stream extends Http2Stream {
export interface ServerHttp2Stream extends Http2Stream {
readonly headersSent: boolean;
readonly pushAllowed: boolean;
additionalHeaders(headers: OutgoingHttpHeaders): void;
Expand All @@ -230,7 +231,7 @@ declare module "http2" {

// Http2Session

interface Settings {
export interface Settings {
headerTableSize?: number;
enablePush?: boolean;
initialWindowSize?: number;
Expand All @@ -240,15 +241,15 @@ declare module "http2" {
enableConnectProtocol?: boolean;
}

interface ClientSessionRequestOptions {
export interface ClientSessionRequestOptions {
endStream?: boolean;
exclusive?: boolean;
parent?: number;
weight?: number;
waitForTrailers?: boolean;
}

interface SessionState {
export interface SessionState {
effectiveLocalWindowSize?: number;
effectiveRecvDataLength?: number;
nextStreamID?: number;
Expand All @@ -260,7 +261,7 @@ declare module "http2" {
inflateDynamicTableSize?: number;
}

interface Http2Session extends events.EventEmitter {
export interface Http2Session extends events.EventEmitter {
readonly alpnProtocol?: string;
readonly closed: boolean;
readonly connecting: boolean;
Expand Down Expand Up @@ -345,7 +346,7 @@ declare module "http2" {
prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
}

interface ClientHttp2Session extends Http2Session {
export interface ClientHttp2Session extends Http2Session {
request(headers?: OutgoingHttpHeaders, options?: ClientSessionRequestOptions): ClientHttp2Stream;

addListener(event: "altsvc", listener: (alt: string, origin: string, stream: number) => void): this;
Expand Down Expand Up @@ -385,11 +386,11 @@ declare module "http2" {
prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
}

interface AlternativeServiceOptions {
export interface AlternativeServiceOptions {
origin: number | string | url.URL;
}

interface ServerHttp2Session extends Http2Session {
export interface ServerHttp2Session extends Http2Session {
readonly server: Http2Server | Http2SecureServer;

altsvc(alt: string, originOrStream: number | string | url.URL | AlternativeServiceOptions): void;
Expand Down Expand Up @@ -422,7 +423,7 @@ declare module "http2" {

// Http2Server

interface SessionOptions {
export interface SessionOptions {
maxDeflateDynamicTableSize?: number;
maxSessionMemory?: number;
maxHeaderListPairs?: number;
Expand All @@ -436,29 +437,29 @@ declare module "http2" {
createConnection?(authority: url.URL, option: SessionOptions): stream.Duplex;
}

interface ClientSessionOptions extends SessionOptions {
export interface ClientSessionOptions extends SessionOptions {
maxReservedRemoteStreams?: number;
createConnection?: (authority: url.URL, option: SessionOptions) => stream.Duplex;
}

interface ServerSessionOptions extends SessionOptions {
export interface ServerSessionOptions extends SessionOptions {
Http1IncomingMessage?: typeof IncomingMessage;
Http1ServerResponse?: typeof ServerResponse;
Http2ServerRequest?: typeof Http2ServerRequest;
Http2ServerResponse?: typeof Http2ServerResponse;
}

interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }
export interface SecureClientSessionOptions extends ClientSessionOptions, tls.ConnectionOptions { }
export interface SecureServerSessionOptions extends ServerSessionOptions, tls.TlsOptions { }

interface ServerOptions extends ServerSessionOptions { }
export interface ServerOptions extends ServerSessionOptions { }

interface SecureServerOptions extends SecureServerSessionOptions {
export interface SecureServerOptions extends SecureServerSessionOptions {
allowHTTP1?: boolean;
origins?: string[];
}

interface Http2Server extends net.Server {
export interface Http2Server extends net.Server {
addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
addListener(event: "session", listener: (session: ServerHttp2Session) => void): this;
Expand Down Expand Up @@ -510,7 +511,7 @@ declare module "http2" {
setTimeout(msec?: number, callback?: () => void): this;
}

interface Http2SecureServer extends tls.Server {
export interface Http2SecureServer extends tls.Server {
addListener(event: "checkContinue", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
addListener(event: "request", listener: (request: Http2ServerRequest, response: Http2ServerResponse) => void): this;
addListener(event: "session", listener: (session: ServerHttp2Session) => void): this;
Expand Down Expand Up @@ -568,7 +569,7 @@ declare module "http2" {
setTimeout(msec?: number, callback?: () => void): this;
}

class Http2ServerRequest extends stream.Readable {
export class Http2ServerRequest extends stream.Readable {
constructor(stream: ServerHttp2Stream, headers: IncomingHttpHeaders, options: stream.ReadableOptions, rawHeaders: string[]);

readonly aborted: boolean;
Expand Down Expand Up @@ -636,7 +637,7 @@ declare module "http2" {
prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
}

class Http2ServerResponse extends stream.Stream {
export class Http2ServerResponse extends stream.Stream {
constructor(stream: ServerHttp2Stream);

readonly connection: net.Socket | tls.TLSSocket;
Expand Down Expand Up @@ -716,7 +717,7 @@ declare module "http2" {

// Public API

namespace constants {
export namespace constants {
const NGHTTP2_SESSION_SERVER: number;
const NGHTTP2_SESSION_CLIENT: number;
const NGHTTP2_STREAM_STATE_IDLE: number;
Expand Down Expand Up @@ -927,20 +928,20 @@ declare module "http2" {
const HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED: number;
}

function getDefaultSettings(): Settings;
function getPackedSettings(settings: Settings): Buffer;
function getUnpackedSettings(buf: Uint8Array): Settings;
export function getDefaultSettings(): Settings;
export function getPackedSettings(settings: Settings): Buffer;
export function getUnpackedSettings(buf: Uint8Array): Settings;

function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
export function createServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;
export function createServer(options: ServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2Server;

function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
export function createSecureServer(onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;
export function createSecureServer(options: SecureServerOptions, onRequestHandler?: (request: Http2ServerRequest, response: Http2ServerResponse) => void): Http2SecureServer;

function connect(authority: string | url.URL, listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
function connect(
export function connect(authority: string | url.URL, listener: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void): ClientHttp2Session;
export function connect(
authority: string | url.URL,
options?: ClientSessionOptions | SecureClientSessionOptions,
listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void,
listener?: (session: ClientHttp2Session, socket: net.Socket | tls.TLSSocket) => void
): ClientHttp2Session;
}
2 changes: 1 addition & 1 deletion types/node/test/http2.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
getPackedSettings,
getUnpackedSettings,
IncomingHttpHeaders,
OutgoingHttpHeaders,
createServer,
constants,
ServerOptions
Expand All @@ -37,7 +38,6 @@ import { Socket, Server } from "net";
import { TLSSocket } from "tls";
import { Duplex, Readable } from "stream";
import { URL } from 'url';
import { OutgoingHttpHeaders } from 'http';

// Headers & Settings
{
Expand Down

0 comments on commit 5bf2bc3

Please sign in to comment.