Node v20で動かないのを修正 Resolve #2480

mei23 · Sep 23, 2023 · 29b555f · 29b555f
1 parent fe5a456
commit 29b555f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 37 deletions.
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
 		"bootstrap": "4.6.2",
 		"bootstrap-vue": "2.23.1",
 		"bull": "4.10.4",
+		"cacheable-lookup": "6.1.0",
 		"cafy": "15.2.1",
 		"cbor": "8.1.0",
 		"chalk": "4.1.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/misc/dns.ts b/src/misc/dns.ts
diff --git a/src/misc/fetch.ts b/src/misc/fetch.ts
@@ -1,7 +1,7 @@
 import * as http from 'http';
 import * as https from 'https';
-import { lookup } from './dns';
 import fetch from 'node-fetch';
+import CacheableLookup from 'cacheable-lookup';
 import { HttpProxyAgent } from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import config from '../config';
@@ -75,15 +75,19 @@ function objectAssignWithLcKey(a: Record<string, string>, b: Record<string, stri
 	return Object.assign(lcObjectKey(a), lcObjectKey(b));
 }
 
-//#region Agent
+const cache = new CacheableLookup({
+	maxTtl: 3600,	// 1hours
+	errorTtl: 30,	// 30secs
+	lookup: false,	// nativeのdns.lookupにfallbackしない
+});
 
 /**
  * Get http non-proxy agent
  */
 const _http = new http.Agent({
 	keepAlive: true,
 	keepAliveMsecs: 30 * 1000,
-	lookup: lookup,
+	lookup: cache.lookup,
 } as http.AgentOptions);
 
 /**
@@ -92,7 +96,7 @@ const _http = new http.Agent({
 const _https = new https.Agent({
 	keepAlive: true,
 	keepAliveMsecs: 30 * 1000,
-	lookup: lookup,
+	lookup: cache.lookup,
 } as https.AgentOptions);
 
 /**