@fedify/relay 2.4.0-dev.2115 → 2.4.0-dev.2127

package/dist/litepub.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Dg7Lwbp9.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-jljNKcly.js";
 import { MemoryKvStore, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mastodon.test.js

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-Dg7Lwbp9.js";
+import { n as exportSpki, r as getDocumentLoader, t as isRelayFollowerData } from "./types-jljNKcly.js";
 import { MemoryKvStore, signJsonLd, signRequest } from "@fedify/fedify";
 import { createRelay } from "@fedify/relay";
 import { deepStrictEqual, ok, strictEqual } from "node:assert";

package/dist/mod.d.cts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-Dr8wEkif.d.ts
+//#region ../vocab-runtime/dist/docloader-oRpq1nQ8.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}
@@ -54,6 +54,12 @@ interface DocumentLoaderOptions {
   * @since 1.8.0
   */
   signal?: AbortSignal;
+  /**
+  * Whether to lower error-level logs for recoverable document loading
+  * failures to warning-level logs.  The loader still throws the error.
+  * @default `false`
+  */
+  suppressError?: boolean;
 }
 /**
 * A JSON-LD document loader that fetches documents from the Web.
@@ -114,6 +120,7 @@ type AuthenticatedDocumentLoaderFactory = (identity: {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal

package/dist/mod.d.ts

@@ -1,7 +1,7 @@
 /// <reference lib="esnext.temporal" />
 import { Context, KvStore, MessageQueue } from "@fedify/fedify";
 import { Actor } from "@fedify/vocab";
-//#region ../vocab-runtime/dist/docloader-Dr8wEkif.d.ts
+//#region ../vocab-runtime/dist/docloader-oRpq1nQ8.d.ts
 /**
 * Options for making `User-Agent` string.
 * @see {@link getUserAgent}
@@ -54,6 +54,12 @@ interface DocumentLoaderOptions {
   * @since 1.8.0
   */
   signal?: AbortSignal;
+  /**
+  * Whether to lower error-level logs for recoverable document loading
+  * failures to warning-level logs.  The loader still throws the error.
+  * @default `false`
+  */
+  suppressError?: boolean;
 }
 /**
 * A JSON-LD document loader that fetches documents from the Web.
@@ -114,6 +120,7 @@ type AuthenticatedDocumentLoaderFactory = (identity: {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal

package/dist/{types-Dg7Lwbp9.js → types-jljNKcly.js}

@@ -26104,7 +26104,7 @@ var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 require_build();
 var import_src = /* @__PURE__ */ __toESM(require_src(), 1);
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2115+e2feaf2b";
+var version = "2.4.0-dev.2127+c41ce2eb";
 /**
 * Error thrown when fetching a JSON-LD document failed.
 */
@@ -26449,15 +26449,21 @@ function createResponseMetadata(response) {
 * @param url The URL of the document to load.
 * @param response The response to get the document from.
 * @param fetch The function to fetch the document.
+* @param options The options for loading the document.
 * @returns The loaded remote document.
 * @throws {FetchError} If the response is not OK.
 * @internal
 */
-async function getRemoteDocument(url, response, fetch) {
+async function getRemoteDocument(url, response, fetch, options) {
 	const documentUrl = response.url === "" ? url : response.url;
 	const docUrl = new URL(documentUrl);
 	if (!response.ok) {
-		logger.error("Failed to fetch document: {status} {url} {headers}", {
+		if (options?.suppressError) logger.warn("Failed to fetch document: {status} {url} {headers}", {
+			status: response.status,
+			url: documentUrl,
+			headers: Object.fromEntries(response.headers.entries())
+		});
+		else logger.error("Failed to fetch document: {status} {url} {headers}", {
 			status: response.status,
 			url: documentUrl,
 			headers: Object.fromEntries(response.headers.entries())
@@ -26491,7 +26497,7 @@ async function getRemoteDocument(url, response, fetch) {
 						alternateUrl: altUri.href,
 						url: documentUrl
 					});
-					return await fetch(altUri.href);
+					return await fetch(altUri.href, options);
 				}
 			}
 		}
@@ -26527,7 +26533,7 @@ async function getRemoteDocument(url, response, fetch) {
 					alternateUrl: attribs.href,
 					url: documentUrl
 				});
-				return await fetch(new URL(attribs.href, docUrl).href);
+				return await fetch(new URL(attribs.href, docUrl).href, options);
 			}
 		}
 		try {
@@ -26585,7 +26591,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 		if (!allowPrivateAddress) try {
 			await validatePublicUrl(currentUrl);
 		} catch (error) {
-			if (error instanceof UrlError) logger.error("Disallowed private URL: {url}", {
+			if (error instanceof UrlError) logger[options?.suppressError ? "warn" : "error"]("Disallowed private URL: {url}", {
 				url: currentUrl,
 				error
 			});
@@ -26606,7 +26612,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 				span.setAttribute("http.response.status_code", response.status);
 				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 					if (redirected >= maximumRedirection) {
-						logger.error("Too many redirections ({redirections}) while fetching document.", {
+						logger[options?.suppressError ? "warn" : "error"]("Too many redirections ({redirections}) while fetching document.", {
 							redirections: redirected + 1,
 							url: currentUrl
 						});
@@ -26615,7 +26621,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 					const redirectUrl = new URL(response.headers.get("Location"), response.url === "" ? currentUrl : response.url).href;
 					span.setAttribute("http.redirect.url", redirectUrl);
 					if (visited.has(redirectUrl)) {
-						logger.error("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
+						logger[options?.suppressError ? "warn" : "error"]("Detected a redirect loop while fetching document: {url} -> {redirectUrl}", {
 							url: currentUrl,
 							redirectUrl
 						});
@@ -26623,7 +26629,7 @@ function getDocumentLoader({ allowPrivateAddress, maxRedirection, skipPreloadedC
 					}
 					return await load(redirectUrl, options, redirected + 1, visited);
 				}
-				const result = await getRemoteDocument(currentUrl, response, load);
+				const result = await getRemoteDocument(currentUrl, response, load, options);
 				span.setAttribute("docloader.document_url", result.documentUrl);
 				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
 				return result;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/relay",
-  "version": "2.4.0-dev.2115+e2feaf2b",
+  "version": "2.4.0-dev.2127+c41ce2eb",
   "description": "ActivityPub relay support for Fedify",
   "keywords": [
     "Fedify",
@@ -47,14 +47,14 @@
   "dependencies": {
     "@logtape/logtape": "^2.2.0",
     "temporal-polyfill": "^1.0.1",
-    "@fedify/fedify": "^2.4.0-dev.2115+e2feaf2b",
-    "@fedify/vocab": "2.4.0-dev.2115+e2feaf2b"
+    "@fedify/fedify": "^2.4.0-dev.2127+c41ce2eb",
+    "@fedify/vocab": "2.4.0-dev.2127+c41ce2eb"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",
     "typescript": "^6.0.0",
     "urlpattern-polyfill": "^10.1.0",
-    "@fedify/vocab-runtime": "^2.4.0-dev.2115+e2feaf2b"
+    "@fedify/vocab-runtime": "^2.4.0-dev.2127+c41ce2eb"
   },
   "scripts": {
     "build:self": "tsdown",