Remove invalid pathname auto-completion and enforce RFC8484 dns query

parameter, and fix #95

Author: lsongdev

client/doh.js

@@ -37,11 +37,16 @@ const makeRequest = (url, query) => new Promise((resolve, reject) => {
   const index = url.indexOf('://');
   if (index === -1) url = `https://${url}`;
   const u = new URL(url);
+  // The DNS query is included in a single variable named “dns” in the
+  // query component of the request URI.  The value of the “dns” variable
+  // is the content of the DNS request message, encoded with base64url
+  // [RFC4648](https://datatracker.ietf.org/doc/html/rfc8484#section-4.1).
+  const searchParams = u.searchParams;
+  searchParams.set('dns', query);
+  u.search = searchParams.toString();
   const get = protocols[u.protocol];
   if (!get) throw new Error(`Unsupported protocol: ${u.protocol}, must be specified (http://, https:// or h2://)`);
-  if (!u.pathname) url += '/dns-query?dns={query}';
-  url = url.replace('{query}', query);
-  const req = get(url, { headers: { accept: 'application/dns-message' } }, resolve);
+  const req = get(u.toString(), { headers: { accept: 'application/dns-message' } }, resolve);
   if (req) req.on('error', reject);
 });
 

example/client/doh.js

@@ -18,5 +18,5 @@ const { DOHClient } = require('../..');
 // })('cdnjs.com', 'NS').then(console.log);
 
 DOHClient({
-  dns: 'h2://ada.openbld.net/dns-query?dns={query}',
+  dns: 'https://1.0.0.1/dns-query',
 })('cdnjs.com', 'NS').then(console.log);

test/index.js

@@ -457,3 +457,23 @@ function get(url, options) {
     }
   });
 }
+
+test('client/doh', async() => {
+  const res = await DOHClient({
+    dns: 'https://1.0.0.1/dns-query',
+  })('cdnjs.com', 'NS');
+
+  // console.log(res);
+  assert.equal(res.answers.length, 2);
+  assert.equal(res.answers[0].name, 'cdnjs.com');
+  assert.equal(res.answers[0].type, Packet.TYPE.NS);
+  assert.equal(res.answers[0].class, Packet.CLASS.IN);
+  assert.equal(res.answers[0].ns, 'ben.ns.cloudflare.com');
+  assert.equal(res.answers[1].name, 'cdnjs.com');
+  assert.equal(res.answers[1].type, Packet.TYPE.NS);
+  assert.equal(res.answers[1].class, Packet.CLASS.IN);
+  assert.equal(res.answers[1].ns, 'lara.ns.cloudflare.com');
+  assert.equal(res.header.qr, 1);
+  assert.equal(res.header.ancount, 2);
+  assert.equal(res.header.rcode, 0);
+});