don't use pick. fixed tests

This commit is contained in:
Huw McNamara
2018-02-07 19:31:40 +00:00
parent 4fb702c02c
commit fb7accbd5e
2 changed files with 15 additions and 18 deletions
+12 -16
View File
@@ -1744,23 +1744,19 @@ declare module "https" {
export type ServerOptions = tls.SecureContextOptions & tls.TlsServerOptions;
// see https://nodejs.org/dist/latest/docs/api/https.html#https_https_request_options_callback
type extendedRequestKeys = "ca" |
"cert" |
"ciphers" |
"clientCertEngine" |
"key" |
"passphrase" |
"pfx" |
"rejectUnauthorized" |
"secureProtocol" |
"servername";
// as many type definitions rely on node, redefine Pick here instead of updating all of them to typescript 2.1
type PortedPick<T, K extends keyof T> = {
[P in K]: T[P];
};
export type RequestOptions = http.RequestOptions & PortedPick<tls.ConnectionOptions, extendedRequestKeys>;
export type RequestOptions = http.RequestOptions & {
ca?: tls.ConnectionOptions["ca"];
cert?: tls.ConnectionOptions["cert"];
ciphers?: tls.ConnectionOptions["ciphers"];
clientCertEngine?: tls.ConnectionOptions["clientCertEngine"];
key?: tls.ConnectionOptions["key"];
passphrase?: tls.ConnectionOptions["passphrase"];
pfx?: tls.ConnectionOptions["pfx"];
rejectUnauthorized?: tls.ConnectionOptions["rejectUnauthorized"];
secureProtocol?: tls.ConnectionOptions["secureProtocol"];
servername?: tls.ConnectionOptions["servername"];
}
export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
rejectUnauthorized?: boolean;
+3 -2
View File
@@ -8,9 +8,10 @@ const options: SMTPServerOptions = {
onRcptTo,
onData,
onClose,
port: 2525
};
const port = 2525;
function onConnect(session: SMTPServerSession, callback: (err?: Error) => void): void {
console.log(`[${session.id}] onConnect`);
callback();
@@ -69,7 +70,7 @@ server.on('close', () => {
console.log('Server closed');
});
server.listen(options.port, () => {
server.listen(port, () => {
const address = server.server.address();
console.log(`Listening on [${address.address}]:${address.port}`);
});