dns-message 1.0.4 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # dns-message
 
+## 1.1.0
+
+### Minor Changes
+
+- Add `compareAnswers` utility for lexicographic sorting
+  Submitted by [@kitten](https://github.com/kitten) (See [#15](https://github.com/kitten/dns-message/pull/15))
+
 ## 1.0.4
 
 ### Patch Changes

package/dist/dns-message.d.ts

@@ -423,6 +423,7 @@ type Answer =
   | HttpsAnswer
   | NullAnswer
   | UnknownAnswer;
+declare const compareAnswers: (a: Answer, b: Answer) => number;
 
 interface Packet {
   id?: number;
@@ -449,6 +450,7 @@ export {
   RecordClass,
   RecordType,
   SvcParamCode,
+  compareAnswers,
   decode,
   encode,
   encodingLength,

package/dist/dns-message.js

@@ -329,7 +329,7 @@ const y = {
   }
 };
 
-const U = {
+const h = {
   bytes: () => 16,
   write(t, e, r) {
     const n = r.indexOf("::");
@@ -419,20 +419,26 @@ const advance = (t, e) => {
   t.length &= ~(t.length >> 31);
 };
 
+const encodeIntoBuffer = (t, e) => {
+  const r = new ArrayBuffer(t.bytes(e));
+  const n = t.write(new DataView(r), 0, e);
+  return new Uint8Array(r, 0, n);
+};
+
 const sliceView = (t, e, r = e.length) => {
   const n = new Uint8Array(t.buffer, t.byteOffset + e.offset, r);
   advance(e, r);
   return n;
 };
 
-const h = 32768;
+const U = 32768;
 
-const w = {
+const b = {
   bytes: t => c.bytes(t.name) + 4,
   write(t, e, n) {
     let s = n.class || r.IN;
     if (n.qu) {
-      s |= h;
+      s |= U;
     }
     e = c.write(t, e, n.name);
     t.setUint16(e, n.type);
@@ -444,7 +450,7 @@ const w = {
     const s = t.getUint16(e.offset);
     let a = t.getUint16(e.offset + 2) || r.ANY;
     let i = !1;
-    if (a !== r.ANY && a & h) {
+    if (a !== r.ANY && a & U) {
       a &= -32769;
       i = !0;
     }
@@ -458,7 +464,7 @@ const w = {
   }
 };
 
-let b = function(t) {
+let w = function(t) {
   t[t.v4 = 1] = "v4";
   t[t.v6 = 2] = "v6";
   return t;
@@ -473,26 +479,22 @@ const p = withRDLength({
   })
 });
 
-const E = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])";
+const A = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])";
 
-const A = new RegExp(`^${`(?:${E}\\.){3}${E}`}$`);
+const E = new RegExp(`^${`(?:${A}\\.){3}${A}`}$`);
 
 const N = withRDLength({
   bytes: t => Math.ceil((t.sourcePrefixLength || 0) / 8) + 4,
   write(t, e, r) {
     const n = r.sourcePrefixLength || 0;
     const s = r.scopePrefixLength || 0;
-    const a = r.family || (A.test(r.ip) ? b.v4 : b.v6);
+    const a = r.family || (E.test(r.ip) ? w.v4 : w.v6);
     const i = Math.ceil(n / 8);
     t.setUint16(e, a);
     t.setUint8(e + 2, n);
     t.setUint8(e + 3, s);
     e += 4;
-    const o = ((t, e) => {
-      const r = new ArrayBuffer(t.bytes(e));
-      const n = t.write(new DataView(r), 0, e);
-      return new Uint8Array(r, 0, n);
-    })(a === b.v4 ? g : U, r.ip);
+    const o = encodeIntoBuffer(a === w.v4 ? g : h, r.ip);
     for (let r = 0; r < i; r++) {
       t.setUint8(e++, o[r]);
     }
@@ -508,7 +510,7 @@ const N = withRDLength({
       family: r,
       sourcePrefixLength: n,
       scopePrefixLength: a,
-      ip: r === b.v4 ? g.read(t, e) : U.read(t, e)
+      ip: r === w.v4 ? g.read(t, e) : h.read(t, e)
     };
   }
 });
@@ -657,11 +659,11 @@ const D = withRDLength(array(y));
 
 const C = withRDLength(array(u));
 
-const m = withRDLength(y);
+const O = withRDLength(y);
 
-const O = withRDLength(array(g));
+const m = withRDLength(array(g));
 
-const L = withRDLength(array(U));
+const L = withRDLength(array(h));
 
 const v = withRDLength(f);
 
@@ -678,10 +680,10 @@ const x = {
       e += 4;
     }
     if (null != t.port) {
-      e += m.bytes(t.port) + 2;
+      e += O.bytes(t.port) + 2;
     }
     if (t.ipv4hint) {
-      e += O.bytes(t.ipv4hint) + 2;
+      e += m.bytes(t.ipv4hint) + 2;
     }
     if (t.ipv6hint) {
       e += L.bytes(t.ipv6hint) + 2;
@@ -713,11 +715,11 @@ const x = {
     }
     if (null != r.port) {
       t.setUint16(e, R.Port);
-      e = m.write(t, e + 2, r.port);
+      e = O.write(t, e + 2, r.port);
     }
     if (r.ipv4hint) {
       t.setUint16(e, R.Ipv4Hint);
-      e = O.write(t, e + 2, r.ipv4hint);
+      e = m.write(t, e + 2, r.ipv4hint);
     }
     if (r.ipv6hint) {
       t.setUint16(e, R.Ipv6Hint);
@@ -768,11 +770,11 @@ const x = {
         break;
 
        case R.Port:
-        s.port = m.read(t, e);
+        s.port = O.read(t, e);
         break;
 
        case R.Ipv4Hint:
-        s.ipv4hint = O.read(t, e);
+        s.ipv4hint = m.read(t, e);
         break;
 
        case R.Ipv6Hint:
@@ -801,15 +803,15 @@ const x = {
 
 const H = withRDLength(f);
 
-const _ = withRDLength(c);
+const k = withRDLength(c);
 
 const M = withRDLength(g);
 
-const V = withRDLength(U);
+const _ = withRDLength(h);
 
-const Y = withRDLength(array(u));
+const V = withRDLength(array(u));
 
-const K = withRDLength({
+const Y = withRDLength({
   bytes: t => c.bytes(t.target) + 6,
   write(t, e, r) {
     t.setUint16(e, r.priority || 0);
@@ -833,7 +835,7 @@ const K = withRDLength({
   }
 });
 
-const X = withRDLength({
+const K = withRDLength({
   bytes: t => u.bytes(t.cpu) + u.bytes(t.os),
   write(t, e, r) {
     e = u.write(t, e, r.cpu);
@@ -857,7 +859,7 @@ const toCaaTag = t => {
   }
 };
 
-const F = withRDLength({
+const X = withRDLength({
   bytes: t => u.bytes(t.tag) + f.bytes(t.value) + 1,
   write(t, e, r) {
     let n = r.flags || 0;
@@ -880,7 +882,7 @@ const F = withRDLength({
   }
 });
 
-const G = withRDLength({
+const F = withRDLength({
   bytes: t => c.bytes(t.mname) + c.bytes(t.rname) + 20,
   write(t, e, r) {
     e = c.write(t, e, r.mname);
@@ -908,7 +910,7 @@ const G = withRDLength({
   }
 });
 
-const B = withRDLength({
+const G = withRDLength({
   bytes: t => c.bytes(t.exchange) + 2,
   write(t, e, r) {
     t.setUint16(e, r.preference || 0);
@@ -925,7 +927,7 @@ const B = withRDLength({
   }
 });
 
-const k = withRDLength({
+const B = withRDLength({
   bytes: t => f.bytes(t.key) + 4,
   write(t, e, r) {
     t.setUint16(e, r.flags);
@@ -1149,28 +1151,28 @@ const nt = {
       return r + M.bytes(t.data);
 
      case e.NS:
-      return r + _.bytes(t.data);
+      return r + k.bytes(t.data);
 
      case e.SOA:
-      return r + G.bytes(t.data);
+      return r + F.bytes(t.data);
 
      case e.HINFO:
-      return r + X.bytes(t.data);
+      return r + K.bytes(t.data);
 
      case e.MX:
-      return r + B.bytes(t.data);
+      return r + G.bytes(t.data);
 
      case e.TXT:
-      return r + Y.bytes(t.data);
+      return r + V.bytes(t.data);
 
      case e.RP:
       return r + q.bytes(t.data);
 
      case e.AAAA:
-      return r + V.bytes(t.data);
+      return r + _.bytes(t.data);
 
      case e.SRV:
-      return r + K.bytes(t.data);
+      return r + Y.bytes(t.data);
 
      case e.NAPTR:
       return r + Z.bytes(t.data);
@@ -1191,7 +1193,7 @@ const nt = {
       return r + Q.bytes(t.data);
 
      case e.DNSKEY:
-      return r + k.bytes(t.data);
+      return r + B.bytes(t.data);
 
      case e.NSEC3:
       return r + j.bytes(t.data);
@@ -1204,12 +1206,12 @@ const nt = {
       return r + tt.bytes(t.data);
 
      case e.CAA:
-      return r + F.bytes(t.data);
+      return r + X.bytes(t.data);
 
      case e.PTR:
      case e.CNAME:
      case e.DNAME:
-      return r + _.bytes(t.data);
+      return r + k.bytes(t.data);
 
      default:
       return r + H.bytes(t.data);
@@ -1235,28 +1237,28 @@ const nt = {
       return M.write(t, r, n.data);
 
      case e.NS:
-      return _.write(t, r, n.data);
+      return k.write(t, r, n.data);
 
      case e.SOA:
-      return G.write(t, r, n.data);
+      return F.write(t, r, n.data);
 
      case e.HINFO:
-      return X.write(t, r, n.data);
+      return K.write(t, r, n.data);
 
      case e.MX:
-      return B.write(t, r, n.data);
+      return G.write(t, r, n.data);
 
      case e.TXT:
-      return Y.write(t, r, n.data);
+      return V.write(t, r, n.data);
 
      case e.RP:
       return q.write(t, r, n.data);
 
      case e.AAAA:
-      return V.write(t, r, n.data);
+      return _.write(t, r, n.data);
 
      case e.SRV:
-      return K.write(t, r, n.data);
+      return Y.write(t, r, n.data);
 
      case e.NAPTR:
       return Z.write(t, r, n.data);
@@ -1274,7 +1276,7 @@ const nt = {
       return Q.write(t, r, n.data);
 
      case e.DNSKEY:
-      return k.write(t, r, n.data);
+      return B.write(t, r, n.data);
 
      case e.NSEC3:
       return j.write(t, r, n.data);
@@ -1287,12 +1289,12 @@ const nt = {
       return tt.write(t, r, n.data);
 
      case e.CAA:
-      return F.write(t, r, n.data);
+      return X.write(t, r, n.data);
 
      case e.PTR:
      case e.CNAME:
      case e.DNAME:
-      return _.write(t, r, n.data);
+      return k.write(t, r, n.data);
 
      default:
       return H.write(t, r, n.data);
@@ -1333,23 +1335,23 @@ const nt = {
       return o;
 
      case e.NS:
-      o.data = _.read(t, r);
+      o.data = k.read(t, r);
       return o;
 
      case e.SOA:
-      o.data = G.read(t, r);
+      o.data = F.read(t, r);
       return o;
 
      case e.HINFO:
-      o.data = X.read(t, r);
+      o.data = K.read(t, r);
       return o;
 
      case e.MX:
-      o.data = B.read(t, r);
+      o.data = G.read(t, r);
       return o;
 
      case e.TXT:
-      o.data = Y.read(t, r);
+      o.data = V.read(t, r);
       return o;
 
      case e.RP:
@@ -1357,11 +1359,11 @@ const nt = {
       return o;
 
      case e.AAAA:
-      o.data = V.read(t, r);
+      o.data = _.read(t, r);
       return o;
 
      case e.SRV:
-      o.data = K.read(t, r);
+      o.data = Y.read(t, r);
       return o;
 
      case e.NAPTR:
@@ -1385,7 +1387,7 @@ const nt = {
       return o;
 
      case e.DNSKEY:
-      o.data = k.read(t, r);
+      o.data = B.read(t, r);
       return o;
 
      case e.NSEC3:
@@ -1402,13 +1404,13 @@ const nt = {
       return o;
 
      case e.CAA:
-      o.data = F.read(t, r);
+      o.data = X.read(t, r);
       return o;
 
      case e.PTR:
      case e.CNAME:
      case e.DNAME:
-      o.data = _.read(t, r);
+      o.data = k.read(t, r);
       return o;
 
      default:
@@ -1436,7 +1438,7 @@ const st = {
     let a = 12;
     let i = 0;
     for (i = 0; e && i < e.length; i++) {
-      a += w.bytes(e[i]);
+      a += b.bytes(e[i]);
     }
     for (i = 0; r && i < r.length; i++) {
       a += nt.bytes(r[i]);
@@ -1461,7 +1463,7 @@ const st = {
     r += 12;
     let f = 0;
     for (f = 0; s && f < s.length; f++) {
-      r = w.write(e, r, s[f]);
+      r = b.write(e, r, s[f]);
     }
     for (f = 0; a && f < a.length; f++) {
       r = nt.write(e, r, a[f]);
@@ -1487,7 +1489,7 @@ const st = {
       flags: s,
       rtype: 15 & s,
       type: s & t.RESPONSE ? t.RESPONSE : t.QUERY,
-      questions: readList(w, e, r, a),
+      questions: readList(b, e, r, a),
       answers: readList(nt, e, r, i),
       authorities: readList(nt, e, r, o),
       additionals: readList(nt, e, r, c)
@@ -1505,6 +1507,117 @@ exports.RecordClass = r;
 
 exports.RecordType = e;
 
+exports.compareAnswers = (t, n) => {
+  if (t.type === e.OPT || n.type === e.OPT) {
+    return 0;
+  }
+  const s = t.class || r.IN;
+  const a = n.class || r.IN;
+  if (s !== a) {
+    return s - a;
+  } else if (t.type !== n.type) {
+    return t.type - n.type;
+  }
+  let i;
+  switch (t.type) {
+   case e.A:
+    i = M;
+    break;
+
+   case e.NS:
+    i = k;
+    break;
+
+   case e.SOA:
+    i = F;
+    break;
+
+   case e.HINFO:
+    i = K;
+    break;
+
+   case e.MX:
+    i = G;
+    break;
+
+   case e.TXT:
+    i = V;
+    break;
+
+   case e.RP:
+    i = q;
+    break;
+
+   case e.AAAA:
+    i = _;
+    break;
+
+   case e.SRV:
+    i = Y;
+    break;
+
+   case e.NAPTR:
+    i = Z;
+    break;
+
+   case e.DS:
+    i = W;
+    break;
+
+   case e.SSHFP:
+    i = z;
+    break;
+
+   case e.RRSIG:
+    i = $;
+    break;
+
+   case e.NSEC:
+    i = Q;
+    break;
+
+   case e.DNSKEY:
+    i = B;
+    break;
+
+   case e.NSEC3:
+    i = j;
+    break;
+
+   case e.TLSA:
+    i = J;
+    break;
+
+   case e.SVCB:
+   case e.HTTPS:
+    i = tt;
+    break;
+
+   case e.CAA:
+    i = X;
+    break;
+
+   case e.PTR:
+   case e.CNAME:
+   case e.DNAME:
+    i = k;
+    break;
+
+   default:
+    i = H;
+  }
+  const o = encodeIntoBuffer(i, t.data);
+  const c = encodeIntoBuffer(i, n.data);
+  const f = o.byteLength < c.byteLength ? o.byteLength : c.byteLength;
+  for (let t = 2; t < f; t++) {
+    const e = o[t] - c[t];
+    if (0 !== e) {
+      return e < 0 ? -1 : 1;
+    }
+  }
+  return o.byteLength !== c.byteLength ? o.byteLength < c.byteLength ? -1 : 1 : 0;
+};
+
 exports.decode = function decode(t) {
   const e = "buffer" in t ? new DataView(t.buffer, t.byteOffset, t.byteLength) : new DataView(t);
   return st.read(e, {