@fedify/fedify 2.5.0-dev.2448 → 2.5.0-dev.2492

package/dist/{exporter-DThFfe7P.mjs → exporter-DVG68ozH.mjs}

@@ -189,33 +189,6 @@ var FedifySpanExporter = class {
 			record.spanId
 		];
 		await this.#kv.set(key, record, options);
-		await this.#updateTraceSummary(record, options);
-	}
-	async #setWithCasRetry(key, transform, options) {
-		if (this.#kv.cas != null) for (let attempt = 0; attempt < 3; attempt++) {
-			const existing = await this.#kv.get(key);
-			const newValue = transform(existing);
-			if (await this.#kv.cas(key, existing, newValue, options)) return;
-		}
-		const newValue = transform(await this.#kv.get(key));
-		await this.#kv.set(key, newValue, options);
-	}
-	async #updateTraceSummary(record, options) {
-		const summaryKey = [
-			...this.#keyPrefix,
-			"_summaries",
-			record.traceId
-		];
-		await this.#setWithCasRetry(summaryKey, (existing) => {
-			const activityCount = existing != null ? existing.activityCount + 1 : 1;
-			const activityTypes = existing != null ? existing.activityTypes.includes(record.activityType) ? existing.activityTypes : [...existing.activityTypes, record.activityType] : [record.activityType];
-			return {
-				traceId: existing?.traceId ?? record.traceId,
-				timestamp: existing?.timestamp ?? record.timestamp,
-				activityCount,
-				activityTypes
-			};
-		}, options);
 	}
 	/**
 	* Gets all activity records for a specific trace ID.
@@ -232,13 +205,46 @@ var FedifySpanExporter = class {
 	/**
 	* Gets recent traces with summary information.
 	*
+	* Each summary is computed directly from the activity records currently
+	* stored for each trace, rather than from a separately maintained
+	* counter.  This guarantees that a trace is discoverable, and its
+	* `activityCount` accurate, as soon as its records are stored, even if
+	* an earlier attempt at summarizing it (in a previous version of this
+	* exporter) never completed, and that the count always reflects
+	* records that have not expired.  It costs a full scan of every stored
+	* record on every call, including full inbound activity JSON.  The
+	* `limit` option only truncates the returned summaries and does not
+	* reduce the scan.  Callers that poll this method frequently should
+	* account for the total retained data when choosing a TTL and polling
+	* interval.
+	*
 	* @param options Options for the query.
 	* @returns An array of trace summaries.
 	*/
 	async getRecentTraces(options) {
-		const summaryPrefix = [...this.#keyPrefix, "_summaries"];
-		const summaries = [];
-		for await (const entry of this.#kv.list(summaryPrefix)) summaries.push(entry.value);
+		const aggregates = /* @__PURE__ */ new Map();
+		const traceIdIndex = this.#keyPrefix.length;
+		for await (const entry of this.#kv.list(this.#keyPrefix)) {
+			const traceId = entry.key[traceIdIndex];
+			if (traceId == null || traceId === "_summaries") continue;
+			const record = entry.value;
+			if (record == null || typeof record.timestamp !== "string") continue;
+			const aggregate = aggregates.get(traceId);
+			if (aggregate == null) aggregates.set(traceId, {
+				timestamp: record.timestamp,
+				activityCount: 1,
+				activityTypes: [record.activityType]
+			});
+			else {
+				aggregate.activityCount++;
+				if (record.timestamp < aggregate.timestamp) aggregate.timestamp = record.timestamp;
+				if (!aggregate.activityTypes.includes(record.activityType)) aggregate.activityTypes.push(record.activityType);
+			}
+		}
+		const summaries = [...aggregates].map(([traceId, aggregate]) => ({
+			traceId,
+			...aggregate
+		}));
 		summaries.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
 		if (options?.limit != null) return summaries.slice(0, options.limit);
 		return summaries;

package/dist/federation/builder.test.mjs

@@ -7,7 +7,7 @@ import { t as assertExists } from "../assert_exists-cffSpJ7X.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
-import { r as createFederationBuilder } from "../builder-DbC8bn6k.mjs";
+import { r as createFederationBuilder } from "../builder-DphK9v7f.mjs";
 import { DisallowedOperatorError, DisallowedVarSpecModifierError, DuplicateRouteVariableError, RouteTemplateOptionsNotMatchedError, RouterError } from "@fedify/uri-template";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/compound-fanout.test.mjs

@@ -6,11 +6,11 @@ import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { x as exportJwk } from "../ld-CQFuiah9.mjs";
+import { x as exportJwk } from "../ld-CdvcOEXQ.mjs";
 import { r as normalizeOutgoingActivityJsonLd } from "../outgoing-jsonld-4IJqPYos.mjs";
-import { h as verifyProof, s as signObject } from "../proof-DPoF06nz.mjs";
+import { h as verifyProof, s as signObject } from "../proof-GH7Poos_.mjs";
 import { i as rsaPrivateKey2, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { n as FederationImpl } from "../middleware-CuVa0UuS.mjs";
+import { n as FederationImpl } from "../middleware-CoBLrTKX.mjs";
 import { Create, DataIntegrityProof, Note } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";
@@ -68,6 +68,7 @@ test("fanout delivery keeps an embedded signed child intact", async () => {
 			kv: new MemoryKvStore(),
 			contextLoaderFactory: () => mockDocumentLoader
 		});
+		federation.allowPrivateAddress = true;
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
 		const message = {
 			type: "fanout",
@@ -139,6 +140,7 @@ test("forced fanout signs before serializing so the child survives", async () =>
 			manuallyStartQueue: true,
 			contextLoaderFactory: () => mockDocumentLoader
 		});
+		federation.allowPrivateAddress = true;
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
 		await federation.createContext(new URL("https://example.com/")).sendActivity({
 			keyId: childKeyId,
@@ -203,6 +205,7 @@ test("an already signed activity keeps its single proof through fanout", async (
 			manuallyStartQueue: true,
 			contextLoaderFactory: () => mockDocumentLoader
 		});
+		federation.allowPrivateAddress = true;
 		federation.setInboxListeners("/users/{identifier}/inbox", "/inbox");
 		await federation.createContext(new URL("https://example.com/")).sendActivity({
 			keyId: childKeyId,

package/dist/federation/handler-compound-proof.test.mjs

@@ -5,10 +5,10 @@ import { r as createRequestContext, t as createInboxContext } from "../context-C
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { a as compactJsonLd, h as verifyCompactJsonLd, m as signJsonLd } from "../ld-CQFuiah9.mjs";
-import { l as signRequest } from "../http-BZkyQIkb.mjs";
+import { a as compactJsonLd, h as verifyCompactJsonLd, m as signJsonLd } from "../ld-CdvcOEXQ.mjs";
+import { u as signRequest } from "../http-BoJCMnjY.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, r as ed25519PublicKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { f as handleInbox, o as createFederation } from "../middleware-CuVa0UuS.mjs";
+import { f as handleInbox, o as createFederation } from "../middleware-CoBLrTKX.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-CELFAodc.mjs";
 import { t as map_local_create_note_default } from "../map-local-create-note-B0SeXJms.mjs";
 import { Create, CryptographicKey, Multikey, Person, Update } from "@fedify/vocab";

package/dist/federation/handler.test.mjs

@@ -11,13 +11,13 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as parseAcceptSignature } from "../accept-CPVqki78.mjs";
-import { T as generateCryptoKeyPair, a as compactJsonLd, m as signJsonLd } from "../ld-CQFuiah9.mjs";
-import { s as signObject } from "../proof-DPoF06nz.mjs";
-import { l as signRequest } from "../http-BZkyQIkb.mjs";
+import { T as generateCryptoKeyPair, a as compactJsonLd, m as signJsonLd } from "../ld-CdvcOEXQ.mjs";
+import { s as signObject } from "../proof-GH7Poos_.mjs";
+import { u as signRequest } from "../http-BoJCMnjY.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-CuVa0UuS.mjs";
+import { d as handleCustomCollection, f as handleInbox, g as respondWithObjectIfAcceptable, h as respondWithObject, l as handleActor, m as handleOutbox, o as createFederation, p as handleObject, u as handleCollection } from "../middleware-CoBLrTKX.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-CELFAodc.mjs";
-import { t as FedifySpanExporter } from "../exporter-DThFfe7P.mjs";
+import { t as FedifySpanExporter } from "../exporter-DVG68ozH.mjs";
 import { configure, getLogger, reset, withContext } from "@logtape/logtape";
 import { Activity, Create, CryptographicKey, Multikey, Note, Person, Tombstone } from "@fedify/vocab";
 import { FetchError, parseIri } from "@fedify/vocab-runtime";

package/dist/federation/hashlink-media.test.mjs

@@ -10,8 +10,8 @@ import "../std__assert-DvMDRPes.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-CYvBmkpC.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
 import { r as ed25519PublicKey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-CuVa0UuS.mjs";
-import { r as createFederationBuilder } from "../builder-DbC8bn6k.mjs";
+import { o as createFederation, x as parseHashlinkGatewayRequest } from "../middleware-CoBLrTKX.mjs";
+import { r as createFederationBuilder } from "../builder-DphK9v7f.mjs";
 import { n as RouterError } from "../router-u5O5KCQr.mjs";
 import { Note } from "@fedify/vocab";
 import { computeDigestMultibase, encodeMultibase, exportDidKey } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -4,9 +4,9 @@ globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
-import { s as signObject } from "../proof-DPoF06nz.mjs";
+import { s as signObject } from "../proof-GH7Poos_.mjs";
 import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-CuVa0UuS.mjs";
+import { o as createFederation } from "../middleware-CoBLrTKX.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox-actorless.test.mjs

@@ -7,12 +7,12 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { m as signJsonLd } from "../ld-CQFuiah9.mjs";
-import { s as signObject } from "../proof-DPoF06nz.mjs";
-import { l as signRequest } from "../http-BZkyQIkb.mjs";
+import { m as signJsonLd } from "../ld-CdvcOEXQ.mjs";
+import { s as signObject } from "../proof-GH7Poos_.mjs";
+import { u as signRequest } from "../http-BoJCMnjY.mjs";
 import { a as rsaPrivateKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2 } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-CuVa0UuS.mjs";
-import { c as expandDocument } from "../inbox-view-NE9wXdLo.mjs";
+import { o as createFederation } from "../middleware-CoBLrTKX.mjs";
+import { c as expandDocument } from "../inbox-view-D-skypg-.mjs";
 import { Create, FeatureRequest, Person } from "@fedify/vocab";
 import { FetchError, encodeMultibase, preloadedContexts } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/inbox-report.test.mjs

@@ -2,12 +2,12 @@ import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as MemoryKvStore } from "../kv-DCHkaJ9-.mjs";
-import { m as signJsonLd } from "../ld-CQFuiah9.mjs";
-import { s as signObject } from "../proof-DPoF06nz.mjs";
-import { l as signRequest } from "../http-BZkyQIkb.mjs";
+import { m as signJsonLd } from "../ld-CdvcOEXQ.mjs";
+import { s as signObject } from "../proof-GH7Poos_.mjs";
+import { u as signRequest } from "../http-BoJCMnjY.mjs";
 import { a as rsaPrivateKey3, c as rsaPublicKey3, i as rsaPrivateKey2, n as ed25519PrivateKey, s as rsaPublicKey2, t as ed25519Multikey } from "../keys-DIJNHW-Y.mjs";
-import { o as createFederation } from "../middleware-CuVa0UuS.mjs";
-import { r as createFederationBuilder } from "../builder-DbC8bn6k.mjs";
+import { o as createFederation } from "../middleware-CoBLrTKX.mjs";
+import { r as createFederationBuilder } from "../builder-DphK9v7f.mjs";
 import { Create, Person } from "@fedify/vocab";
 import { exportDidKey, parseIri } from "@fedify/vocab-runtime";
 import { mockDocumentLoader, test } from "@fedify/fixture";

package/dist/federation/inbox-view.test.mjs

@@ -6,7 +6,7 @@ import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
 import { t as assert } from "../assert-D1Eafmd_.mjs";
-import { a as createSnapshotOnlyLoader, c as expandDocument, f as restoreVerifiedActivityView, i as createReleasableLoader, l as getActorPresence, n as buildVerifiedActivityView, p as serializeContextSnapshot, r as createContextSnapshot, s as deserializeContextSnapshot, t as ContextSnapshotMissError, u as getPropertyValues } from "../inbox-view-NE9wXdLo.mjs";
+import { a as createSnapshotOnlyLoader, c as expandDocument, f as restoreVerifiedActivityView, i as createReleasableLoader, l as getActorPresence, n as buildVerifiedActivityView, p as serializeContextSnapshot, r as createContextSnapshot, s as deserializeContextSnapshot, t as ContextSnapshotMissError, u as getPropertyValues } from "../inbox-view-D-skypg-.mjs";
 import { getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";
 //#region src/federation/inbox-view.test.ts

package/dist/federation/inbox.test.mjs

@@ -5,7 +5,7 @@ import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import { t as assertFalse } from "../assert_false-CPdRnc3E.mjs";
 import { t as assertThrows } from "../assert_throws-BYITOvPO.mjs";
 import { t as ActivityListenerSet } from "../activity-listener-CELFAodc.mjs";
-import { t as actorsHaveSameOrigin } from "../inbox-wDuMKaFW.mjs";
+import { t as actorsHaveSameOrigin } from "../inbox-BjihTKLo.mjs";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 import { parseIri } from "@fedify/vocab-runtime";
 import { test } from "@fedify/fixture";

package/dist/federation/metrics.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Z6IcEbWU.mjs";
 import "../std__assert-DvMDRPes.mjs";
 import { t as assertRejects } from "../assert_rejects-CTptdYck.mjs";
-import { _ as recordKeyLookup, 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, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-B-QxRSSR.mjs";
+import { _ as recordKeyLookup, 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, m as recordDocumentFetch, p as recordDocumentCache, r as getFederationMetrics, t as classifyFetchError, u as recordCollectionPageItems, v as recordOutboxActivity, x as registerQueueDepthGauge, y as recordOutboxEnqueue } from "../metrics-CpxvUrBz.mjs";
 import { FetchError } from "@fedify/vocab-runtime";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { DataPointType, MeterProvider, MetricReader } from "@opentelemetry/sdk-metrics";