dns-message 1.0.0 → 1.0.1-canary-5358558d51748ee8060d5894158491696423b95e

package/dist/dns-message.mjs

@@ -141,62 +141,69 @@ const c = {
       if ("." === t[t.length - 1]) {
         e--;
       }
-      return e + t.replace(/\\\./g, ".").length;
+      e += t.replace(/\\\./g, ".").length;
+      if (e > 255) {
+        throw new RangeError(`Name "${t}" is above 255 byte limit.`);
+      }
+      return e;
     }
   },
   write(t, e, n) {
     const r = a.encode(n);
-    for (let n = 46 === r[0] ? 1 : 0, s = 0; n < r.byteLength; n = s + 1) {
-      s = r.indexOf(46, n);
-      while (s > -1 && 92 === r[s - 1]) {
-        s = r.indexOf(46, s + 1);
+    for (let s = 46 === r[0] ? 1 : 0, a = 0; s < r.byteLength; s = a + 1) {
+      a = r.indexOf(46, s);
+      while (a > -1 && 92 === r[a - 1]) {
+        a = r.indexOf(46, a + 1);
       }
-      if (-1 === s) {
-        s = r.byteLength;
+      if (-1 === a) {
+        a = r.byteLength;
       }
-      if (s === n) {
+      if (a === s) {
         continue;
+      } else if (a - s > 63) {
+        throw new RangeError(`Label in "${n}" is above 63 byte limit.`);
       }
-      let a = e + 1;
-      for (let e = n; e < s; e++) {
+      let i = e + 1;
+      for (let e = s; e < a; e++) {
         if (92 === r[e] && 46 === r[e + 1]) {
           e++;
         }
-        t.setUint8(a++, r[e]);
+        t.setUint8(i++, r[e]);
       }
-      t.setUint8(e, a - e - 1);
-      e = a;
-      n = s + 1;
+      t.setUint8(e, i - e - 1);
+      e = i;
+      s = a + 1;
     }
     return e + 1;
   },
   read(t, e) {
-    let {offset: n, length: r} = e;
-    const s = [];
-    while (e.offset - n < r) {
-      const a = t.getUint8(e.offset);
-      advance(e, 1);
-      if (0 === a) {
+    const n = [];
+    let r = e.offset;
+    let s = e;
+    while (1) {
+      const e = t.getUint8(s.offset);
+      if (0 === e) {
+        advance(s, 1);
         break;
-      } else if (!(192 & a)) {
-        const n = i.decode(sliceView(t, e, a));
-        s.push(n.replace(/\./g, "\\."));
-      } else if (!(192 & ~a)) {
-        const a = e.offset - n;
-        n = e.offset;
-        r = e.length;
-        e.offset = t.getUint16(e.offset - 1) - 49152;
-        e.length = r - a;
-        const i = c.read(t, e);
-        if (i && "." !== i) {
-          s.push(i);
+      } else if (!(192 & e)) {
+        advance(s, 1);
+        const r = sliceView(t, s, e);
+        n.push(i.decode(r).replace(/\./g, "\\."));
+      } else {
+        const e = t.getUint16(s.offset) - 49152;
+        advance(s, 2);
+        if (e < r) {
+          s = {
+            offset: r = e,
+            length: 0
+          };
+        } else {
+          advance(s, 2);
+          break;
         }
-        e.offset = n;
-        e.length = r;
-        break;
       }
     }
-    return s.join(".") || ".";
+    return n.join(".") || ".";
   }
 };
 
@@ -390,8 +397,9 @@ const array = t => ({
 });
 
 const advance = (t, e) => {
-  t.offset += e;
-  t.length -= e;
+  t.offset += 0 | e;
+  t.length -= 0 | e;
+  t.length &= ~(t.length >> 31);
 };
 
 const sliceView = (t, e, n = e.length) => {
@@ -439,7 +447,7 @@ let w = function(t) {
   return t;
 }({});
 
-const b = withRDLength({
+const E = withRDLength({
   bytes: t => f.bytes(t.data),
   write: (t, e, n) => f.write(t, e, n.data),
   read: (t, e) => ({
@@ -448,16 +456,16 @@ const b = withRDLength({
   })
 });
 
-const p = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])";
+const b = "(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])";
 
-const E = new RegExp(`^${`(?:${p}\\.){3}${p}`}$`);
+const A = new RegExp(`^${`(?:${b}\\.){3}${b}`}$`);
 
-const A = withRDLength({
+const p = withRDLength({
   bytes: t => Math.ceil((t.sourcePrefixLength || 0) / 8) + 4,
   write(t, e, n) {
     const r = n.sourcePrefixLength || 0;
     const s = n.scopePrefixLength || 0;
-    const a = n.family || (E.test(n.ip) ? w.v4 : w.v6);
+    const a = n.family || (A.test(n.ip) ? w.v4 : w.v6);
     const i = Math.ceil(r / 8);
     t.setUint16(e, a);
     t.setUint8(e + 2, r);
@@ -488,7 +496,7 @@ const A = withRDLength({
   }
 });
 
-const S = withRDLength({
+const N = withRDLength({
   bytes: t => t.timeout ? 2 : 0,
   write(t, e, n) {
     if (n.timeout) {
@@ -514,7 +522,7 @@ const S = withRDLength({
   }
 });
 
-const N = withRDLength({
+const S = withRDLength({
   bytes: t => t.length || 0,
   write: (t, e, n) => e + (n.length || 0),
   read(t, e) {
@@ -555,17 +563,17 @@ const isUnknownOpt = t => !!t.data;
 const I = {
   bytes(t) {
     if (isUnknownOpt(t)) {
-      return b.bytes(t) + 2;
+      return E.bytes(t) + 2;
     }
     switch (t.code) {
      case s.CLIENT_SUBNET:
-      return A.bytes(t) + 2;
+      return p.bytes(t) + 2;
 
      case s.TCP_KEEPALIVE:
-      return S.bytes(t) + 2;
+      return N.bytes(t) + 2;
 
      case s.PADDING:
-      return N.bytes(t) + 2;
+      return S.bytes(t) + 2;
 
      case s.KEY_TAG:
       return T.bytes(t) + 2;
@@ -575,17 +583,17 @@ const I = {
     t.setUint16(e, n.code);
     e += 2;
     if (isUnknownOpt(n)) {
-      return b.write(t, e, n);
+      return E.write(t, e, n);
     }
     switch (n.code) {
      case s.CLIENT_SUBNET:
-      return A.write(t, e, n);
+      return p.write(t, e, n);
 
      case s.TCP_KEEPALIVE:
-      return S.write(t, e, n);
+      return N.write(t, e, n);
 
      case s.PADDING:
-      return N.write(t, e, n);
+      return S.write(t, e, n);
 
      case s.KEY_TAG:
       return T.write(t, e, n);
@@ -596,19 +604,19 @@ const I = {
     advance(e, 2);
     switch (n) {
      case s.CLIENT_SUBNET:
-      return A.read(t, e);
+      return p.read(t, e);
 
      case s.TCP_KEEPALIVE:
-      return S.read(t, e);
+      return N.read(t, e);
 
      case s.PADDING:
-      return N.read(t, e);
+      return S.read(t, e);
 
      case s.KEY_TAG:
       return T.read(t, e);
 
      default:
-      const r = b.read(t, e);
+      const r = E.read(t, e);
       r.code = n;
       return r;
     }
@@ -628,9 +636,9 @@ let P = function(t) {
   return t;
 }({});
 
-const D = withRDLength(array(g));
+const R = withRDLength(array(g));
 
-const R = withRDLength(array(d));
+const D = withRDLength(array(d));
 
 const C = withRDLength(g);
 
@@ -644,10 +652,10 @@ const v = {
   bytes(t) {
     let e = 0;
     if (null != t.mandatory) {
-      e += D.bytes(t.mandatory) + 2;
+      e += R.bytes(t.mandatory) + 2;
     }
     if (null != t.alpn) {
-      e += R.bytes(t.alpn) + 2;
+      e += D.bytes(t.alpn) + 2;
     }
     if (t["no-default-alpn"]) {
       e += 4;
@@ -675,11 +683,11 @@ const v = {
   write(t, e, n) {
     if (null != n.mandatory) {
       t.setUint16(e, P.Mandatory);
-      e = D.write(t, e + 2, n.mandatory);
+      e = R.write(t, e + 2, n.mandatory);
     }
     if (null != n.alpn) {
       t.setUint16(e, P.Alpn);
-      e = R.write(t, e + 2, n.alpn);
+      e = D.write(t, e + 2, n.alpn);
     }
     if (n["no-default-alpn"]) {
       t.setUint16(e, P.NoDefaultAlpn);
@@ -729,11 +737,11 @@ const v = {
       advance(e, 2);
       switch (n) {
        case P.Mandatory:
-        s.mandatory = D.read(t, e);
+        s.mandatory = R.read(t, e);
         break;
 
        case P.Alpn:
-        s.alpn = R.read(t, e);
+        s.alpn = D.read(t, e);
         break;
 
        case P.NoDefaultAlpn:
@@ -779,11 +787,11 @@ const x = withRDLength(c);
 
 const _ = withRDLength(l);
 
-const V = withRDLength(y);
+const M = withRDLength(y);
 
-const Y = withRDLength(array(d));
+const V = withRDLength(array(d));
 
-const K = withRDLength({
+const Y = withRDLength({
   bytes: t => c.bytes(t.target) + 6,
   write(t, e, n) {
     t.setUint16(e, n.priority || 0);
@@ -807,7 +815,7 @@ const K = withRDLength({
   }
 });
 
-const M = withRDLength({
+const K = withRDLength({
   bytes: t => d.bytes(t.cpu) + d.bytes(t.os),
   write(t, e, n) {
     e = d.write(t, e, n.cpu);
@@ -1129,22 +1137,22 @@ const nt = {
       return n + F.bytes(t.data);
 
      case e.HINFO:
-      return n + M.bytes(t.data);
+      return n + K.bytes(t.data);
 
      case e.MX:
       return n + G.bytes(t.data);
 
      case e.TXT:
-      return n + Y.bytes(t.data);
+      return n + V.bytes(t.data);
 
      case e.RP:
       return n + $.bytes(t.data);
 
      case e.AAAA:
-      return n + V.bytes(t.data);
+      return n + M.bytes(t.data);
 
      case e.SRV:
-      return n + K.bytes(t.data);
+      return n + Y.bytes(t.data);
 
      case e.NAPTR:
       return n + W.bytes(t.data);
@@ -1180,6 +1188,11 @@ const nt = {
      case e.CAA:
       return n + X.bytes(t.data);
 
+     case e.PTR:
+     case e.CNAME:
+     case e.DNAME:
+      return n + x.bytes(t.data);
+
      default:
       return n + H.bytes(t.data);
     }
@@ -1210,22 +1223,22 @@ const nt = {
       return F.write(t, n, r.data);
 
      case e.HINFO:
-      return M.write(t, n, r.data);
+      return K.write(t, n, r.data);
 
      case e.MX:
       return G.write(t, n, r.data);
 
      case e.TXT:
-      return Y.write(t, n, r.data);
+      return V.write(t, n, r.data);
 
      case e.RP:
       return $.write(t, n, r.data);
 
      case e.AAAA:
-      return V.write(t, n, r.data);
+      return M.write(t, n, r.data);
 
      case e.SRV:
-      return K.write(t, n, r.data);
+      return Y.write(t, n, r.data);
 
      case e.NAPTR:
       return W.write(t, n, r.data);
@@ -1258,6 +1271,11 @@ const nt = {
      case e.CAA:
       return X.write(t, n, r.data);
 
+     case e.PTR:
+     case e.CNAME:
+     case e.DNAME:
+      return x.write(t, n, r.data);
+
      default:
       return H.write(t, n, r.data);
     }
@@ -1305,7 +1323,7 @@ const nt = {
       return o;
 
      case e.HINFO:
-      o.data = M.read(t, n);
+      o.data = K.read(t, n);
       return o;
 
      case e.MX:
@@ -1313,7 +1331,7 @@ const nt = {
       return o;
 
      case e.TXT:
-      o.data = Y.read(t, n);
+      o.data = V.read(t, n);
       return o;
 
      case e.RP:
@@ -1321,11 +1339,11 @@ const nt = {
       return o;
 
      case e.AAAA:
-      o.data = V.read(t, n);
+      o.data = M.read(t, n);
       return o;
 
      case e.SRV:
-      o.data = K.read(t, n);
+      o.data = Y.read(t, n);
       return o;
 
      case e.NAPTR:
@@ -1369,6 +1387,12 @@ const nt = {
       o.data = X.read(t, n);
       return o;
 
+     case e.PTR:
+     case e.CNAME:
+     case e.DNAME:
+      o.data = x.read(t, n);
+      return o;
+
      default:
       o.data = H.read(t, n);
       return o;
@@ -1463,7 +1487,7 @@ function decode(t) {
 
 function streamDecode(t) {
   const e = "buffer" in t ? new DataView(t.buffer, t.byteOffset, t.byteLength) : new DataView(t);
-  const n = Math.min(e.byteLength, e.getUint16(0)) - 2;
+  const n = Math.min(e.byteLength - 2, e.getUint16(0));
   return rt.read(e, {
     offset: 2,
     length: n
@@ -1484,7 +1508,7 @@ function streamEncode(t) {
   const e = new ArrayBuffer(rt.bytes(t) + 2);
   const n = new DataView(e);
   const r = rt.write(n, 2, t);
-  n.setUint16(0, r);
+  n.setUint16(0, r - 2);
   return new Uint8Array(e, 0, r);
 }