dns2 2.0.0 → 2.0.3

package/client/doh.js

@@ -1,42 +1,50 @@
-const https = require('https');
-const Packet = require('../packet');
-
-const get = url => new Promise(resolve => {
-  const headers = {
-    accept: 'application/dns-message'
-  };
-  https.get(url, { headers }, resolve);
-});
-
-const readStream = stream => {
-  const buffer = [];
-  return new Promise((resolve, reject) => {
-    stream
-      .on('error', reject)
-      .on('data', chunk => buffer.push(chunk)) 
-      .on('end', () => resolve(Buffer.concat(buffer)));
-  })
-};
-
-/**
- * @docs https://tools.ietf.org/html/rfc8484
- * @param {*} param0 
- */
-const DOHClient = ({ dns } = {}) => {
-  return (name, type = 'A', cls = Packet.CLASS.IN) => {
-    const packet = new Packet();
-    packet.questions.push({
-      name,
-      class: cls,
-      type: Packet.TYPE[type],
-    });
-    const query = packet.toBase64URL();
-    return Promise
-      .resolve()
-      .then(() => get(`https://${dns}/dns-query?dns=${query}`))
-      .then(readStream)
-      .then(Packet.parse)
-  };
-};
-
-module.exports = DOHClient;
+const Packet = require('../packet');
+
+const defaultGet = url => new Promise((resolve, reject) => {
+  const headers = {
+    accept: 'application/dns-message',
+  };
+  const base = url.startsWith('https') ? require('https') : require('http');
+  const req = base.get(url, { headers }, resolve);
+  req.on('error', reject);
+});
+
+const readStream = stream => {
+  const buffer = [];
+  return new Promise((resolve, reject) => {
+    stream
+      .on('error', reject)
+      .on('data', chunk => buffer.push(chunk))
+      .on('end', () => resolve(Buffer.concat(buffer)));
+  });
+};
+
+/**
+ * @docs https://tools.ietf.org/html/rfc8484
+ * @param {*} param0
+ */
+const DOHClient = ({ dns, http, get = defaultGet } = {}) => {
+  return (name, type = 'A', cls = Packet.CLASS.IN, { clientIp, recursive = true } = {}) => {
+    const packet = new Packet();
+    // see https://github.com/song940/node-dns/issues/29
+    if (recursive) {
+      packet.header.rd = 1;
+    }
+    if (clientIp) {
+      packet.additionals.push(Packet.Resource.EDNS([
+        Packet.Resource.EDNS.ECS(clientIp),
+      ]));
+    }
+    packet.questions.push({
+      name,
+      class : cls,
+      type  : Packet.TYPE[type],
+    });
+    const query = packet.toBase64URL();
+    return Promise.resolve(get(`http${http ? '' : 's'}://${dns}/dns-query?dns=${query}`))
+      .then(readStream)
+      .then(Packet.parse);
+  };
+};
+
+module.exports = DOHClient;

package/client/google.js

@@ -1,27 +1,27 @@
-const https = require('https');
-
-const get = url => new Promise(resolve =>
-  https.get(url, resolve));
-
-const readStream = stream => {
-  const buffer = [];
-  return new Promise((resolve, reject) => {
-    stream
-      .on('error', reject)
-      .on('data', chunk => {
-        buffer.push(chunk)
-      })
-      .on('end', () => resolve(Buffer.concat(buffer)));
-  });
-};
-
-const GoogleClient = ({ }) =>
-  (name, type = 'ANY') => {
-    return Promise
-      .resolve()
-      .then(() => get(`https://dns.google.com/resolve?name=${name}&type=${type}`))
-      .then(readStream)
-      .then(JSON.parse)
-  };
-
-module.exports = GoogleClient;
+const https = require('https');
+
+const get = url => new Promise(resolve =>
+  https.get(url, resolve));
+
+const readStream = stream => {
+  const buffer = [];
+  return new Promise((resolve, reject) => {
+    stream
+      .on('error', reject)
+      .on('data', chunk => {
+        buffer.push(chunk);
+      })
+      .on('end', () => resolve(Buffer.concat(buffer)));
+  });
+};
+
+const GoogleClient = () =>
+  (name, type = 'ANY') => {
+    return Promise
+      .resolve()
+      .then(() => get(`https://dns.google.com/resolve?name=${name}&type=${type}`))
+      .then(readStream)
+      .then(JSON.parse);
+  };
+
+module.exports = GoogleClient;

package/client/tcp.js

@@ -1,34 +1,34 @@
-const tcp = require('net');
-const Packet = require('../packet');
-
-module.exports = ({ dns = '1.1.1.1', port = 53 } = {}) => {
-  return async (name, type = 'A', cls = Packet.CLASS.IN, { clientIp, recursive = true } = {}) => {
-    const packet = new Packet();
-
-    // see https://github.com/song940/node-dns/issues/29
-    if (recursive) {
-      query.header.rd = 1;
-    }
-    if (clientIp) {
-      query.additionals.push(Packet.Resource.EDNS([
-        Packet.Resource.EDNS.ECS(clientIp)
-      ]));
-    };
-
-    packet.questions.push({
-      name,
-      class: cls,
-      type: Packet.TYPE[type],
-    });
-    const message = packet.toBuffer();
-    const len = Buffer.alloc(2);
-    len.writeUInt16BE(message.length);
-    const client = tcp.connect({ host: dns, port });
-    client.end(Buffer.concat([len, message]));
-    const data = await Packet.readStream(client);
-    if (!data.length) {
-      throw new Error('Empty TCP response');
-    }
-    return Packet.parse(data);
-  }
-};
+const tcp = require('net');
+const Packet = require('../packet');
+
+module.exports = ({ dns = '1.1.1.1', port = 53 } = {}) => {
+  return async(name, type = 'A', cls = Packet.CLASS.IN, { clientIp, recursive = true } = {}) => {
+    const packet = new Packet();
+
+    // see https://github.com/song940/node-dns/issues/29
+    if (recursive) {
+      packet.header.rd = 1;
+    }
+    if (clientIp) {
+      packet.additionals.push(Packet.Resource.EDNS([
+        Packet.Resource.EDNS.ECS(clientIp),
+      ]));
+    }
+
+    packet.questions.push({
+      name,
+      class : cls,
+      type  : Packet.TYPE[type],
+    });
+    const message = packet.toBuffer();
+    const len = Buffer.alloc(2);
+    len.writeUInt16BE(message.length);
+    const client = tcp.connect({ host: dns, port });
+    client.end(Buffer.concat([ len, message ]));
+    const data = await Packet.readStream(client);
+    if (!data.length) {
+      throw new Error('Empty TCP response');
+    }
+    return Packet.parse(data);
+  };
+};

package/client/udp.js

@@ -1,39 +1,39 @@
-const udp = require('dgram');
-const Packet = require('../packet');
-const { equal } = require('assert');
-const { debuglog } = require('util');
-
-const debug = debuglog('dns2');
-
-module.exports = ({ dns = '8.8.8.8', port = 53, socketType = 'udp4' } = {}) => {
-  return (name, type = 'A', cls = Packet.CLASS.IN, { clientIp, recursive = true } = {}) => {
-    const query = new Packet();
-    query.header.id = (Math.random() * 1e4) | 0;
-
-    // see https://github.com/song940/node-dns/issues/29
-    if (recursive) {
-      query.header.rd = 1;
-    }
-    if (clientIp) {
-      query.additionals.push(Packet.Resource.EDNS([
-        Packet.Resource.EDNS.ECS(clientIp)
-      ]));
-    };
-    query.questions.push({
-      name,
-      class: cls,
-      type: Packet.TYPE[type],
-    });
-    const client = new udp.Socket(socketType);
-    return new Promise((resolve, reject) => {
-      client.once('message', function onMessage(message) {
-        client.close();
-        const response = Packet.parse(message);
-        equal(response.header.id, query.header.id);
-        resolve(response);
-      });
-      debug('send', dns, query.toBuffer());
-      client.send(query.toBuffer(), port, dns, err => err && reject(err));
-    });
-  }
-};
+const udp = require('dgram');
+const Packet = require('../packet');
+const { equal } = require('assert');
+const { debuglog } = require('util');
+
+const debug = debuglog('dns2');
+
+module.exports = ({ dns = '8.8.8.8', port = 53, socketType = 'udp4' } = {}) => {
+  return (name, type = 'A', cls = Packet.CLASS.IN, { clientIp, recursive = true } = {}) => {
+    const query = new Packet();
+    query.header.id = (Math.random() * 1e4) | 0;
+
+    // see https://github.com/song940/node-dns/issues/29
+    if (recursive) {
+      query.header.rd = 1;
+    }
+    if (clientIp) {
+      query.additionals.push(Packet.Resource.EDNS([
+        Packet.Resource.EDNS.ECS(clientIp),
+      ]));
+    }
+    query.questions.push({
+      name,
+      class : cls,
+      type  : Packet.TYPE[type],
+    });
+    const client = new udp.Socket(socketType);
+    return new Promise((resolve, reject) => {
+      client.once('message', function onMessage(message) {
+        client.close();
+        const response = Packet.parse(message);
+        equal(response.header.id, query.header.id);
+        resolve(response);
+      });
+      debug('send', dns, query.toBuffer());
+      client.send(query.toBuffer(), port, dns, err => err && reject(err));
+    });
+  };
+};

package/example/client/doh.js

@@ -1,12 +1,12 @@
-const { DOHClient } = require('../..');
-
-const resolve = DOHClient({
-  dns: '1.1.1.1'
-});
-
-(async () => {
-
-  const response = await resolve('google.com');
-  console.log(response.answers);
-
-})();
+const { DOHClient } = require('../..');
+
+process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+
+const resolve = DOHClient({
+  dns: '1.1.1.1',
+});
+
+(async() => {
+  const response = await resolve('google.com');
+  console.log(response.answers);
+})();

package/example/client/google.js

@@ -1,8 +1,7 @@
-const { GoogleClient } = require('../..');
-
-(async () => {
-  const resolve = GoogleClient();
-  const response = await resolve('google.com');
-  console.log(response);
-
-})();
+const { GoogleClient } = require('../..');
+
+(async() => {
+  const resolve = GoogleClient();
+  const response = await resolve('google.com');
+  console.log(response);
+})();

package/example/client/tcp-custom-dns.js

@@ -1,10 +1,10 @@
-const { TCPClient } = require('../..');
-
-const resolve = TCPClient({
-  dns: '1.1.1.1'
-});
-
-(async () => {
-  const response = await resolve('google.com')
-  console.log(response.answers);
-})();
+const { TCPClient } = require('../..');
+
+const resolve = TCPClient({
+  dns: '1.1.1.1',
+});
+
+(async() => {
+  const response = await resolve('google.com');
+  console.log(response.answers);
+})();

package/example/client/tcp.js

@@ -1,12 +1,12 @@
-const { TCPClient } = require('../..');
-
-const resolve = TCPClient();
-
-(async () => {
-  try {
-    const response = await resolve('google.com')
-    console.log(response.answers);
-  } catch(error) {
-    console.log(error);
-  }
-})();
+const { TCPClient } = require('../..');
+
+const resolve = TCPClient();
+
+(async() => {
+  try {
+    const response = await resolve('google.com');
+    console.log(response.answers);
+  } catch (error) {
+    console.log(error);
+  }
+})();

package/example/client/udp-custom-dns.js

@@ -1,11 +1,11 @@
-const dns = require('dns');
-const { UDPClient } = require('../..');
-
-const resolve = UDPClient({
-  dns: dns.getServers()[0]
-});
-
-(async () => {
-  const response = await resolve('google.com')
-  console.log(response.answers);
-})();
+const dns = require('dns');
+const { UDPClient } = require('../..');
+
+const resolve = UDPClient({
+  dns: dns.getServers()[0],
+});
+
+(async() => {
+  const response = await resolve('google.com');
+  console.log(response.answers);
+})();

package/example/client/udp-default.js

@@ -1,8 +1,8 @@
-const DNS = require('../..');
-
-const dns = new DNS();
-
-(async () => {
-  const result = await dns.resolveA('google.com');
-  console.log(result.answers);
-})();
+const DNS = require('../..');
+
+const dns = new DNS();
+
+(async() => {
+  const result = await dns.resolveA('google.com');
+  console.log(result.answers);
+})();

package/example/client/udp-subnet.js

@@ -1,11 +1,11 @@
-const DNS = require('../..');
-
-// Lookup directly from ns1.google.com
-const dns = new DNS({nameServers: ['216.239.32.10']});
-
-(async () => {
-  // What is the IP address for google.com if a client in the subnet
-  // '178.67.222.0/24' asks for it?
-  const result = await dns.resolveA('google.com', '178.67.222.0/24');
-  console.log(result.answers);
-})();
+const DNS = require('../..');
+
+// Lookup directly from ns1.google.com
+const dns = new DNS({ nameServers: [ '216.239.32.10' ] });
+
+(async() => {
+  // What is the IP address for google.com if a client in the subnet
+  // '178.67.222.0/24' asks for it?
+  const result = await dns.resolveA('google.com', '178.67.222.0/24');
+  console.log(result.answers);
+})();

package/example/client/udp.js

@@ -1,8 +1,8 @@
-const { UDPClient } = require('../..');
-
-const resolve = UDPClient();
-
-(async () => {
-  const response = await resolve('google.com')
-  console.log(response.answers);
-})();
+const { UDPClient } = require('../..');
+
+const resolve = UDPClient();
+
+(async() => {
+  const response = await resolve('google.com');
+  console.log(response.answers);
+})();

package/example/server/dns.js

@@ -0,0 +1,46 @@
+const dns = require('../..');
+const path = require('path');
+const fs = require('fs');
+
+const { Packet } = dns;
+
+// Create a SSL enabled server
+const server = dns.createServer({
+  udp : true,
+  tcp : true,
+  doh : {
+    ssl  : true,
+    cert : fs.readFileSync(path.join(__dirname, 'server.crt')),
+    key  : fs.readFileSync(path.join(__dirname, 'secret.key')),
+  },
+});
+
+// Handle the incomming request (same style as both UDP and TCP server)
+server.on('request', (request, send, client) => {
+  const response = Packet.createResponseFromRequest(request);
+  const [ question ] = request.questions;
+  const { name } = question;
+  response.answers.push({
+    name,
+    type    : Packet.TYPE.A,
+    class   : Packet.CLASS.IN,
+    ttl     : 300,
+    address : '1.1.1.1',
+  });
+  send(response);
+});
+
+(async() => {
+  const closed = new Promise(resolve => process.on('SIGINT', resolve));
+  await server.listen({
+    doh : 8443,
+    udp : 5333,
+    tcp : 5334,
+  });
+  console.log('Listening.');
+  console.log(server.addresses());
+  await closed;
+  process.stdout.write('\n');
+  await server.close();
+  console.log('Closed.');
+})();

package/example/server/doh.js

@@ -1,28 +1,30 @@
-const dns = require('../..');
-const path = require('path');
-const fs = require('fs');
-
-const { Packet } = dns;
-
-// Create a SSL enabled server
-const server = dns.createDOHServer({
-    port: 0,
-    sslport: 443,
-    cert: fs.readFileSync(path.join(__dirname,"server.crt")),
-    key: fs.readFileSync(path.join(__dirname,"secret.key"))  
-});
-
-//Handle the incomming request (same style as both UDP and TCP server)
-server.on('request', (request, send, client) => {
-    const response = Packet.createResponseFromRequest(request);
-    const [ question ] = request.questions;
-    const { name } = question;
-    response.answers.push({
-      name,
-      type: Packet.TYPE.A,
-      class: Packet.CLASS.IN,
-      ttl: 300,
-      address: '8.8.8.8'
-    });
-    send(response);
-  });
+const dns = require('../..');
+const path = require('path');
+const fs = require('fs');
+
+const { Packet } = dns;
+
+// Create a SSL enabled server
+const server = dns.createDOHServer({
+  port : 8080,
+  ssl  : true,
+  cert : fs.readFileSync(path.join(__dirname, 'server.crt')),
+  key  : fs.readFileSync(path.join(__dirname, 'secret.key')),
+});
+
+// Handle the incomming request (same style as both UDP and TCP server)
+server.on('request', (request, send, client) => {
+  const response = Packet.createResponseFromRequest(request);
+  const [ question ] = request.questions;
+  const { name } = question;
+  response.answers.push({
+    name,
+    type    : Packet.TYPE.A,
+    class   : Packet.CLASS.IN,
+    ttl     : 300,
+    address : '1.1.1.1',
+  });
+  send(response);
+});
+
+server.listen();

package/example/server/secret.key

@@ -1,28 +1,28 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLodEOCR2A593i
-wZR7xkHOgHeCK697OXknn4okuUqopUo5qcQeqcvNJ+McMNGexwpg3YuIHKYYGmtw
-1QCoeqCOPoyZUed6GK5r7CkQl+hsCMrbRFpM8B8RmlsxVoot52WyfhF0lJT087g9
-L4P1/rwcE6NGMkpvpCl/3mo90AYvFyX+LWpBFi4j3hx33LoTiuMunhOROWNobG1Z
-GWYsoQriCq6mO9SOk1sbKXnr27yMaxbHcjZO36ZJxobrkHManVtmAQIlW0j66MLj
-6xsa9AZep0zFVQnoRZA56GYyH81RNAdxps1Nr7GYgRi4kyDLGvo2ZTJUuxpbiR68
-dcL8yKJ9AgMBAAECggEAJzC0cFQWxolZbdu9vPiSD7EvzvCjbD7Kb3LH/ntewAhX
-ubNPmGsrWweTMQjAPyOlfrEEuqRw3vCuvt9vqf03y0iEfLmDqD75yrF/0b66r5gd
-moeULXyFLjkb1eoG3ADN1MVojJxP8ri5O6Vaa0ykXW72HHtvUf8xMXfX0J+poQQm
-FnGC0g6ky6VfIlP6XxJNnC1EHcu3g1DxXEp8ALeP2UBiGuXNUTTXix+fqpVep2DP
-C+n/YTo7N6yqKrJCP97Fspd0We2rsT/DDPsOv4E44veLY/iZuyO01Eorp6PavXhg
-0WJyGN4eww7F4yzYQcJZjM6MmEkYJHVxK0Nz5NIB4QKBgQD+oDmkD5mL365f/Yhr
-32sRbTX311Grg0485us9rcyUj7HN82MVy3I5na/DxmQFyXJ3jaAi9cO3IFRpCyT5
-yVlNp0ufD4oBa/wbceVTOf5xkl0uRi9XxaC97r5kIWX/I4g3xRivqWW9I+Hs8PKv
-RphNFIadH81AbKVk0DD51usABQKBgQDMuyRHC1xN8uAOe1y23ytveFJImb0Rr6XL
-/ml/zpVzR+4r89FVI5NDYtKdUctkQuk6hSkPfLeURqekUD64nqK+5+hKuLy6Eqjw
-Vd5+Ah/Z18n1q37NuTwxi5XTBZfNDjWJnYKT3NSg1I10CVT+FDzzlA5AT0zzvTZM
-0JeIDSq6GQKBgHWx8BLSlyHdace69FUQd3gdqAWAhKKn1gE2p+Phsx+0b/aHmvRX
-Dtxs8/KlgFRgckWqtCuUuDusePf5C8Vd+aZ4Pu8uCpdvp5+z/NGEjAVJJ0MddAK5
-OfyxH1Y/TdsqPGuy8h84SOuta1/PXA4CrqFqbHKyYXh2/9hil1DUs9lVAoGAcYaQ
-jkixbZPxRHaJqepElrJcxl9h5U3GHUE9VR7D5sILQxoXiSOKBILnEU+K/lTQKaAv
-baQV1EX9rfLFZPCqhDvqpoycMn4oaeTj1HHvIYg0OGNZlFBUHZEuim5+h7mKXH4Y
-K0/4JBrZOW/3TlEAn30JDgYrQLk6RAwjCtFqUPkCgYEA9Ukemwm/Tfx/YTzPnfrs
-BnaI9VBtqET/Z8/VvZcNTyuNcwkRJtRvnqHiJaAIZE+dSwdIHlgyZfTYDTVTEDhd
-NoiSrV/pgjLysSOzr8gqaO5alZNaBW+05/LqlluqSD7wyVs+lWaAviJ+SIpabt9j
-XMzR/9OBxoVDL4Zqny4nkB0=
------END PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLodEOCR2A593i
+wZR7xkHOgHeCK697OXknn4okuUqopUo5qcQeqcvNJ+McMNGexwpg3YuIHKYYGmtw
+1QCoeqCOPoyZUed6GK5r7CkQl+hsCMrbRFpM8B8RmlsxVoot52WyfhF0lJT087g9
+L4P1/rwcE6NGMkpvpCl/3mo90AYvFyX+LWpBFi4j3hx33LoTiuMunhOROWNobG1Z
+GWYsoQriCq6mO9SOk1sbKXnr27yMaxbHcjZO36ZJxobrkHManVtmAQIlW0j66MLj
+6xsa9AZep0zFVQnoRZA56GYyH81RNAdxps1Nr7GYgRi4kyDLGvo2ZTJUuxpbiR68
+dcL8yKJ9AgMBAAECggEAJzC0cFQWxolZbdu9vPiSD7EvzvCjbD7Kb3LH/ntewAhX
+ubNPmGsrWweTMQjAPyOlfrEEuqRw3vCuvt9vqf03y0iEfLmDqD75yrF/0b66r5gd
+moeULXyFLjkb1eoG3ADN1MVojJxP8ri5O6Vaa0ykXW72HHtvUf8xMXfX0J+poQQm
+FnGC0g6ky6VfIlP6XxJNnC1EHcu3g1DxXEp8ALeP2UBiGuXNUTTXix+fqpVep2DP
+C+n/YTo7N6yqKrJCP97Fspd0We2rsT/DDPsOv4E44veLY/iZuyO01Eorp6PavXhg
+0WJyGN4eww7F4yzYQcJZjM6MmEkYJHVxK0Nz5NIB4QKBgQD+oDmkD5mL365f/Yhr
+32sRbTX311Grg0485us9rcyUj7HN82MVy3I5na/DxmQFyXJ3jaAi9cO3IFRpCyT5
+yVlNp0ufD4oBa/wbceVTOf5xkl0uRi9XxaC97r5kIWX/I4g3xRivqWW9I+Hs8PKv
+RphNFIadH81AbKVk0DD51usABQKBgQDMuyRHC1xN8uAOe1y23ytveFJImb0Rr6XL
+/ml/zpVzR+4r89FVI5NDYtKdUctkQuk6hSkPfLeURqekUD64nqK+5+hKuLy6Eqjw
+Vd5+Ah/Z18n1q37NuTwxi5XTBZfNDjWJnYKT3NSg1I10CVT+FDzzlA5AT0zzvTZM
+0JeIDSq6GQKBgHWx8BLSlyHdace69FUQd3gdqAWAhKKn1gE2p+Phsx+0b/aHmvRX
+Dtxs8/KlgFRgckWqtCuUuDusePf5C8Vd+aZ4Pu8uCpdvp5+z/NGEjAVJJ0MddAK5
+OfyxH1Y/TdsqPGuy8h84SOuta1/PXA4CrqFqbHKyYXh2/9hil1DUs9lVAoGAcYaQ
+jkixbZPxRHaJqepElrJcxl9h5U3GHUE9VR7D5sILQxoXiSOKBILnEU+K/lTQKaAv
+baQV1EX9rfLFZPCqhDvqpoycMn4oaeTj1HHvIYg0OGNZlFBUHZEuim5+h7mKXH4Y
+K0/4JBrZOW/3TlEAn30JDgYrQLk6RAwjCtFqUPkCgYEA9Ukemwm/Tfx/YTzPnfrs
+BnaI9VBtqET/Z8/VvZcNTyuNcwkRJtRvnqHiJaAIZE+dSwdIHlgyZfTYDTVTEDhd
+NoiSrV/pgjLysSOzr8gqaO5alZNaBW+05/LqlluqSD7wyVs+lWaAviJ+SIpabt9j
+XMzR/9OBxoVDL4Zqny4nkB0=
+-----END PRIVATE KEY-----