@fedify/fedify 2.0.0-dev.335 → 2.0.0-dev.377

package/dist/{middleware-CULfPNt-.cjs → middleware-BnPyW8eH.cjs}

@@ -4,10 +4,10 @@
         
 const require_chunk = require('./chunk-CGaQZ11T.cjs');
 const require_transformers = require('./transformers-3g8GZwkZ.cjs');
-const require_http = require('./http-ChlQCtql.cjs');
-const require_proof = require('./proof-_Rz8hNBt.cjs');
+const require_http = require('./http--LccV8fH.cjs');
+const require_proof = require('./proof-M23tkRqK.cjs');
 const require_types = require('./types-Cd_hszr_.cjs');
-const require_kv_cache = require('./kv-cache-DwcKE9EQ.cjs');
+const require_kv_cache = require('./kv-cache-C-fZXbD0.cjs');
 const __logtape_logtape = require_chunk.__toESM(require("@logtape/logtape"));
 const __fedify_vocab = require_chunk.__toESM(require("@fedify/vocab"));
 const __opentelemetry_api = require_chunk.__toESM(require("@opentelemetry/api"));
@@ -339,7 +339,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-ChlsNVu2.cjs"));
+		const { FederationImpl: FederationImpl$1 } = await Promise.resolve().then(() => require("./middleware-BmuJqg7S.cjs"));
 		const f = new FederationImpl$1(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();
@@ -2395,7 +2395,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	outboxRetryPolicy;
 	inboxRetryPolicy;
 	activityTransformers;
-	tracerProvider;
+	_tracerProvider;
 	firstKnock;
 	constructor(options) {
 		super();
@@ -2477,9 +2477,12 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.activityTransformers = options.activityTransformers ?? require_transformers.getDefaultActivityTransformers();
-		this.tracerProvider = options.tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
+		this._tracerProvider = options.tracerProvider;
 		this.firstKnock = options.firstKnock;
 	}
+	get tracerProvider() {
+		return this._tracerProvider ?? __opentelemetry_api.trace.getTracerProvider();
+	}
 	_initializeRouter() {
 		this.router.add("/.well-known/webfinger", "webfinger");
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
@@ -2520,18 +2523,24 @@ var FederationImpl = class extends FederationBuilderImpl {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.activity.type": message.activityType }
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenFanoutMessage(contextData, message);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenFanoutMessage(contextData, message);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "outbox") await tracer.startActiveSpan("activitypub.outbox", {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
@@ -2540,34 +2549,46 @@ var FederationImpl = class extends FederationBuilderImpl {
 					"activitypub.activity.retries": message.attempt
 				}
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenOutboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenOutboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "inbox") await tracer.startActiveSpan("activitypub.inbox", {
 				kind: __opentelemetry_api.SpanKind.CONSUMER,
 				attributes: { "activitypub.shared_inbox": message.identifier == null }
 			}, extractedContext, async (span) => {
-				try {
-					await this.#listenInboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					try {
+						await this.#listenInboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 		});
 	}
@@ -3040,54 +3061,60 @@ var FederationImpl = class extends FederationBuilderImpl {
 					[__opentelemetry_semantic_conventions.ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$1 = (0, __logtape_logtape.getLogger)([
-					"fedify",
-					"federation",
-					"http"
-				]);
-				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
-				let response;
-				try {
-					response = await this.#fetch(request, {
-						...options,
-						span,
-						tracer
-					});
-					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
-				} catch (error) {
-					span.setStatus({
-						code: __opentelemetry_api.SpanStatusCode.ERROR,
-						message: `${error}`
-					});
+				const spanCtx = span.spanContext();
+				return await (0, __logtape_logtape.withContext)({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					const logger$1 = (0, __logtape_logtape.getLogger)([
+						"fedify",
+						"federation",
+						"http"
+					]);
+					if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_REQUEST_HEADER)(k), [v]);
+					let response;
+					try {
+						response = await this.#fetch(request, {
+							...options,
+							span,
+							tracer
+						});
+						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
+					} catch (error) {
+						span.setStatus({
+							code: __opentelemetry_api.SpanStatusCode.ERROR,
+							message: `${error}`
+						});
+						span.end();
+						logger$1.error("An error occurred while serving request {method} {url}: {error}", {
+							method: request.method,
+							url: request.url,
+							error
+						});
+						throw error;
+					}
+					if (span.isRecording()) {
+						span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
+						for (const [k, v] of response.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
+						span.setStatus({
+							code: response.status >= 500 ? __opentelemetry_api.SpanStatusCode.ERROR : __opentelemetry_api.SpanStatusCode.UNSET,
+							message: response.statusText
+						});
+					}
 					span.end();
-					logger$1.error("An error occurred while serving request {method} {url}: {error}", {
+					const url = new URL(request.url);
+					const logTpl = "{method} {path}: {status}";
+					const values = {
 						method: request.method,
+						path: `${url.pathname}${url.search}`,
 						url: request.url,
-						error
-					});
-					throw error;
-				}
-				if (span.isRecording()) {
-					span.setAttribute(__opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
-					for (const [k, v] of response.headers) span.setAttribute((0, __opentelemetry_semantic_conventions.ATTR_HTTP_RESPONSE_HEADER)(k), [v]);
-					span.setStatus({
-						code: response.status >= 500 ? __opentelemetry_api.SpanStatusCode.ERROR : __opentelemetry_api.SpanStatusCode.UNSET,
-						message: response.statusText
-					});
-				}
-				span.end();
-				const url = new URL(request.url);
-				const logTpl = "{method} {path}: {status}";
-				const values = {
-					method: request.method,
-					path: `${url.pathname}${url.search}`,
-					url: request.url,
-					status: response.status
-				};
-				if (response.status >= 500) logger$1.error(logTpl, values);
-				else if (response.status >= 400) logger$1.warn(logTpl, values);
-				else logger$1.info(logTpl, values);
-				return response;
+						status: response.status
+					};
+					if (response.status >= 500) logger$1.error(logTpl, values);
+					else if (response.status >= 400) logger$1.warn(logTpl, values);
+					else logger$1.info(logTpl, values);
+					return response;
+				});
 			});
 		});
 	}

package/dist/{middleware-DebYvXJs.js → middleware-Cn7ge0Yf.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "./deno-Dhe5E7NK.js";
-import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-zvH5O0zk.js";
+import "./deno-C6PE0Mbz.js";
+import { ContextImpl, FederationImpl, InboxContextImpl, KvSpecDeterminer, createFederation } from "./middleware-DMrI5DbU.js";
 import "./client-Dg7OfUDA.js";
 import "./router-D9eI0s4b.js";
 import "./types-CPz01LGH.js";
-import "./key-DFPkYar3.js";
-import "./http-CSqVEUdE.js";
-import "./ld-kAhyoO55.js";
-import "./owner-DcyH0sQg.js";
-import "./proof-D7C8ouBO.js";
-import "./docloader-D6VuU143.js";
+import "./key-CY1j_I4p.js";
+import "./http-DLAyfXxs.js";
+import "./ld-Cur4daC1.js";
+import "./owner-DEun_sgG.js";
+import "./proof-DwHX-_TR.js";
+import "./docloader-D3K5sxGg.js";
 import "./kv-cache-B__dHl7g.js";
-import "./inbox-9F91oWJU.js";
-import "./builder-RHW0dkbP.js";
+import "./inbox-B5o0DKdw.js";
+import "./builder-gzWbPXA1.js";
 import "./collection-CcnIw1qY.js";
 import "./keycache-DRxpZ5r9.js";
 import "./negotiation-5NPJL6zp.js";
 import "./retry-D4GJ670a.js";
-import "./send-mAsnzegg.js";
+import "./send-CwWPg8LE.js";
 
 export { FederationImpl };

package/dist/{middleware-zvH5O0zk.js → middleware-DMrI5DbU.js}

@@ -3,24 +3,24 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./deno-Dhe5E7NK.js";
+import { deno_default } from "./deno-C6PE0Mbz.js";
 import { getNodeInfo } from "./client-Dg7OfUDA.js";
 import { RouterError } from "./router-D9eI0s4b.js";
 import { nodeInfoToJson } from "./types-CPz01LGH.js";
-import { exportJwk, importJwk, validateCryptoKey } from "./key-DFPkYar3.js";
-import { verifyRequest } from "./http-CSqVEUdE.js";
-import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-kAhyoO55.js";
-import { doesActorOwnKey, getKeyOwner } from "./owner-DcyH0sQg.js";
-import { signObject, verifyObject } from "./proof-D7C8ouBO.js";
-import { getAuthenticatedDocumentLoader } from "./docloader-D6VuU143.js";
+import { exportJwk, importJwk, validateCryptoKey } from "./key-CY1j_I4p.js";
+import { verifyRequest } from "./http-DLAyfXxs.js";
+import { detachSignature, hasSignature, signJsonLd, verifyJsonLd } from "./ld-Cur4daC1.js";
+import { doesActorOwnKey, getKeyOwner } from "./owner-DEun_sgG.js";
+import { signObject, verifyObject } from "./proof-DwHX-_TR.js";
+import { getAuthenticatedDocumentLoader } from "./docloader-D3K5sxGg.js";
 import { kvCache } from "./kv-cache-B__dHl7g.js";
-import { routeActivity } from "./inbox-9F91oWJU.js";
-import { FederationBuilderImpl } from "./builder-RHW0dkbP.js";
+import { routeActivity } from "./inbox-B5o0DKdw.js";
+import { FederationBuilderImpl } from "./builder-gzWbPXA1.js";
 import { buildCollectionSynchronizationHeader } from "./collection-CcnIw1qY.js";
 import { KvKeyCache } from "./keycache-DRxpZ5r9.js";
 import { acceptsJsonLd } from "./negotiation-5NPJL6zp.js";
 import { createExponentialBackoffPolicy } from "./retry-D4GJ670a.js";
-import { SendActivityError, extractInboxes, sendActivity } from "./send-mAsnzegg.js";
+import { SendActivityError, extractInboxes, sendActivity } from "./send-CwWPg8LE.js";
 import { getLogger, withContext } from "@logtape/logtape";
 import { Activity, Collection, CollectionPage, CryptographicKey, Link, Multikey, Object as Object$1, OrderedCollection, OrderedCollectionPage, getTypeId, lookupObject, traverseCollection } from "@fedify/vocab";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
@@ -1313,7 +1313,7 @@ var FederationImpl = class extends FederationBuilderImpl {
 	outboxRetryPolicy;
 	inboxRetryPolicy;
 	activityTransformers;
-	tracerProvider;
+	_tracerProvider;
 	firstKnock;
 	constructor(options) {
 		super();
@@ -1395,9 +1395,12 @@ var FederationImpl = class extends FederationBuilderImpl {
 		this.outboxRetryPolicy = options.outboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.inboxRetryPolicy = options.inboxRetryPolicy ?? createExponentialBackoffPolicy();
 		this.activityTransformers = options.activityTransformers ?? getDefaultActivityTransformers();
-		this.tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
+		this._tracerProvider = options.tracerProvider;
 		this.firstKnock = options.firstKnock;
 	}
+	get tracerProvider() {
+		return this._tracerProvider ?? trace.getTracerProvider();
+	}
 	_initializeRouter() {
 		this.router.add("/.well-known/webfinger", "webfinger");
 		this.router.add("/.well-known/nodeinfo", "nodeInfoJrd");
@@ -1438,18 +1441,24 @@ var FederationImpl = class extends FederationBuilderImpl {
 				kind: SpanKind.CONSUMER,
 				attributes: { "activitypub.activity.type": message.activityType }
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenFanoutMessage(contextData, message);
-				} catch (e) {
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenFanoutMessage(contextData, message);
+					} catch (e) {
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "outbox") await tracer.startActiveSpan("activitypub.outbox", {
 				kind: SpanKind.CONSUMER,
@@ -1458,34 +1467,46 @@ var FederationImpl = class extends FederationBuilderImpl {
 					"activitypub.activity.retries": message.attempt
 				}
 			}, extractedContext, async (span) => {
-				if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
-				try {
-					await this.#listenOutboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					if (message.activityId != null) span.setAttribute("activitypub.activity.id", message.activityId);
+					try {
+						await this.#listenOutboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 			else if (message.type === "inbox") await tracer.startActiveSpan("activitypub.inbox", {
 				kind: SpanKind.CONSUMER,
 				attributes: { "activitypub.shared_inbox": message.identifier == null }
 			}, extractedContext, async (span) => {
-				try {
-					await this.#listenInboxMessage(contextData, message, span);
-				} catch (e) {
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: String(e)
-					});
-					throw e;
-				} finally {
-					span.end();
-				}
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					try {
+						await this.#listenInboxMessage(contextData, message, span);
+					} catch (e) {
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: String(e)
+						});
+						throw e;
+					} finally {
+						span.end();
+					}
+				});
 			});
 		});
 	}
@@ -1958,54 +1979,60 @@ var FederationImpl = class extends FederationBuilderImpl {
 					[ATTR_URL_FULL]: request.url
 				}
 			}, async (span) => {
-				const logger$2 = getLogger([
-					"fedify",
-					"federation",
-					"http"
-				]);
-				if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute(ATTR_HTTP_REQUEST_HEADER(k), [v]);
-				let response;
-				try {
-					response = await this.#fetch(request, {
-						...options,
-						span,
-						tracer
-					});
-					if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
-				} catch (error) {
-					span.setStatus({
-						code: SpanStatusCode.ERROR,
-						message: `${error}`
-					});
+				const spanCtx = span.spanContext();
+				return await withContext({
+					traceId: spanCtx.traceId,
+					spanId: spanCtx.spanId
+				}, async () => {
+					const logger$2 = getLogger([
+						"fedify",
+						"federation",
+						"http"
+					]);
+					if (span.isRecording()) for (const [k, v] of request.headers) span.setAttribute(ATTR_HTTP_REQUEST_HEADER(k), [v]);
+					let response;
+					try {
+						response = await this.#fetch(request, {
+							...options,
+							span,
+							tracer
+						});
+						if (acceptsJsonLd(request)) response.headers.set("Vary", "Accept");
+					} catch (error) {
+						span.setStatus({
+							code: SpanStatusCode.ERROR,
+							message: `${error}`
+						});
+						span.end();
+						logger$2.error("An error occurred while serving request {method} {url}: {error}", {
+							method: request.method,
+							url: request.url,
+							error
+						});
+						throw error;
+					}
+					if (span.isRecording()) {
+						span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
+						for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
+						span.setStatus({
+							code: response.status >= 500 ? SpanStatusCode.ERROR : SpanStatusCode.UNSET,
+							message: response.statusText
+						});
+					}
 					span.end();
-					logger$2.error("An error occurred while serving request {method} {url}: {error}", {
+					const url = new URL(request.url);
+					const logTpl = "{method} {path}: {status}";
+					const values = {
 						method: request.method,
+						path: `${url.pathname}${url.search}`,
 						url: request.url,
-						error
-					});
-					throw error;
-				}
-				if (span.isRecording()) {
-					span.setAttribute(ATTR_HTTP_RESPONSE_STATUS_CODE, response.status);
-					for (const [k, v] of response.headers) span.setAttribute(ATTR_HTTP_RESPONSE_HEADER(k), [v]);
-					span.setStatus({
-						code: response.status >= 500 ? SpanStatusCode.ERROR : SpanStatusCode.UNSET,
-						message: response.statusText
-					});
-				}
-				span.end();
-				const url = new URL(request.url);
-				const logTpl = "{method} {path}: {status}";
-				const values = {
-					method: request.method,
-					path: `${url.pathname}${url.search}`,
-					url: request.url,
-					status: response.status
-				};
-				if (response.status >= 500) logger$2.error(logTpl, values);
-				else if (response.status >= 400) logger$2.warn(logTpl, values);
-				else logger$2.info(logTpl, values);
-				return response;
+						status: response.status
+					};
+					if (response.status >= 500) logger$2.error(logTpl, values);
+					else if (response.status >= 400) logger$2.warn(logTpl, values);
+					else logger$2.info(logTpl, values);
+					return response;
+				});
 			});
 		});
 	}