@fedify/vocab-runtime 2.0.29-dev.1989 → 2.0.29-dev.2018

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.29-dev.1989+6b9d933b",
+  "version": "2.0.29-dev.2018+2e67253f",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

package/dist/mod.cjs

@@ -6,6 +6,7 @@ let _opentelemetry_api = require("@opentelemetry/api");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let node_dns_promises = require("node:dns/promises");
+node_dns_promises = require_chunk.__toESM(node_dns_promises);
 let node_net = require("node:net");
 let asn1js = require("asn1js");
 let byte_encodings_base64 = require("byte-encodings/base64");
@@ -4434,7 +4435,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.1989+6b9d933b";
+var version = "2.0.29-dev.2018+2e67253f";
 //#endregion
 //#region src/request.ts
 /**
@@ -4757,9 +4758,16 @@ var HttpHeaderLink = class HttpHeaderLink {
 //#endregion
 //#region src/url.ts
 var UrlError = class extends Error {
+	/**
+	* The failure category. Defaults to `"disallowed"`.
+	* `"dns"` includes lookup errors and results with no usable IP addresses.
+	* @since 2.0.29
+	*/
+	reason;
 	constructor(message, options) {
 		super(message, options);
 		this.name = "UrlError";
+		this.reason = options?.reason ?? "disallowed";
 	}
 };
 /**
@@ -4785,9 +4793,12 @@ async function validatePublicUrl(url) {
 	}
 	let addresses;
 	try {
-		addresses = await (0, node_dns_promises.lookup)(hostname, { all: true });
+		addresses = await node_dns_promises.default.lookup(hostname, { all: true });
 	} catch (error) {
-		throw new UrlError("DNS lookup failed", { cause: error });
+		throw new UrlError("DNS lookup failed", {
+			cause: error,
+			reason: "dns"
+		});
 	}
 	validateLookupAddresses(addresses);
 }
@@ -4816,7 +4827,7 @@ function validateLookupAddresses(addresses) {
 		ipAddressCount++;
 		validatePublicIpAddress(address, family);
 	}
-	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address", { reason: "dns" });
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;

package/dist/mod.d.cts

@@ -320,8 +320,15 @@ declare function encodingFromBaseData(data: string | Uint8Array): Base;
 //#endregion
 //#region src/url.d.ts
 declare class UrlError extends Error {
+  /**
+  * The failure category. Defaults to `"disallowed"`.
+  * `"dns"` includes lookup errors and results with no usable IP addresses.
+  * @since 2.0.29
+  */
+  readonly reason: "dns" | "disallowed";
   constructor(message: string, options?: {
     cause?: unknown;
+    reason?: "dns" | "disallowed";
   });
 }
 /**

package/dist/mod.d.ts

@@ -319,8 +319,15 @@ declare function encodingFromBaseData(data: string | Uint8Array): Base;
 //#endregion
 //#region src/url.d.ts
 declare class UrlError extends Error {
+  /**
+  * The failure category. Defaults to `"disallowed"`.
+  * `"dns"` includes lookup errors and results with no usable IP addresses.
+  * @since 2.0.29
+  */
+  readonly reason: "dns" | "disallowed";
   constructor(message: string, options?: {
     cause?: unknown;
+    reason?: "dns" | "disallowed";
   });
 }
 /**

package/dist/mod.js

@@ -2,7 +2,7 @@
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import process from "node:process";
-import { lookup } from "node:dns/promises";
+import dns from "node:dns/promises";
 import { isIP } from "node:net";
 import { Integer, Sequence } from "asn1js";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
@@ -4430,7 +4430,7 @@ const preloadedContexts = {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.1989+6b9d933b";
+var version = "2.0.29-dev.2018+2e67253f";
 //#endregion
 //#region src/request.ts
 /**
@@ -4753,9 +4753,16 @@ var HttpHeaderLink = class HttpHeaderLink {
 //#endregion
 //#region src/url.ts
 var UrlError = class extends Error {
+	/**
+	* The failure category. Defaults to `"disallowed"`.
+	* `"dns"` includes lookup errors and results with no usable IP addresses.
+	* @since 2.0.29
+	*/
+	reason;
 	constructor(message, options) {
 		super(message, options);
 		this.name = "UrlError";
+		this.reason = options?.reason ?? "disallowed";
 	}
 };
 /**
@@ -4781,9 +4788,12 @@ async function validatePublicUrl(url) {
 	}
 	let addresses;
 	try {
-		addresses = await lookup(hostname, { all: true });
+		addresses = await dns.lookup(hostname, { all: true });
 	} catch (error) {
-		throw new UrlError("DNS lookup failed", { cause: error });
+		throw new UrlError("DNS lookup failed", {
+			cause: error,
+			reason: "dns"
+		});
 	}
 	validateLookupAddresses(addresses);
 }
@@ -4812,7 +4822,7 @@ function validateLookupAddresses(addresses) {
 		ipAddressCount++;
 		validatePublicIpAddress(address, family);
 	}
-	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address", { reason: "dns" });
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;

package/dist/tests/{body-D_AlSh8c.mjs → body-DNFbzsxI.mjs}

@@ -1,4 +1,4 @@
-import { t as FetchError } from "./request-Dz-c-sU9.mjs";
+import { t as FetchError } from "./request-D5j8WVks.mjs";
 import { getLogger } from "@logtape/logtape";
 //#region src/body.ts
 /** Decoded JSON body limit: 16 MiB.  @internal */

package/dist/tests/{body-BPzg1k_5.cjs → body-DPMAUTtz.cjs}

@@ -1,5 +1,5 @@
 require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-CYnGwxbv.cjs");
+const require_request = require("./request-dIRBY7QP.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-BPzg1k_5.cjs");
+const require_body = require("./body-DPMAUTtz.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-D_AlSh8c.mjs";
+import { r as readBoundedText, t as BodyTooLargeError } from "./body-DNFbzsxI.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,8 +1,8 @@
 const require_chunk = require("./chunk-Do9eywBl.cjs");
-const require_request = require("./request-CYnGwxbv.cjs");
-const require_body = require("./body-BPzg1k_5.cjs");
+const require_request = require("./request-dIRBY7QP.cjs");
+const require_body = require("./body-DPMAUTtz.cjs");
 const require_link = require("./link-FguCydMA.cjs");
-const require_url = require("./url-CWU5HT3Y.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");

package/dist/tests/docloader.test.mjs

@@ -1,7 +1,7 @@
-import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-Dz-c-sU9.mjs";
-import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-D_AlSh8c.mjs";
+import { a as name, i as logRequest, n as createActivityPubRequest, o as version, t as FetchError } from "./request-D5j8WVks.mjs";
+import { n as MAX_BODY_SIZE, r as readBoundedText } from "./body-DNFbzsxI.mjs";
 import { t as HttpHeaderLink } from "./link-NUUWCdnK.mjs";
-import { o as validatePublicUrl, t as UrlError } from "./url-o0e-aXQY.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";

package/dist/tests/{request-Dz-c-sU9.mjs → request-D5j8WVks.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.0.29-dev.1989+6b9d933b";
+var version = "2.0.29-dev.2018+2e67253f";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-CYnGwxbv.cjs → request-dIRBY7QP.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.1989+6b9d933b";
+var version = "2.0.29-dev.2018+2e67253f";
 //#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-CYnGwxbv.cjs");
+const require_request = require("./request-dIRBY7QP.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-Dz-c-sU9.mjs";
+import { o as version, r as getUserAgent } from "./request-D5j8WVks.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/dist/tests/{url-o0e-aXQY.mjs → url-DzlMS01z.mjs}

@@ -1,10 +1,17 @@
-import { lookup } from "node:dns/promises";
+import dns from "node:dns/promises";
 import { isIP } from "node:net";
 //#region src/url.ts
 var UrlError = class extends Error {
+	/**
+	* The failure category. Defaults to `"disallowed"`.
+	* `"dns"` includes lookup errors and results with no usable IP addresses.
+	* @since 2.0.29
+	*/
+	reason;
 	constructor(message, options) {
 		super(message, options);
 		this.name = "UrlError";
+		this.reason = options?.reason ?? "disallowed";
 	}
 };
 /**
@@ -30,9 +37,12 @@ async function validatePublicUrl(url) {
 	}
 	let addresses;
 	try {
-		addresses = await lookup(hostname, { all: true });
+		addresses = await dns.lookup(hostname, { all: true });
 	} catch (error) {
-		throw new UrlError("DNS lookup failed", { cause: error });
+		throw new UrlError("DNS lookup failed", {
+			cause: error,
+			reason: "dns"
+		});
 	}
 	validateLookupAddresses(addresses);
 }
@@ -61,7 +71,7 @@ function validateLookupAddresses(addresses) {
 		ipAddressCount++;
 		validatePublicIpAddress(address, family);
 	}
-	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address", { reason: "dns" });
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;

package/dist/tests/{url-CWU5HT3Y.cjs → url-Qk1svKZU.cjs}

@@ -1,11 +1,19 @@
-require("./chunk-Do9eywBl.cjs");
+const require_chunk = require("./chunk-Do9eywBl.cjs");
 let node_dns_promises = require("node:dns/promises");
+node_dns_promises = require_chunk.__toESM(node_dns_promises);
 let node_net = require("node:net");
 //#region src/url.ts
 var UrlError = class extends Error {
+	/**
+	* The failure category. Defaults to `"disallowed"`.
+	* `"dns"` includes lookup errors and results with no usable IP addresses.
+	* @since 2.0.29
+	*/
+	reason;
 	constructor(message, options) {
 		super(message, options);
 		this.name = "UrlError";
+		this.reason = options?.reason ?? "disallowed";
 	}
 };
 /**
@@ -31,9 +39,12 @@ async function validatePublicUrl(url) {
 	}
 	let addresses;
 	try {
-		addresses = await (0, node_dns_promises.lookup)(hostname, { all: true });
+		addresses = await node_dns_promises.default.lookup(hostname, { all: true });
 	} catch (error) {
-		throw new UrlError("DNS lookup failed", { cause: error });
+		throw new UrlError("DNS lookup failed", {
+			cause: error,
+			reason: "dns"
+		});
 	}
 	validateLookupAddresses(addresses);
 }
@@ -62,7 +73,7 @@ function validateLookupAddresses(addresses) {
 		ipAddressCount++;
 		validatePublicIpAddress(address, family);
 	}
-	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address");
+	if (ipAddressCount === 0) throw new UrlError("DNS lookup did not return any IP address", { reason: "dns" });
 }
 function validatePublicIpAddress(address, family) {
 	if (family === 4 && isValidPublicIPv4Address(address) || family === 6 && isValidPublicIPv6Address(address)) return;

package/dist/tests/url.test.cjs

@@ -1,8 +1,31 @@
 require("./chunk-Do9eywBl.cjs");
-const require_url = require("./url-CWU5HT3Y.cjs");
+const require_url = require("./url-Qk1svKZU.cjs");
 let node_test = require("node:test");
 let node_assert = require("node:assert");
 //#region src/url.test.ts
+(0, node_test.test)("UrlError reason is independent of its cause", () => {
+	const cause = /* @__PURE__ */ new Error("Underlying failure");
+	(0, node_assert.strictEqual)(new require_url.UrlError("Rejected URL").reason, "disallowed");
+	const disallowedError = new require_url.UrlError("Rejected URL", { cause });
+	(0, node_assert.strictEqual)(disallowedError.reason, "disallowed");
+	(0, node_assert.strictEqual)(disallowedError.cause, cause);
+	const dnsError = new require_url.UrlError("Lookup failed", {
+		reason: "dns",
+		cause
+	});
+	(0, node_assert.strictEqual)(dnsError.reason, "dns");
+	(0, node_assert.strictEqual)(dnsError.cause, cause);
+});
+(0, node_test.test)("validatePublicUrl() classifies disallowed URLs", async () => {
+	for (const url of [
+		"ftp://example.com",
+		"https://localhost",
+		"https://127.0.0.1"
+	]) await (0, node_assert.rejects)(() => require_url.validatePublicUrl(url), {
+		name: "UrlError",
+		reason: "disallowed"
+	});
+});
 (0, node_test.test)("validatePublicUrl()", async () => {
 	await (0, node_assert.rejects)(() => require_url.validatePublicUrl("ftp://localhost"), require_url.UrlError);
 	await (0, node_assert.rejects)(() => require_url.validatePublicUrl("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ=="), require_url.UrlError);
@@ -52,11 +75,21 @@ let node_assert = require("node:assert");
 	}, {
 		address: "127.0.0.1",
 		family: 4
-	}]), require_url.UrlError);
+	}]), {
+		name: "UrlError",
+		reason: "disallowed"
+	});
 	(0, node_assert.throws)(() => require_url.validateLookupAddresses([{
 		address: "app-host.example.net.",
 		family: 4
-	}]), require_url.UrlError);
+	}]), {
+		name: "UrlError",
+		reason: "dns"
+	});
+	(0, node_assert.throws)(() => require_url.validateLookupAddresses([]), {
+		name: "UrlError",
+		reason: "dns"
+	});
 });
 (0, node_test.test)("isValidPublicIPv4Address()", () => {
 	(0, node_assert.ok)(require_url.isValidPublicIPv4Address("8.8.8.8"));

package/dist/tests/url.test.mjs

@@ -1,7 +1,30 @@
-import { a as validateLookupAddresses, i as isValidPublicIPv6Address, n as expandIPv6Address, o as validatePublicUrl, r as isValidPublicIPv4Address, t as UrlError } from "./url-o0e-aXQY.mjs";
+import { a as validateLookupAddresses, i as isValidPublicIPv6Address, n as expandIPv6Address, o as validatePublicUrl, r as isValidPublicIPv4Address, t as UrlError } from "./url-DzlMS01z.mjs";
 import { test } from "node:test";
-import { deepStrictEqual, ok, rejects, throws } from "node:assert";
+import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert";
 //#region src/url.test.ts
+test("UrlError reason is independent of its cause", () => {
+	const cause = /* @__PURE__ */ new Error("Underlying failure");
+	strictEqual(new UrlError("Rejected URL").reason, "disallowed");
+	const disallowedError = new UrlError("Rejected URL", { cause });
+	strictEqual(disallowedError.reason, "disallowed");
+	strictEqual(disallowedError.cause, cause);
+	const dnsError = new UrlError("Lookup failed", {
+		reason: "dns",
+		cause
+	});
+	strictEqual(dnsError.reason, "dns");
+	strictEqual(dnsError.cause, cause);
+});
+test("validatePublicUrl() classifies disallowed URLs", async () => {
+	for (const url of [
+		"ftp://example.com",
+		"https://localhost",
+		"https://127.0.0.1"
+	]) await rejects(() => validatePublicUrl(url), {
+		name: "UrlError",
+		reason: "disallowed"
+	});
+});
 test("validatePublicUrl()", async () => {
 	await rejects(() => validatePublicUrl("ftp://localhost"), UrlError);
 	await rejects(() => validatePublicUrl("data:text/plain;base64,SGVsbG8sIFdvcmxkIQ=="), UrlError);
@@ -51,11 +74,21 @@ test("validateLookupAddresses() rejects unsafe or CNAME-only Cloudflare Workers
 	}, {
 		address: "127.0.0.1",
 		family: 4
-	}]), UrlError);
+	}]), {
+		name: "UrlError",
+		reason: "disallowed"
+	});
 	throws(() => validateLookupAddresses([{
 		address: "app-host.example.net.",
 		family: 4
-	}]), UrlError);
+	}]), {
+		name: "UrlError",
+		reason: "dns"
+	});
+	throws(() => validateLookupAddresses([]), {
+		name: "UrlError",
+		reason: "dns"
+	});
 });
 test("isValidPublicIPv4Address()", () => {
 	ok(isValidPublicIPv4Address("8.8.8.8"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.0.29-dev.1989+6b9d933b",
+  "version": "2.0.29-dev.2018+2e67253f",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/url.test.ts

@@ -1,4 +1,4 @@
-import { deepStrictEqual, ok, rejects, throws } from "node:assert";
+import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert";
 import { test } from "node:test";
 import {
   expandIPv6Address,
@@ -9,6 +9,28 @@ import {
   validatePublicUrl,
 } from "./url.ts";
 
+test("UrlError reason is independent of its cause", () => {
+  const cause = new Error("Underlying failure");
+  strictEqual(new UrlError("Rejected URL").reason, "disallowed");
+  const disallowedError = new UrlError("Rejected URL", { cause });
+  strictEqual(disallowedError.reason, "disallowed");
+  strictEqual(disallowedError.cause, cause);
+  const dnsError = new UrlError("Lookup failed", { reason: "dns", cause });
+  strictEqual(dnsError.reason, "dns");
+  strictEqual(dnsError.cause, cause);
+});
+
+test("validatePublicUrl() classifies disallowed URLs", async () => {
+  for (
+    const url of ["ftp://example.com", "https://localhost", "https://127.0.0.1"]
+  ) {
+    await rejects(() => validatePublicUrl(url), {
+      name: "UrlError",
+      reason: "disallowed",
+    });
+  }
+});
+
 test("validatePublicUrl()", async () => {
   await rejects(() => validatePublicUrl("ftp://localhost"), UrlError);
   await rejects(
@@ -81,15 +103,19 @@ test("validateLookupAddresses() rejects unsafe or CNAME-only Cloudflare Workers
         { address: "private-host.example.net.", family: 4 },
         { address: "127.0.0.1", family: 4 },
       ]),
-    UrlError,
+    { name: "UrlError", reason: "disallowed" },
   );
   throws(
     () =>
       validateLookupAddresses([
         { address: "app-host.example.net.", family: 4 },
       ]),
-    UrlError,
+    { name: "UrlError", reason: "dns" },
   );
+  throws(() => validateLookupAddresses([]), {
+    name: "UrlError",
+    reason: "dns",
+  });
 });
 
 test("isValidPublicIPv4Address()", () => {

package/src/url.ts

@@ -1,11 +1,25 @@
 import type { LookupAddress } from "node:dns";
-import { lookup } from "node:dns/promises";
+// FIXME: the default dns import exists since tests can stub `dns.lookup()`.
+// This should be replaced by injecting the lookup function such as an internal
+// option on `validatePublicUrl()`
+import dns from "node:dns/promises";
 import { isIP } from "node:net";
 
 export class UrlError extends Error {
-  constructor(message: string, options?: { cause?: unknown }) {
+  /**
+   * The failure category. Defaults to `"disallowed"`.
+   * `"dns"` includes lookup errors and results with no usable IP addresses.
+   * @since 2.0.29
+   */
+  readonly reason: "dns" | "disallowed";
+
+  constructor(
+    message: string,
+    options?: { cause?: unknown; reason?: "dns" | "disallowed" },
+  ) {
     super(message, options);
     this.name = "UrlError";
+    this.reason = options?.reason ?? "disallowed";
   }
 }
 
@@ -50,9 +64,9 @@ export async function validatePublicUrl(url: string): Promise<void> {
   // and ensure that they are all public:
   let addresses: LookupAddress[];
   try {
-    addresses = await lookup(hostname, { all: true });
+    addresses = await dns.lookup(hostname, { all: true });
   } catch (error) {
-    throw new UrlError("DNS lookup failed", { cause: error });
+    throw new UrlError("DNS lookup failed", { cause: error, reason: "dns" });
   }
   validateLookupAddresses(addresses);
 }
@@ -85,7 +99,9 @@ export function validateLookupAddresses(
     validatePublicIpAddress(address, family);
   }
   if (ipAddressCount === 0) {
-    throw new UrlError("DNS lookup did not return any IP address");
+    throw new UrlError("DNS lookup did not return any IP address", {
+      reason: "dns",
+    });
   }
 }