summaryrefslogtreecommitdiff
path: root/src/@types
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-07-28 09:49:02 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-28 09:49:02 +0900
commit14736620ec1e0040c55c83cfc163049b36f7af23 (patch)
tree2f00431dceae92da1b8da6a40ac66d3364282570 /src/@types
parent「削除して編集」機能を追加 (#5182) (diff)
downloadsharkey-14736620ec1e0040c55c83cfc163049b36f7af23.tar.gz
sharkey-14736620ec1e0040c55c83cfc163049b36f7af23.tar.bz2
sharkey-14736620ec1e0040c55c83cfc163049b36f7af23.zip
HTTPリクエストのKeep-AliveとPrxoy対応など (#5226)
* DriveのKeep-Alive, Proxy と APのProxy対応 * request系でKeep-Aliveするように * fix lookup-dns-cache.d.ts * remove debug output
Diffstat (limited to 'src/@types')
-rw-r--r--src/@types/lookup-dns-cache.d.ts20
-rw-r--r--src/@types/promise-any.d.ts7
2 files changed, 6 insertions, 21 deletions
diff --git a/src/@types/lookup-dns-cache.d.ts b/src/@types/lookup-dns-cache.d.ts
index ae93cc539b..8dea52ea20 100644
--- a/src/@types/lookup-dns-cache.d.ts
+++ b/src/@types/lookup-dns-cache.d.ts
@@ -1,17 +1,9 @@
declare module 'lookup-dns-cache' {
- type IPv4 = 4;
+ import { LookupOneOptions, LookupAllOptions, LookupOptions, LookupAddress } from 'dns'
- type IPv6 = 6;
-
- type Family = IPv4 | IPv6 | undefined;
-
- interface IRunOptions {
- family?: Family;
- all?: boolean;
- }
-
- type RunCallback = (error: Error | null, address?: string | string[], family?: Family) => void;
-
- export function lookup(hostname: string, options: IRunOptions | Family, callback: RunCallback): {} | undefined;
- export function lookup(hostname: string, callback: RunCallback): {} | undefined;
+ function lookup(hostname: string, family: number, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+ function lookup(hostname: string, options: LookupOneOptions, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
+ function lookup(hostname: string, options: LookupAllOptions, callback: (err: NodeJS.ErrnoException | null, addresses: LookupAddress[]) => void): void;
+ function lookup(hostname: string, options: LookupOptions, callback: (err: NodeJS.ErrnoException | null, address: string | LookupAddress[], family: number) => void): void;
+ function lookup(hostname: string, callback: (err: NodeJS.ErrnoException | null, address: string, family: number) => void): void;
}
diff --git a/src/@types/promise-any.d.ts b/src/@types/promise-any.d.ts
deleted file mode 100644
index 97060b84bd..0000000000
--- a/src/@types/promise-any.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-declare module 'promise-any' {
- function promiseAny<T>(iterable: Iterable<T | PromiseLike<T>>): Promise<T>;
-
- namespace promiseAny {} // Hack
-
- export = promiseAny;
-}