@fedify/fedify 1.9.2-dev.1890 → 1.10.0-dev.11

package/dist/{actor-DyfGDQJB.js → actor-CzhWrNYT.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Application, Group, Organization, Person, Service, deno_default, getTypeId, lookupWebFinger } from "./type-CfrcT6D9.js";
+import { Application, Group, Organization, Person, Service, deno_default, getTypeId, lookupWebFinger } from "./type-Bjc-_Rom.js";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { domainToASCII, domainToUnicode } from "node:url";
 

package/dist/{authdocloader-DaFhFZWS.cjs → authdocloader-BJPbXGjs.cjs}

@@ -3,9 +3,9 @@
           const { URLPattern } = require("urlpattern-polyfill");
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
-const require_docloader = require('./docloader-Uh0ciwr4.cjs');
-const require_key = require('./key-CkxzRYsV.cjs');
-const require_http = require('./http-DNoRdF3N.cjs');
+const require_docloader = require('./docloader-Cgy1RCqb.cjs');
+const require_key = require('./key-CHl3R_Y6.cjs');
+const require_http = require('./http-DBJHuWVd.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 
 //#region src/runtime/authdocloader.ts

package/dist/{authdocloader-8jtTmnjn.js → authdocloader-DWc5tH1y.js}

@@ -3,9 +3,9 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { UrlError, createRequest, getRemoteDocument, logRequest, validatePublicUrl } from "./type-CfrcT6D9.js";
-import { validateCryptoKey } from "./key-Ci7FKLpn.js";
-import { doubleKnock } from "./http-jrUnvC1R.js";
+import { UrlError, createRequest, getRemoteDocument, logRequest, validatePublicUrl } from "./type-Bjc-_Rom.js";
+import { validateCryptoKey } from "./key-DZXdhUze.js";
+import { doubleKnock } from "./http-BqvHtYhP.js";
 import { getLogger } from "@logtape/logtape";
 
 //#region src/runtime/authdocloader.ts

package/dist/{authdocloader-Djn6Z8TB.js → authdocloader-Y9lwp2q3.js}

@@ -2,9 +2,9 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import { UrlError, createRequest, getRemoteDocument, logRequest, validatePublicUrl } from "./docloader-B_A2nB2W.js";
-import { validateCryptoKey } from "./key-CAH7GCWj.js";
-import { doubleKnock } from "./http-CJ7SfCok.js";
+import { UrlError, createRequest, getRemoteDocument, logRequest, validatePublicUrl } from "./docloader-Crf5jJS0.js";
+import { validateCryptoKey } from "./key-1YPBM8c7.js";
+import { doubleKnock } from "./http-CSJ1EReB.js";
 import { getLogger } from "@logtape/logtape";
 
 //#region src/runtime/authdocloader.ts

package/dist/{builder-DG1srBKu.js → builder-D9HmXe-c.js}

@@ -3,9 +3,9 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default, getTypeId } from "./type-CfrcT6D9.js";
-import { Router, RouterError } from "./lookup-BA3bNgf4.js";
-import { InboxListenerSet } from "./inbox-C3N4s1QJ.js";
+import { deno_default, getTypeId } from "./type-Bjc-_Rom.js";
+import { Router, RouterError } from "./lookup-pw97bxAu.js";
+import { InboxListenerSet } from "./inbox-BuzNfn3x.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 
@@ -43,7 +43,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-BxBgtIG4.js");
+		const { FederationImpl } = await import("./middleware-qKLKzVpT.js");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/{client-Dq-zkC8Y.js → client-DPYh54yM.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { getUserAgent } from "./type-CfrcT6D9.js";
+import { getUserAgent } from "./type-Bjc-_Rom.js";
 import { parseSemVer } from "./semver-dArNLkR9.js";
 import { getLogger } from "@logtape/logtape";
 

package/dist/compat/transformers.test.js

@@ -3,30 +3,30 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Follow, Person } from "../type-CfrcT6D9.js";
+import { Follow, Person } from "../type-Bjc-_Rom.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { FederationImpl, actorDehydrator, autoIdAssigner } from "../middleware-8Utrfm2B.js";
+import { FederationImpl, actorDehydrator, autoIdAssigner } from "../middleware-_hA7WuDf.js";
 import "../semver-dArNLkR9.js";
-import "../client-Dq-zkC8Y.js";
-import "../lookup-BA3bNgf4.js";
+import "../client-DPYh54yM.js";
+import "../lookup-pw97bxAu.js";
 import "../types-BIgY6c-l.js";
-import "../actor-DyfGDQJB.js";
-import "../key-Ci7FKLpn.js";
-import "../http-jrUnvC1R.js";
-import "../authdocloader-8jtTmnjn.js";
-import "../ld-CF-_Iv3N.js";
-import "../owner-D2N6v5Gm.js";
-import "../proof-GwNAN3ln.js";
-import "../inbox-C3N4s1QJ.js";
-import "../builder-DG1srBKu.js";
+import "../actor-CzhWrNYT.js";
+import "../key-DZXdhUze.js";
+import "../http-BqvHtYhP.js";
+import "../authdocloader-DWc5tH1y.js";
+import "../ld-CmJQd-xc.js";
+import "../owner-B7WLWS8V.js";
+import "../proof-BSpRVVLc.js";
+import "../inbox-BuzNfn3x.js";
+import "../builder-D9HmXe-c.js";
 import "../collection-CSzG2j1P.js";
-import "../keycache-CEs327f0.js";
+import "../keycache-CGSAu6vs.js";
 import "../retry-D4GJ670a.js";
-import "../send-D_f3mgyD.js";
-import { test } from "../testing-hVeFvsZ9.js";
+import "../send-CKzTk_tF.js";
+import { test } from "../testing-DiHxoGZd.js";
 
 //#region src/compat/transformers.test.ts
 const federation = new FederationImpl({ kv: new MemoryKvStore() });

package/dist/{docloader-Uh0ciwr4.cjs → docloader-Cgy1RCqb.cjs}

@@ -4,13 +4,14 @@
         
 const require_chunk = require('./chunk-DqRYRqnO.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
+const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
 const node_process = require_chunk.__toESM(require("node:process"));
 const node_dns_promises = require_chunk.__toESM(require("node:dns/promises"));
 const node_net = require_chunk.__toESM(require("node:net"));
 
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "1.9.2-dev.1890+4be74434";
+var version = "1.10.0-dev.11+d74bbbd7";
 var license = "MIT";
 var exports$1 = {
 	".": "./src/mod.ts",
@@ -32,6 +33,8 @@ var imports = {
 	"@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
 	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
 	"@opentelemetry/api": "npm:@opentelemetry/api@^1.9.0",
+	"@opentelemetry/core": "npm:@opentelemetry/core@^1.30.1",
+	"@opentelemetry/sdk-trace-base": "npm:@opentelemetry/sdk-trace-base@^1.30.1",
 	"@opentelemetry/semantic-conventions": "npm:@opentelemetry/semantic-conventions@^1.27.0",
 	"@phensley/language-tag": "npm:@phensley/language-tag@^1.9.0",
 	"@std/assert": "jsr:@std/assert@^0.226.0",
@@ -43,7 +46,7 @@ var imports = {
 	"fast-check": "npm:fast-check@^3.22.0",
 	"fetch-mock": "npm:fetch-mock@^12.5.2",
 	"json-canon": "npm:json-canon@^1.0.1",
-	"jsonld": "npm:jsonld@^8.3.2",
+	"jsonld": "npm:jsonld@^9.0.0",
 	"multicodec": "npm:multicodec@^3.2.1",
 	"pkijs": "npm:pkijs@^3.2.4",
 	"structured-field-values": "npm:structured-field-values@^2.0.4",
@@ -4627,29 +4630,38 @@ async function getRemoteDocument(url, response, fetch$1) {
 	}
 	let document;
 	if (!jsonLd && (contentType === "text/html" || contentType?.startsWith("text/html;") || contentType === "application/xhtml+xml" || contentType?.startsWith("application/xhtml+xml;"))) {
-		const p = /<(a|link)((\s+[a-z][a-z:_-]*=("[^"]*"|'[^']*'|[^\s>]+))+)\s*\/?>/gi;
-		const p2 = /\s+([a-z][a-z:_-]*)=("([^"]*)"|'([^']*)'|([^\s>]+))/gi;
+		const MAX_HTML_SIZE = 1024 * 1024;
 		const html = await response.text();
-		let m;
-		const rawAttribs = [];
-		while ((m = p.exec(html)) !== null) rawAttribs.push(m[2]);
-		for (const rawAttrs of rawAttribs) {
-			let m2;
-			const attribs = {};
-			while ((m2 = p2.exec(rawAttrs)) !== null) {
-				const key = m2[1].toLowerCase();
-				const value = m2[3] ?? m2[4] ?? m2[5] ?? "";
-				attribs[key] = value;
-			}
-			if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
-				logger.debug("Found alternate document: {alternateUrl} from {url}", {
-					alternateUrl: attribs.href,
-					url: documentUrl
-				});
-				return await fetch$1(new URL(attribs.href, docUrl).href);
+		if (html.length > MAX_HTML_SIZE) {
+			logger.warn("HTML response too large, skipping alternate link discovery: {url}", {
+				url: documentUrl,
+				size: html.length
+			});
+			document = JSON.parse(html);
+		} else {
+			const tagPattern = /<(a|link)\s+([^>]*?)\s*\/?>/gi;
+			const attrPattern = /([a-z][a-z:_-]*)=(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
+			let tagMatch;
+			while ((tagMatch = tagPattern.exec(html)) !== null) {
+				const tagContent = tagMatch[2];
+				let attrMatch;
+				const attribs = {};
+				attrPattern.lastIndex = 0;
+				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
+					const key = attrMatch[1].toLowerCase();
+					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
+					attribs[key] = value;
+				}
+				if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
+					logger.debug("Found alternate document: {alternateUrl} from {url}", {
+						alternateUrl: attribs.href,
+						url: documentUrl
+					});
+					return await fetch$1(new URL(attribs.href, docUrl).href);
+				}
 			}
+			document = JSON.parse(html);
 		}
-		document = JSON.parse(html);
 	} else document = await response.json();
 	logger.debug("Fetched document: {status} {url} {headers}", {
 		status: response.status,
@@ -4680,6 +4692,8 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
+	const tracerProvider = __opentelemetry_api.trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
 	async function load(url, options) {
 		options?.signal?.throwIfAborted();
 		if (!skipPreloadedContexts && url in contexts_default) {
@@ -4699,14 +4713,38 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 			});
 			throw error;
 		}
-		const request = createRequest(url, { userAgent });
-		logRequest(request);
-		const response = await fetch(request, {
-			redirect: "manual",
-			signal: options?.signal
+		return await tracer.startActiveSpan("activitypub.fetch_document", {
+			kind: __opentelemetry_api.SpanKind.CLIENT,
+			attributes: { "url.full": url }
+		}, async (span) => {
+			try {
+				const request = createRequest(url, { userAgent });
+				logRequest(request);
+				const response = await fetch(request, {
+					redirect: "manual",
+					signal: options?.signal
+				});
+				span.setAttribute("http.response.status_code", response.status);
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+					const redirectUrl = response.headers.get("Location");
+					span.setAttribute("http.redirect.url", redirectUrl);
+					return await load(redirectUrl, options);
+				}
+				const result = await getRemoteDocument(url, response, load);
+				span.setAttribute("docloader.document_url", result.documentUrl);
+				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
+				return result;
+			} catch (error) {
+				span.recordException(error);
+				span.setStatus({
+					code: __opentelemetry_api.SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
 		});
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), options);
-		return getRemoteDocument(url, response, load);
 	}
 	return load;
 }

package/dist/{docloader-B_A2nB2W.js → docloader-Crf5jJS0.js}

@@ -3,13 +3,14 @@
           import { URLPattern } from "urlpattern-polyfill";
         
 import { getLogger } from "@logtape/logtape";
+import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import process from "node:process";
 import { lookup } from "node:dns/promises";
 import { isIP } from "node:net";
 
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "1.9.2-dev.1890+4be74434";
+var version = "1.10.0-dev.11+d74bbbd7";
 var license = "MIT";
 var exports = {
 	".": "./src/mod.ts",
@@ -31,6 +32,8 @@ var imports = {
 	"@cfworker/json-schema": "npm:@cfworker/json-schema@^4.1.1",
 	"@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",
 	"@opentelemetry/api": "npm:@opentelemetry/api@^1.9.0",
+	"@opentelemetry/core": "npm:@opentelemetry/core@^1.30.1",
+	"@opentelemetry/sdk-trace-base": "npm:@opentelemetry/sdk-trace-base@^1.30.1",
 	"@opentelemetry/semantic-conventions": "npm:@opentelemetry/semantic-conventions@^1.27.0",
 	"@phensley/language-tag": "npm:@phensley/language-tag@^1.9.0",
 	"@std/assert": "jsr:@std/assert@^0.226.0",
@@ -42,7 +45,7 @@ var imports = {
 	"fast-check": "npm:fast-check@^3.22.0",
 	"fetch-mock": "npm:fetch-mock@^12.5.2",
 	"json-canon": "npm:json-canon@^1.0.1",
-	"jsonld": "npm:jsonld@^8.3.2",
+	"jsonld": "npm:jsonld@^9.0.0",
 	"multicodec": "npm:multicodec@^3.2.1",
 	"pkijs": "npm:pkijs@^3.2.4",
 	"structured-field-values": "npm:structured-field-values@^2.0.4",
@@ -4626,29 +4629,38 @@ async function getRemoteDocument(url, response, fetch$1) {
 	}
 	let document;
 	if (!jsonLd && (contentType === "text/html" || contentType?.startsWith("text/html;") || contentType === "application/xhtml+xml" || contentType?.startsWith("application/xhtml+xml;"))) {
-		const p = /<(a|link)((\s+[a-z][a-z:_-]*=("[^"]*"|'[^']*'|[^\s>]+))+)\s*\/?>/gi;
-		const p2 = /\s+([a-z][a-z:_-]*)=("([^"]*)"|'([^']*)'|([^\s>]+))/gi;
+		const MAX_HTML_SIZE = 1024 * 1024;
 		const html = await response.text();
-		let m;
-		const rawAttribs = [];
-		while ((m = p.exec(html)) !== null) rawAttribs.push(m[2]);
-		for (const rawAttrs of rawAttribs) {
-			let m2;
-			const attribs = {};
-			while ((m2 = p2.exec(rawAttrs)) !== null) {
-				const key = m2[1].toLowerCase();
-				const value = m2[3] ?? m2[4] ?? m2[5] ?? "";
-				attribs[key] = value;
-			}
-			if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
-				logger.debug("Found alternate document: {alternateUrl} from {url}", {
-					alternateUrl: attribs.href,
-					url: documentUrl
-				});
-				return await fetch$1(new URL(attribs.href, docUrl).href);
+		if (html.length > MAX_HTML_SIZE) {
+			logger.warn("HTML response too large, skipping alternate link discovery: {url}", {
+				url: documentUrl,
+				size: html.length
+			});
+			document = JSON.parse(html);
+		} else {
+			const tagPattern = /<(a|link)\s+([^>]*?)\s*\/?>/gi;
+			const attrPattern = /([a-z][a-z:_-]*)=(?:"([^"]*)"|'([^']*)'|([^\s>]+))/gi;
+			let tagMatch;
+			while ((tagMatch = tagPattern.exec(html)) !== null) {
+				const tagContent = tagMatch[2];
+				let attrMatch;
+				const attribs = {};
+				attrPattern.lastIndex = 0;
+				while ((attrMatch = attrPattern.exec(tagContent)) !== null) {
+					const key = attrMatch[1].toLowerCase();
+					const value = attrMatch[2] ?? attrMatch[3] ?? attrMatch[4] ?? "";
+					attribs[key] = value;
+				}
+				if (attribs.rel === "alternate" && "type" in attribs && (attribs.type === "application/activity+json" || attribs.type === "application/ld+json" || attribs.type.startsWith("application/ld+json;")) && "href" in attribs && new URL(attribs.href, docUrl).href !== docUrl.href) {
+					logger.debug("Found alternate document: {alternateUrl} from {url}", {
+						alternateUrl: attribs.href,
+						url: documentUrl
+					});
+					return await fetch$1(new URL(attribs.href, docUrl).href);
+				}
 			}
+			document = JSON.parse(html);
 		}
-		document = JSON.parse(html);
 	} else document = await response.json();
 	logger.debug("Fetched document: {status} {url} {headers}", {
 		status: response.status,
@@ -4679,6 +4691,8 @@ async function getRemoteDocument(url, response, fetch$1) {
 * @since 1.3.0
 */
 function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAgent } = {}) {
+	const tracerProvider = trace.getTracerProvider();
+	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
 	async function load(url, options) {
 		options?.signal?.throwIfAborted();
 		if (!skipPreloadedContexts && url in contexts_default) {
@@ -4698,14 +4712,38 @@ function getDocumentLoader({ allowPrivateAddress, skipPreloadedContexts, userAge
 			});
 			throw error;
 		}
-		const request = createRequest(url, { userAgent });
-		logRequest(request);
-		const response = await fetch(request, {
-			redirect: "manual",
-			signal: options?.signal
+		return await tracer.startActiveSpan("activitypub.fetch_document", {
+			kind: SpanKind.CLIENT,
+			attributes: { "url.full": url }
+		}, async (span) => {
+			try {
+				const request = createRequest(url, { userAgent });
+				logRequest(request);
+				const response = await fetch(request, {
+					redirect: "manual",
+					signal: options?.signal
+				});
+				span.setAttribute("http.response.status_code", response.status);
+				if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) {
+					const redirectUrl = response.headers.get("Location");
+					span.setAttribute("http.redirect.url", redirectUrl);
+					return await load(redirectUrl, options);
+				}
+				const result = await getRemoteDocument(url, response, load);
+				span.setAttribute("docloader.document_url", result.documentUrl);
+				if (result.contextUrl != null) span.setAttribute("docloader.context_url", result.contextUrl);
+				return result;
+			} catch (error) {
+				span.recordException(error);
+				span.setStatus({
+					code: SpanStatusCode.ERROR,
+					message: String(error)
+				});
+				throw error;
+			} finally {
+				span.end();
+			}
 		});
-		if (response.status >= 300 && response.status < 400 && response.headers.has("Location")) return load(response.headers.get("Location"), options);
-		return getRemoteDocument(url, response, load);
 	}
 	return load;
 }

package/dist/{esm-D-py171v.js → esm-D6gwWBFZ.js}

@@ -3,7 +3,7 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { __commonJS, __toESM } from "./type-CfrcT6D9.js";
+import { __commonJS, __toESM } from "./type-Bjc-_Rom.js";
 
 //#region ../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js
 var require_glob_to_regexp = __commonJS({ "../../node_modules/.pnpm/glob-to-regexp@0.4.1/node_modules/glob-to-regexp/index.js"(exports, module) {

package/dist/federation/builder.test.js

@@ -3,16 +3,16 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Activity, Note, Person } from "../type-CfrcT6D9.js";
+import { Activity, Note, Person } from "../type-Bjc-_Rom.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
 import { parseSemVer } from "../semver-dArNLkR9.js";
-import "../lookup-BA3bNgf4.js";
-import "../inbox-C3N4s1QJ.js";
-import { createFederationBuilder } from "../builder-DG1srBKu.js";
-import { test } from "../testing-hVeFvsZ9.js";
+import "../lookup-pw97bxAu.js";
+import "../inbox-BuzNfn3x.js";
+import { createFederationBuilder } from "../builder-D9HmXe-c.js";
+import { test } from "../testing-DiHxoGZd.js";
 import { assertExists } from "../std__assert-X-_kMxKM.js";
 import "../assert_rejects-DiIiJbZn.js";
 import "../assert_is_error-BPGph1Jx.js";

package/dist/federation/collection.test.js

@@ -3,13 +3,13 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../type-CfrcT6D9.js";
+import "../type-Bjc-_Rom.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-BA3bNgf4.js";
+import "../lookup-pw97bxAu.js";
 import { buildCollectionSynchronizationHeader, digest } from "../collection-CSzG2j1P.js";
-import { test } from "../testing-hVeFvsZ9.js";
+import { test } from "../testing-DiHxoGZd.js";
 import "../std__assert-X-_kMxKM.js";
 import "../assert_rejects-DiIiJbZn.js";
 import "../assert_is_error-BPGph1Jx.js";

package/dist/federation/handler.test.js

@@ -3,36 +3,37 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Create, Note, Person } from "../type-CfrcT6D9.js";
+import { Create, Note, Person } from "../type-Bjc-_Rom.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
 import { MemoryKvStore } from "../kv-CRZrzyXm.js";
-import { acceptsJsonLd, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleObject, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-8Utrfm2B.js";
+import { acceptsJsonLd, createFederation, handleActor, handleCollection, handleCustomCollection, handleInbox, handleObject, respondWithObject, respondWithObjectIfAcceptable } from "../middleware-_hA7WuDf.js";
 import "../semver-dArNLkR9.js";
-import "../client-Dq-zkC8Y.js";
-import "../lookup-BA3bNgf4.js";
+import "../client-DPYh54yM.js";
+import "../lookup-pw97bxAu.js";
 import "../types-BIgY6c-l.js";
-import "../actor-DyfGDQJB.js";
-import "../key-Ci7FKLpn.js";
-import { signRequest } from "../http-jrUnvC1R.js";
-import "../authdocloader-8jtTmnjn.js";
-import "../ld-CF-_Iv3N.js";
-import "../owner-D2N6v5Gm.js";
-import "../proof-GwNAN3ln.js";
-import { InboxListenerSet } from "../inbox-C3N4s1QJ.js";
-import "../builder-DG1srBKu.js";
+import "../actor-CzhWrNYT.js";
+import "../key-DZXdhUze.js";
+import { signRequest } from "../http-BqvHtYhP.js";
+import "../authdocloader-DWc5tH1y.js";
+import "../ld-CmJQd-xc.js";
+import "../owner-B7WLWS8V.js";
+import "../proof-BSpRVVLc.js";
+import { InboxListenerSet } from "../inbox-BuzNfn3x.js";
+import "../builder-D9HmXe-c.js";
 import "../collection-CSzG2j1P.js";
-import "../keycache-CEs327f0.js";
+import "../keycache-CGSAu6vs.js";
 import "../retry-D4GJ670a.js";
-import "../send-D_f3mgyD.js";
-import { createInboxContext, createRequestContext, mockDocumentLoader, test } from "../testing-hVeFvsZ9.js";
+import "../send-CKzTk_tF.js";
+import { createInboxContext, createRequestContext, mockDocumentLoader, test } from "../testing-DiHxoGZd.js";
 import "../std__assert-X-_kMxKM.js";
 import { assertFalse } from "../assert_rejects-DiIiJbZn.js";
 import "../assert_is_error-BPGph1Jx.js";
 import "../assert_not_equals-f3m3epl3.js";
 import "../assert_throws-BOO88avQ.js";
-import { rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-BgYAMY7I.js";
+import { rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-CfLhGOby.js";
+import { createTestTracerProvider } from "../otel-Chy5T2Xh.js";
 
 //#region src/federation/handler.test.ts
 test("acceptsJsonLd()", () => {
@@ -1602,5 +1603,91 @@ test("handleCustomCollection()", async () => {
 	assertEquals(onNotAcceptableCalled, null);
 	assertEquals(onUnauthorizedCalled, null);
 });
+test("handleInbox() records OpenTelemetry span events", async () => {
+	const [tracerProvider, exporter] = createTestTracerProvider();
+	const kv = new MemoryKvStore();
+	const federation = createFederation({
+		kv,
+		tracerProvider
+	});
+	const activity = new Create({
+		id: new URL("https://example.com/activity"),
+		actor: new URL("https://example.com/users/someone"),
+		object: new Note({
+			id: new URL("https://example.com/note"),
+			content: "Hello, world!"
+		})
+	});
+	const request = new Request("https://example.com/users/someone/inbox", {
+		method: "POST",
+		headers: { "Content-Type": "application/activity+json" },
+		body: JSON.stringify(await activity.toJsonLd())
+	});
+	const signed = await signRequest(request, rsaPrivateKey3, new URL("https://example.com/users/someone#main-key"));
+	const context = createRequestContext({
+		federation,
+		request: signed,
+		url: new URL(signed.url),
+		data: void 0,
+		documentLoader: mockDocumentLoader,
+		contextLoader: mockDocumentLoader,
+		getActorUri(identifier) {
+			return new URL(`https://example.com/users/${identifier}`);
+		}
+	});
+	const actorDispatcher = (ctx, handle) => {
+		if (handle !== "someone") return null;
+		return new Person({
+			id: ctx.getActorUri(handle),
+			name: "Someone",
+			inbox: new URL("https://example.com/users/someone/inbox"),
+			publicKey: rsaPublicKey2
+		});
+	};
+	const listeners = new InboxListenerSet();
+	let receivedActivity = null;
+	listeners.add(Create, (_ctx, activity$1) => {
+		receivedActivity = activity$1;
+	});
+	const response = await handleInbox(signed, {
+		recipient: "someone",
+		context,
+		inboxContextFactory(_activity) {
+			return createInboxContext({
+				...context,
+				clone: void 0
+			});
+		},
+		kv,
+		kvPrefixes: {
+			activityIdempotence: ["activityIdempotence"],
+			publicKey: ["publicKey"]
+		},
+		actorDispatcher,
+		inboxListeners: listeners,
+		inboxErrorHandler: void 0,
+		onNotFound: (_request) => new Response("Not found", { status: 404 }),
+		signatureTimeWindow: false,
+		skipSignatureVerification: true,
+		tracerProvider
+	});
+	assertEquals(response.status, 202);
+	assert(receivedActivity != null);
+	const spans = exporter.getSpans("activitypub.inbox");
+	assertEquals(spans.length, 1);
+	const span = spans[0];
+	assertEquals(span.attributes["fedify.inbox.recipient"], "someone");
+	assertEquals(span.attributes["activitypub.activity.id"], "https://example.com/activity");
+	const events = exporter.getEvents("activitypub.inbox", "activitypub.activity.received");
+	assertEquals(events.length, 1);
+	const event = events[0];
+	assert(event.attributes != null);
+	assertEquals(event.attributes["activitypub.activity.verified"], true);
+	assertEquals(event.attributes["http_signatures.verified"], false);
+	assert(typeof event.attributes["activitypub.activity.json"] === "string");
+	const recordedActivity = JSON.parse(event.attributes["activitypub.activity.json"]);
+	assertEquals(recordedActivity.id, "https://example.com/activity");
+	assertEquals(recordedActivity.type, "Create");
+});
 
 //#endregion