@fedify/vocab-runtime 2.0.29-dev.2020 → 2.0.29-dev.2046

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.29-dev.2020+b789935e",
+  "version": "2.0.29-dev.2046+5211d803",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/mod.cjs

@@ -4435,7 +4435,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.2020+b789935e";
+var version = "2.0.29-dev.2046+5211d803";
 //#endregion
 //#region src/request.ts
 /**
@@ -5096,7 +5096,11 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: currentUrl,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});

package/dist/mod.js

@@ -4430,7 +4430,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.2020+b789935e";
+var version = "2.0.29-dev.2046+5211d803";
 //#endregion
 //#region src/request.ts
 /**
@@ -5091,7 +5091,11 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: currentUrl,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});

package/dist/tests/{body-BXnCq6ed.mjs → body-CtVeJKAb.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-CDO-jqNj.mjs";
+import { t as FetchError } from "./request-3-6XVYbp.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-DlOEQngJ.cjs → body-GbL4FSd6.cjs}

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-BGn7Xf1v.cjs");
+const require_request = require("./request-B8Dv92jS.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/body.test.cjs

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_body = require("./body-DlOEQngJ.cjs");
+const require_body = require("./body-GbL4FSd6.cjs");
 let node_assert_strict = require("node:assert/strict");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");

package/dist/tests/body.test.mjs

@@ -1,4 +1,4 @@
-import { r as readBoundedText, t as BodyTooLargeError } from "./body-BXnCq6ed.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-CtVeJKAb.mjs";
 import { deepStrictEqual, ok, rejects } from "node:assert/strict";
 import { test } from "node:test";
 import { gunzipSync, gzipSync } from "node:zlib";

package/dist/tests/docloader.test.cjs

@@ -1,12 +1,14 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-BGn7Xf1v.cjs");
-const require_body = require("./body-DlOEQngJ.cjs");
+const require_request = require("./request-B8Dv92jS.cjs");
+const require_body = require("./body-GbL4FSd6.cjs");
 const require_link = require("./link-FguCydMA.cjs");
 const require_url = require("./url-Qk1svKZU.cjs");
 let node_test = require("node:test");
 let node_zlib = require("node:zlib");
 let _logtape_logtape = require("@logtape/logtape");
 let node_assert = require("node:assert");
+let node_dns_promises = require("node:dns/promises");
+node_dns_promises = require_chunk.__toESM(node_dns_promises);
 let node_http = require("node:http");
 let _opentelemetry_api = require("@opentelemetry/api");
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
@@ -5758,7 +5760,11 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		if (!allowPrivateAddress) try {
 			await require_url.validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof require_url.UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof require_url.UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: currentUrl,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});
@@ -6244,4 +6250,62 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 	(0, node_assert.deepStrictEqual)(canceled, true);
 	(0, node_assert.deepStrictEqual)(pulls, 257);
 });
+(0, node_test.test)("getDocumentLoader() logs DNS failures as such", async (t) => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") {
+		t.skip("requires the net permission");
+		return;
+	}
+	const loader = getDocumentLoader();
+	for (const result of [
+		"throws",
+		"empty",
+		"private"
+	]) await t.test(result, async () => {
+		const originalLookup = node_dns_promises.default.lookup;
+		node_dns_promises.default.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+			address: "127.0.0.1",
+			family: 4
+		}]));
+		const records = [];
+		await (0, _logtape_logtape.configure)({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			const url = "https://dns-failure.invalid/object";
+			let error;
+			await (0, node_assert.rejects)(() => loader(url), (e) => {
+				error = e;
+				return true;
+			});
+			(0, node_assert.ok)(error instanceof require_url.UrlError);
+			(0, node_assert.deepStrictEqual)(error.reason, result === "private" ? "disallowed" : "dns");
+			(0, node_assert.deepStrictEqual)(records.map((r) => [
+				r.level,
+				r.rawMessage,
+				r.properties.url
+			]), [result === "private" ? [
+				"error",
+				"Disallowed private URL: {url}",
+				url
+			] : [
+				"debug",
+				"DNS lookup failed for {url}",
+				url
+			]]);
+			(0, node_assert.ok)(records[0].properties.error === error);
+		} finally {
+			await (0, _logtape_logtape.reset)();
+			node_dns_promises.default.lookup = originalLookup;
+		}
+	});
+});
 //#endregion

package/dist/tests/docloader.test.mjs

@@ -1,11 +1,12 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-CDO-jqNj.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-BXnCq6ed.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-3-6XVYbp.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-CtVeJKAb.mjs";
 import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
 import { o as validatePublicUrl, t as UrlError } from "./url-DzlMS01z.mjs";
 import { test } from "node:test";
 import { gzipSync } from "node:zlib";
-import { getLogger } from "@logtape/logtape";
+import { configure, getLogger, reset } from "@logtape/logtape";
 import { deepStrictEqual, ok, rejects } from "node:assert";
+import dns from "node:dns/promises";
 import { createServer } from "node:http";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 //#region \0rolldown/runtime.js
@@ -5777,7 +5778,11 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) if (error.reason === "dns") logger.debug("DNS lookup failed for {url}", {
+				url: currentUrl,
+				error
+			});
+			else logger.error("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});
@@ -6263,5 +6268,63 @@ test("getRemoteDocument() bounds JSON by default", async () => {
 	deepStrictEqual(canceled, true);
 	deepStrictEqual(pulls, 257);
 });
+test("getDocumentLoader() logs DNS failures as such", async (t) => {
+	if ("Deno" in globalThis && (await Deno.permissions.query({ name: "net" })).state !== "granted") {
+		t.skip("requires the net permission");
+		return;
+	}
+	const loader = getDocumentLoader();
+	for (const result of [
+		"throws",
+		"empty",
+		"private"
+	]) await t.test(result, async () => {
+		const originalLookup = dns.lookup;
+		dns.lookup = (() => result === "throws" ? Promise.reject(/* @__PURE__ */ new Error("Resolver unavailable")) : Promise.resolve(result === "empty" ? [] : [{
+			address: "127.0.0.1",
+			family: 4
+		}]));
+		const records = [];
+		await configure({
+			sinks: { buffer: (record) => records.push(record) },
+			loggers: [{
+				category: "fedify",
+				sinks: ["buffer"],
+				lowestLevel: "debug"
+			}, {
+				category: ["logtape", "meta"],
+				sinks: []
+			}],
+			reset: true
+		});
+		try {
+			const url = "https://dns-failure.invalid/object";
+			let error;
+			await rejects(() => loader(url), (e) => {
+				error = e;
+				return true;
+			});
+			ok(error instanceof UrlError);
+			deepStrictEqual(error.reason, result === "private" ? "disallowed" : "dns");
+			deepStrictEqual(records.map((r) => [
+				r.level,
+				r.rawMessage,
+				r.properties.url
+			]), [result === "private" ? [
+				"error",
+				"Disallowed private URL: {url}",
+				url
+			] : [
+				"debug",
+				"DNS lookup failed for {url}",
+				url
+			]]);
+			ok(records[0].properties.error === error);
+		} finally {
+			await reset();
+			dns.lookup = originalLookup;
+		}
+	});
+});
 //#endregion
 export {};

package/dist/tests/{request-CDO-jqNj.mjs → request-3-6XVYbp.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.2020+b789935e";
+var version = "2.0.29-dev.2046+5211d803";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-BGn7Xf1v.cjs → request-B8Dv92jS.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.2020+b789935e";
+var version = "2.0.29-dev.2046+5211d803";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-BGn7Xf1v.cjs");
+const require_request = require("./request-B8Dv92jS.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { o as version, r as getUserAgent } from "./request-CDO-jqNj.mjs";
+import { o as version, r as getUserAgent } from "./request-3-6XVYbp.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.29-dev.2020+b789935e",
+  "version": "2.0.29-dev.2046+5211d803",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/docloader.test.ts

@@ -1,5 +1,7 @@
+import { configure, type LogRecord, reset } from "@logtape/logtape";
 import fetchMock from "fetch-mock";
 import { deepStrictEqual, ok, rejects } from "node:assert";
+import dns from "node:dns/promises";
 import { test } from "node:test";
 import { createServer } from "node:http";
 import { gzipSync } from "node:zlib";
@@ -622,3 +624,66 @@ test("getRemoteDocument() bounds JSON by default", async () => {
   deepStrictEqual(canceled, true);
   deepStrictEqual(pulls, 257);
 });
+
+test("getDocumentLoader() logs DNS failures as such", async (t) => {
+  // The validator skips DNS when Deno has no network permission.  Checked
+  // here rather than with top-level await, which the CommonJS build rejects.
+  if (
+    "Deno" in globalThis &&
+    (await Deno.permissions.query({ name: "net" })).state !== "granted"
+  ) {
+    t.skip("requires the net permission");
+    return;
+  }
+  const loader = getDocumentLoader();
+  for (const result of ["throws", "empty", "private"] as const) {
+    await t.test(result, async () => {
+      // Stubbing works only because url.ts uses the default node:dns/promises
+      // import; see the FIXME there.
+      const originalLookup = dns.lookup;
+      dns.lookup = (() =>
+        result === "throws"
+          ? Promise.reject(new Error("Resolver unavailable"))
+          : Promise.resolve(
+            result === "empty" ? [] : [{ address: "127.0.0.1", family: 4 }],
+          )) as typeof dns.lookup;
+      const records: LogRecord[] = [];
+      await configure({
+        sinks: {
+          buffer: (record) =>
+            records.push(record),
+        },
+        loggers: [
+          { category: "fedify", sinks: ["buffer"], lowestLevel: "debug" },
+          { category: ["logtape", "meta"], sinks: [] },
+        ],
+        reset: true,
+      });
+      try {
+        const url = "https://dns-failure.invalid/object";
+        let error: unknown;
+        await rejects(() => loader(url), (e) => {
+          error = e;
+          return true;
+        });
+        ok(error instanceof UrlError);
+        deepStrictEqual(
+          error.reason,
+          result === "private" ? "disallowed" : "dns",
+        );
+        deepStrictEqual(
+          records.map((r) => [r.level, r.rawMessage, r.properties.url]),
+          [
+            result === "private"
+              ? ["error", "Disallowed private URL: {url}", url]
+              : ["debug", "DNS lookup failed for {url}", url],
+          ],
+        );
+        ok(records[0].properties.error === error);
+      } finally {
+        await reset();
+        dns.lookup = originalLookup;
+      }
+    });
+  }
+});

package/src/docloader.ts

@@ -311,10 +311,17 @@ export function getDocumentLoader(
         await validatePublicUrl(currentUrl);
       } catch (error) {
         if (error instanceof UrlError) {
-          logger.error("Disallowed private URL: {url}", {
-            url: currentUrl,
-            error,
-          });
+          if (error.reason === "dns") {
+            logger.debug("DNS lookup failed for {url}", {
+              url: currentUrl,
+              error,
+            });
+          } else {
+            logger.error("Disallowed private URL: {url}", {
+              url: currentUrl,
+              error,
+            });
+          }
         }
         throw error;
       }