Skip to content

Commit

Permalink
fix: connector types (nodejs#1362)
Browse files Browse the repository at this point in the history
* fix: connector types

* fix: add maxCachedSessions, socketPath and timeout back

* Update types/connector.d.ts

Co-authored-by: Khafra <42794878+KhafraDev@users.noreply.github.com>

* fix: undo interface

* Add tests

* fix: tests & port should be optional

Co-authored-by: Khafra <42794878+KhafraDev@users.noreply.github.com>
  • Loading branch information
S222em and KhafraDev committed Jun 23, 2022
1 parent 5c4a3bf commit ad798ee
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
10 changes: 8 additions & 2 deletions test/types/connector.test-d.ts
@@ -1,6 +1,7 @@
import { expectAssignable } from 'tsd'
import {expectAssignable} from 'tsd'
import { Client, buildConnector } from '../..'
import { TLSSocket } from 'tls'
import {ConnectionOptions, TLSSocket} from 'tls'
import {IpcNetConnectOpts, NetConnectOpts, TcpNetConnectOpts} from "net";

const connector = buildConnector({ rejectUnauthorized: false })
expectAssignable<Client>(new Client('', {
Expand All @@ -19,3 +20,8 @@ expectAssignable<Client>(new Client('', {
})
}
}))

expectAssignable<buildConnector.BuildOptions>({
checkServerIdentity: () => undefined, // Test if ConnectionOptions is assignable
localPort: 1234, // Test if TcpNetConnectOpts is assignable
});
9 changes: 4 additions & 5 deletions types/connector.d.ts
@@ -1,16 +1,15 @@
import { URL } from 'url'
import { TLSSocket, TlsOptions } from 'tls'
import { Socket } from 'net'
import {TLSSocket, ConnectionOptions} from 'tls'
import {IpcNetConnectOpts, Socket, TcpNetConnectOpts} from 'net'

export = buildConnector
declare function buildConnector (options?: buildConnector.BuildOptions): typeof buildConnector.connector

declare namespace buildConnector {
export interface BuildOptions extends TlsOptions {
export type BuildOptions = (ConnectionOptions | TcpNetConnectOpts | IpcNetConnectOpts) & {
maxCachedSessions?: number | null;
socketPath?: string | null;
timeout?: number | null;
servername?: string | null;
port?: number;
}

export interface Options {
Expand Down

0 comments on commit ad798ee

Please sign in to comment.