dns2 2.0.4 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dns2",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "A DNS Server and Client Implementation in Pure JavaScript with no dependencies.",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   "keywords": [
     "dns"
   ],
-  "author": "Liu Song <hi@lsong.org>",
+  "author": "Liu Song <song940@gmail.com>",
   "contributors": [
     "Andris Reinman <andris.reinman@gmail.com>",
     "Eviltik <eviltik@gmail.com>",

package/packet.js

@@ -4,6 +4,32 @@ const BufferWriter = require('./lib/writer');
 
 const debug = debuglog('dns2');
 
+const toIPv6 = buffer => buffer
+  .map(part => (part > 0 ? part.toString(16) : '0'))
+  .join(':')
+  .replace(/\b(?:0+:){1,}/, ':');
+
+const fromIPv6 = (address) => {
+  const digits = address.split(':');
+  // CAVEAT edge case for :: and IPs starting
+  // or ending by ::
+  if (digits[0] === '') {
+    digits.shift();
+  }
+  if (digits[digits.length - 1] === '') {
+    digits.pop();
+  }
+  // CAVEAT we have to take into account
+  // the extra space used by the empty string
+  const missingFields = 8 - digits.length + 1;
+  return digits.flatMap((digit) => {
+    if (digit === '') {
+      return Array(missingFields).fill('0');
+    }
+    return digit.padStart(4, '0');
+  });
+};
+
 /**
  * [Packet description]
  * @param {[type]} data [description]
@@ -514,16 +540,12 @@ Packet.Resource.AAAA = {
       length -= 2;
       parts.push(reader.read(16));
     }
-    this.address = parts
-      .map(part => part > 0 ? part.toString(16) : '')
-      .join(':')
-      .replace('::::', '::')
-      .replace(':::', '::');
+    this.address = toIPv6(parts);
     return this;
   },
   encode: function(record, writer) {
     writer = writer || new Packet.Writer();
-    const parts = record.address.split(':');
+    const parts = fromIPv6(record.address);
     writer.write(parts.length * 2, 16);
     parts.forEach(function(part) {
       writer.write(parseInt(part, 16), 16);
@@ -872,3 +894,5 @@ Packet.prototype.toBase64URL = function() {
 };
 
 module.exports = Packet;
+module.exports.toIPv6 = toIPv6;
+module.exports.fromIPv6 = fromIPv6;

package/test/index.js

@@ -85,6 +85,24 @@ test('Question#decode', function() {
 });
 
 //
+test('Package#toIPv6', function() {
+  assert.equal(Packet.toIPv6([ 10756, 20034, 512, 0, 0, 0, 0, 803 ]), '2a04:4e42:200::323');
+  assert.equal(Packet.toIPv6([ 10755, 45248, 3, 208, 0, 0, 5057, 61441 ]), '2a03:b0c0:3:d0::13c1:f001');
+  assert.equal(Packet.toIPv6([ 10752, 5200, 16387, 2055, 0, 0, 0, 8206 ]), '2a00:1450:4003:807::200e');
+  assert.equal(Packet.toIPv6([ 9734, 18176, 12552, 0, 0, 0, 44098, 10984 ]), '2606:4700:3108::ac42:2ae8');
+});
+
+test('Package#fromIPv6', function() {
+  assert.deepEqual(Packet.fromIPv6('2a04:4e42:200::323'), [
+    '2a04', '4e42', '0200', '0', '0', '0', '0', '0323' ]);
+  assert.deepEqual(Packet.fromIPv6('2a03:b0c0:3:d0::13c1:f001'), [ '2a03', 'b0c0', '0003', '00d0', '0', '0', '13c1', 'f001' ]);
+  assert.deepEqual(Packet.fromIPv6('2a00:1450:4003:807::200e'), [ '2a00', '1450', '4003', '0807', '0', '0', '0', '200e' ]);
+  assert.deepEqual(Packet.fromIPv6('2606:4700:3108::ac42:2ae8'), [ '2606', '4700', '3108', '0', '0', '0', 'ac42', '2ae8' ]);
+  assert.deepEqual(Packet.fromIPv6('::'), [ '0', '0', '0', '0', '0', '0', '0', '0' ]);
+  assert.deepEqual(Packet.fromIPv6('::2606:4700:3108'), [ '0', '0', '0', '0', '0', '2606', '4700', '3108' ]);
+  assert.deepEqual(Packet.fromIPv6('606:4700:3108::'), [ '0606', '4700', '3108', '0', '0', '0', '0', '0' ]);
+});
+
 test('Packet#parse', function() {
   const packet = Packet.parse(response);
   assert.equal(packet.questions[0].name, 'www.z.cn');