Skip to content

Commit b46aa7c

Browse files
committed
dns: re-export error code constants from dns/promises
1 parent 40162db commit b46aa7c

File tree

4 files changed

+61
-26
lines changed

4 files changed

+61
-26
lines changed

lib/dns.js

+2-24
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const {
4444
emitInvalidHostnameWarning,
4545
getDefaultVerbatim,
4646
setDefaultResultOrder,
47+
errorCodes,
4748
} = require('internal/dns/utils');
4849
const {
4950
ERR_INVALID_ARG_TYPE,
@@ -351,30 +352,7 @@ module.exports = {
351352
V4MAPPED: cares.AI_V4MAPPED,
352353

353354
// ERROR CODES
354-
NODATA: 'ENODATA',
355-
FORMERR: 'EFORMERR',
356-
SERVFAIL: 'ESERVFAIL',
357-
NOTFOUND: 'ENOTFOUND',
358-
NOTIMP: 'ENOTIMP',
359-
REFUSED: 'EREFUSED',
360-
BADQUERY: 'EBADQUERY',
361-
BADNAME: 'EBADNAME',
362-
BADFAMILY: 'EBADFAMILY',
363-
BADRESP: 'EBADRESP',
364-
CONNREFUSED: 'ECONNREFUSED',
365-
TIMEOUT: 'ETIMEOUT',
366-
EOF: 'EOF',
367-
FILE: 'EFILE',
368-
NOMEM: 'ENOMEM',
369-
DESTRUCTION: 'EDESTRUCTION',
370-
BADSTR: 'EBADSTR',
371-
BADFLAGS: 'EBADFLAGS',
372-
NONAME: 'ENONAME',
373-
BADHINTS: 'EBADHINTS',
374-
NOTINITIALIZED: 'ENOTINITIALIZED',
375-
LOADIPHLPAPI: 'ELOADIPHLPAPI',
376-
ADDRGETNETWORKPARAMS: 'EADDRGETNETWORKPARAMS',
377-
CANCELLED: 'ECANCELLED'
355+
...errorCodes,
378356
};
379357

380358
bindDefaultResolver(module.exports, getDefaultResolver());

lib/internal/dns/promises.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const {
1616
validateTries,
1717
emitInvalidHostnameWarning,
1818
getDefaultVerbatim,
19+
errorCodes,
1920
} = require('internal/dns/utils');
2021
const { codes, dnsException } = require('internal/errors');
2122
const { toASCII } = require('internal/idna');
@@ -313,5 +314,5 @@ Resolver.prototype.resolve = function resolve(hostname, rrtype) {
313314
};
314315

315316

316-
module.exports = { lookup, lookupService, Resolver };
317+
module.exports = { lookup, lookupService, Resolver, ...errorCodes };
317318
bindDefaultResolver(module.exports, Resolver.prototype);

lib/internal/dns/utils.js

+29
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,34 @@ function setDefaultResultOrder(value) {
201201
dnsOrder = value;
202202
}
203203

204+
// ERROR CODES
205+
const errorCodes = {
206+
NODATA: 'ENODATA',
207+
FORMERR: 'EFORMERR',
208+
SERVFAIL: 'ESERVFAIL',
209+
NOTFOUND: 'ENOTFOUND',
210+
NOTIMP: 'ENOTIMP',
211+
REFUSED: 'EREFUSED',
212+
BADQUERY: 'EBADQUERY',
213+
BADNAME: 'EBADNAME',
214+
BADFAMILY: 'EBADFAMILY',
215+
BADRESP: 'EBADRESP',
216+
CONNREFUSED: 'ECONNREFUSED',
217+
TIMEOUT: 'ETIMEOUT',
218+
EOF: 'EOF',
219+
FILE: 'EFILE',
220+
NOMEM: 'ENOMEM',
221+
DESTRUCTION: 'EDESTRUCTION',
222+
BADSTR: 'EBADSTR',
223+
BADFLAGS: 'EBADFLAGS',
224+
NONAME: 'ENONAME',
225+
BADHINTS: 'EBADHINTS',
226+
NOTINITIALIZED: 'ENOTINITIALIZED',
227+
LOADIPHLPAPI: 'ELOADIPHLPAPI',
228+
ADDRGETNETWORKPARAMS: 'EADDRGETNETWORKPARAMS',
229+
CANCELLED: 'ECANCELLED',
230+
};
231+
204232
module.exports = {
205233
bindDefaultResolver,
206234
getDefaultResolver,
@@ -212,4 +240,5 @@ module.exports = {
212240
emitInvalidHostnameWarning,
213241
getDefaultVerbatim,
214242
setDefaultResultOrder,
243+
errorCodes,
215244
};

test/parallel/test-dns-promises-exists.js

+28-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,32 @@
22

33
require('../common');
44
const assert = require('assert');
5+
const dnsPromises = require('dns/promises');
6+
const dns = require('dns');
57

6-
assert.strictEqual(require('dns/promises'), require('dns').promises);
8+
assert.strictEqual(dnsPromises, dns.promises);
9+
10+
assert.strictEqual(dnsPromises.NODATA, dns.NODATA);
11+
assert.strictEqual(dnsPromises.FORMERR, dns.FORMERR);
12+
assert.strictEqual(dnsPromises.SERVFAIL, dns.SERVFAIL);
13+
assert.strictEqual(dnsPromises.NOTFOUND, dns.NOTFOUND);
14+
assert.strictEqual(dnsPromises.NOTIMP, dns.NOTIMP);
15+
assert.strictEqual(dnsPromises.REFUSED, dns.REFUSED);
16+
assert.strictEqual(dnsPromises.BADQUERY, dns.BADQUERY);
17+
assert.strictEqual(dnsPromises.BADNAME, dns.BADNAME);
18+
assert.strictEqual(dnsPromises.BADFAMILY, dns.BADFAMILY);
19+
assert.strictEqual(dnsPromises.BADRESP, dns.BADRESP);
20+
assert.strictEqual(dnsPromises.CONNREFUSED, dns.CONNREFUSED);
21+
assert.strictEqual(dnsPromises.TIMEOUT, dns.TIMEOUT);
22+
assert.strictEqual(dnsPromises.EOF, dns.EOF);
23+
assert.strictEqual(dnsPromises.FILE, dns.FILE);
24+
assert.strictEqual(dnsPromises.NOMEM, dns.NOMEM);
25+
assert.strictEqual(dnsPromises.DESTRUCTION, dns.DESTRUCTION);
26+
assert.strictEqual(dnsPromises.BADSTR, dns.BADSTR);
27+
assert.strictEqual(dnsPromises.BADFLAGS, dns.BADFLAGS);
28+
assert.strictEqual(dnsPromises.NONAME, dns.NONAME);
29+
assert.strictEqual(dnsPromises.BADHINTS, dns.BADHINTS);
30+
assert.strictEqual(dnsPromises.NOTINITIALIZED, dns.NOTINITIALIZED);
31+
assert.strictEqual(dnsPromises.LOADIPHLPAPI, dns.LOADIPHLPAPI);
32+
assert.strictEqual(dnsPromises.ADDRGETNETWORKPARAMS, dns.ADDRGETNETWORKPARAMS);
33+
assert.strictEqual(dnsPromises.CANCELLED, dns.CANCELLED);

0 commit comments

Comments
 (0)