Skip to content

Refactor dns.lookup and address handling logic #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
C0oki3s wants to merge 1 commit into
base: C0oki3s-patch-1
Choose a base branch
from
Open

Refactor dns.lookup and address handling logic #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,16 +242,19 @@ async function resolveAll (hostname) {
results.push(...v6)
} catch {}

// Fallback: dns.lookup if resolvers are blocked
// Fallback: dns.lookup (gives system resolver results)
if (!results.length) {
const address = await new Promise((resolve, reject) => {
dns.lookup(hostname, { all: false, family: 0, hints: dns.ADDRCONFIG | dns.V4MAPPED }, (err, address) => {
const addresses = await new Promise((resolve, reject) => {
dns.lookup(hostname, { all: true, family: 0, hints: dns.ADDRCONFIG | dns.V4MAPPED }, (err, addresses) => {
if (err) return reject(err)
resolve(address)
resolve(addresses)
})
})
if (typeof address === 'string') results.push(address)
else if (address && address.address) results.push(address.address)
if (Array.isArray(addresses)) {
for (const addr of addresses) {
if (addr && addr.address) results.push(addr.address)
}
}
}

return results
Expand Down Expand Up @@ -288,11 +291,11 @@ function normalizeObfuscatedIPv4 (host) {
if (nums.every(x => x !== null && x >= 0)) {
let dword = null
if (nums.length === 4) {
if (nums.every(x => x <= 255)) dword = (nums[0] << 24) | (nums[1] << 16) | (nums[2] << 8) | nums[3]
if (nums.every(x => x <= 255)) dword = ((nums[0] << 24) | (nums[1] << 16) | (nums[2] << 8) | nums[3]) >>> 0
} else if (nums.length === 3) {
if (nums[0] <= 255 && nums[1] <= 255 && nums[2] <= 0xFFFF) dword = (nums[0] << 24) | (nums[1] << 16) | nums[2]
if (nums[0] <= 255 && nums[1] <= 255 && nums[2] <= 0xFFFF) dword = ((nums[0] << 24) | (nums[1] << 16) | nums[2]) >>> 0
} else if (nums.length === 2) {
if (nums[0] <= 255 && nums[1] <= 0xFFFFFF) dword = (nums[0] << 24) | nums[1]
if (nums[0] <= 255 && nums[1] <= 0xFFFFFF) dword = ((nums[0] << 24) | nums[1]) >>> 0
} else if (nums.length === 1) {
if (nums[0] <= 0xFFFFFFFF) dword = nums[0]
}
Expand Down