@fedify/fedify 2.4.0-dev.1668 → 2.4.0-dev.1727

package/dist/{http-BbnOMQoy.js → http-Bw6s_dOB.js}

@@ -10,7 +10,7 @@ import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } fro
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.4.0-dev.1668+90797b01";
+var version = "2.4.0-dev.1727+1eadcb04";
 //#endregion
 //#region src/sig/accept.ts
 /**
@@ -917,7 +917,7 @@ function isAbortError$1(error) {
 	const name = error.name;
 	return typeof name === "string" && name === "AbortError";
 }
-const KNOWN_HTTP_METHODS = new Set([
+const KNOWN_HTTP_METHODS = /* @__PURE__ */ new Set([
 	"CONNECT",
 	"DELETE",
 	"GET",
@@ -1716,7 +1716,7 @@ function getKeyFetchErrorName(error) {
 * algorithm, so unknown values are dropped from the metric to prevent
 * cardinality blow-up.
 */
-const DRAFT_KNOWN_ALGORITHMS = new Set([
+const DRAFT_KNOWN_ALGORITHMS = /* @__PURE__ */ new Set([
 	"ecdsa-sha256",
 	"ecdsa-sha384",
 	"ecdsa-sha512",

package/dist/{http-DUmWq5Pw.mjs → http-TjhZfiSN.mjs}

@@ -1,10 +1,10 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DtHcfB0f.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DT-CnD1g.mjs";
-import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-8PiolDP7.mjs";
-import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-CM7wDnZG.mjs";
+import { n as version, t as name } from "./deno-Deyoxesx.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-AlCGTDrr.mjs";
+import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature } from "./accept-CPVqki78.mjs";
+import { o as validateCryptoKey, r as fetchKeyDetailed } from "./key-b4kf4yZT.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -325,7 +325,7 @@ function getKeyFetchErrorName(error) {
 * algorithm, so unknown values are dropped from the metric to prevent
 * cardinality blow-up.
 */
-const DRAFT_KNOWN_ALGORITHMS = new Set([
+const DRAFT_KNOWN_ALGORITHMS = /* @__PURE__ */ new Set([
 	"ecdsa-sha256",
 	"ecdsa-sha384",
 	"ecdsa-sha512",

package/dist/{key-CM7wDnZG.mjs → key-b4kf4yZT.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DtHcfB0f.mjs";
-import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-DT-CnD1g.mjs";
+import { n as version, t as name } from "./deno-Deyoxesx.mjs";
+import { _ as recordKeyLookup, n as getDurationMs, t as classifyFetchError } from "./metrics-AlCGTDrr.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Multikey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{kv-cache-zmgG1HUp.cjs → kv-cache-BTVaZrf-.cjs}

@@ -1,7 +1,5 @@
 const { URLPattern } = require("urlpattern-polyfill");
-require("./chunk-Czpeue4M.cjs");
-const require_http = require("./http-BpT5cE6r.cjs");
-const require_temporal_polyfill = require("./temporal-polyfill-BCdTHexd.cjs");
+const require_http = require("./http-AyKngJ_h.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let es_toolkit = require("es-toolkit");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
@@ -46,7 +44,7 @@ function getAuthenticatedDocumentLoader(identity, { allowPrivateAddress, maxRedi
 }
 //#endregion
 //#region src/utils/kv-cache.ts
-const Temporal = require_temporal_polyfill.Temporal;
+const Temporal = require_http.Temporal;
 const logger = (0, _logtape_logtape.getLogger)([
 	"fedify",
 	"utils",

package/dist/{kv-cache-ZQ22hm44.js → kv-cache-CQsh-KUw.js}

@@ -1,6 +1,6 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http-BbnOMQoy.js";
+import { C as recordDocumentCache, d as validateCryptoKey, t as doubleKnock } from "./http-Bw6s_dOB.js";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, preloadedContexts, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/{kv-cache-DEXKemJ9.mjs → kv-cache-CpILvhUV.mjs}

@@ -1,7 +1,7 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { p as recordDocumentCache } from "./metrics-DT-CnD1g.mjs";
+import { p as recordDocumentCache } from "./metrics-AlCGTDrr.mjs";
 import { getLogger } from "@logtape/logtape";
 import { preloadedContexts } from "@fedify/vocab-runtime";
 //#region src/utils/kv-cache.ts

package/dist/{ld-BttH_-8K.mjs → ld-CKujkAfG.mjs}

@@ -1,9 +1,9 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DtHcfB0f.mjs";
-import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-DT-CnD1g.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-CM7wDnZG.mjs";
+import { n as version, t as name } from "./deno-Deyoxesx.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-AlCGTDrr.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-b4kf4yZT.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
@@ -25,7 +25,7 @@ const localContext = [
 ];
 const localContextUrls = new Set(localContext);
 const builtInContextLoader = getDocumentLoader();
-const disallowedJsonLdKeywords = new Set([
+const disallowedJsonLdKeywords = /* @__PURE__ */ new Set([
 	"@graph",
 	"@included",
 	"@reverse"
@@ -525,7 +525,7 @@ async function verifySignature(jsonLd, options = {}) {
 * only from external documents and are dropped from the metric attribute to
 * avoid attacker-controlled cardinality.
 */
-const LD_KNOWN_SIGNATURE_TYPES = new Set(["RsaSignature2017"]);
+const LD_KNOWN_SIGNATURE_TYPES = /* @__PURE__ */ new Set(["RsaSignature2017"]);
 /**
 * Reports only whether a `signature` key is present on the document, with
 * no shape check on its value.  This is intentionally looser than

package/dist/{metrics-DT-CnD1g.mjs → metrics-AlCGTDrr.mjs}

@@ -1,7 +1,7 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DtHcfB0f.mjs";
+import { n as version, t as name } from "./deno-Deyoxesx.mjs";
 import { metrics } from "@opentelemetry/api";
 import { FetchError } from "@fedify/vocab-runtime";
 //#region src/federation/metrics.ts
@@ -770,7 +770,7 @@ function isAbortError(error) {
 	const name = error.name;
 	return typeof name === "string" && name === "AbortError";
 }
-const KNOWN_HTTP_METHODS = new Set([
+const KNOWN_HTTP_METHODS = /* @__PURE__ */ new Set([
 	"CONNECT",
 	"DELETE",
 	"GET",

package/dist/metrics-DVKYY6K1.d.cts

@@ -0,0 +1,36 @@
+/// <reference lib="esnext.temporal" />
+import { DocumentLoader } from "@fedify/vocab-runtime";
+import { MeterProvider } from "@opentelemetry/api";
+
+//#region src/federation/metrics.d.ts
+/**
+* The kind of remote ActivityPub lookup, recorded as
+* `activitypub.lookup.kind` on the public-key lookup and remote document
+* fetch metric families.
+*
+*  -  `public_key`: a public key lookup performed by `fetchKey` /
+*     `fetchKeyDetailed` (always recorded on `activitypub.key.lookup*`).
+*  -  `actor`: a document fetch whose resolved value is an Actor.  The
+*     bucket exists in the taxonomy for future actor-aware call sites;
+*     today, actor documents fetched through Fedify's generic document
+*     loader are still classified as `object` because the kind is decided
+*     at the loader boundary, before the response is parsed.
+*  -  `object`: a generic ActivityPub object fetch through Fedify's
+*     document loader.  This is the default classification for
+*     `documentLoader` invocations that do not match a more specific
+*     bucket.
+*  -  `context`: a JSON-LD `@context` document fetch through Fedify's
+*     context loader.
+*  -  `other`: a fetch that does not fit any of the above classifications.
+* @since 2.3.0
+*/
+type LookupKind = "public_key" | "actor" | "object" | "context" | "other";
+/**
+* The {@link LookupKind} values that can appear on remote document fetch
+* metrics.  `public_key` lookups are reported on the
+* `activitypub.key.lookup` metric family instead, so it is excluded here.
+* @since 2.3.0
+*/
+type DocumentFetchKind = Exclude<LookupKind, "public_key">;
+//#endregion
+export { DocumentFetchKind as t };

package/dist/metrics-DoRtI0qU.d.ts

@@ -0,0 +1,36 @@
+/// <reference lib="esnext.temporal" />
+import { MeterProvider } from "@opentelemetry/api";
+import { DocumentLoader } from "@fedify/vocab-runtime";
+
+//#region src/federation/metrics.d.ts
+/**
+* The kind of remote ActivityPub lookup, recorded as
+* `activitypub.lookup.kind` on the public-key lookup and remote document
+* fetch metric families.
+*
+*  -  `public_key`: a public key lookup performed by `fetchKey` /
+*     `fetchKeyDetailed` (always recorded on `activitypub.key.lookup*`).
+*  -  `actor`: a document fetch whose resolved value is an Actor.  The
+*     bucket exists in the taxonomy for future actor-aware call sites;
+*     today, actor documents fetched through Fedify's generic document
+*     loader are still classified as `object` because the kind is decided
+*     at the loader boundary, before the response is parsed.
+*  -  `object`: a generic ActivityPub object fetch through Fedify's
+*     document loader.  This is the default classification for
+*     `documentLoader` invocations that do not match a more specific
+*     bucket.
+*  -  `context`: a JSON-LD `@context` document fetch through Fedify's
+*     context loader.
+*  -  `other`: a fetch that does not fit any of the above classifications.
+* @since 2.3.0
+*/
+type LookupKind = "public_key" | "actor" | "object" | "context" | "other";
+/**
+* The {@link LookupKind} values that can appear on remote document fetch
+* metrics.  `public_key` lookups are reported on the
+* `activitypub.key.lookup` metric family instead, so it is excluded here.
+* @since 2.3.0
+*/
+type DocumentFetchKind = Exclude<LookupKind, "public_key">;
+//#endregion
+export { DocumentFetchKind as t };

package/dist/{middleware-DrroX3aD.mjs → middleware-C9Y5lLZN.mjs}

@@ -1,28 +1,28 @@
 import { Temporal } from "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-DtHcfB0f.mjs";
-import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-DT-CnD1g.mjs";
-import { t as formatAcceptSignature } from "./accept-8PiolDP7.mjs";
-import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-CM7wDnZG.mjs";
-import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-DUmWq5Pw.mjs";
-import { t as getAuthenticatedDocumentLoader } from "./docloader-0vAfF6XW.mjs";
-import { n as kvCache } from "./kv-cache-DEXKemJ9.mjs";
-import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-BttH_-8K.mjs";
-import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-DZALmhdl.mjs";
-import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-URuqsICz.mjs";
-import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DiQ0uBal.mjs";
-import { t as getNodeInfo } from "./client-CjF5IYQS.mjs";
-import { t as nodeInfoToJson } from "./types-CrtdVuDP.mjs";
-import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DcwZnQWG.mjs";
-import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-iXZ5jNVg.mjs";
-import { t as CircuitBreaker } from "./circuit-breaker-CBGyz5F7.mjs";
-import { t as buildCollectionSynchronizationHeader } from "./collection-BIhlldqK.mjs";
-import { t as KvKeyCache } from "./keycache-_DHqz5z_.mjs";
-import { t as acceptsJsonLd } from "./negotiation-RuwrPFqi.mjs";
-import { t as hasMalformedKnownTemporalLiteral } from "./temporal-Bpxpsl2k.mjs";
-import { t as createExponentialBackoffPolicy } from "./retry-DgFqeS5k.mjs";
-import { t as TaskCodec } from "./codec-BBga-FWI.mjs";
+import { n as version, t as name } from "./deno-Deyoxesx.mjs";
+import { a as instrumentDocumentLoader, b as recordWebFingerHandle, c as recordCircuitBreakerStateChange, d as recordCollectionRequest, f as recordCollectionTotalItems, g as recordInboxActivity, h as recordFanoutRecipients, i as getRemoteHost, l as recordCollectionDispatchDuration, n as getDurationMs, o as isAbortError, r as getFederationMetrics, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "./metrics-AlCGTDrr.mjs";
+import { t as formatAcceptSignature } from "./accept-CPVqki78.mjs";
+import { a as importJwk, o as validateCryptoKey, t as exportJwk } from "./key-b4kf4yZT.mjs";
+import { l as verifyRequest, o as parseRfc9421SignatureInput, u as verifyRequestDetailed } from "./http-TjhZfiSN.mjs";
+import { t as getAuthenticatedDocumentLoader } from "./docloader-B3kuDBg9.mjs";
+import { n as kvCache } from "./kv-cache-CpILvhUV.mjs";
+import { _ as wrapContextLoaderForJsonLd, a as compactJsonLd, c as getNormalizationContextLoader, d as isClearlyMalformedContextReference, f as isInvalidUrlTypeError, l as hasSignature, m as verifyCompactJsonLd, p as signJsonLd, r as assertSafeJsonLd, s as detachSignature, t as InvalidContextReferenceError, u as hasSignatureLike } from "./ld-CKujkAfG.mjs";
+import { n as getKeyOwner, t as doesActorOwnKey } from "./owner-D1O8v8FB.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-BQSHRLhg.mjs";
+import { i as verifyObject, n as hasProofLike, r as signObject } from "./proof-DeMR7Akd.mjs";
+import { t as getNodeInfo } from "./client-CtxvmazV.mjs";
+import { t as nodeInfoToJson } from "./types-DE_LV1JB.mjs";
+import { n as extractInboxes, r as sendActivity, t as SendActivityError } from "./send-DG7JG280.mjs";
+import { n as FederationBuilderImpl, t as ACTOR_ALIAS_PREFIX } from "./builder-f5-YwHfj.mjs";
+import { t as CircuitBreaker } from "./circuit-breaker-BT7CiPbz.mjs";
+import { t as buildCollectionSynchronizationHeader } from "./collection-CnnP1UAv.mjs";
+import { t as KvKeyCache } from "./keycache-0Jk78XmB.mjs";
+import { t as acceptsJsonLd } from "./negotiation-CCocWT_N.mjs";
+import { t as hasMalformedKnownTemporalLiteral } from "./temporal-DA3jx8x1.mjs";
+import { t as createExponentialBackoffPolicy } from "./retry-zX5xw5e0.mjs";
+import { t as TaskCodec } from "./codec-peqOdBaE.mjs";
 import { getLogger, withContext } from "@logtape/logtape";
 import { RouterError } from "@fedify/uri-template";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, Tombstone, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
@@ -600,7 +600,7 @@ async function handleObject(request, { values, context, objectDispatcher, author
 		Vary: "Accept"
 	} });
 }
-const BUILT_IN_COLLECTION_METRIC_KINDS = new Set([
+const BUILT_IN_COLLECTION_METRIC_KINDS = /* @__PURE__ */ new Set([
 	"inbox",
 	"outbox",
 	"following",
@@ -2211,7 +2211,7 @@ async function respondWithObjectIfAcceptable(object, request, options) {
 	return response;
 }
 function generateNonce() {
-	const bytes = new Uint8Array(16);
+	const bytes = /* @__PURE__ */ new Uint8Array(16);
 	crypto.getRandomValues(bytes);
 	return btoa(String.fromCharCode(...bytes)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
@@ -2480,6 +2480,24 @@ const logger = getLogger([
 	"webfinger",
 	"server"
 ]);
+function getWebFingerSubjectAndAliases({ resourceUrl, actorUri, preferredUsername, acctUsername, host, contextHost }) {
+	const aliases = [];
+	let subject = resourceUrl.href;
+	if (resourceUrl.protocol != "acct:" && preferredUsername != null) {
+		aliases.push(`acct:${preferredUsername}@${host ?? contextHost}`);
+		if (host != null && host !== contextHost) aliases.push(`acct:${preferredUsername}@${contextHost}`);
+	}
+	if (resourceUrl.href !== actorUri.href) aliases.push(actorUri.href);
+	if (resourceUrl.protocol === "acct:" && host != null && host !== contextHost && !resourceUrl.href.endsWith(`@${host}`)) {
+		subject = `acct:${preferredUsername ?? acctUsername}@${host}`;
+		aliases.push(resourceUrl.href);
+		if (preferredUsername != null && preferredUsername !== "" && preferredUsername !== acctUsername) aliases.push(`acct:${preferredUsername}@${contextHost}`);
+	}
+	return {
+		subject,
+		aliases
+	};
+}
 /**
 * Handles a WebFinger request.  You would not typically call this function
 * directly, but instead use {@link Federation.fetch} method.
@@ -2528,7 +2546,7 @@ async function handleWebFinger(request, options) {
 		});
 	}
 }
-const WEBFINGER_HANDLE_SCHEME_WHITELIST = new Set([
+const WEBFINGER_HANDLE_SCHEME_WHITELIST = /* @__PURE__ */ new Set([
 	"acct",
 	"http",
 	"https",
@@ -2584,6 +2602,7 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		return identifier;
 	}
 	let identifier = null;
+	let acctUsername = null;
 	const uriParsed = context.parseUri(resourceUrl);
 	if (uriParsed?.type != "actor") {
 		const match = /^acct:([^@]+)@([^@]+)$/.exec(resource);
@@ -2597,8 +2616,9 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 			const normalizedHost = portMatch == null ? domainToASCII(match[2].toLowerCase()) : domainToASCII(match[2].substring(0, portMatch.index).toLowerCase()) + portMatch[0];
 			if (normalizedHost != context.url.host && normalizedHost != host) return await onNotFound(request);
 			else {
-				identifier = await mapUsernameToIdentifier(match[1]);
-				resourceUrl = new URL(`acct:${match[1]}@${normalizedHost}`);
+				acctUsername = match[1];
+				identifier = await mapUsernameToIdentifier(acctUsername);
+				resourceUrl = new URL(`acct:${acctUsername}@${normalizedHost}`);
 			}
 		}
 	} else identifier = uriParsed.identifier;
@@ -2612,9 +2632,10 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		status: 410,
 		headers: { "Access-Control-Allow-Origin": "*" }
 	});
+	const actorUri = context.getActorUri(identifier);
 	const links = [{
 		rel: "self",
-		href: context.getActorUri(identifier).href,
+		href: actorUri.href,
 		type: "application/activity+json"
 	}];
 	for (const url of actor.urls) if (url instanceof Link && url.href != null) links.push({
@@ -2638,23 +2659,19 @@ async function handleWebFingerInternal(request, { context, host, actorDispatcher
 		const customLinks = await webFingerLinksDispatcher(context, resourceUrl);
 		if (customLinks != null) for (const link of customLinks) links.push(link);
 	}
-	const aliases = [];
-	const preferredUsername = actor.preferredUsername;
-	if (resourceUrl.protocol != "acct:" && preferredUsername != null) {
-		aliases.push(`acct:${preferredUsername}@${host ?? context.url.host}`);
-		if (host != null && host !== context.url.host) aliases.push(`acct:${preferredUsername}@${context.url.host}`);
-	}
-	if (resourceUrl.href !== context.getActorUri(identifier).href) aliases.push(context.getActorUri(identifier).href);
-	if (resourceUrl.protocol === "acct:" && host != null && host !== context.url.host && !resourceUrl.href.endsWith(`@${host}`)) {
-		const username = resourceUrl.href.replace(/^acct:/, "").replace(/@.*$/, "");
-		aliases.push(`acct:${username}@${host}`);
-	}
-	const jrd = {
-		subject: resourceUrl.href,
+	const { subject, aliases } = getWebFingerSubjectAndAliases({
+		resourceUrl,
+		actorUri,
+		preferredUsername: actor.preferredUsername,
+		acctUsername,
+		host,
+		contextHost: context.url.host
+	});
+	return new Response(JSON.stringify({
+		subject,
 		aliases,
 		links
-	};
-	return new Response(JSON.stringify(jrd), { headers: {
+	}), { headers: {
 		"Content-Type": "application/jrd+json",
 		"Access-Control-Allow-Origin": "*"
 	} });