snxraven/bare-operating-system
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Try to fix whois

Browse Source
This commit is contained in:
Raven Scott
2026-04-27 21:00:49 -04:00
parent 9074978c83
commit 60e2efa64a
10 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/bin/whois
+16 -8
View File
@@ -398,12 +398,18 @@ async function run(ctx, argv) {
ctx.exitCode = 1
return
}
/** Total wall-clock budget for bootstrap + optional ipv6 bootstrap + RDAP GET (shared across hops). */
const DEFAULT_RDAP_MS = 120000
const MAX_RDAP_MS = 600000
const timeoutRaw = Number.parseInt(
String(ctx.vfs?.env?.BARE_OS_WHOIS_TIMEOUT_MS || '10000'),
String(ctx.vfs?.env?.BARE_OS_WHOIS_TIMEOUT_MS || String(DEFAULT_RDAP_MS)),
10
)
const timeoutMs =
Number.isFinite(timeoutRaw) && timeoutRaw > 0 ? Math.min(timeoutRaw, 60000) : 10000
const totalBudgetMs = Number.isFinite(timeoutRaw) && timeoutRaw > 0
? Math.min(timeoutRaw, MAX_RDAP_MS)
: DEFAULT_RDAP_MS
const deadlineMs = Date.now() + totalBudgetMs
const hopTimeoutMs = () => Math.max(1, deadlineMs - Date.now())
let bootstrapUrl = ''
let rdapPath = ''
@@ -419,13 +425,13 @@ async function run(ctx, argv) {
}
try {
const bootstrap = await fetchJson(fetchFn, bootstrapUrl, timeoutMs)
const bootstrap = await fetchJson(fetchFn, bootstrapUrl, hopTimeoutMs())
let base = pickBaseUrlFromBootstrap(target.kind, target.query, bootstrap)
if (!base && target.kind === 'ip' && isIpv6(target.query)) {
const ipv6Bootstrap = await fetchJson(
fetchFn,
'https://data.iana.org/rdap/ipv6.json',
timeoutMs
hopTimeoutMs()
)
base = pickBaseUrlFromBootstrap(target.kind, target.query, ipv6Bootstrap)
}
@@ -434,13 +440,15 @@ async function run(ctx, argv) {
ctx.exitCode = 1
return
}
const rdap = await fetchJson(fetchFn, joinUrl(base, rdapPath), timeoutMs)
const rdap = await fetchJson(fetchFn, joinUrl(base, rdapPath), hopTimeoutMs())
if (parsed.json) ctx.console.log(JSON.stringify(rdap, null, 2))
else printSummary(ctx, target.kind, target.query, rdap)
} catch (err) {
const msg = String((err && err.message) || err || '')
if ((err && err.name === 'AbortError') || /abort|timeout/i.test(msg)) {
ctx.console.error('whois: network timeout after ' + timeoutMs + 'ms')
if (err && err.name === 'AbortError') {
ctx.console.error(
'whois: network timeout (RDAP lookup exceeded ' + totalBudgetMs + 'ms)'
)
} else if (/allowlist|denylist|HTTP blocked/i.test(msg)) {
ctx.console.error('whois: blocked by HTTP policy: ' + msg)
} else if (/ENOTFOUND|EAI_AGAIN|ENETUNREACH|EHOSTUNREACH/i.test(msg)) {