thunder-bridge 0.8.9 → 0.8.10

package/dist/server.cjs

@@ -402,20 +402,22 @@ var REDIRECTS = [301, 302, 303, 307, 308];
 var KEEPS_THE_METHOD = [307, 308];
 var CREDENTIALS = ["authorization", "cookie", "proxy-authorization"];
 var BODY_LIMIT_BYTES = 262144;
+var throughFetch = (url, sent, signal) => fetch(url, {
+  method: sent.method ?? "GET",
+  headers: sent.headers ?? {},
+  body: sent.body,
+  redirect: "manual",
+  signal
+});
+var send = throughFetch;
 async function ask(url, sent = {}) {
   const capped = AbortSignal.timeout(HTTP_TIMEOUT_MS);
   const signal = sent.deadline ? AbortSignal.any([sent.deadline, capped]) : capped;
   let target = url;
   let carried = sent;
   for (let hop = 0; hop <= HOPS_FOLLOWED; hop += 1) {
-    await refuseUnlessPublic(target);
-    const response = await fetch(target, {
-      method: carried.method ?? "GET",
-      headers: carried.headers ?? {},
-      body: carried.body,
-      redirect: "manual",
-      signal
-    });
+    const at = await addressesToReach(target);
+    const response = await send(target, carried, signal, at);
     if (!REDIRECTS.includes(response.status)) return await answerOf(response);
     const location = response.headers.get("location");
     if (location === null) {
@@ -429,7 +431,15 @@ async function ask(url, sent = {}) {
   }
   throw new Error(`${url} redirected more than ${HOPS_FOLLOWED} times`);
 }
-async function resolvesNothingPrivate(url) {
+async function addressesToReach(url) {
+  if (!publicHttps(url)) throw new Error(`${url} is not a public https URL`);
+  const found = await resolved(url);
+  if (found.length === 0 || !found.every((one) => publicAddress(one.address))) {
+    throw new Error(`${url} resolves to an address we do not reach`);
+  }
+  return found;
+}
+async function resolved(url) {
   const { lookup } = await import("dns/promises");
   const { setTimeout: sleep } = await import("timers/promises");
   const host = new URL(url).hostname.replace(/^\[|]$/g, "");
@@ -437,11 +447,7 @@ async function resolvesNothingPrivate(url) {
     lookup(host, { all: true, verbatim: true }).catch(() => []),
     sleep(LOOKUP_TIMEOUT_MS, null, { ref: false })
   ]);
-  return found !== null && found.every((one) => publicAddress(one.address));
-}
-async function refuseUnlessPublic(url) {
-  if (!publicHttps(url)) throw new Error(`${url} is not a public https URL`);
-  if (!await resolvesNothingPrivate(url)) throw new Error(`${url} resolves to an address we do not reach`);
+  return found ?? [];
 }
 async function answerOf(response) {
   const { status, ok, headers } = response;
@@ -808,21 +814,21 @@ async function mintThroughGateway(config, address, amountMsat, nonce) {
   return { bolt11: payment.bolt11, verifyUrl: payment.verifyUrl };
 }
 async function mintBlind(config, address, amountMsat) {
-  const resolved = await resolve([address], amountMsat);
-  const minted = { ...resolved, amountMsat, lnAddress: resolved.address };
+  const resolved2 = await resolve([address], amountMsat);
+  const minted = { ...resolved2, amountMsat, lnAddress: resolved2.address };
   const locked = config.sealed;
   try {
     await config.gateway.watchPayment({
-      paymentHash: resolved.paymentHash,
-      verifyUrl: resolved.verifyUrl,
-      expiresAt: resolved.expiresAt,
+      paymentHash: resolved2.paymentHash,
+      verifyUrl: resolved2.verifyUrl,
+      expiresAt: resolved2.expiresAt,
       trigger: config.watchSecret,
       sealed: locked ? await seal(locked.secret, JSON.stringify(locked.data(minted))) : void 0
     });
   } catch (refused) {
     if (!alreadyWatched(refused)) throw refused;
   }
-  return { bolt11: resolved.bolt11, verifyUrl: resolved.verifyUrl };
+  return { bolt11: resolved2.bolt11, verifyUrl: resolved2.verifyUrl };
 }
 function alreadyWatched(refused) {
   return refused instanceof ProblemError && isProblemType(refused, PAYMENT_ALREADY_WATCHED);
@@ -908,16 +914,16 @@ async function relayedVerifyUrl(endpoint, wallet, secret) {
 var LIGHTNING = "lightning";
 function blindLightningRail(config) {
   return async (order) => {
-    const resolved = await invoiceFrom(config.lnAddresses, await config.amountMsat(order));
+    const resolved2 = await invoiceFrom(config.lnAddresses, await config.amountMsat(order));
     const relay = config.relayVerifyThrough;
     const watched = await config.gateway.watchPayment({
-      paymentHash: resolved.paymentHash,
+      paymentHash: resolved2.paymentHash,
       verifyUrl: relay ? await relayedVerifyUrl(
         relay.endpoint,
-        { url: resolved.verifyUrl, hash: resolved.paymentHash },
+        { url: resolved2.verifyUrl, hash: resolved2.paymentHash },
         relay.secret
-      ) : resolved.verifyUrl,
-      expiresAt: resolved.expiresAt,
+      ) : resolved2.verifyUrl,
+      expiresAt: resolved2.expiresAt,
       trigger: config.trigger,
       sealed: await config.sealed?.(order),
       webhookUrl: config.webhookUrl,
@@ -926,9 +932,9 @@ function blindLightningRail(config) {
     return {
       id: watched.id,
       rail: config.name ?? LIGHTNING,
-      scan: resolved.bolt11,
-      qr: encodeForQr(resolved.bolt11),
-      expiresAt: resolved.expiresAt
+      scan: resolved2.bolt11,
+      qr: encodeForQr(resolved2.bolt11),
+      expiresAt: resolved2.expiresAt
     };
   };
 }

package/dist/server.js

@@ -363,20 +363,22 @@ var REDIRECTS = [301, 302, 303, 307, 308];
 var KEEPS_THE_METHOD = [307, 308];
 var CREDENTIALS = ["authorization", "cookie", "proxy-authorization"];
 var BODY_LIMIT_BYTES = 262144;
+var throughFetch = (url, sent, signal) => fetch(url, {
+  method: sent.method ?? "GET",
+  headers: sent.headers ?? {},
+  body: sent.body,
+  redirect: "manual",
+  signal
+});
+var send = throughFetch;
 async function ask(url, sent = {}) {
   const capped = AbortSignal.timeout(HTTP_TIMEOUT_MS);
   const signal = sent.deadline ? AbortSignal.any([sent.deadline, capped]) : capped;
   let target = url;
   let carried = sent;
   for (let hop = 0; hop <= HOPS_FOLLOWED; hop += 1) {
-    await refuseUnlessPublic(target);
-    const response = await fetch(target, {
-      method: carried.method ?? "GET",
-      headers: carried.headers ?? {},
-      body: carried.body,
-      redirect: "manual",
-      signal
-    });
+    const at = await addressesToReach(target);
+    const response = await send(target, carried, signal, at);
     if (!REDIRECTS.includes(response.status)) return await answerOf(response);
     const location = response.headers.get("location");
     if (location === null) {
@@ -390,7 +392,15 @@ async function ask(url, sent = {}) {
   }
   throw new Error(`${url} redirected more than ${HOPS_FOLLOWED} times`);
 }
-async function resolvesNothingPrivate(url) {
+async function addressesToReach(url) {
+  if (!publicHttps(url)) throw new Error(`${url} is not a public https URL`);
+  const found = await resolved(url);
+  if (found.length === 0 || !found.every((one) => publicAddress(one.address))) {
+    throw new Error(`${url} resolves to an address we do not reach`);
+  }
+  return found;
+}
+async function resolved(url) {
   const { lookup } = await import("dns/promises");
   const { setTimeout: sleep } = await import("timers/promises");
   const host = new URL(url).hostname.replace(/^\[|]$/g, "");
@@ -398,11 +408,7 @@ async function resolvesNothingPrivate(url) {
     lookup(host, { all: true, verbatim: true }).catch(() => []),
     sleep(LOOKUP_TIMEOUT_MS, null, { ref: false })
   ]);
-  return found !== null && found.every((one) => publicAddress(one.address));
-}
-async function refuseUnlessPublic(url) {
-  if (!publicHttps(url)) throw new Error(`${url} is not a public https URL`);
-  if (!await resolvesNothingPrivate(url)) throw new Error(`${url} resolves to an address we do not reach`);
+  return found ?? [];
 }
 async function answerOf(response) {
   const { status, ok, headers } = response;
@@ -769,21 +775,21 @@ async function mintThroughGateway(config, address, amountMsat, nonce) {
   return { bolt11: payment.bolt11, verifyUrl: payment.verifyUrl };
 }
 async function mintBlind(config, address, amountMsat) {
-  const resolved = await resolve([address], amountMsat);
-  const minted = { ...resolved, amountMsat, lnAddress: resolved.address };
+  const resolved2 = await resolve([address], amountMsat);
+  const minted = { ...resolved2, amountMsat, lnAddress: resolved2.address };
   const locked = config.sealed;
   try {
     await config.gateway.watchPayment({
-      paymentHash: resolved.paymentHash,
-      verifyUrl: resolved.verifyUrl,
-      expiresAt: resolved.expiresAt,
+      paymentHash: resolved2.paymentHash,
+      verifyUrl: resolved2.verifyUrl,
+      expiresAt: resolved2.expiresAt,
       trigger: config.watchSecret,
       sealed: locked ? await seal(locked.secret, JSON.stringify(locked.data(minted))) : void 0
     });
   } catch (refused) {
     if (!alreadyWatched(refused)) throw refused;
   }
-  return { bolt11: resolved.bolt11, verifyUrl: resolved.verifyUrl };
+  return { bolt11: resolved2.bolt11, verifyUrl: resolved2.verifyUrl };
 }
 function alreadyWatched(refused) {
   return refused instanceof ProblemError && isProblemType(refused, PAYMENT_ALREADY_WATCHED);
@@ -869,16 +875,16 @@ async function relayedVerifyUrl(endpoint, wallet, secret) {
 var LIGHTNING = "lightning";
 function blindLightningRail(config) {
   return async (order) => {
-    const resolved = await invoiceFrom(config.lnAddresses, await config.amountMsat(order));
+    const resolved2 = await invoiceFrom(config.lnAddresses, await config.amountMsat(order));
     const relay = config.relayVerifyThrough;
     const watched = await config.gateway.watchPayment({
-      paymentHash: resolved.paymentHash,
+      paymentHash: resolved2.paymentHash,
       verifyUrl: relay ? await relayedVerifyUrl(
         relay.endpoint,
-        { url: resolved.verifyUrl, hash: resolved.paymentHash },
+        { url: resolved2.verifyUrl, hash: resolved2.paymentHash },
         relay.secret
-      ) : resolved.verifyUrl,
-      expiresAt: resolved.expiresAt,
+      ) : resolved2.verifyUrl,
+      expiresAt: resolved2.expiresAt,
       trigger: config.trigger,
       sealed: await config.sealed?.(order),
       webhookUrl: config.webhookUrl,
@@ -887,9 +893,9 @@ function blindLightningRail(config) {
     return {
       id: watched.id,
       rail: config.name ?? LIGHTNING,
-      scan: resolved.bolt11,
-      qr: encodeForQr(resolved.bolt11),
-      expiresAt: resolved.expiresAt
+      scan: resolved2.bolt11,
+      qr: encodeForQr(resolved2.bolt11),
+      expiresAt: resolved2.expiresAt
     };
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thunder-bridge",
-  "version": "0.8.9",
+  "version": "0.8.10",
   "description": "Trustless JavaScript client for the Thunder Bridge Lightning payment gateway. Proves the invoice came from your own wallet before the payer sees it.",
   "author": "i-am-fatik",
   "homepage": "https://agora.gripe/en/tools/thunder-bridge",