better-hosts 0.2.1 → 0.2.3

package/lib/cli.js

@@ -27,7 +27,7 @@ program
         transport: new TerminalTransport({})
     });
     const hosts = new Hosts({ filename, logger });
-    startServer({
+    await startServer({
         logger,
         hosts,
         fallbackServer,

package/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC9E,OAAO,EAAe,eAAe,EAAE,qCAAmC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,2BAAyB;AAS9D,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;AAEpB,OAAO;KACJ,IAAI,CAAC,IAAI,CAAC;KACV,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,cAAc,CAAC,4BAA4B,CAAC;KAC5C,MAAM,CAAC,qBAAqB,EAAE,EAAE,EAAE,IAAI,CAAC;KACvC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC;KACjC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC;KACnC,QAAQ,CAAC,YAAY,CAAC;KACtB,MAAM,CAAC,KAAK,EAAE,QAAgB,EAAE,EAAE;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAY,CAAA;IACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IAEjD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,IAAI,iBAAiB,CAAC,EAAE,CAAC;KACrC,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,WAAW,CAAC;QACV,MAAM;QACN,KAAK;QACL,cAAc;QACd,OAAO;QACP,IAAI;KACL,CAAC,CAAA;AACJ,CAAC,CAAC;KACD,KAAK,EAAE,CAAA;AAEV,SAAS,OAAO,CAAC,OAAiB;IAChC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,oCAAoC,CAAC,CAAA;IAExE,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED,SAAS,UAAU,CAAC,OAAiB;IACnC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,uCAAuC,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAA;AACjD,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAiB;IAC1C,OAAO,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;AAChD,CAAC;AAED,SAAS,WAAW,CAAC,OAAiB;IACpC,OAAO,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC9E,OAAO,EAAe,eAAe,EAAE,qCAAmC;AAC1E,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,2BAAyB;AAS9D,OAAO,CAAC,KAAK,GAAG,IAAI,CAAA;AAEpB,OAAO;KACJ,IAAI,CAAC,IAAI,CAAC;KACV,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,cAAc,CAAC,4BAA4B,CAAC;KAC5C,MAAM,CAAC,qBAAqB,EAAE,EAAE,EAAE,IAAI,CAAC;KACvC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,IAAI,CAAC;KACjC,MAAM,CAAC,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC;KACnC,QAAQ,CAAC,YAAY,CAAC;KACtB,MAAM,CAAC,KAAK,EAAE,QAAgB,EAAE,EAAE;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAY,CAAA;IACxC,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7B,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAA;IAEjD,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,IAAI,iBAAiB,CAAC,EAAE,CAAC;KACrC,CAAC,CAAA;IACF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,MAAM,WAAW,CAAC;QAChB,MAAM;QACN,KAAK;QACL,cAAc;QACd,OAAO;QACP,IAAI;KACL,CAAC,CAAA;AACJ,CAAC,CAAC;KACD,KAAK,EAAE,CAAA;AAEV,SAAS,OAAO,CAAC,OAAiB;IAChC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,oCAAoC,CAAC,CAAA;IAExE,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AAC1C,CAAC;AAED,SAAS,UAAU,CAAC,OAAiB;IACnC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,uCAAuC,CAAC,CAAA;IAE9E,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAA;AACjD,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAiB;IAC1C,OAAO,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;AAChD,CAAC;AAED,SAAS,WAAW,CAAC,OAAiB;IACpC,OAAO,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC"}

package/lib/hosts.js

@@ -92,7 +92,7 @@ export function parseHosts(lines) {
         if (/^\s*#/.test(line))
             return null;
         {
-            const result = line.match(/^\s*(?<address>\S+)\s+(?<hostname>[\S^-]\S*)\s*(?:#.*)?$/);
+            const result = line.match(/^\s*(?<address>\S+)\s+(?<hostname>\S+)\s*(?:#.*)?$/);
             if (result) {
                 const { address, hostname } = result.groups;
                 const pattern = new HostnamePattern(hostname);

package/lib/hosts.js.map

@@ -1 +1 @@
-{"version":3,"file":"hosts.js","sourceRoot":"","sources":["../src/hosts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosts.js","sourceRoot":"","sources":["../src/hosts.ts"],"names":[],"mappings":"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"}

package/lib/server.js

@@ -1,98 +1,91 @@
-import * as dns from 'native-node-dns';
-import { getErrorResultAsync } from 'return-style';
 import chalk from 'chalk';
-import { go } from '@blackglory/prelude';
-import { RecordType } from './record-types.js';
-export function startServer({ logger, timeout, port, hosts, fallbackServer }) {
-    const server = dns.createServer();
-    server.on('error', console.error);
-    server.on('socketError', console.error);
-    server.on('request', async (req, res) => {
-        logger.trace(`request: ${JSON.stringify(req)}`);
-        res.header.rcode = dns.consts.NAME_TO_RCODE.SERVFAIL;
-        const question = req.question[0];
-        logger.trace(`${formatHostname(question.name)} ${formatRecordType(question.type)}`);
-        const result = go(() => {
-            switch (question.type) {
-                case dns.consts.NAME_TO_QTYPE.A: return hosts.resolveA(question.name);
-                case dns.consts.NAME_TO_QTYPE.AAAA: return hosts.resolveAAAA(question.name);
-            }
-        });
-        if (result === null || result === void 0 ? void 0 : result.hasRecords) {
-            if (result.address) {
-                logger.info(`${formatHostname(question.name)} ${result.address}`);
-                res.header.rcode = dns.consts.NAME_TO_RCODE.NOERROR;
-                res.answer.push({
-                    name: question.name,
-                    type: question.type,
-                    class: question.class,
-                    ttl: 0,
-                    address: result.address
-                });
-            }
-            else {
-                logger.info(`${formatHostname(question.name)} No records for ${formatRecordType(question.type)}`);
-                res.header.rcode = dns.consts.NAME_TO_RCODE.NOERROR;
-            }
-        }
-        else {
-            const startTime = Date.now();
-            const [err, response] = await getErrorResultAsync(() => resolve(fallbackServer, question, timeout));
-            if (err) {
-                logger.error(`${formatHostname(question.name)} ${err}`, getElapsed(startTime));
-            }
-            else {
-                logger.info(`${formatHostname(question.name)} ${formatRecordType(question.type)}`, getElapsed(startTime));
-                res.header.rcode = response.header.rcode;
-                res.answer = response.answer;
-                res.authority = response.authority;
-            }
-        }
-        logger.trace(`response: ${JSON.stringify(res)}`);
-        res.send();
-    });
-    return server.serve(port);
-}
-function resolve(server, question, timeout) {
-    return new Promise((resolve, reject) => {
-        let response;
-        const request = dns.Request({
-            question,
-            server: {
-                address: server.host,
-                port: server.port,
-                type: 'udp'
+import { assert, go } from '@blackglory/prelude';
+import { DNSClient, DNSServer, QR, RCODE, TYPE } from 'extra-dns';
+import { timeoutSignal } from 'extra-abort';
+import { createRDATAForA, createRDATAForAAAA } from "./utils/dns.js";
+export async function startServer({ logger, timeout, port, hosts, fallbackServer }) {
+    var _a;
+    const server = new DNSServer('0.0.0.0', port);
+    const client = new DNSClient(fallbackServer.host, (_a = fallbackServer.port) !== null && _a !== void 0 ? _a : 53);
+    server.on('query', async (query, respond) => {
+        logger.trace(`request: ${JSON.stringify(query)}`);
+        let response = {
+            header: {
+                ID: query.header.ID,
+                flags: {
+                    QR: QR.Response,
+                    OPCODE: query.header.flags.OPCODE,
+                    AA: 0,
+                    TC: 0,
+                    RD: 0,
+                    RA: 0,
+                    Z: 0,
+                    RCODE: RCODE.ServFail
+                }
             },
-            timeout,
-            cache: false,
-            try_edns: true
-        });
-        request.on('timeout', () => reject(new Error('timeout')));
-        request.on('cancelled', () => reject(new Error('cancelled')));
-        request.on('end', () => {
-            if (response) {
-                resolve(response);
+            questions: query.questions,
+            answers: [],
+            authorityRecords: [],
+            additionalRecords: []
+        };
+        const question = query.questions[0];
+        if (question) {
+            logger.trace(`${formatHostname(question.QNAME)} ${formatRecordType(question.QTYPE)}`);
+            const resolveResult = go(() => {
+                switch (question.QTYPE) {
+                    case TYPE.A: return hosts.resolveA(question.QNAME);
+                    case TYPE.AAAA: return hosts.resolveAAAA(question.QNAME);
+                }
+            });
+            if (resolveResult === null || resolveResult === void 0 ? void 0 : resolveResult.hasRecords) {
+                response.header.flags.RCODE = RCODE.NoError;
+                if (resolveResult.address) {
+                    logger.info(`${formatHostname(question.QNAME)} ${resolveResult.address}`);
+                    const address = resolveResult.address;
+                    assert(address);
+                    const answer = {
+                        NAME: question.QNAME,
+                        TYPE: question.QTYPE,
+                        CLASS: question.QCLASS,
+                        TTL: 0,
+                        RDATA: go(() => {
+                            switch (question.QTYPE) {
+                                case TYPE.A: return createRDATAForA(address);
+                                case TYPE.AAAA: return createRDATAForAAAA(address);
+                                default: throw new Error('Impossible route');
+                            }
+                        })
+                    };
+                    response.answers.push(answer);
+                }
+                else {
+                    logger.info(`${formatHostname(question.QNAME)} No records for ${formatRecordType(question.QTYPE)}`);
+                }
             }
             else {
-                reject(new Error('No response'));
+                const startTime = Date.now();
+                try {
+                    response = await client.resolve(query, timeoutSignal(timeout));
+                    logger.info(`${formatHostname(question.QNAME)} ${formatRecordType(question.QTYPE)}`, getElapsed(startTime));
+                }
+                catch (e) {
+                    logger.error(`${formatHostname(question.QNAME)} ${e}`, getElapsed(startTime));
+                }
             }
-        });
-        request.on('message', (err, msg) => {
-            if (err)
-                return reject(err);
-            response = msg;
-        });
-        request.send();
+        }
+        logger.trace(`response: ${JSON.stringify(response)}`);
+        await respond(response);
     });
+    return await server.listen();
 }
 function formatHostname(hostname) {
     return chalk.cyan(hostname);
 }
-function getElapsed(startTime) {
-    return Date.now() - startTime;
-}
 function formatRecordType(recordType) {
     var _a;
-    return (_a = RecordType[recordType]) !== null && _a !== void 0 ? _a : `Unknown(${recordType})`;
+    return (_a = TYPE[recordType]) !== null && _a !== void 0 ? _a : `Unknown(${recordType})`;
+}
+function getElapsed(startTime) {
+    return Date.now() - startTime;
 }
 //# sourceMappingURL=server.js.map

package/lib/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,iBAAiB,CAAA;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAGlD,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAU9C,MAAM,UAAU,WAAW,CAAC,EAC1B,MAAM,EACN,OAAO,EACP,IAAI,EACJ,KAAK,EACL,cAAc,EACM;IACpB,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;IAEjC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACjC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IACvC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACtC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAE/C,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAA;QAGpD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAChC,MAAM,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACnF,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,EAAE;YACrB,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACtB,KAAK,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBACrE,KAAK,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC7E,CAAC;QACH,CAAC,CAAC,CAAA;QACF,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE,CAAC;YACvB,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;gBAEjE,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAA;gBACnD,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;oBACd,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,IAAI,EAAE,QAAQ,CAAC,IAAI;oBACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,GAAG,EAAE,CAAC;oBACN,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC,CAAA;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBAEjG,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAA;YACrD,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YAC5B,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,MAAM,mBAAmB,CAAC,GAAG,EAAE,CAAC,OAAO,CAC7D,cAAc,EACd,QAAQ,EACR,OAAO,CACR,CAAC,CAAA;YACF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;YAChF,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;gBAEzG,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAA;gBACxC,GAAG,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;gBAC5B,GAAG,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAA;YACpC,CAAC;QACH,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChD,GAAG,CAAC,IAAI,EAAE,CAAA;IACZ,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AAC3B,CAAC;AAED,SAAS,OAAO,CACd,MAAmB,EACnB,QAAuB,EACvB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,QAAqB,CAAA;QACzB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YAC1B,QAAQ;YACR,MAAM,EAAE;gBACN,OAAO,EAAE,MAAM,CAAC,IAAI;gBACpB,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,IAAI,EAAE,KAAK;aACZ;YACD,OAAO;YACP,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QAEF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACzD,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QAC7D,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;YACrB,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC,CAAA;YAClC,CAAC;QACH,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,QAAQ,GAAG,GAAG,CAAA;QAChB,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,IAAI,EAAE,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB;IACtC,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;AAC7B,CAAC;AAED,SAAS,UAAU,CAAC,SAAiB;IACnC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAA;AAC/B,CAAC;AAED,SAAS,gBAAgB,CAAC,UAAkB;;IAC1C,OAAO,MAAA,UAAU,CAAC,UAAU,CAAC,mCAAI,WAAW,UAAU,GAAG,CAAA;AAC3D,CAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}

package/lib/utils/dns.js

@@ -0,0 +1,16 @@
+import { Address6 } from 'ip-address';
+import { uint16ArrayBigEndian } from "./typed-array.js";
+export function createRDATAForA(ipv4Address) {
+    const data = new Uint8Array(ipv4Address
+        .split('.')
+        .map(x => Number.parseInt(x, 10)));
+    return data.buffer;
+}
+export function createRDATAForAAAA(ipv6Address) {
+    const canonicalAddress = new Address6(ipv6Address).canonicalForm();
+    const data = uint16ArrayBigEndian(canonicalAddress
+        .split(':')
+        .map(x => Number.parseInt(x, 16)));
+    return data.buffer;
+}
+//# sourceMappingURL=dns.js.map

package/lib/utils/dns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dns.js","sourceRoot":"","sources":["../../src/utils/dns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AACrC,OAAO,EAAE,oBAAoB,EAAE,yBAA6B;AAE5D,MAAM,UAAU,eAAe,CAAC,WAAmB;IACjD,MAAM,IAAI,GAAG,IAAI,UAAU,CACzB,WAAW;SACR,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACpC,CAAA;IAED,OAAO,IAAI,CAAC,MAAM,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAmB;IACpD,MAAM,gBAAgB,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAC,aAAa,EAAE,CAAA;IAElE,MAAM,IAAI,GAAG,oBAAoB,CAC/B,gBAAgB;SACb,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACpC,CAAA;IAED,OAAO,IAAI,CAAC,MAAM,CAAA;AACpB,CAAC"}

package/lib/utils/typed-array.js

@@ -0,0 +1,9 @@
+export function uint16ArrayBigEndian(array) {
+    const data = new Uint16Array(array.length);
+    const view = new DataView(data.buffer);
+    for (let i = 0, byteOffset = 0; i < array.length; i++, byteOffset += Uint16Array.BYTES_PER_ELEMENT) {
+        view.setUint16(byteOffset, array[i], false);
+    }
+    return data;
+}
+//# sourceMappingURL=typed-array.js.map

package/lib/utils/typed-array.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typed-array.js","sourceRoot":"","sources":["../../src/utils/typed-array.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,oBAAoB,CAClC,KAAwB;IAExB,MAAM,IAAI,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAE1C,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACtC,KACE,IAAI,CAAC,GAAG,CAAC,EAAE,UAAU,GAAG,CAAC,EACzB,CAAC,GAAG,KAAK,CAAC,MAAM,EAChB,CAAC,EAAE,EAAE,UAAU,IAAI,WAAW,CAAC,iBAAiB,EAChD,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;IAC7C,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-hosts",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "",
   "keywords": [
     "dns"
@@ -19,8 +19,7 @@
   "scripts": {
     "prepare": "ts-patch install -s",
     "deduplicate": "yarn-deduplicate",
-    "prepublishOnly": "run-s postinstall prepare clean build",
-    "postinstall": "patch-package",
+    "prepublishOnly": "run-s prepare clean build",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src",
     "test": "vitest --run",
     "clean": "rimraf lib dist",
@@ -30,7 +29,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "run-s postinstall prepare clean lint build test smoke",
+      "pre-commit": "run-s prepare clean lint build test smoke",
       "commit-msg": "commitlint --env HUSKY_GIT_PARAMS"
     }
   },
@@ -43,6 +42,7 @@
     "eslint": "^8.56.0",
     "husky": "4",
     "npm-run-all": "^4.1.5",
+    "return-style": "^3.0.1",
     "rimraf": "^5.0.5",
     "standard-version": "^9.5.0",
     "ts-patch": "^3.1.1",
@@ -57,15 +57,14 @@
     "@blackglory/prelude": "^0.3.4",
     "chalk": "^5.3.0",
     "commander": "^11.1.0",
+    "extra-abort": "^0.4.0",
+    "extra-dns": "^0.1.2",
     "extra-filesystem": "^0.5.1",
     "extra-logger": "^0.7.2",
     "extra-promise": "^6.0.8",
     "extra-utils": "^5.6.0",
     "extra-watcher": "^0.2.2",
-    "iterable-operator": "^4.0.6",
-    "native-node-dns": "0.7.6",
-    "native-node-dns-packet": "0.1.5",
-    "patch-package": "^8.0.0",
-    "return-style": "^3.0.1"
+    "ip-address": "^10.0.1",
+    "iterable-operator": "^4.0.6"
   }
 }

package/lib/record-types.js

@@ -1,77 +0,0 @@
-export var RecordType;
-(function (RecordType) {
-    RecordType[RecordType["A"] = 1] = "A";
-    RecordType[RecordType["NS"] = 2] = "NS";
-    RecordType[RecordType["MD"] = 3] = "MD";
-    RecordType[RecordType["MF"] = 4] = "MF";
-    RecordType[RecordType["CNAME"] = 5] = "CNAME";
-    RecordType[RecordType["SOA"] = 6] = "SOA";
-    RecordType[RecordType["MB"] = 7] = "MB";
-    RecordType[RecordType["MG"] = 8] = "MG";
-    RecordType[RecordType["MR"] = 9] = "MR";
-    RecordType[RecordType["NULL"] = 10] = "NULL";
-    RecordType[RecordType["WKS"] = 11] = "WKS";
-    RecordType[RecordType["PTR"] = 12] = "PTR";
-    RecordType[RecordType["HINFO"] = 13] = "HINFO";
-    RecordType[RecordType["MINFO"] = 14] = "MINFO";
-    RecordType[RecordType["MX"] = 15] = "MX";
-    RecordType[RecordType["TXT"] = 16] = "TXT";
-    RecordType[RecordType["RP"] = 17] = "RP";
-    RecordType[RecordType["AFSDB"] = 18] = "AFSDB";
-    RecordType[RecordType["X25"] = 19] = "X25";
-    RecordType[RecordType["ISDN"] = 20] = "ISDN";
-    RecordType[RecordType["RT"] = 21] = "RT";
-    RecordType[RecordType["NSAP"] = 22] = "NSAP";
-    RecordType[RecordType["NSAP-PTR"] = 23] = "NSAP-PTR";
-    RecordType[RecordType["SIG"] = 24] = "SIG";
-    RecordType[RecordType["KEY"] = 25] = "KEY";
-    RecordType[RecordType["PX"] = 26] = "PX";
-    RecordType[RecordType["GPOS"] = 27] = "GPOS";
-    RecordType[RecordType["AAAA"] = 28] = "AAAA";
-    RecordType[RecordType["LOC"] = 29] = "LOC";
-    RecordType[RecordType["NXT"] = 30] = "NXT";
-    RecordType[RecordType["EID"] = 31] = "EID";
-    RecordType[RecordType["NIMLOC"] = 32] = "NIMLOC";
-    RecordType[RecordType["SRV"] = 33] = "SRV";
-    RecordType[RecordType["ATMA"] = 34] = "ATMA";
-    RecordType[RecordType["NAPTR"] = 35] = "NAPTR";
-    RecordType[RecordType["KX"] = 36] = "KX";
-    RecordType[RecordType["CERT"] = 37] = "CERT";
-    RecordType[RecordType["A6"] = 38] = "A6";
-    RecordType[RecordType["DNAME"] = 39] = "DNAME";
-    RecordType[RecordType["SINK"] = 40] = "SINK";
-    RecordType[RecordType["OPT"] = 41] = "OPT";
-    RecordType[RecordType["APL"] = 42] = "APL";
-    RecordType[RecordType["DS"] = 43] = "DS";
-    RecordType[RecordType["SSHFP"] = 44] = "SSHFP";
-    RecordType[RecordType["IPSECKEY"] = 45] = "IPSECKEY";
-    RecordType[RecordType["RRSIG"] = 46] = "RRSIG";
-    RecordType[RecordType["NSEC"] = 47] = "NSEC";
-    RecordType[RecordType["DNSKEY"] = 48] = "DNSKEY";
-    RecordType[RecordType["DHCID"] = 49] = "DHCID";
-    RecordType[RecordType["NSEC3"] = 50] = "NSEC3";
-    RecordType[RecordType["NSEC3PARAM"] = 51] = "NSEC3PARAM";
-    RecordType[RecordType["TLSA"] = 52] = "TLSA";
-    RecordType[RecordType["HIP"] = 55] = "HIP";
-    RecordType[RecordType["NINFO"] = 56] = "NINFO";
-    RecordType[RecordType["RKEY"] = 57] = "RKEY";
-    RecordType[RecordType["TALINK"] = 58] = "TALINK";
-    RecordType[RecordType["CDS"] = 59] = "CDS";
-    RecordType[RecordType["SPF"] = 99] = "SPF";
-    RecordType[RecordType["UINFO"] = 100] = "UINFO";
-    RecordType[RecordType["UID"] = 101] = "UID";
-    RecordType[RecordType["GID"] = 102] = "GID";
-    RecordType[RecordType["UNSPEC"] = 103] = "UNSPEC";
-    RecordType[RecordType["TKEY"] = 249] = "TKEY";
-    RecordType[RecordType["TSIG"] = 250] = "TSIG";
-    RecordType[RecordType["IXFR"] = 251] = "IXFR";
-    RecordType[RecordType["AXFR"] = 252] = "AXFR";
-    RecordType[RecordType["MAILB"] = 253] = "MAILB";
-    RecordType[RecordType["MAILA"] = 254] = "MAILA";
-    RecordType[RecordType["ANY"] = 255] = "ANY";
-    RecordType[RecordType["URI"] = 256] = "URI";
-    RecordType[RecordType["CAA"] = 257] = "CAA";
-    RecordType[RecordType["TA"] = 32768] = "TA";
-    RecordType[RecordType["DLV"] = 32769] = "DLV";
-})(RecordType || (RecordType = {}));
-//# sourceMappingURL=record-types.js.map

package/lib/record-types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"record-types.js","sourceRoot":"","sources":["../src/record-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,UA0EX;AA1ED,WAAY,UAAU;IACpB,qCAAK,CAAA;IACL,uCAAM,CAAA;IACN,uCAAM,CAAA;IACN,uCAAM,CAAA;IACN,6CAAS,CAAA;IACT,yCAAO,CAAA;IACP,uCAAM,CAAA;IACN,uCAAM,CAAA;IACN,uCAAM,CAAA;IACN,4CAAS,CAAA;IACT,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,8CAAU,CAAA;IACV,8CAAU,CAAA;IACV,wCAAO,CAAA;IACP,0CAAQ,CAAA;IACR,wCAAO,CAAA;IACP,8CAAU,CAAA;IACV,0CAAQ,CAAA;IACR,4CAAS,CAAA;IACT,wCAAO,CAAA;IACP,4CAAS,CAAA;IACT,oDAAe,CAAA;IACf,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,wCAAO,CAAA;IACP,4CAAS,CAAA;IACT,4CAAS,CAAA;IACT,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,gDAAW,CAAA;IACX,0CAAQ,CAAA;IACR,4CAAS,CAAA;IACT,8CAAU,CAAA;IACV,wCAAO,CAAA;IACP,4CAAS,CAAA;IACT,wCAAO,CAAA;IACP,8CAAU,CAAA;IACV,4CAAS,CAAA;IACT,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,wCAAO,CAAA;IACP,8CAAU,CAAA;IACV,oDAAa,CAAA;IACb,8CAAU,CAAA;IACV,4CAAS,CAAA;IACT,gDAAW,CAAA;IACX,8CAAU,CAAA;IACV,8CAAU,CAAA;IACV,wDAAe,CAAA;IACf,4CAAS,CAAA;IACT,0CAAQ,CAAA;IACR,8CAAU,CAAA;IACV,4CAAS,CAAA;IACT,gDAAW,CAAA;IACX,0CAAQ,CAAA;IACR,0CAAQ,CAAA;IACR,+CAAW,CAAA;IACX,2CAAS,CAAA;IACT,2CAAS,CAAA;IACT,iDAAY,CAAA;IACZ,6CAAU,CAAA;IACV,6CAAU,CAAA;IACV,6CAAU,CAAA;IACV,6CAAU,CAAA;IACV,+CAAW,CAAA;IACX,+CAAW,CAAA;IACX,2CAAS,CAAA;IACT,2CAAS,CAAA;IACT,2CAAS,CAAA;IACT,2CAAU,CAAA;IACV,6CAAW,CAAA;AACb,CAAC,EA1EW,UAAU,KAAV,UAAU,QA0ErB"}