From 9b615f3a7602134b71ed9ebd1edfb6737128c3b4 Mon Sep 17 00:00:00 2001 From: Andrew Makarov Date: Sat, 9 Jun 2018 11:42:17 +0300 Subject: [PATCH 1/2] Add dns.lookupService method --- types/node/index.d.ts | 7 +++++++ types/node/node-tests.ts | 6 ++++++ types/node/v4/index.d.ts | 2 ++ types/node/v4/node-tests.ts | 6 ++++++ types/node/v6/index.d.ts | 2 ++ types/node/v6/node-tests.ts | 6 ++++++ types/node/v7/index.d.ts | 2 ++ types/node/v7/node-tests.ts | 6 ++++++ types/node/v8/index.d.ts | 6 ++++++ types/node/v8/node-tests.ts | 6 ++++++ 10 files changed, 49 insertions(+) diff --git a/types/node/index.d.ts b/types/node/index.d.ts index 070c668e11..7bbc6ef651 100644 --- a/types/node/index.d.ts +++ b/types/node/index.d.ts @@ -24,6 +24,7 @@ // Hoàng Văn Khải // Alexander T. // Lishude +// Andrew Makarov // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /** inspector module types */ @@ -2540,6 +2541,12 @@ declare module "dns" { export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>; } + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + + export namespace lookupService { + export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>; + } + export interface ResolveOptions { ttl: boolean; } diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts index 740ad1f61a..14a939fb81 100644 --- a/types/node/node-tests.ts +++ b/types/node/node-tests.ts @@ -3114,6 +3114,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; }); diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts index dab3b0c5d9..58dc079f70 100644 --- a/types/node/v4/index.d.ts +++ b/types/node/v4/index.d.ts @@ -1445,6 +1445,8 @@ declare module "dns" { export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void; export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void; + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + export interface MxRecord { priority: number; exchange: string; diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts index 6409e83e18..a9471f2bd6 100644 --- a/types/node/v4/node-tests.ts +++ b/types/node/v4/node-tests.ts @@ -1196,6 +1196,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; }); diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts index 570e668c53..0644a6dccd 100644 --- a/types/node/v6/index.d.ts +++ b/types/node/v6/index.d.ts @@ -2057,6 +2057,8 @@ declare module "dns" { export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void; export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void; + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + export interface MxRecord { priority: number; exchange: string; diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts index 4457f83492..2d0666e322 100644 --- a/types/node/v6/node-tests.ts +++ b/types/node/v6/node-tests.ts @@ -2407,6 +2407,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; }); diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts index 055933977d..cd76d4b038 100644 --- a/types/node/v7/index.d.ts +++ b/types/node/v7/index.d.ts @@ -2100,6 +2100,8 @@ declare module "dns" { export function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException, address: string | LookupAddress[], family: number) => void): void; export function lookup(hostname: string, callback: (err: NodeJS.ErrnoException, address: string, family: number) => void): void; + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + export interface ResolveOptions { ttl: boolean; } diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts index 0ea05066b4..4d99c91841 100644 --- a/types/node/v7/node-tests.ts +++ b/types/node/v7/node-tests.ts @@ -2398,6 +2398,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; }); diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts index bc4fa2d749..ec19101c0a 100644 --- a/types/node/v8/index.d.ts +++ b/types/node/v8/index.d.ts @@ -2444,6 +2444,12 @@ declare module "dns" { export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>; } + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + + export namespace lookupService { + export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>; + } + export interface ResolveOptions { ttl: boolean; } diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts index d37aa70ad5..3033956017 100644 --- a/types/node/v8/node-tests.ts +++ b/types/node/v8/node-tests.ts @@ -3075,6 +3075,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; }); From be6409bb59550341231c3ae02997dae6e438e72a Mon Sep 17 00:00:00 2001 From: Andrew Makarov Date: Sun, 10 Jun 2018 23:08:28 +0300 Subject: [PATCH 2/2] Update tests --- types/node/node-tests.ts | 2 +- types/node/v4/node-tests.ts | 2 +- types/node/v6/node-tests.ts | 2 +- types/node/v7/node-tests.ts | 2 +- types/node/v8/index.d.ts | 1 + types/node/v8/node-tests.ts | 2 +- types/node/v9/index.d.ts | 7 +++++++ types/node/v9/node-tests.ts | 6 ++++++ 8 files changed, 19 insertions(+), 5 deletions(-) diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts index 14a939fb81..4db61a5e40 100644 --- a/types/node/node-tests.ts +++ b/types/node/node-tests.ts @@ -3114,7 +3114,7 @@ namespace dns_tests { const _family: number | undefined = family; }); - dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { const _err: NodeJS.ErrnoException = err; const _hostname: string = hostname; const _service: string = service; diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts index a9471f2bd6..5e63842704 100644 --- a/types/node/v4/node-tests.ts +++ b/types/node/v4/node-tests.ts @@ -1196,7 +1196,7 @@ namespace dns_tests { const _family: number | undefined = family; }); - dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { const _err: NodeJS.ErrnoException = err; const _hostname: string = hostname; const _service: string = service; diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts index 2d0666e322..9987b76a71 100644 --- a/types/node/v6/node-tests.ts +++ b/types/node/v6/node-tests.ts @@ -2407,7 +2407,7 @@ namespace dns_tests { const _family: number | undefined = family; }); - dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { const _err: NodeJS.ErrnoException = err; const _hostname: string = hostname; const _service: string = service; diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts index 4d99c91841..f17b3be5db 100644 --- a/types/node/v7/node-tests.ts +++ b/types/node/v7/node-tests.ts @@ -2398,7 +2398,7 @@ namespace dns_tests { const _family: number | undefined = family; }); - dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { const _err: NodeJS.ErrnoException = err; const _hostname: string = hostname; const _service: string = service; diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts index ec19101c0a..3e153570d6 100644 --- a/types/node/v8/index.d.ts +++ b/types/node/v8/index.d.ts @@ -21,6 +21,7 @@ // Bruno Scheufler // Hoàng Văn Khải // Lishude +// Andrew Makarov // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.1 diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts index 3033956017..dee74cc036 100644 --- a/types/node/v8/node-tests.ts +++ b/types/node/v8/node-tests.ts @@ -3075,7 +3075,7 @@ namespace dns_tests { const _family: number | undefined = family; }); - dns.lookupService("nodejs.org", 0, (err, hostname, service) => { + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { const _err: NodeJS.ErrnoException = err; const _hostname: string = hostname; const _service: string = service; diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts index 1c9e01cc01..d11f93e382 100644 --- a/types/node/v9/index.d.ts +++ b/types/node/v9/index.d.ts @@ -24,6 +24,7 @@ // Hoàng Văn Khải // Alexander T. // Lishude +// Andrew Makarov // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped /** inspector module types */ @@ -2525,6 +2526,12 @@ declare module "dns" { export function __promisify__(hostname: string, options?: LookupOptions | number): Promise<{ address: string | LookupAddress[], family?: number }>; } + export function lookupService(address: string, port: number, callback: (err: NodeJS.ErrnoException, hostname: string, service: string) => void): void; + + export namespace lookupService { + export function __promisify__(address: string, port: number): Promise<{ hostname: string, service: string }>; + } + export interface ResolveOptions { ttl: boolean; } diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts index b7c7471fe1..72ce012a3c 100644 --- a/types/node/v9/node-tests.ts +++ b/types/node/v9/node-tests.ts @@ -3108,6 +3108,12 @@ namespace dns_tests { const _family: number | undefined = family; }); + dns.lookupService("127.0.0.1", 0, (err, hostname, service) => { + const _err: NodeJS.ErrnoException = err; + const _hostname: string = hostname; + const _service: string = service; + }); + dns.resolve("nodejs.org", (err, addresses) => { const _addresses: string[] = addresses; });