mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix node:dns error code issue impacting MongoDB (#11235)

Browse Source
This commit is contained in:
Jarred Sumner
2024-05-21 14:41:00 -07:00
committed by GitHub
parent 6e55612d36
commit c03b35ecfc
2 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/js/node/dns.ts
View File

@@ -3,6 +3,22 @@
const dns = Bun.dns;
const utilPromisifyCustomSymbol = Symbol.for("nodejs.util.promisify.custom");
function translateErrorCode(promise: Promise<any>) {
return promise.catch(error => {
return Promise.reject(withTranslatedError(error));
});
}
// We prefix the error codes with "DNS_" to make it clear it's a DNS error code.
// Node does not do this, so we have to translate.
function withTranslatedError(error: any) {
const code = error?.code;
if (code?.startsWith?.("DNS_")) {
error.code = code.slice(4);
}
return error;
}
function getServers() {
return dns.getServers();
}
@@ -52,7 +68,7 @@ function lookupService(address, port, callback) {
callback(null, ...results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -89,7 +105,7 @@ var InternalResolver = class Resolver {
}
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -109,7 +125,7 @@ var InternalResolver = class Resolver {
callback(null, options?.ttl ? addresses : addresses.map(mapResolveX));
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -129,7 +145,7 @@ var InternalResolver = class Resolver {
callback(null, options?.ttl ? addresses : addresses.map(({ address }) => address));
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -148,7 +164,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -163,7 +179,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -178,7 +194,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -193,7 +209,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -208,7 +224,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -223,7 +239,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -238,7 +254,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -253,7 +269,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -267,7 +283,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -282,7 +298,7 @@ var InternalResolver = class Resolver {
callback(null, results);
},
error => {
callback(error);
callback(withTranslatedError(error));
},
);
}
@@ -343,13 +359,13 @@ const promisifyResolveX = res => {
const promises = {
lookup(domain, options) {
if (options?.all) {
return dns.lookup(domain, options).then(promisifyLookupAll);
return translateErrorCode(dns.lookup(domain, options).then(promisifyLookupAll));
}
return dns.lookup(domain, options).then(promisifyLookup);
return translateErrorCode(dns.lookup(domain, options).then(promisifyLookup));
},
lookupService(address, port) {
return dns.lookupService(address, port);
return translateErrorCode(dns.lookupService(address, port));
},
resolve(hostname, rrtype) {
@@ -359,56 +375,56 @@ const promises = {
switch (rrtype?.toLowerCase()) {
case "a":
case "aaaa":
return dns.resolve(hostname, rrtype).then(promisifyLookup);
return translateErrorCode(dns.resolve(hostname, rrtype).then(promisifyLookup));
default:
return dns.resolve(hostname, rrtype);
return translateErrorCode(dns.resolve(hostname, rrtype));
}
},
resolve4(hostname, options) {
if (options?.ttl) {
return dns.lookup(hostname, { family: 4 });
return translateErrorCode(dns.lookup(hostname, { family: 4 }));
}
return dns.lookup(hostname, { family: 4 }).then(promisifyResolveX);
return translateErrorCode(dns.lookup(hostname, { family: 4 }).then(promisifyResolveX));
},
resolve6(hostname, options) {
if (options?.ttl) {
return dns.lookup(hostname, { family: 6 });
return translateErrorCode(dns.lookup(hostname, { family: 6 }));
}
return dns.lookup(hostname, { family: 6 }).then(promisifyResolveX);
return translateErrorCode(dns.lookup(hostname, { family: 6 }).then(promisifyResolveX));
},
resolveSrv(hostname) {
return dns.resolveSrv(hostname);
return translateErrorCode(dns.resolveSrv(hostname));
},
resolveTxt(hostname) {
return dns.resolveTxt(hostname);
return translateErrorCode(dns.resolveTxt(hostname));
},
resolveSoa(hostname) {
return dns.resolveSoa(hostname);
return translateErrorCode(dns.resolveSoa(hostname));
},
resolveNaptr(hostname) {
return dns.resolveNaptr(hostname);
return translateErrorCode(dns.resolveNaptr(hostname));
},
resolveMx(hostname) {
return dns.resolveMx(hostname);
return translateErrorCode(dns.resolveMx(hostname));
},
resolveCaa(hostname) {
return dns.resolveCaa(hostname);
return translateErrorCode(dns.resolveCaa(hostname));
},
resolveNs(hostname) {
return dns.resolveNs(hostname);
return translateErrorCode(dns.resolveNs(hostname));
},
resolvePtr(hostname) {
return dns.resolvePtr(hostname);
return translateErrorCode(dns.resolvePtr(hostname));
},
resolveCname(hostname) {
return dns.resolveCname(hostname);
return translateErrorCode(dns.resolveCname(hostname));
},
reverse(ip) {
return dns.reverse(ip);
return translateErrorCode(dns.reverse(ip));
},
Resolver: class Resolver {
@@ -427,24 +443,24 @@ const promises = {
switch (rrtype?.toLowerCase()) {
case "a":
case "aaaa":
return dns.resolve(hostname, rrtype).then(promisifyLookup);
return translateErrorCode(dns.resolve(hostname, rrtype).then(promisifyLookup));
default:
return dns.resolve(hostname, rrtype);
return translateErrorCode(dns.resolve(hostname, rrtype));
}
}
resolve4(hostname, options) {
if (options?.ttl) {
return dns.lookup(hostname, { family: 4 });
return translateErrorCode(dns.lookup(hostname, { family: 4 }));
}
return dns.lookup(hostname, { family: 4 }).then(promisifyResolveX);
return translateErrorCode(dns.lookup(hostname, { family: 4 }).then(promisifyResolveX));
}
resolve6(hostname, options) {
if (options?.ttl) {
return dns.lookup(hostname, { family: 6 });
return translateErrorCode(dns.lookup(hostname, { family: 6 }));
}
return dns.lookup(hostname, { family: 6 }).then(promisifyResolveX);
return translateErrorCode(dns.lookup(hostname, { family: 6 }).then(promisifyResolveX));
}
resolveAny(hostname) {
@@ -452,43 +468,43 @@ const promises = {
}
resolveCname(hostname) {
return dns.resolveCname(hostname);
return translateErrorCode(dns.resolveCname(hostname));
}
resolveMx(hostname) {
return dns.resolveMx(hostname);
return translateErrorCode(dns.resolveMx(hostname));
}
resolveNaptr(hostname) {
return dns.resolveNaptr(hostname);
return translateErrorCode(dns.resolveNaptr(hostname));
}
resolveNs(hostname) {
return dns.resolveNs(hostname);
return translateErrorCode(dns.resolveNs(hostname));
}
resolvePtr(hostname) {
return dns.resolvePtr(hostname);
return translateErrorCode(dns.resolvePtr(hostname));
}
resolveSoa(hostname) {
return dns.resolveSoa(hostname);
return translateErrorCode(dns.resolveSoa(hostname));
}
resolveSrv(hostname) {
return dns.resolveSrv(hostname);
return translateErrorCode(dns.resolveSrv(hostname));
}
resolveCaa(hostname) {
return dns.resolveCaa(hostname);
return translateErrorCode(dns.resolveCaa(hostname));
}
resolveTxt(hostname) {
return dns.resolveTxt(hostname);
return translateErrorCode(dns.resolveTxt(hostname));
}
reverse(ip) {
return dns.reverse(ip);
return translateErrorCode(dns.reverse(ip));
}
setServers(servers) {}
@@ -539,7 +555,7 @@ export default {
BADRESP: "DNS_EBADRESP",
CONNREFUSED: "DNS_ECONNREFUSED",
TIMEOUT: "DNS_ETIMEOUT",
EOF: "DNS_EEOF",
EOF: "DNS_EOF",
FILE: "DNS_EFILE",
NOMEM: "DNS_ENOMEM",
DESTRUCTION: "DNS_EDESTRUCTION",

2
test/js/node/dns/node-dns.test.js
View File

@@ -336,6 +336,8 @@ describe("test invalid arguments", () => {
try {
expect(err).not.toBeNull();
expect(results).toBeUndefined();
// Assert we convert our error codes to Node.js error codes
expect(err.code).not.toStartWith("DNS_");
done();
} catch (e) {
done(e);