core-3nweb-client-lib 0.53.4 → 0.53.5

package/build/lib-client/doh.d.ts

@@ -1,3 +1,4 @@
 import { RequestFn } from "./request-utils";
 import { DnsResolver } from "./networks";
-export declare function dohAt(request: RequestFn<unknown>, dohServerUrl: string): DnsResolver;
+export declare function dohAt(request: RequestFn<unknown>, dohServerUrl: string, type: 'legacy' | 'json'): DnsResolver;
+export declare function sendLegacyDohTxtQuestion(request: RequestFn<Uint8Array>, serverUrl: string, domain: string): Promise<string[][]>;

package/build/lib-client/doh.js

@@ -17,26 +17,75 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dohAt = dohAt;
+exports.sendLegacyDohTxtQuestion = sendLegacyDohTxtQuestion;
 const networks_1 = require("./networks");
-function dohAt(request, dohServerUrl) {
-    async function resolveTxt(domain) {
-        const answer = await sendDohQuestion(request, dohServerUrl, domain, 'TXT');
+const Packet = require("native-node-dns-packet");
+const buffer_utils_1 = require("../lib-common/buffer-utils");
+function dohAt(request, dohServerUrl, type) {
+    return {
+        resolveTxt: ((type === 'legacy') ?
+            domain => sendLegacyDohTxtQuestion(request, dohServerUrl, domain) :
+            domain => sendJsonDohTxtQuestion(request, dohServerUrl, domain))
+    };
+}
+async function sendJsonDohTxtQuestion(request, serverUrl, domain) {
+    const opts = {
+        method: 'GET',
+        url: `${serverUrl}?name=${domain}&type=TXT`,
+        requestHeaders: {
+            accept: 'application/dns-json'
+        },
+        responseType: 'json'
+    };
+    const reply = await request(opts)
+        .catch((exc) => {
+        if (exc.type === 'connect') {
+            throw { code: networks_1.CONNREFUSED, hostname: domain, cause: exc };
+        }
+        else {
+            throw { code: networks_1.SERVFAIL, hostname: domain, cause: exc };
+        }
+    });
+    const { status, data } = reply;
+    if (status !== 200) {
+        throw {
+            code: networks_1.SERVFAIL, hostname: domain,
+            message: `status ${reply.status} from DoH server`
+        };
+    }
+    if (data.Status !== 0) {
+        throw { code: networks_1.NOTFOUND, hostname: domain };
+    }
+    if (data.Answer) {
         let txt = [];
-        for (const { data: line } of answer) {
+        for (const { data: line } of data.Answer) {
             txt.push([line]);
         }
         return txt;
     }
-    return { resolveTxt };
+    else {
+        throw { code: networks_1.NODATA, hostname: domain };
+    }
+}
+function packB64TxtDnsQuestionPacket(domain) {
+    const questionPack = new Packet();
+    questionPack.question.push({ name: domain, type: 16, class: 1 });
+    const buf = Buffer.alloc(500);
+    const len = Packet.write(buf, questionPack);
+    return buffer_utils_1.base64urlSafe.pack(buf.subarray(0, len));
+}
+function unpackDnsAnswerPacket(data) {
+    return Packet.parse((0, buffer_utils_1.toBuffer)(data));
 }
-async function sendDohQuestion(request, serverUrl, domain, type) {
+async function sendLegacyDohTxtQuestion(request, serverUrl, domain) {
+    const dnsPacketInB64 = packB64TxtDnsQuestionPacket(domain);
     const opts = {
         method: 'GET',
-        url: `${serverUrl}?name=${domain}&type=${type}`,
+        url: `${serverUrl}?dns=${dnsPacketInB64}`,
         requestHeaders: {
-            accept: 'application/dns-json'
+            accept: 'application/dns-message'
         },
-        responseType: 'json'
+        responseType: 'arraybuffer'
     };
     const reply = await request(opts)
         .catch((exc) => {
@@ -54,11 +103,12 @@ async function sendDohQuestion(request, serverUrl, domain, type) {
             message: `status ${reply.status} from DoH server`
         };
     }
-    if (data.Status !== 0) {
+    const answerPacket = unpackDnsAnswerPacket(data);
+    if (answerPacket.header.rcode !== 0) {
         throw { code: networks_1.NOTFOUND, hostname: domain };
     }
-    if (data.Answer) {
-        return data.Answer;
+    if (answerPacket.answer.length > 0) {
+        return answerPacket.answer.map(({ data }) => data);
     }
     else {
         throw { code: networks_1.NODATA, hostname: domain };

package/build/lib-common-on-node/request-from-node.js

@@ -20,6 +20,9 @@ exports.makeRequestFromNode = makeRequestFromNode;
 const https = require("https");
 const http = require("http");
 const request_utils_1 = require("../lib-client/request-utils");
+// XXX
+//  we need a request that uses http2, connected to some host:port, relying on downstream
+//  making NetClient requester for every host:port.
 function makeRequestFromNode(getAgent) {
     const nodeHttpsRequest = (opts) => https.request(opts);
     const nodeHttpRequest = (opts) => http.request(opts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.53.4",
+  "version": "0.53.5",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -36,6 +36,7 @@
   "license": "GPL-3.0-or-later",
   "dependencies": {
     "ecma-nacl-cryptors": "^1.0.1",
+    "native-node-dns-packet": "^0.1.5",
     "protobufjs": "^7.5.5",
     "punycode": "^2.1.1",
     "rxjs": "^7.5.7",