dnssd-advertise 1.0.2 → 1.0.3

package/dist/dnssd-advertise.js

@@ -303,7 +303,7 @@ const y = {
   }
 };
 
-const p = {
+const E = {
   bytes: () => 4,
   write(e, t, n) {
     const r = n.split(".", 4);
@@ -333,7 +333,7 @@ const g = {
   }
 };
 
-const E = {
+const p = {
   bytes: () => 16,
   write(e, t, n) {
     const r = n.indexOf("::");
@@ -423,6 +423,12 @@ const advance = (e, t) => {
   e.length &= ~(e.length >> 31);
 };
 
+const encodeIntoBuffer = (e, t) => {
+  const n = new ArrayBuffer(e.bytes(t));
+  const r = e.write(new DataView(n), 0, t);
+  return new Uint8Array(n, 0, r);
+};
+
 const sliceView = (e, t, n = t.length) => {
   const r = new Uint8Array(e.buffer, e.byteOffset + t.offset, n);
   advance(t, n);
@@ -490,11 +496,7 @@ const m = withRDLength({
     e.setUint8(t + 2, r);
     e.setUint8(t + 3, s);
     t += 4;
-    const i = ((e, t) => {
-      const n = new ArrayBuffer(e.bytes(t));
-      const r = e.write(new DataView(n), 0, t);
-      return new Uint8Array(n, 0, r);
-    })(a === b.v4 ? p : E, n.ip);
+    const i = encodeIntoBuffer(a === b.v4 ? E : p, n.ip);
     for (let n = 0; n < o; n++) {
       e.setUint8(t++, i[n]);
     }
@@ -510,7 +512,7 @@ const m = withRDLength({
       family: n,
       sourcePrefixLength: r,
       scopePrefixLength: s,
-      ip: n === b.v4 ? p.read(e, t) : E.read(e, t)
+      ip: n === b.v4 ? E.read(e, t) : p.read(e, t)
     };
   }
 });
@@ -661,11 +663,11 @@ const C = withRDLength(array(h));
 
 const D = withRDLength(g);
 
-const v = withRDLength(array(p));
-
 const L = withRDLength(array(E));
 
-const k = withRDLength(u);
+const k = withRDLength(array(p));
+
+const v = withRDLength(u);
 
 const M = {
   bytes(e) {
@@ -683,19 +685,19 @@ const M = {
       t += D.bytes(e.port) + 2;
     }
     if (e.ipv4hint) {
-      t += v.bytes(e.ipv4hint) + 2;
+      t += L.bytes(e.ipv4hint) + 2;
     }
     if (e.ipv6hint) {
-      t += L.bytes(e.ipv6hint) + 2;
+      t += k.bytes(e.ipv6hint) + 2;
     }
     if (e.echconfig) {
-      t += k.bytes(e.echconfig) + 2;
+      t += v.bytes(e.echconfig) + 2;
     }
     if (e.dohpath) {
-      t += k.bytes(e.dohpath) + 2;
+      t += v.bytes(e.dohpath) + 2;
     }
     if (e.odoh) {
-      t += k.bytes(e.odoh) + 2;
+      t += v.bytes(e.odoh) + 2;
     }
     return t;
   },
@@ -719,23 +721,23 @@ const M = {
     }
     if (n.ipv4hint) {
       e.setUint16(t, R.Ipv4Hint);
-      t = v.write(e, t + 2, n.ipv4hint);
+      t = L.write(e, t + 2, n.ipv4hint);
     }
     if (n.ipv6hint) {
       e.setUint16(t, R.Ipv6Hint);
-      t = L.write(e, t + 2, n.ipv6hint);
+      t = k.write(e, t + 2, n.ipv6hint);
     }
     if (n.echconfig) {
       e.setUint16(t, R.EchConfig);
-      t = k.write(e, t + 2, n.echconfig);
+      t = v.write(e, t + 2, n.echconfig);
     }
     if (n.dohpath) {
       e.setUint16(t, R.DohPath);
-      t = k.write(e, t + 2, n.dohpath);
+      t = v.write(e, t + 2, n.dohpath);
     }
     if (n.odoh) {
       e.setUint16(t, R.Odoh);
-      t = k.write(e, t + 2, n.odoh);
+      t = v.write(e, t + 2, n.odoh);
     }
     return t;
   },
@@ -774,27 +776,27 @@ const M = {
         break;
 
        case R.Ipv4Hint:
-        s.ipv4hint = v.read(e, t);
+        s.ipv4hint = L.read(e, t);
         break;
 
        case R.Ipv6Hint:
-        s.ipv6hint = L.read(e, t);
+        s.ipv6hint = k.read(e, t);
         break;
 
        case R.EchConfig:
-        s.echconfig = k.read(e, t);
+        s.echconfig = v.read(e, t);
         break;
 
        case R.DohPath:
-        s.dohpath = c.decode(k.read(e, t));
+        s.dohpath = c.decode(v.read(e, t));
         break;
 
        case R.Odoh:
-        s.odoh = k.read(e, t);
+        s.odoh = v.read(e, t);
         break;
 
        default:
-        k.read(e, t);
+        v.read(e, t);
       }
     }
     return s;
@@ -805,13 +807,13 @@ const _ = withRDLength(u);
 
 const H = withRDLength(l);
 
-const x = withRDLength(p);
+const x = withRDLength(E);
 
-const V = withRDLength(E);
+const V = withRDLength(p);
 
 const Y = withRDLength(array(h));
 
-const q = withRDLength({
+const B = withRDLength({
   bytes: e => l.bytes(e.target) + 6,
   write(e, t, n) {
     e.setUint16(t, n.priority || 0);
@@ -835,7 +837,7 @@ const q = withRDLength({
   }
 });
 
-const B = withRDLength({
+const q = withRDLength({
   bytes: e => h.bytes(e.cpu) + h.bytes(e.os),
   write(e, t, n) {
     t = h.write(e, t, n.cpu);
@@ -859,7 +861,7 @@ const toCaaTag = e => {
   }
 };
 
-const G = withRDLength({
+const K = withRDLength({
   bytes: e => h.bytes(e.tag) + u.bytes(e.value) + 1,
   write(e, t, n) {
     let r = n.flags || 0;
@@ -882,7 +884,7 @@ const G = withRDLength({
   }
 });
 
-const K = withRDLength({
+const G = withRDLength({
   bytes: e => l.bytes(e.mname) + l.bytes(e.rname) + 20,
   write(e, t, n) {
     t = l.write(e, t, n.mname);
@@ -1152,10 +1154,10 @@ const re = {
       return t + H.bytes(e.data);
 
      case r.SOA:
-      return t + K.bytes(e.data);
+      return t + G.bytes(e.data);
 
      case r.HINFO:
-      return t + B.bytes(e.data);
+      return t + q.bytes(e.data);
 
      case r.MX:
       return t + X.bytes(e.data);
@@ -1170,7 +1172,7 @@ const re = {
       return t + V.bytes(e.data);
 
      case r.SRV:
-      return t + q.bytes(e.data);
+      return t + B.bytes(e.data);
 
      case r.NAPTR:
       return t + J.bytes(e.data);
@@ -1204,7 +1206,7 @@ const re = {
       return t + te.bytes(e.data);
 
      case r.CAA:
-      return t + G.bytes(e.data);
+      return t + K.bytes(e.data);
 
      case r.PTR:
      case r.CNAME:
@@ -1238,10 +1240,10 @@ const re = {
       return H.write(e, t, n.data);
 
      case r.SOA:
-      return K.write(e, t, n.data);
+      return G.write(e, t, n.data);
 
      case r.HINFO:
-      return B.write(e, t, n.data);
+      return q.write(e, t, n.data);
 
      case r.MX:
       return X.write(e, t, n.data);
@@ -1256,7 +1258,7 @@ const re = {
       return V.write(e, t, n.data);
 
      case r.SRV:
-      return q.write(e, t, n.data);
+      return B.write(e, t, n.data);
 
      case r.NAPTR:
       return J.write(e, t, n.data);
@@ -1287,7 +1289,7 @@ const re = {
       return te.write(e, t, n.data);
 
      case r.CAA:
-      return G.write(e, t, n.data);
+      return K.write(e, t, n.data);
 
      case r.PTR:
      case r.CNAME:
@@ -1337,11 +1339,11 @@ const re = {
       return i;
 
      case r.SOA:
-      i.data = K.read(e, t);
+      i.data = G.read(e, t);
       return i;
 
      case r.HINFO:
-      i.data = B.read(e, t);
+      i.data = q.read(e, t);
       return i;
 
      case r.MX:
@@ -1361,7 +1363,7 @@ const re = {
       return i;
 
      case r.SRV:
-      i.data = q.read(e, t);
+      i.data = B.read(e, t);
       return i;
 
      case r.NAPTR:
@@ -1402,7 +1404,7 @@ const re = {
       return i;
 
      case r.CAA:
-      i.data = G.read(e, t);
+      i.data = K.read(e, t);
       return i;
 
      case r.PTR:
@@ -1418,6 +1420,117 @@ const re = {
   }
 };
 
+const compareAnswers = (e, t) => {
+  if (e.type === r.OPT || t.type === r.OPT) {
+    return 0;
+  }
+  const n = e.class || s.IN;
+  const a = t.class || s.IN;
+  if (n !== a) {
+    return n - a;
+  } else if (e.type !== t.type) {
+    return e.type - t.type;
+  }
+  let o;
+  switch (e.type) {
+   case r.A:
+    o = x;
+    break;
+
+   case r.NS:
+    o = H;
+    break;
+
+   case r.SOA:
+    o = G;
+    break;
+
+   case r.HINFO:
+    o = q;
+    break;
+
+   case r.MX:
+    o = X;
+    break;
+
+   case r.TXT:
+    o = Y;
+    break;
+
+   case r.RP:
+    o = z;
+    break;
+
+   case r.AAAA:
+    o = V;
+    break;
+
+   case r.SRV:
+    o = B;
+    break;
+
+   case r.NAPTR:
+    o = J;
+    break;
+
+   case r.DS:
+    o = Z;
+    break;
+
+   case r.SSHFP:
+    o = W;
+    break;
+
+   case r.RRSIG:
+    o = F;
+    break;
+
+   case r.NSEC:
+    o = Q;
+    break;
+
+   case r.DNSKEY:
+    o = $;
+    break;
+
+   case r.NSEC3:
+    o = j;
+    break;
+
+   case r.TLSA:
+    o = ee;
+    break;
+
+   case r.SVCB:
+   case r.HTTPS:
+    o = te;
+    break;
+
+   case r.CAA:
+    o = K;
+    break;
+
+   case r.PTR:
+   case r.CNAME:
+   case r.DNAME:
+    o = H;
+    break;
+
+   default:
+    o = _;
+  }
+  const i = encodeIntoBuffer(o, e.data);
+  const c = encodeIntoBuffer(o, t.data);
+  const f = i.byteLength < c.byteLength ? i.byteLength : c.byteLength;
+  for (let e = 2; e < f; e++) {
+    const t = i[e] - c[e];
+    if (0 !== t) {
+      return t < 0 ? -1 : 1;
+    }
+  }
+  return i.byteLength !== c.byteLength ? i.byteLength < c.byteLength ? -1 : 1 : 0;
+};
+
 const readList = (e, t, n, r) => {
   if (!r) {
     return;
@@ -1599,12 +1712,15 @@ const aaaaAnswers = (e, t, n) => t.filter(e => e.family === fe.v6).map(t => ({
 
 const answers = (e, t, n) => [ ...ptrAnswers(e, n), srvAnswer(e, n), txtAnswer(e, n), ...aAnswers(e, t, n), ...aaaaAnswers(e, t, n) ];
 
+const authorities = (e, t, n) => [ ...aAnswers(e, t, n), txtAnswer(e, n), ...aaaaAnswers(e, t, n), srvAnswer(e, n) ];
+
 let ce = function(e) {
   e[e.NONE = 0] = "NONE";
   e[e.NAME = 1] = "NAME";
   e[e.HOSTNAME_A = 2] = "HOSTNAME_A";
   e[e.HOSTNAME_AAAA = 4] = "HOSTNAME_AAAA";
   e[e.HOSTNAME = e.HOSTNAME_A | e.HOSTNAME_AAAA] = "HOSTNAME";
+  e[e.LOST_TIEBREAKER = 8] = "LOST_TIEBREAKER";
   return e;
 }({});
 
@@ -1667,10 +1783,29 @@ const checkQuestionConflicts = (e, t, s) => {
   if (e.type !== n.QUERY || !e.questions?.length || !e.authorities?.length) {
     return ce.NONE;
   }
-  return e.questions.some(e => {
+  if (!e.questions.some(e => {
     const n = e.name.toLowerCase();
     return (e => e.type === r.ANY || e.type === r.A || e.type === r.AAAA || e.type === r.SRV || e.type === r.TXT || e.type === r.PTR)(e) && (n === t.host || n === t.fqdnIn);
-  }) ? checkAnswerConflicts(e.authorities, t, s) : ce.NONE;
+  })) {
+    return ce.NONE;
+  }
+  const a = ((e, t) => {
+    e.sort(compareAnswers);
+    t.sort(compareAnswers);
+    const n = e.length < t.length ? e.length : t.length;
+    for (let r = 0; r < n; r++) {
+      const n = compareAnswers(e[r], t[r]);
+      if (0 !== n) {
+        return n;
+      }
+    }
+    return e.length !== t.length ? e.length < t.length ? -1 : 1 : 0;
+  })(authorities(t, s, t.ttl), e.authorities.filter(e => e.name?.toLowerCase() === t.host || e.name?.toLowerCase() === t.fqdnIn));
+  if (a < 0) {
+    return checkAnswerConflicts(e.authorities, t, s);
+  } else {
+    return ce.NONE;
+  }
 };
 
 const responseMessage = (e, t, s, o) => {
@@ -2140,13 +2275,16 @@ const ye = {
               e.delete(onCancel);
               let i = !1;
               try {
-                const e = await n({
-                  attempt: r,
-                  async retry(e) {
-                    i = !0;
-                    return schedule(r + 1, e);
-                  }
-                });
+                let e;
+                if (n) {
+                  e = await n({
+                    attempt: r,
+                    async retry(e) {
+                      i = !0;
+                      return schedule(r + 1, e);
+                    }
+                  });
+                }
                 a(e);
               } catch (e) {
                 if (!i && shouldRetry(t, r)) {
@@ -2234,11 +2372,12 @@ const ye = {
   hostname
 };
 
-let pe = function(e) {
+let Ee = function(e) {
   e[e.SEND = 0] = "SEND";
   e[e.PROBE = 1] = "PROBE";
   e[e.ANNOUNCE = 2] = "ANNOUNCE";
   e[e.REOPEN = 3] = "REOPEN";
+  e[e.DELAY = 4] = "DELAY";
   return e;
 }({});
 
@@ -2248,31 +2387,37 @@ const randomDelay = (e, t) => e + Math.floor(Math.random() * (t - e + 1));
 
 const shouldRetry = (e, t) => {
   switch (e) {
-   case pe.SEND:
-   case pe.PROBE:
+   case Ee.SEND:
+   case Ee.PROBE:
     return t < 4;
 
-   case pe.ANNOUNCE:
+   case Ee.ANNOUNCE:
     return t < 3;
 
-   case pe.REOPEN:
+   case Ee.REOPEN:
     return !0;
+
+   case Ee.DELAY:
+    return !1;
   }
 };
 
 const getDelay = (e, t) => {
   switch (e) {
-   case pe.SEND:
+   case Ee.SEND:
     return randomDelay(20, 120);
 
-   case pe.PROBE:
+   case Ee.PROBE:
     return t ? 250 : randomDelay(0, 250);
 
-   case pe.ANNOUNCE:
+   case Ee.ANNOUNCE:
     return t ? 1e3 * 2 ** (Math.min(t, 3) - 1) : 0;
 
-   case pe.REOPEN:
+   case Ee.REOPEN:
     return 6e3;
+
+   case Ee.DELAY:
+    return 1e3;
   }
 };
 
@@ -2282,7 +2427,7 @@ const runTimer = (e, t, n) => {
   let a;
   if (s) {
     for (const t of s) {
-      if (e === pe.REOPEN || Math.abs(t.time - r) <= 100) {
+      if (e === Ee.REOPEN || Math.abs(t.time - r) <= 100) {
         a = t;
         break;
       }
@@ -2327,12 +2472,12 @@ class AbortError extends Error {
   }
 }
 
-var Ee = function(e) {
+var pe = function(e) {
   e[e.PROBING = 0] = "PROBING";
   e[e.ADVERTISE = 2] = "ADVERTISE";
   e[e.CLOSED = 3] = "CLOSED";
   return e;
-}(Ee || {});
+}(pe || {});
 
 function createInterfaceAdvertiser(e, t, o) {
   const i = o.createServiceInput(t);
@@ -2340,11 +2485,11 @@ function createInterfaceAdvertiser(e, t, o) {
   let f = 0;
   let l = 0;
   let u = o.createServiceRecord(i);
-  let d = Ee.PROBING;
+  let d = pe.PROBING;
   let h = ce.NONE;
   const y = o.createSocket(e, {
     async onMessage(e, t) {
-      if (d === Ee.CLOSED) {
+      if (d === pe.CLOSED) {
         return;
       }
       const r = function decode(e) {
@@ -2354,25 +2499,29 @@ function createInterfaceAdvertiser(e, t, o) {
           length: t.byteLength
         });
       }(e);
-      if (d === Ee.PROBING) {
-        l++;
-        h |= ((e, t, r) => e.type === n.RESPONSE ? checkResponseConflicts(e, t, r) : checkQuestionConflicts(e, t, r))(r, u, y.bindings);
-        return;
-      } else if (d === Ee.ADVERTISE) {
+      if (d === pe.PROBING) {
+        if (r.type === n.QUERY) {
+          l++;
+          const e = checkQuestionConflicts(r, u, y.bindings);
+          h |= e !== ce.NONE ? e | ce.LOST_TIEBREAKER : ce.NONE;
+        } else if (r.type === n.RESPONSE) {
+          h |= checkResponseConflicts(r, u, y.bindings);
+        }
+      } else if (d === pe.ADVERTISE) {
         h = checkResponseConflicts(r, u, y.bindings);
         if (resolveConflicts()) {
-          d = Ee.PROBING;
-          return;
-        }
-        try {
-          await async function sendReply(e, t) {
-            const n = responseMessage(e, u, y.bindings, !1);
-            const r = responseMessage(e, u, y.bindings, !0);
-            await Promise.all([ n && c.schedule(pe.SEND, () => t.reply(n)), r && c.schedule(pe.SEND, () => y.send(r)) ]);
-          }(r, t);
-        } catch (e) {
-          if (!AbortError.isAbortError(e)) {
-            o.onError(e);
+          d = pe.PROBING;
+        } else {
+          try {
+            await async function sendReply(e, t) {
+              const n = responseMessage(e, u, y.bindings, !1);
+              const r = responseMessage(e, u, y.bindings, !0);
+              await Promise.all([ n && c.schedule(Ee.SEND, () => t.reply(n)), r && c.schedule(Ee.SEND, () => y.send(r)) ]);
+            }(r, t);
+          } catch (e) {
+            if (!AbortError.isAbortError(e)) {
+              o.onError(e);
+            }
           }
         }
       }
@@ -2392,9 +2541,9 @@ function createInterfaceAdvertiser(e, t, o) {
         class: s.IN,
         qu: !0
       } ],
-      authorities: [ srvAnswer(e, e.ttl), ...aAnswers(e, t, e.ttl), ...aaaaAnswers(e, t, e.ttl) ]
+      authorities: authorities(e, t, e.ttl)
     }))(u, y.bindings);
-    await c.schedule(pe.SEND, () => y.send(e));
+    await c.schedule(Ee.SEND, () => y.send(e));
   }
   async function sendAnnouncement() {
     const e = ((e, t) => encode({
@@ -2402,7 +2551,7 @@ function createInterfaceAdvertiser(e, t, o) {
       flags: a.AUTHORITATIVE_ANSWER,
       answers: answers(e, t, e.ttl)
     }))(u, y.bindings);
-    await c.schedule(pe.SEND, () => y.send(e));
+    await c.schedule(Ee.SEND, () => y.send(e));
   }
   async function sendGoodbye() {
     const e = ((e, t) => encode({
@@ -2410,7 +2559,7 @@ function createInterfaceAdvertiser(e, t, o) {
       flags: a.AUTHORITATIVE_ANSWER,
       answers: answers(e, t, 0)
     }))(u, y.bindings);
-    await c.schedule(pe.SEND, () => y.send(e));
+    await c.schedule(Ee.SEND, () => y.send(e));
   }
   function resolveConflicts() {
     if (h !== ce.NONE) {
@@ -2429,37 +2578,41 @@ function createInterfaceAdvertiser(e, t, o) {
   }
   function next() {
     switch (d) {
-     case Ee.PROBING:
+     case pe.PROBING:
       return async function probe() {
         l = 0;
         h = ce.NONE;
-        await c.schedule(pe.PROBE, async e => {
+        let e = 3;
+        await c.schedule(Ee.PROBE, async t => {
+          const n = h & ce.LOST_TIEBREAKER;
           if (y.closed) {
-            d = Ee.CLOSED;
+            d = pe.CLOSED;
             return;
-          } else if (d !== Ee.PROBING) {
+          } else if (d !== pe.PROBING) {
             return;
-          } else if (e.attempt >= 3) {
-            if (l) {
-              d = h === ce.NONE ? Ee.ADVERTISE : Ee.CLOSED;
-            } else {
-              d = Ee.CLOSED;
+          } else if (resolveConflicts()) {
+            if (n) {
+              await c.schedule(Ee.DELAY);
             }
-            return;
-          } else {
-            resolveConflicts();
+            e += 4;
+            return t.retry();
+          } else if (t.attempt < e) {
             await sendProbe();
-            return e.retry();
+            return t.retry();
+          } else if (l) {
+            d = h === ce.NONE ? pe.ADVERTISE : pe.CLOSED;
+          } else {
+            d = pe.CLOSED;
           }
         });
         return next();
       }();
 
-     case Ee.ADVERTISE:
+     case pe.ADVERTISE:
       return async function announce() {
-        while (d === Ee.ADVERTISE && !y.closed) {
-          if (!await c.schedule(pe.ANNOUNCE, async e => {
-            if (d !== Ee.ADVERTISE) {
+        while (d === pe.ADVERTISE && !y.closed) {
+          if (!await c.schedule(Ee.ANNOUNCE, async e => {
+            if (d !== pe.ADVERTISE) {
               return !1;
             } else if (e.attempt > 2 && y.refresh()) {
               return !0;
@@ -2472,8 +2625,8 @@ function createInterfaceAdvertiser(e, t, o) {
             }
             return !1;
           })) {
-            await c.schedule(pe.REOPEN, async e => {
-              if (d !== Ee.ADVERTISE) {
+            await c.schedule(Ee.REOPEN, async e => {
+              if (d !== pe.ADVERTISE) {
                 return;
               } else if (!y.refresh() && !y.closed) {
                 return e.retry();
@@ -2484,19 +2637,20 @@ function createInterfaceAdvertiser(e, t, o) {
         return next();
       }();
 
-     case Ee.CLOSED:
+     case pe.CLOSED:
       return async function reopen() {
         c.cancel();
         if (f++ > 15) {
           return;
         }
-        await c.schedule(pe.REOPEN, async e => {
-          if (d === Ee.CLOSED && y.refresh() && !y.closed) {
-            return e.retry();
-          } else if (!y.closed) {
-            d = Ee.PROBING;
+        await c.schedule(Ee.REOPEN, async e => {
+          if (d !== pe.CLOSED) {
             return;
           }
+          if (!y.refresh() || y.closed) {
+            return e.retry();
+          }
+          d = pe.PROBING;
         });
         return next();
       }();
@@ -2505,7 +2659,7 @@ function createInterfaceAdvertiser(e, t, o) {
   return {
     promise: (async () => {
       try {
-        d = Ee.PROBING;
+        d = pe.PROBING;
         await next();
         c.cancel();
       } catch (e) {
@@ -2519,8 +2673,8 @@ function createInterfaceAdvertiser(e, t, o) {
     async close() {
       try {
         c.cancel();
-        if (d !== Ee.CLOSED) {
-          d = Ee.CLOSED;
+        if (d !== pe.CLOSED) {
+          d = pe.CLOSED;
           await sendGoodbye();
         }
         c.cancel();
@@ -2543,7 +2697,7 @@ exports.advertise = function advertise(e) {
     for (const s of n) {
       r.set(s, createInterfaceAdvertiser(s, e, t));
     }
-    s.schedule(pe.REOPEN, n => {
+    s.schedule(Ee.REOPEN, n => {
       try {
         const s = new Set(t.networkInterfaceNames());
         for (const n of s) {