Request server may be string, Question type may be string

Author: tjfontaine

README.md

@@ -27,7 +27,7 @@ var dns = require('../dns'),
 
 var question = dns.Question({
   name: 'www.google.com',
-  type: dns.consts.NAME_TO_QTYPE.A,
+  type: 'A',
 });
 
 var start = new Date().getTime();
@@ -59,11 +59,13 @@ req.send();
 Request creation takes an object with the following fields
 
  * `question` -- an instance of Question (required)
- * `server` -- an object that defines the remote end point (required)
-  - `address` -- a string ip address (required)
-  - `port` -- a number for the remote port (required)
-  - `type` -- a string indicating `udp` or `tcp` (required)
+ * `server` -- defines the remote end point (required)
+  - as an object it should be
+    * `address` -- a string ip address (required)
+    * `port` -- a number for the remote port (optional, default 53)
+    * `type` -- a string indicating `udp` or `tcp` (optional, default `udp`)
 You do not need to indicate ipv4 or ipv6, the backend will handle that
+  - a string ip address
  * `timeout` -- a number in milliseconds indicating how long to wait for the
 request to finish. (optional, default 4000)
  * `try_edns` -- a boolean indicating whether to use an `EDNSPacket` (optional)

dns.js

@@ -76,10 +76,21 @@ exports.registerType = function(name, fields) {
 var Question = require('./lib/question');
 
 exports.Question = function (opts) {
-  var q = new Question();
+  var q = new Question(), qtype;
+
   q.name = opts.name;
-  q.type = opts.type;
+
+  qtype = opts.type || consts.NAME_TO_QTYPE.A;
+  if (typeof(qtype) === 'string' || qtype instanceof String)
+    qtype = consts.nameToQtype(qtype.toUpperCase());
+
+  if (!qtype || typeof(qtype) !== 'number')
+    throw new Error("Question type must be defined and be valid");
+
+  q.type = qtype;
+
   q.class = opts.class || consts.NAME_TO_QCLASS.IN;
+
   return q;
 };
 exports.Request = require('./lib/request');

lib/request.js

@@ -24,11 +24,25 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 
 var EventEmitter = require('events').EventEmitter,
   PendingRequests = require('./pending'),
+  net = require('net'),
   util = require('util');
 
 var Request = function (opts) {
   this.question = opts.question;
   this.server = opts.server;
+
+  if (typeof(this.server) === 'string' || this.server instanceof String)
+    this.server = { address: this.server, port: 53, type: 'udp'};
+
+  if (!this.server || !this.server.address || !net.isIP(this.server.address))
+    throw new Error("Server object must be supplied with at least address");
+
+  if (!this.server.type || ['udp', 'tcp'].indexOf(this.server.type))
+    this.server.type = 'udp';
+
+  if (!this.server.port)
+    this.server.port = 53;
+
   this.timeout = opts.timeout || 4 * 1000;
   this.try_edns = opts.try_edns || false;
 

test/request.js

@@ -158,6 +158,51 @@ exports.noPromote = function (test) {
   r.send();
 };
 
+exports.serverString = function (test) {
+  var r = Request({
+    question: q,
+    server: '8.8.8.8',
+  });
+
+  r.on('message', function (err, answer) {
+    test.ok(answer.answer.length > 0, 'no answers found');
+  });
+
+  r.on('timeout', function () {
+    test.ok(false, 'Should not timeout');
+  });
+
+  r.on('end', function () {
+    test.done();
+  });
+
+  r.send();
+};
+
+exports.questionString = function (test) {
+  var r = Request({
+    question: Question({
+      name: 'www.google.com',
+      type: 'a',
+    }),
+    server: '8.8.8.8',
+  });
+
+  r.on('message', function (err, answer) {
+    test.ok(answer.answer.length > 0, 'no answers found');
+  });
+
+  r.on('timeout', function () {
+    test.ok(false, 'Should not timeout');
+  });
+
+  r.on('end', function () {
+    test.done();
+  });
+
+  r.send();
+};
+
 exports.tearDown = function (cb) {
   cb();
 };