dns2 2.0.0 → 2.0.3

package/example/server/server.crt

@@ -1,22 +1,22 @@
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIUaX6RpRwOKLTEniFdAq5WadU33jUwDQYJKoZIhvcNAQEL
-BQAwZTELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEPMA0GA1UEBwwG
-VmFybWRvMR0wGwYDVQQKDBRub2RlLWRucyBkb2ggZXhhbXBsZTESMBAGA1UEAwwJ
-bG9jYWxob3N0MB4XDTIwMTIyOTE2NDAxOVoXDTIxMDEyODE2NDAxOVowZTELMAkG
-A1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEPMA0GA1UEBwwGVmFybWRvMR0w
-GwYDVQQKDBRub2RlLWRucyBkb2ggZXhhbXBsZTESMBAGA1UEAwwJbG9jYWxob3N0
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy6HRDgkdgOfd4sGUe8ZB
-zoB3giuvezl5J5+KJLlKqKVKOanEHqnLzSfjHDDRnscKYN2LiBymGBprcNUAqHqg
-jj6MmVHnehiua+wpEJfobAjK20RaTPAfEZpbMVaKLedlsn4RdJSU9PO4PS+D9f68
-HBOjRjJKb6Qpf95qPdAGLxcl/i1qQRYuI94cd9y6E4rjLp4TkTljaGxtWRlmLKEK
-4gqupjvUjpNbGyl569u8jGsWx3I2Tt+mScaG65BzGp1bZgECJVtI+ujC4+sbGvQG
-XqdMxVUJ6EWQOehmMh/NUTQHcabNTa+xmIEYuJMgyxr6NmUyVLsaW4kevHXC/Mii
-fQIDAQABo1MwUTAdBgNVHQ4EFgQUTHzmfH502gXcq7ouYT0hlhtdEIgwHwYDVR0j
-BBgwFoAUTHzmfH502gXcq7ouYT0hlhtdEIgwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQsFAAOCAQEAG+hS41BD9U84mTHvy5F/bF1h3jqeLPZ4asWM3f3XZmHb
-MVnASBnVySesjLvkn3FCB1nVm6sR+71l9qOn2E/2OSOliFejqtEwjrtUujTHx88V
-fmnu0zKCo9j7itl12eBqr7hEE4PYEIOG46eyj70U75PxevTF6Ahp3IpSRQxmS/b2
-mtMfhEJKyFYzQyI0Nx1ZZT/N0Vn45Ezgu0skggw0d2/3Y7h9573uKJPT8O4c+wRB
-1VAEo5h+DTzjalNkiQubrtXS9aAplTmafjPHJyvTCZKqczGD6P/kvX1lI69L3pGG
-lmIEBb2xjOuxxDGKiwuBqKb2pRIMfP8UtT/LxqQx4Q==
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIUaX6RpRwOKLTEniFdAq5WadU33jUwDQYJKoZIhvcNAQEL
+BQAwZTELMAkGA1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEPMA0GA1UEBwwG
+VmFybWRvMR0wGwYDVQQKDBRub2RlLWRucyBkb2ggZXhhbXBsZTESMBAGA1UEAwwJ
+bG9jYWxob3N0MB4XDTIwMTIyOTE2NDAxOVoXDTIxMDEyODE2NDAxOVowZTELMAkG
+A1UEBhMCU0UxEjAQBgNVBAgMCVN0b2NraG9sbTEPMA0GA1UEBwwGVmFybWRvMR0w
+GwYDVQQKDBRub2RlLWRucyBkb2ggZXhhbXBsZTESMBAGA1UEAwwJbG9jYWxob3N0
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy6HRDgkdgOfd4sGUe8ZB
+zoB3giuvezl5J5+KJLlKqKVKOanEHqnLzSfjHDDRnscKYN2LiBymGBprcNUAqHqg
+jj6MmVHnehiua+wpEJfobAjK20RaTPAfEZpbMVaKLedlsn4RdJSU9PO4PS+D9f68
+HBOjRjJKb6Qpf95qPdAGLxcl/i1qQRYuI94cd9y6E4rjLp4TkTljaGxtWRlmLKEK
+4gqupjvUjpNbGyl569u8jGsWx3I2Tt+mScaG65BzGp1bZgECJVtI+ujC4+sbGvQG
+XqdMxVUJ6EWQOehmMh/NUTQHcabNTa+xmIEYuJMgyxr6NmUyVLsaW4kevHXC/Mii
+fQIDAQABo1MwUTAdBgNVHQ4EFgQUTHzmfH502gXcq7ouYT0hlhtdEIgwHwYDVR0j
+BBgwFoAUTHzmfH502gXcq7ouYT0hlhtdEIgwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQsFAAOCAQEAG+hS41BD9U84mTHvy5F/bF1h3jqeLPZ4asWM3f3XZmHb
+MVnASBnVySesjLvkn3FCB1nVm6sR+71l9qOn2E/2OSOliFejqtEwjrtUujTHx88V
+fmnu0zKCo9j7itl12eBqr7hEE4PYEIOG46eyj70U75PxevTF6Ahp3IpSRQxmS/b2
+mtMfhEJKyFYzQyI0Nx1ZZT/N0Vn45Ezgu0skggw0d2/3Y7h9573uKJPT8O4c+wRB
+1VAEo5h+DTzjalNkiQubrtXS9aAplTmafjPHJyvTCZKqczGD6P/kvX1lI69L3pGG
+lmIEBb2xjOuxxDGKiwuBqKb2pRIMfP8UtT/LxqQx4Q==
+-----END CERTIFICATE-----

package/example/server/tcp.js

@@ -1,19 +1,19 @@
-const dns = require('../..');
-
-const { Packet } = dns;
-
-const server = dns.createTCPServer();
-
-server.on('request', (request, send, client) => {
-  const response = Packet.createResponseFromRequest(request);
-  const answer = new Packet.createResourceFromQuestion(request.questions[0], {
-    target: 'hermes2.jabber.org',
-    port: 8080,
-    weight: 30,
-    priority: 30
-  });
-  response.answers.push(answer);
-  send(response);
-});
-
-server.listen(5333);
+const dns = require('../..');
+
+const { Packet } = dns;
+
+const server = dns.createTCPServer();
+
+server.on('request', (request, send, client) => {
+  const response = Packet.createResponseFromRequest(request);
+  const answer = Packet.createResourceFromQuestion(request.questions[0], {
+    target   : 'hermes2.jabber.org',
+    port     : 8080,
+    weight   : 30,
+    priority : 30,
+  });
+  response.answers.push(answer);
+  send(response);
+});
+
+server.listen(5333);

package/example/server/udp.js

@@ -1,23 +1,23 @@
-const dns = require('../..');
-
-const { Packet } = dns;
-
-const server = dns.createUDPServer((request, send, rinfo) => {
-  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);
-});
-
-server.on('request', (request, response, rinfo) => {
-  console.log(request.header.id, request.questions[0]);
-});
-
-server.listen(5333);
+const dns = require('../..');
+
+const { Packet } = dns;
+
+const server = dns.createUDPServer((request, send, rinfo) => {
+  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);
+});
+
+server.on('request', (request, response, rinfo) => {
+  console.log(request.header.id, request.questions[0]);
+});
+
+server.listen(5333);

package/index.js

@@ -1,89 +1,97 @@
-const {
-  TCPServer,
-  UDPServer,
-  DOHServer,
-  createTCPServer,
-  createUDPServer,
-  createDOHServer,
-} = require('./server');
-const EventEmitter = require('events');
-
-/**
- * [DNS description]
- * @docs https://tools.ietf.org/html/rfc1034
- * @docs https://tools.ietf.org/html/rfc1035
- */
-class DNS extends EventEmitter {
-  constructor(options) {
-    super();
-    Object.assign(this, {
-      port: 53,
-      retries: 3,
-      timeout: 3,
-      recursive: true,
-      resolverProtocol: 'UDP',
-      nameServers: [
-        '8.8.8.8',
-        '114.114.114.114',
-      ],
-      rootServers: [
-        'a', 'b', 'c', 'd', 'e', 'f',
-        'g', 'h', 'i', 'j', 'k', 'l', 'm'
-      ].map(x => `${x}.root-servers.net`)
-    }, options);
-  }
-  /**
-   * query
-   * @param {*} questions 
-   */
-  query(name, type, cls, clientIp) {
-    const { port, nameServers, recursive, resolverProtocol = 'UDP' } = this;
-    const createResolver = DNS[resolverProtocol + 'Client'];
-    return Promise.race(nameServers.map(address => {
-      const resolve = createResolver({ dns: address, port, recursive });
-      return resolve(name, type, cls, clientIp);
-    }));
-  }
-  /**
-   * resolve
-   * @param {*} domain 
-   * @param {*} type 
-   * @param {*} cls 
-   */
-  resolve(domain, type = 'ANY', cls = DNS.Packet.CLASS.IN, clientIp) {
-    return this.query(domain, type, cls, clientIp);
-  }
-  resolveA(domain, clientIp) {
-    return this.resolve(domain, 'A', undefined, clientIp);
-  }
-  resolveAAAA(domain) {
-    return this.resolve(domain, 'AAAA');
-  }
-  resolveMX(domain) {
-    return this.resolve(domain, 'MX');
-  }
-  resolveCNAME(domain) {
-    return this.resolve(domain, 'CNAME');
-  }
-  resolvePTR(domain) {
-    return this.resolve(domain, 'PTR');
-  }
-}
-
-DNS.TCPServer = TCPServer;
-DNS.UDPServer = UDPServer;
-DNS.DOHServer = DOHServer;
-
-DNS.createUDPServer = createUDPServer;
-DNS.createTCPServer = createTCPServer;
-DNS.createDOHServer = createDOHServer;
-
-DNS.TCPClient = require('./client/tcp');
-DNS.DOHClient = require('./client/doh');
-DNS.UDPClient = require('./client/udp');
-DNS.GoogleClient = require('./client/google');
-
-DNS.Packet = require('./packet');
-
-module.exports = DNS;
-
+const {
+  TCPServer,
+  UDPServer,
+  DOHServer,
+  createTCPServer,
+  createUDPServer,
+  createDOHServer,
+  createServer,
+} = require('./server');
+const EventEmitter = require('events');
+
+/**
+ * [DNS description]
+ * @docs https://tools.ietf.org/html/rfc1034
+ * @docs https://tools.ietf.org/html/rfc1035
+ */
+class DNS extends EventEmitter {
+  constructor(options) {
+    super();
+    Object.assign(this, {
+      port             : 53,
+      retries          : 3,
+      timeout          : 3,
+      recursive        : true,
+      resolverProtocol : 'UDP',
+      nameServers      : [
+        '8.8.8.8',
+        '114.114.114.114',
+      ],
+      rootServers: [
+        'a', 'b', 'c', 'd', 'e', 'f',
+        'g', 'h', 'i', 'j', 'k', 'l', 'm',
+      ].map(x => `${x}.root-servers.net`),
+    }, options);
+  }
+
+  /**
+   * query
+   * @param {*} questions
+   */
+  query(name, type, cls, clientIp) {
+    const { port, nameServers, recursive, resolverProtocol = 'UDP' } = this;
+    const createResolver = DNS[resolverProtocol + 'Client'];
+    return Promise.race(nameServers.map(address => {
+      const resolve = createResolver({ dns: address, port, recursive });
+      return resolve(name, type, cls, clientIp);
+    }));
+  }
+
+  /**
+   * resolve
+   * @param {*} domain
+   * @param {*} type
+   * @param {*} cls
+   */
+  resolve(domain, type = 'ANY', cls = DNS.Packet.CLASS.IN, clientIp = undefined) {
+    return this.query(domain, type, cls, clientIp);
+  }
+
+  resolveA(domain, clientIp) {
+    return this.resolve(domain, 'A', undefined, clientIp);
+  }
+
+  resolveAAAA(domain) {
+    return this.resolve(domain, 'AAAA');
+  }
+
+  resolveMX(domain) {
+    return this.resolve(domain, 'MX');
+  }
+
+  resolveCNAME(domain) {
+    return this.resolve(domain, 'CNAME');
+  }
+
+  resolvePTR(domain) {
+    return this.resolve(domain, 'PTR');
+  }
+}
+
+DNS.TCPServer = TCPServer;
+DNS.UDPServer = UDPServer;
+DNS.DOHServer = DOHServer;
+
+DNS.createUDPServer = createUDPServer;
+DNS.createTCPServer = createTCPServer;
+DNS.createDOHServer = createDOHServer;
+DNS.createServer = createServer;
+
+DNS.TCPClient = require('./client/tcp');
+DNS.DOHClient = require('./client/doh');
+DNS.UDPClient = require('./client/udp');
+DNS.GoogleClient = require('./client/google');
+
+DNS.Packet = require('./packet');
+
+module.exports = DNS;

package/lib/reader.js

@@ -1,55 +1,53 @@
-
-/**
- * [Reader description]
- * @param {[type]} buffer [description]
- * @param {[type]} offset [description]
- */
-function BufferReader(buffer, offset){
-  this.buffer = buffer;
-  this.offset = offset || 0;
-  return this;
-};
-
-/**
- * [read description]
- * @param  {[type]} buffer [description]
- * @param  {[type]} offset [description]
- * @param  {[type]} length [description]
- * @return {[type]}        [description]
- */
-BufferReader.read = function(buffer, offset, length){
-  var a = [], 
-      c = Math.ceil(length / 8),
-      l = Math.floor(offset / 8),
-      m = offset % 8
-  function t(n){  
-    var r = [ 0,0,0,0, 0,0,0,0 ];
-    for (var i = 7; i >= 0; i--) {
-      r[7 - i] = n & Math.pow(2, i) ? 1 : 0;
-    }    
-    a = a.concat(r);
-  }
-  function p(a){
-    var n = 0;
-    var f = a.length - 1;
-    for(var i = f;i >= 0;i--)
-      if(a[ f - i ]) n += Math.pow(2, i);
-    return n;
-  }
-  while(c--) t(buffer.readUInt8(l++));
-  return p(a.slice(m, m + length))
-};
-
-/**
- * [read description]
- * @param  {[type]} size [description]
- * @return {[type]}      [description]
- */
-BufferReader.prototype.read = function(size){
-  var val = BufferReader.read(this.buffer, this.offset, size);
-  this.offset += size;
-  return val;
-};
-
-
-module.exports = BufferReader;
+
+/**
+ * [Reader description]
+ * @param {[type]} buffer [description]
+ * @param {[type]} offset [description]
+ */
+function BufferReader(buffer, offset) {
+  this.buffer = buffer;
+  this.offset = offset || 0;
+  return this;
+}
+
+/**
+ * [read description]
+ * @param  {[type]} buffer [description]
+ * @param  {[type]} offset [description]
+ * @param  {[type]} length [description]
+ * @return {[type]}        [description]
+ */
+BufferReader.read = function(buffer, offset, length) {
+  let a = [];
+  let c = Math.ceil(length / 8);
+  let l = Math.floor(offset / 8);
+  const m = offset % 8;
+  function t(n) {
+    const r = [ 0, 0, 0, 0, 0, 0, 0, 0 ];
+    for (let i = 7; i >= 0; i--) {
+      r[7 - i] = n & Math.pow(2, i) ? 1 : 0;
+    }
+    a = a.concat(r);
+  }
+  function p(a) {
+    let n = 0;
+    const f = a.length - 1;
+    for (let i = f; i >= 0; i--) { if (a[f - i]) n += Math.pow(2, i); }
+    return n;
+  }
+  while (c--) t(buffer.readUInt8(l++));
+  return p(a.slice(m, m + length));
+};
+
+/**
+ * [read description]
+ * @param  {[type]} size [description]
+ * @return {[type]}      [description]
+ */
+BufferReader.prototype.read = function(size) {
+  const val = BufferReader.read(this.buffer, this.offset, size);
+  this.offset += size;
+  return val;
+};
+
+module.exports = BufferReader;

package/lib/writer.js

@@ -1,42 +1,42 @@
-
-
-/**
- * [Writer description]
- */
-function BufferWriter(){
-  this.buffer = [];
-};
-
-/**
- * [write description]
- * @param  {[type]} d    [description]
- * @param  {[type]} size [description]
- * @return {[type]}      [description]
- */
-BufferWriter.prototype.write = function(d, size){
-  for(var i = 0; i < size; i++)
-    this.buffer.push((d & Math.pow(2, size - i - 1 )) ? 1 : 0);
-};
-
-/**
- * [writeBuffer description]
- * @param {[type]} b [description]
- */
-BufferWriter.prototype.writeBuffer = function(b) {
-  this.buffer = this.buffer.concat(b.buffer);
-}
-
-/**
- * [toBuffer description]
- * @return {[type]} [description]
- */
-BufferWriter.prototype.toBuffer = function(){
-  var arr = [];
-  for(var i = 0; i < this.buffer.length; i += 8){
-    var chunk = this.buffer.slice(i, i + 8);
-    arr.push(parseInt(chunk.join(''), 2));
-  }
-  return Buffer.from(arr);
-};
-
-module.exports = BufferWriter;
+
+/**
+ * [Writer description]
+ */
+function BufferWriter() {
+  this.buffer = [];
+}
+
+/**
+ * [write description]
+ * @param  {[type]} d    [description]
+ * @param  {[type]} size [description]
+ * @return {[type]}      [description]
+ */
+BufferWriter.prototype.write = function(d, size) {
+  for (let i = 0; i < size; i++) {
+    this.buffer.push((d & Math.pow(2, size - i - 1)) ? 1 : 0);
+  }
+};
+
+/**
+ * [writeBuffer description]
+ * @param {[type]} b [description]
+ */
+BufferWriter.prototype.writeBuffer = function(b) {
+  this.buffer = this.buffer.concat(b.buffer);
+};
+
+/**
+ * [toBuffer description]
+ * @return {[type]} [description]
+ */
+BufferWriter.prototype.toBuffer = function() {
+  const arr = [];
+  for (let i = 0; i < this.buffer.length; i += 8) {
+    const chunk = this.buffer.slice(i, i + 8);
+    arr.push(parseInt(chunk.join(''), 2));
+  }
+  return Buffer.from(arr);
+};
+
+module.exports = BufferWriter;

package/package.json

@@ -1,34 +1,42 @@
-{
-  "name": "dns2",
-  "version": "2.0.0",
-  "description": "A DNS Server and Client Implementation in Pure JavaScript with no dependencies.",
-  "main": "index.js",
-  "scripts": {
-    "test": "node test",
-    "example-server-udp": "node example/server/udp.js",
-    "example-server-tcp": "node example/server/tcp.js",
-    "example-server-doh": "node example/server/doh.js",
-    "example-client-doh": "node example/client/doh.js",
-    "example-client-udp": "node example/client/udp.js",
-    "example-client-tcp": "node example/client/tcp.js",
-    "example-client-google": "node example/client/google.js",
-    "example-client-udp-subnet": "node example/client/udp-subnet.js"
-  },
-  "keywords": [
-    "dns"
-  ],
-  "author": "Liu Song <hi@lsong.org>",
-  "contributors": [
-    "Andris Reinman <andris.reinman@gmail.com>",
-    "Eviltik <eviltik@gmail.com>"
-  ],
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/song940/node-dns.git"
-  },
-  "bugs": {
-    "url": "https://github.com/song940/node-dns/issues"
-  },
-  "homepage": "https://github.com/song940/node-dns#readme"
-}
+{
+  "name": "dns2",
+  "version": "2.0.3",
+  "description": "A DNS Server and Client Implementation in Pure JavaScript with no dependencies.",
+  "main": "index.js",
+  "scripts": {
+    "test": "node test",
+    "lint": "eslint .",
+    "example-server-udp": "node example/server/udp.js",
+    "example-server-tcp": "node example/server/tcp.js",
+    "example-server-doh": "node example/server/doh.js",
+    "example-client-doh": "node example/client/doh.js",
+    "example-client-udp": "node example/client/udp.js",
+    "example-client-tcp": "node example/client/tcp.js",
+    "example-client-google": "node example/client/google.js",
+    "example-client-udp-subnet": "node example/client/udp-subnet.js"
+  },
+  "keywords": [
+    "dns"
+  ],
+  "author": "Liu Song <hi@lsong.org>",
+  "contributors": [
+    "Andris Reinman <andris.reinman@gmail.com>",
+    "Eviltik <eviltik@gmail.com>",
+    "Martin Heidegger <martin.heidegger@gmail.com>"
+  ],
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/song940/node-dns.git"
+  },
+  "bugs": {
+    "url": "https://github.com/song940/node-dns/issues"
+  },
+  "homepage": "https://github.com/song940/node-dns#readme",
+  "devDependencies": {
+    "eslint": "^7.28.0",
+    "eslint-config-semistandard": "^15.0.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^4.2.1"
+  }
+}