Skip to content
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

dns: implement light dns caching #49560

Closed
wants to merge 15 commits into from
Closed

dns: implement light dns caching #49560

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
db4dde6
dns: implement light dns caching
kshitjj Sep 8, 2023
b5a7580
dns: add default value to dnsCache
kshitjj Sep 9, 2023
5d33b3f
Merge branch 'main' into async-dns-resolution
kshitjj Sep 11, 2023
3038e59
fix: dns cache algorithm
kshitjj Sep 11, 2023
71fc2cc
Merge branch 'nodejs:main' into async-dns-resolution
kshitjj Sep 11, 2023
b4f1025
fix: removed hasOwnProperty method
kshitjj Sep 11, 2023
c32745b
fix: removed hasOwnProperty method
kshitjj Sep 11, 2023
9fff8f9
Merge branch 'main' into async-dns-resolution
kshitjj Sep 15, 2023
f731c16
fix: linter
kshitjj Sep 16, 2023
80c60eb
fix: unref timer
kshitjj Sep 16, 2023
83586ef
Refactor: DNS cache cleanup scheduling
kshitjj Sep 16, 2023
090a1a0
Implement lazy cache cleanup for DNS entries
kshitjj Sep 16, 2023
514f8e2
performance: changed deleting method
kshitjj Oct 6, 2023
1c6a9f6
dns: fix test/test-tls-connect-address-family.js
kshitjj Oct 7, 2023
d217c14
Merge branch 'nodejs:main' into async-dns-resolution
kshitjj Feb 28, 2024
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
38 changes: 37 additions & 1 deletion lib/dns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,32 @@ function onlookupall(err, addresses) {
}
}

function cleanExpiredDnsCache() {
const currentTime = DateNow();
for (const key in dnsCache) {
if (currentTime - dnsCache[key].timestamp >= 1000) {
dnsCache[key] = undefined;
}
}
}

function addDnsEntry(cacheKey, address, family) {
dnsCache[cacheKey] = {
address,
family,
timestamp: DateNow(),
};

cleanExpiredDnsCache();

return dnsCache[cacheKey];
}

// Easy DNS A/AAAA look up
// lookup(hostname, [options,] callback)
const validFamilies = [0, 4, 6];
const dnsCache = { __proto__: null };
const { DateNow } = primordials;
function lookup(hostname, options, callback) {
let hints = 0;
let family = 0;
Expand Down Expand Up @@ -212,8 +234,22 @@ function lookup(hostname, options, callback) {
return {};
}

const cacheKey = `${hostname}_${family || 'default'}_${all ? 'all' : 'single'}`;
const cachedResult = dnsCache[cacheKey];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A read-through cache approach would be a bit simpler here. essentially something like

cache.get(cacheKey, callback, () => {
  // If the cache lookup is a miss, this function is called to do the lookup and cache the result of the lookup.
});


if (cachedResult) {
cleanExpiredDnsCache();
callback(null, cachedResult.address, cachedResult.family);
return {};
}

const req = new GetAddrInfoReqWrap();
req.callback = callback;
req.callback = (error, address, family) => {
if (!error) {
addDnsEntry(cacheKey, address, family);
}
callback(error, address, family);
};
req.family = family;
req.hostname = hostname;
req.oncomplete = all ? onlookupall : onlookup;
Expand Down