@fedify/fedify 1.9.6-dev.2118 → 1.9.7

package/dist/{http-DAz2fpwK.js → http-hFXuPP4j.mjs}

@@ -1,17 +1,14 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import { FetchError, deno_default } from "./docloader-ENN4YgIF.js";
-import { CryptographicKey } from "./actor-CCg-pZae.js";
-import { fetchKey, validateCryptoKey } from "./key-VDAxfcre.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { G as FetchError, ot as name, s as CryptographicKey, st as version } from "./vocab-DuJO9k13.mjs";
+import { a as validateCryptoKey, n as fetchKey } from "./key-ByblW_7f.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
 import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { Item, decodeDict, encodeItem } from "structured-field-values";
-
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
 /**
@@ -25,9 +22,7 @@ const DEFAULT_MAX_REDIRECTION = 20;
 */
 async function signRequest(request, privateKey, keyId, options = {}) {
 	validateCryptoKey(privateKey, "private");
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.sign", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.sign", async (span) => {
 		try {
 			const spec = options.spec ?? "draft-cavage-http-signatures-12";
 			let signed;
@@ -122,9 +117,7 @@ function createRfc9421SignatureBase(request, components, parameters) {
 * @returns The formatted signature string.
 */
 function formatRfc9421Signature(signature, components, parameters) {
-	const signatureInputValue = `sig1=("${components.join("\" \"")}");${parameters}`;
-	const signatureValue = `sig1=:${encodeBase64(signature)}:`;
-	return [signatureInputValue, signatureValue];
+	return [`sig1=("${components.join("\" \"")}");${parameters}`, `sig1=:${encodeBase64(signature)}:`];
 }
 /**
 * Parse RFC 9421 Signature-Input header.
@@ -254,9 +247,7 @@ const supportedHashAlgorithms = {
 *          could not be verified.
 */
 async function verifyRequest(request, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.verify", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.verify", async (span) => {
 		if (span.isRecording()) {
 			span.setAttribute(ATTR_HTTP_REQUEST_METHOD, request.method);
 			span.setAttribute(ATTR_URL_FULL, request.url);
@@ -446,8 +437,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 	const message = headerNames.map((name) => `${name}: ` + (name === "(request-target)" ? `${request.method.toLowerCase()} ${new URL(request.url).pathname}` : name === "(created)" ? sigValues.created ?? "" : name === "(expires)" ? sigValues.expires ?? "" : name === "host" ? request.headers.get("host") ?? new URL(request.url).host : request.headers.get(name))).join("\n");
 	const sig = decodeBase64(signature);
 	span?.setAttribute("http_signatures.signature", encodeHex(sig));
-	const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message));
-	if (!verified) {
+	if (!await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message))) {
 		if (cached) {
 			logger.debug("Failed to verify with the cached key {keyId}; signature {signature} is invalid.  Retrying with the freshly fetched key...", {
 				keyId,
@@ -461,7 +451,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 				currentTime,
 				keyCache: {
 					get: () => Promise.resolve(void 0),
-					set: async (keyId$1, key$1) => await keyCache?.set(keyId$1, key$1)
+					set: async (keyId, key) => await keyCache?.set(keyId, key)
 				}
 			});
 		}
@@ -611,9 +601,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				logger.debug("Failed to verify; Content-Digest header required but not found.", { components: sigInput.components });
 				continue;
 			}
-			const body = await request.arrayBuffer();
-			const digestValid = await verifyRfc9421ContentDigest(contentDigestHeader, body);
-			if (!digestValid) {
+			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				continue;
 			}
@@ -659,8 +647,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		const signatureBaseBytes = new TextEncoder().encode(signatureBase);
 		span?.setAttribute("http_signatures.signature", encodeHex(sigBytes));
 		try {
-			const verified = await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes);
-			if (verified) {
+			if (await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes)) {
 				validKey = key;
 				break;
 			} else if (cached) {
@@ -672,7 +659,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 					currentTime,
 					keyCache: {
 						get: () => Promise.resolve(void 0),
-						set: async (keyId, key$1) => await keyCache?.set(keyId, key$1)
+						set: async (keyId, key) => await keyCache?.set(keyId, key)
 					},
 					spec: "rfc9421"
 				});
@@ -745,8 +732,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	});
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const location = response.headers.get("Location");
-		const redirectRequest = createRedirectRequest(request, location, body);
+		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 		if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -776,8 +762,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		});
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const location = response.headers.get("Location");
-			const redirectRequest = createRedirectRequest(request, location, body);
+			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 			if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,
@@ -814,6 +799,5 @@ function timingSafeEqual(a, b) {
 	result |= lenA ^ lenB;
 	return result === 0;
 }
-
 //#endregion
-export { doubleKnock, signRequest, verifyRequest };
+export { parseRfc9421Signature as a, timingSafeEqual as c, formatRfc9421SignatureParameters as i, verifyRequest as l, doubleKnock as n, parseRfc9421SignatureInput as o, formatRfc9421Signature as r, signRequest as s, createRfc9421SignatureBase as t };

package/dist/{http-LDjZxhgJ.js → http-z-J6i29D.js}

@@ -1,17 +1,14 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { CryptographicKey, FetchError, deno_default } from "./type-kdsaa4c5.js";
-import { fetchKey, validateCryptoKey } from "./key-kD68vuX_.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+import { d as name, f as version, t as FetchError } from "./docloader-Dlo9EMTn.js";
+import { y as CryptographicKey } from "./actor-B3mkavdq.js";
+import { n as fetchKey, o as validateCryptoKey } from "./key-DPg0mibt.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
+import { ATTR_HTTP_REQUEST_HEADER, ATTR_HTTP_REQUEST_METHOD, ATTR_URL_FULL } from "@opentelemetry/semantic-conventions";
 import { Item, decodeDict, encodeItem } from "structured-field-values";
-
 //#region src/sig/http.ts
 const DEFAULT_MAX_REDIRECTION = 20;
 /**
@@ -25,9 +22,7 @@ const DEFAULT_MAX_REDIRECTION = 20;
 */
 async function signRequest(request, privateKey, keyId, options = {}) {
 	validateCryptoKey(privateKey, "private");
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.sign", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.sign", async (span) => {
 		try {
 			const spec = options.spec ?? "draft-cavage-http-signatures-12";
 			let signed;
@@ -122,9 +117,7 @@ function createRfc9421SignatureBase(request, components, parameters) {
 * @returns The formatted signature string.
 */
 function formatRfc9421Signature(signature, components, parameters) {
-	const signatureInputValue = `sig1=("${components.join("\" \"")}");${parameters}`;
-	const signatureValue = `sig1=:${encodeBase64(signature)}:`;
-	return [signatureInputValue, signatureValue];
+	return [`sig1=("${components.join("\" \"")}");${parameters}`, `sig1=:${encodeBase64(signature)}:`];
 }
 /**
 * Parse RFC 9421 Signature-Input header.
@@ -254,9 +247,7 @@ const supportedHashAlgorithms = {
 *          could not be verified.
 */
 async function verifyRequest(request, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("http_signatures.verify", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("http_signatures.verify", async (span) => {
 		if (span.isRecording()) {
 			span.setAttribute(ATTR_HTTP_REQUEST_METHOD, request.method);
 			span.setAttribute(ATTR_URL_FULL, request.url);
@@ -446,8 +437,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 	const message = headerNames.map((name) => `${name}: ` + (name === "(request-target)" ? `${request.method.toLowerCase()} ${new URL(request.url).pathname}` : name === "(created)" ? sigValues.created ?? "" : name === "(expires)" ? sigValues.expires ?? "" : name === "host" ? request.headers.get("host") ?? new URL(request.url).host : request.headers.get(name))).join("\n");
 	const sig = decodeBase64(signature);
 	span?.setAttribute("http_signatures.signature", encodeHex(sig));
-	const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message));
-	if (!verified) {
+	if (!await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, sig, new TextEncoder().encode(message))) {
 		if (cached) {
 			logger.debug("Failed to verify with the cached key {keyId}; signature {signature} is invalid.  Retrying with the freshly fetched key...", {
 				keyId,
@@ -461,7 +451,7 @@ async function verifyRequestDraft(request, span, { documentLoader, contextLoader
 				currentTime,
 				keyCache: {
 					get: () => Promise.resolve(void 0),
-					set: async (keyId$1, key$1) => await keyCache?.set(keyId$1, key$1)
+					set: async (keyId, key) => await keyCache?.set(keyId, key)
 				}
 			});
 		}
@@ -611,9 +601,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 				logger.debug("Failed to verify; Content-Digest header required but not found.", { components: sigInput.components });
 				continue;
 			}
-			const body = await request.arrayBuffer();
-			const digestValid = await verifyRfc9421ContentDigest(contentDigestHeader, body);
-			if (!digestValid) {
+			if (!await verifyRfc9421ContentDigest(contentDigestHeader, await request.arrayBuffer())) {
 				logger.debug("Failed to verify; Content-Digest verification failed.", { contentDigest: contentDigestHeader });
 				continue;
 			}
@@ -659,8 +647,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 		const signatureBaseBytes = new TextEncoder().encode(signatureBase);
 		span?.setAttribute("http_signatures.signature", encodeHex(sigBytes));
 		try {
-			const verified = await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes);
-			if (verified) {
+			if (await crypto.subtle.verify(algorithm, key.publicKey, sigBytes.slice(), signatureBaseBytes)) {
 				validKey = key;
 				break;
 			} else if (cached) {
@@ -672,7 +659,7 @@ async function verifyRequestRfc9421(request, span, { documentLoader, contextLoad
 					currentTime,
 					keyCache: {
 						get: () => Promise.resolve(void 0),
-						set: async (keyId, key$1) => await keyCache?.set(keyId, key$1)
+						set: async (keyId, key) => await keyCache?.set(keyId, key)
 					},
 					spec: "rfc9421"
 				});
@@ -745,8 +732,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 	});
 	if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 		if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-		const location = response.headers.get("Location");
-		const redirectRequest = createRedirectRequest(request, location, body);
+		const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 		if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 		return doubleKnockInternal(redirectRequest, identity, {
 			...options,
@@ -776,8 +762,7 @@ async function doubleKnockInternal(request, identity, options, redirected = 0, v
 		});
 		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
 			if (redirected >= DEFAULT_MAX_REDIRECTION) throw new FetchError(request.url, `Too many redirections (${redirected + 1})`);
-			const location = response.headers.get("Location");
-			const redirectRequest = createRedirectRequest(request, location, body);
+			const redirectRequest = createRedirectRequest(request, response.headers.get("Location"), body);
 			if (visited.has(redirectRequest.url)) throw new FetchError(request.url, `Redirect loop detected: ${redirectRequest.url}`);
 			return doubleKnockInternal(redirectRequest, identity, {
 				...options,
@@ -814,6 +799,5 @@ function timingSafeEqual(a, b) {
 	result |= lenA ^ lenB;
 	return result === 0;
 }
-
 //#endregion
-export { createRfc9421SignatureBase, doubleKnock, formatRfc9421Signature, formatRfc9421SignatureParameters, parseRfc9421Signature, parseRfc9421SignatureInput, signRequest, timingSafeEqual, verifyRequest };
+export { signRequest as n, verifyRequest as r, doubleKnock as t };

package/dist/{inbox-CLgNEczc.js → inbox-B0NdZv6Q.mjs}

@@ -1,12 +1,9 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { Activity, deno_default, getTypeId } from "./type-kdsaa4c5.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { U as getTypeId, ot as name, st as version, t as Activity } from "./vocab-DuJO9k13.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, context, propagation, trace } from "@opentelemetry/api";
-
 //#region src/federation/inbox.ts
 var InboxListenerSet = class InboxListenerSet {
 	#listeners;
@@ -57,10 +54,8 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			warnedAboutDefaultIdempotency = true;
 		}
 		let keyString;
-		if (typeof strategy === "function") {
-			const result = await strategy(inboxContext, activity);
-			keyString = result;
-		} else switch (strategy) {
+		if (typeof strategy === "function") keyString = await strategy(inboxContext, activity);
+		else switch (strategy) {
 			case "global":
 				keyString = activity.id.href;
 				break;
@@ -75,8 +70,7 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		if (keyString != null) cacheKey = [...kvPrefixes.activityIdempotence, keyString];
 	}
 	if (cacheKey != null) {
-		const cached = await kv.get(cacheKey);
-		if (cached === true) {
+		if (await kv.get(cacheKey) === true) {
 			logger.debug("Activity {activityId} has already been processed.", {
 				activityId: activity.id?.href,
 				activity: json,
@@ -133,31 +127,30 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 		return "enqueued";
 	}
 	tracerProvider = tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span$1) => {
+	return await tracerProvider.getTracer(name, version).startActiveSpan("activitypub.dispatch_inbox_listener", { kind: SpanKind.INTERNAL }, async (span) => {
 		const dispatched = inboxListeners?.dispatchWithClass(activity);
 		if (dispatched == null) {
 			logger.error("Unsupported activity type:\n{activity}", {
 				activity: json,
 				recipient
 			});
-			span$1.setStatus({
+			span.setStatus({
 				code: SpanStatusCode.UNSET,
 				message: `Unsupported activity type: ${getTypeId(activity).href}`
 			});
-			span$1.end();
+			span.end();
 			return "unsupportedActivity";
 		}
 		const { class: cls, listener } = dispatched;
-		span$1.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
+		span.updateName(`activitypub.dispatch_inbox_listener ${cls.name}`);
 		try {
 			await listener(inboxContextFactory(recipient, json, activity?.id?.href, getTypeId(activity).href), activity);
 		} catch (error) {
 			try {
 				await inboxErrorHandler?.(ctx, error);
-			} catch (error$1) {
+			} catch (error) {
 				logger.error("An unexpected error occurred in inbox error handler:\n{error}", {
-					error: error$1,
+					error,
 					activityId: activity.id?.href,
 					activity: json,
 					recipient
@@ -169,11 +162,11 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 				activity: json,
 				recipient
 			});
-			span$1.setStatus({
+			span.setStatus({
 				code: SpanStatusCode.ERROR,
 				message: String(error)
 			});
-			span$1.end();
+			span.end();
 			return "error";
 		}
 		if (cacheKey != null) await kv.set(cacheKey, true, { ttl: Temporal.Duration.from({ days: 1 }) });
@@ -182,10 +175,9 @@ async function routeActivity({ context: ctx, json, activity, recipient, inboxLis
 			activity: json,
 			recipient
 		});
-		span$1.end();
+		span.end();
 		return "success";
 	});
 }
-
 //#endregion
-export { InboxListenerSet, routeActivity };
+export { routeActivity as n, InboxListenerSet as t };

package/dist/{key-C45K8q1u.cjs → key-B2ZqbGDP.cjs}

@@ -1,13 +1,9 @@
-
-          const { Temporal } = require("@js-temporal/polyfill");
-          const { URLPattern } = require("urlpattern-polyfill");
-        
-const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-OWdVzt6R.cjs');
-const require_actor = require('./actor-C71CIMfC.cjs');
-const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
-const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
-
+const { Temporal } = require("@js-temporal/polyfill");
+const { URLPattern } = require("urlpattern-polyfill");
+const require_docloader = require("./docloader-Co-tW1B6.cjs");
+const require_actor = require("./actor-CsvteFj1.cjs");
+let _logtape_logtape = require("@logtape/logtape");
+let _opentelemetry_api = require("@opentelemetry/api");
 //#region src/sig/key.ts
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
@@ -22,8 +18,7 @@ function validateCryptoKey(key, type) {
 	if (!key.extractable) throw new TypeError("The key is not extractable.");
 	if (key.algorithm.name !== "RSASSA-PKCS1-v1_5" && key.algorithm.name !== "Ed25519") throw new TypeError("Currently only RSASSA-PKCS1-v1_5 and Ed25519 keys are supported.  More algorithms will be added in the future!");
 	if (key.algorithm.name === "RSASSA-PKCS1-v1_5") {
-		const algorithm = key.algorithm;
-		if (algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
+		if (key.algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
 	}
 }
 /**
@@ -34,7 +29,7 @@ function validateCryptoKey(key, type) {
 * @throws {TypeError} If the algorithm is unsupported.
 */
 function generateCryptoKeyPair(algorithm) {
-	if (algorithm == null) (0, __logtape_logtape.getLogger)([
+	if (algorithm == null) (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"sig",
 		"key"
@@ -102,11 +97,10 @@ async function importJwk(jwk, type) {
 * @since 1.3.0
 */
 function fetchKey(keyId, cls, options = {}) {
-	const tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(require_docloader.deno_default.name, require_docloader.deno_default.version);
+	const tracer = (options.tracerProvider ?? _opentelemetry_api.trace.getTracerProvider()).getTracer(require_docloader.name, require_docloader.version);
 	keyId = typeof keyId === "string" ? new URL(keyId) : keyId;
 	return tracer.startActiveSpan("activitypub.fetch_key", {
-		kind: __opentelemetry_api.SpanKind.CLIENT,
+		kind: _opentelemetry_api.SpanKind.CLIENT,
 		attributes: {
 			"http.method": "GET",
 			"url.full": keyId.href,
@@ -123,7 +117,7 @@ function fetchKey(keyId, cls, options = {}) {
 			return result;
 		} catch (e) {
 			span.setStatus({
-				code: __opentelemetry_api.SpanStatusCode.ERROR,
+				code: _opentelemetry_api.SpanStatusCode.ERROR,
 				message: String(e)
 			});
 			throw e;
@@ -133,7 +127,7 @@ function fetchKey(keyId, cls, options = {}) {
 	});
 }
 async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, keyCache, tracerProvider } = {}) {
-	const logger = (0, __logtape_logtape.getLogger)([
+	const logger = (0, _logtape_logtape.getLogger)([
 		"fedify",
 		"sig",
 		"key"
@@ -159,8 +153,7 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 	logger.debug("Fetching key {keyId} to verify signature...", { keyId });
 	let document;
 	try {
-		const remoteDocument = await (documentLoader ?? require_docloader.getDocumentLoader())(keyId);
-		document = remoteDocument.document;
+		document = (await (documentLoader ?? require_docloader.getDocumentLoader())(keyId)).document;
 	} catch (_) {
 		logger.debug("Failed to fetch key {keyId}.", { keyId });
 		await keyCache?.set(cacheKey, null);
@@ -184,8 +177,8 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 				contextLoader,
 				tracerProvider
 			});
-		} catch (e$1) {
-			if (e$1 instanceof TypeError) {
+		} catch (e) {
+			if (e instanceof TypeError) {
 				logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
 				await keyCache?.set(cacheKey, null);
 				return {
@@ -193,7 +186,7 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 					cached: false
 				};
 			}
-			throw e$1;
+			throw e;
 		}
 	}
 	let key = null;
@@ -256,35 +249,34 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 		cached: false
 	};
 }
-
 //#endregion
-Object.defineProperty(exports, 'exportJwk', {
-  enumerable: true,
-  get: function () {
-    return exportJwk;
-  }
+Object.defineProperty(exports, "exportJwk", {
+	enumerable: true,
+	get: function() {
+		return exportJwk;
+	}
+});
+Object.defineProperty(exports, "fetchKey", {
+	enumerable: true,
+	get: function() {
+		return fetchKey;
+	}
 });
-Object.defineProperty(exports, 'fetchKey', {
-  enumerable: true,
-  get: function () {
-    return fetchKey;
-  }
+Object.defineProperty(exports, "generateCryptoKeyPair", {
+	enumerable: true,
+	get: function() {
+		return generateCryptoKeyPair;
+	}
 });
-Object.defineProperty(exports, 'generateCryptoKeyPair', {
-  enumerable: true,
-  get: function () {
-    return generateCryptoKeyPair;
-  }
+Object.defineProperty(exports, "importJwk", {
+	enumerable: true,
+	get: function() {
+		return importJwk;
+	}
 });
-Object.defineProperty(exports, 'importJwk', {
-  enumerable: true,
-  get: function () {
-    return importJwk;
-  }
+Object.defineProperty(exports, "validateCryptoKey", {
+	enumerable: true,
+	get: function() {
+		return validateCryptoKey;
+	}
 });
-Object.defineProperty(exports, 'validateCryptoKey', {
-  enumerable: true,
-  get: function () {
-    return validateCryptoKey;
-  }
-});

package/dist/key-BfH9JUMQ.cjs

@@ -0,0 +1,4 @@
+const { Temporal } = require("@js-temporal/polyfill");
+const { URLPattern } = require("urlpattern-polyfill");
+const require_key = require("./key-B2ZqbGDP.cjs");
+exports.validateCryptoKey = require_key.validateCryptoKey;

package/dist/{key-VDAxfcre.js → key-ByblW_7f.mjs}

@@ -1,12 +1,10 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import { deno_default, getDocumentLoader } from "./docloader-ENN4YgIF.js";
-import { CryptographicKey, Object as Object$1, isActor } from "./actor-CCg-pZae.js";
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { J as getDocumentLoader, ot as name, s as CryptographicKey, st as version, v as Object$1 } from "./vocab-DuJO9k13.mjs";
+import { i as isActor } from "./actor-DeUOMMMQ.mjs";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-
 //#region src/sig/key.ts
 /**
 * Checks if the given key is valid and supported.  No-op if the key is valid,
@@ -21,8 +19,7 @@ function validateCryptoKey(key, type) {
 	if (!key.extractable) throw new TypeError("The key is not extractable.");
 	if (key.algorithm.name !== "RSASSA-PKCS1-v1_5" && key.algorithm.name !== "Ed25519") throw new TypeError("Currently only RSASSA-PKCS1-v1_5 and Ed25519 keys are supported.  More algorithms will be added in the future!");
 	if (key.algorithm.name === "RSASSA-PKCS1-v1_5") {
-		const algorithm = key.algorithm;
-		if (algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
+		if (key.algorithm.hash.name !== "SHA-256") throw new TypeError("For compatibility with the existing Fediverse software (e.g., Mastodon), hash algorithm for RSASSA-PKCS1-v1_5 keys must be SHA-256.");
 	}
 }
 /**
@@ -101,8 +98,7 @@ async function importJwk(jwk, type) {
 * @since 1.3.0
 */
 function fetchKey(keyId, cls, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
+	const tracer = (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version);
 	keyId = typeof keyId === "string" ? new URL(keyId) : keyId;
 	return tracer.startActiveSpan("activitypub.fetch_key", {
 		kind: SpanKind.CLIENT,
@@ -158,8 +154,7 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 	logger.debug("Fetching key {keyId} to verify signature...", { keyId });
 	let document;
 	try {
-		const remoteDocument = await (documentLoader ?? getDocumentLoader())(keyId);
-		document = remoteDocument.document;
+		document = (await (documentLoader ?? getDocumentLoader())(keyId)).document;
 	} catch (_) {
 		logger.debug("Failed to fetch key {keyId}.", { keyId });
 		await keyCache?.set(cacheKey, null);
@@ -183,8 +178,8 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 				contextLoader,
 				tracerProvider
 			});
-		} catch (e$1) {
-			if (e$1 instanceof TypeError) {
+		} catch (e) {
+			if (e instanceof TypeError) {
 				logger.debug("Failed to verify; key {keyId} returned an invalid object.", { keyId });
 				await keyCache?.set(cacheKey, null);
 				return {
@@ -192,7 +187,7 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 					cached: false
 				};
 			}
-			throw e$1;
+			throw e;
 		}
 	}
 	let key = null;
@@ -255,6 +250,5 @@ async function fetchKeyInternal(keyId, cls, { documentLoader, contextLoader, key
 		cached: false
 	};
 }
-
 //#endregion
-export { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey };
+export { validateCryptoKey as a, importJwk as i, fetchKey as n, generateCryptoKeyPair as r, exportJwk as t };