Uses HTTP/2 to comply with RFC 8484 - section 5.2.

src/doh.js

@@ -1,7 +1,5 @@
 import dnsPacket from 'dns-packet';
-import https from 'https';
+import http2 from 'http2';
-import http from 'http';
-import base32Encode from 'base32-encode';
 
 /**
  * A super lame DNS over HTTPS stub resolver
@@ -63,56 +61,51 @@ function makeQuery(qname, qtype = 'TXT') {
  */
 function sendDohMsg(packet, url, timeout) {
     return new Promise((resolve, reject) => {
-        const transport = url.startsWith('https://') ? https : http;
+        const client = http2.connect(url);
         const buf = dnsPacket.encode(packet);
-        let requestOptions;
-        const headers = {
-            'Accept': 'application/dns-message',
-            'User-Agent': 'domain-forward/1.x'
-        };
         const dnsQueryParam = buf.toString('base64').toString('utf-8').replace(/=/g, '');
         url = `${url}?dns=${dnsQueryParam}`;
         url = new URL(url);
-        requestOptions = {
+        const req = client.request({
-            method: 'GET',
+            ":path": url.pathname + url.search
-            hostname: url.hostname,
+        });
-            port: url.port || 443,
-            path: url.pathname + url.search,
-            headers: headers
-        };
         let data;
         let timer;
-        const request = transport.request(requestOptions, (response) => {
+        if (timeout) {
-            response.on('data', (d) => {
+            timer = setTimeout(() => {
+                req.destroy();
+                return reject(new Error(`Query timed out after ${timeout} milliseconds of inactivity`));
+            }, timeout);
+        }
+        /*req.on('response', (headers, flags) => {
+            for (const name in headers) {
+                console.log(`${name}: ${headers[name]}`);
+            }
+        });*/
+        req.on('data', chunk => {
             if (!data) {
-                    data = d;
+                data = chunk;
             } else {
-                    data = Buffer.concat([data, d]);
+                data = Buffer.concat([data, chunk]);
             }
         });
-            response.on('end', () => {
+        req.on('end', () => {
+            client.close();
             if (timer) {
                 clearTimeout(timer);
             }
             try {
                 const decoded = dnsPacket.decode(data);
                 resolve(decoded);
-                } catch (e) {
+            } catch (err) {
-                    reject(e);
+                return reject(err);
             }
         });
-        });
+        req.on('error', (err) => {
-        request.on('error', (err) => {
+            req.destroy();
-            request.destroy();
             return reject(err);
         });
-        if (timeout) {
+        req.end();
-            timer = setTimeout(() => {
-                request.destroy();
-                return reject(new Error(`Query timed out after ${timeout} milliseconds of inactivity`));
-            }, timeout);
-        }
-        request.end()
     });
 }