From 76569bfb08b781ca2596a271408d22d9ea719385 Mon Sep 17 00:00:00 2001 From: "Acid Chicken (硫酸鶏)" Date: Thu, 31 Jan 2019 17:53:49 +0900 Subject: Create type definition for 'lookup-dns-cache' (#4051) --- src/remote/activitypub/request.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/remote') diff --git a/src/remote/activitypub/request.ts b/src/remote/activitypub/request.ts index 7e487f76ec..9baab83740 100644 --- a/src/remote/activitypub/request.ts +++ b/src/remote/activitypub/request.ts @@ -3,7 +3,7 @@ const { sign } = require('http-signature'); import { URL } from 'url'; import * as debug from 'debug'; import * as crypto from 'crypto'; -const { lookup } = require('lookup-dns-cache'); +import { lookup, IRunOptions } from 'lookup-dns-cache'; import * as promiseAny from 'promise-any'; import config from '../../config'; @@ -89,16 +89,16 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async async function resolveAddr(domain: string) { // v4/v6で先に取得できた方を採用する return await promiseAny([ - resolveAddrInner(domain, { ipv6: false }), - resolveAddrInner(domain, { ipv6: true }) + resolveAddrInner(domain, { family: 4 }), + resolveAddrInner(domain, { family: 6 }) ]); } -function resolveAddrInner(domain: string, options = { }): Promise { +function resolveAddrInner(domain: string, options: IRunOptions = {}): Promise { return new Promise((res, rej) => { - lookup(domain, options, (error: any, address: string) => { + lookup(domain, options, (error: any, address: string | string[]) => { if (error) return rej(error); - return res(address); + return res(Array.isArray(address) ? address[0] : address); }); }); } -- cgit v1.2.3-freya