@fedify/fedify 2.3.0-dev.994 → 2.3.0-pr.809.37

package/dist/nodeinfo/client.test.mjs

@@ -1,10 +1,10 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as esm_default } from "../esm-DVILvP5e.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-CRDpx_HF.mjs";
-import { a as parseProtocol, c as parseUsage, i as parseOutboundService, n as parseInboundService, o as parseServices, r as parseNodeInfo, s as parseSoftware, t as getNodeInfo } from "../client-D_1QpnWt.mjs";
+import { t as esm_default } from "../esm-vrlUxr60.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { a as parseProtocol, c as parseUsage, i as parseOutboundService, n as parseInboundService, o as parseServices, r as parseNodeInfo, s as parseSoftware, t as getNodeInfo } from "../client-ByXmQhYD.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/client.test.ts
 test("getNodeInfo()", async (t) => {

package/dist/nodeinfo/handler.test.mjs

@@ -1,11 +1,11 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { r as createRequestContext } from "../context-Dk_tacqz.mjs";
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-CRDpx_HF.mjs";
+import { r as createRequestContext } from "../context-DVoTs_wM.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { _ as handleNodeInfoJrd, g as handleNodeInfo, o as createFederation } from "../middleware-K1g6bEkV.mjs";
+import { _ as handleNodeInfo, o as createFederation, v as handleNodeInfoJrd } from "../middleware-Cg4EyWsq.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/handler.test.ts
 test("handleNodeInfo()", async () => {

package/dist/nodeinfo/mod.d.cts

@@ -1,2 +1,3 @@
-import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "../client-z-8dc-e1.cjs";
+/// <reference lib="esnext.temporal" />
+import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "../client-CAM_bQXx.cjs";
 export { type GetNodeInfoOptions, InboundService, JsonValue, NodeInfo, OutboundService, type ParseNodeInfoOptions, Protocol, Services, Software, Usage, getNodeInfo, nodeInfoToJson, parseNodeInfo };

package/dist/nodeinfo/mod.d.ts

@@ -1,4 +1,3 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
-import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "../client-AtlibPOU.js";
+/// <reference lib="esnext.temporal" />
+import { a as InboundService, c as OutboundService, d as Software, f as Usage, i as parseNodeInfo, l as Protocol, n as ParseNodeInfoOptions, o as JsonValue, p as nodeInfoToJson, r as getNodeInfo, s as NodeInfo, t as GetNodeInfoOptions, u as Services } from "../client-CSddvgWN.js";
 export { type GetNodeInfoOptions, InboundService, JsonValue, NodeInfo, OutboundService, type ParseNodeInfoOptions, Protocol, Services, Software, Usage, getNodeInfo, nodeInfoToJson, parseNodeInfo };

package/dist/nodeinfo/mod.js

@@ -1,4 +1,4 @@
-import "@js-temporal/polyfill";
-import "urlpattern-polyfill";
-import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "../types-hvL8ElAs.js";
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+import { n as getNodeInfo, r as parseNodeInfo, t as nodeInfoToJson } from "../types-CAY3OdLq.js";
 export { getNodeInfo, nodeInfoToJson, parseNodeInfo };

package/dist/nodeinfo/types.test.mjs

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-CRDpx_HF.mjs";
-import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
+import { t as assertThrows } from "../assert_throws-BOkhLGYc.mjs";
 import { t as nodeInfoToJson } from "../types-J53Kw7so.mjs";
 import { test } from "@fedify/fixture";
 //#region src/nodeinfo/types.test.ts

package/dist/otel/exporter.test.mjs

@@ -1,13 +1,13 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import "../std__assert-CRDpx_HF.mjs";
+import { t as assertEquals } from "../assert_equals-C-ZRDbaf.mjs";
+import "../std__assert-BBjXFNOb.mjs";
 import { t as MemoryKvStore } from "../kv-rV3vodCc.mjs";
-import { test } from "@fedify/fixture";
-import { SpanKind, SpanStatusCode, TraceFlags } from "@opentelemetry/api";
 import { getLogger } from "@logtape/logtape";
 import { ExportResultCode } from "@opentelemetry/core";
+import { SpanKind, SpanStatusCode, TraceFlags } from "@opentelemetry/api";
+import { test } from "@fedify/fixture";
 //#region src/otel/exporter.ts
 /**
 * A SpanExporter that persists ActivityPub activity traces to a
@@ -159,11 +159,10 @@ var FedifySpanExporter = class {
 		const attrs = event.attributes;
 		if (attrs == null) return null;
 		const activityJson = attrs["activitypub.activity.json"];
-		if (typeof activityJson !== "string") return null;
 		let activityType = "Unknown";
 		let activityId;
 		let actorId;
-		try {
+		if (typeof activityJson === "string") try {
 			const activity = JSON.parse(activityJson);
 			activityType = activity.type ?? "Unknown";
 			activityId = activity.id;
@@ -172,15 +171,17 @@ var FedifySpanExporter = class {
 		} catch {}
 		const inboxUrl = attrs["activitypub.inbox.url"];
 		const explicitActivityId = attrs["activitypub.activity.id"];
+		const explicitActivityType = attrs["activitypub.activity.type"];
+		const explicitActorId = attrs["activitypub.actor.id"];
 		return {
 			traceId,
 			spanId,
 			parentSpanId,
 			direction: "outbound",
-			activityType,
+			activityType: typeof explicitActivityType === "string" && explicitActivityType !== "" ? explicitActivityType : activityType,
 			activityId: activityId ?? (typeof explicitActivityId === "string" && explicitActivityId !== "" ? explicitActivityId : void 0),
-			actorId,
-			activityJson,
+			actorId: typeof explicitActorId === "string" && explicitActorId !== "" ? explicitActorId : actorId,
+			...typeof activityJson === "string" ? { activityJson } : {},
 			timestamp: (/* @__PURE__ */ new Date(event.time[0] * 1e3 + event.time[1] / 1e6)).toISOString(),
 			inboxUrl: typeof inboxUrl === "string" ? inboxUrl : void 0
 		};
@@ -316,14 +317,17 @@ function createActivityReceivedEvent(options) {
 	};
 }
 function createActivitySentEvent(options) {
+	const attributes = {
+		"activitypub.inbox.url": options.inboxUrl,
+		"activitypub.activity.id": options.activityId ?? ""
+	};
+	if (options.activityType != null) attributes["activitypub.activity.type"] = options.activityType;
+	if (options.actorId != null) attributes["activitypub.actor.id"] = options.actorId;
+	if (options.activityJson != null) attributes["activitypub.activity.json"] = options.activityJson;
 	return {
 		name: "activitypub.activity.sent",
 		time: [17e8, 5e8],
-		attributes: {
-			"activitypub.activity.json": options.activityJson,
-			"activitypub.inbox.url": options.inboxUrl,
-			"activitypub.activity.id": options.activityId ?? ""
-		}
+		attributes
 	};
 }
 test("FedifySpanExporter", async (t) => {
@@ -376,21 +380,18 @@ test("FedifySpanExporter", async (t) => {
 		const traceId = "trace789";
 		const spanId = "span012";
 		const inboxUrl = "https://example.com/users/alice/inbox";
-		const activity = {
-			"@context": "https://www.w3.org/ns/activitystreams",
-			type: "Follow",
-			id: "https://myserver.com/activities/789",
-			actor: "https://myserver.com/users/bob",
-			object: "https://example.com/users/alice"
-		};
+		const activityId = "https://myserver.com/activities/789";
+		const activityType = "https://www.w3.org/ns/activitystreams#Accept";
+		const actorId = "https://myserver.com/users/bob";
 		const span = createMockSpan({
 			traceId,
 			spanId,
 			name: "activitypub.send_activity",
 			events: [createActivitySentEvent({
-				activityJson: JSON.stringify(activity),
 				inboxUrl,
-				activityId: activity.id
+				activityId,
+				activityType,
+				actorId
 			})]
 		});
 		await new Promise((resolve) => {
@@ -404,8 +405,10 @@ test("FedifySpanExporter", async (t) => {
 		assertEquals(activities[0].traceId, traceId);
 		assertEquals(activities[0].spanId, spanId);
 		assertEquals(activities[0].direction, "outbound");
-		assertEquals(activities[0].activityType, activity.type);
-		assertEquals(activities[0].activityId, activity.id);
+		assertEquals(activities[0].activityType, activityType);
+		assertEquals(activities[0].activityId, activityId);
+		assertEquals(activities[0].actorId, actorId);
+		assertEquals(activities[0].activityJson, void 0);
 		assertEquals(activities[0].inboxUrl, inboxUrl);
 	});
 	await t.step("export() ignores spans without activity events", async () => {

package/dist/otel/mod.cjs

@@ -155,11 +155,10 @@ var FedifySpanExporter = class {
 		const attrs = event.attributes;
 		if (attrs == null) return null;
 		const activityJson = attrs["activitypub.activity.json"];
-		if (typeof activityJson !== "string") return null;
 		let activityType = "Unknown";
 		let activityId;
 		let actorId;
-		try {
+		if (typeof activityJson === "string") try {
 			const activity = JSON.parse(activityJson);
 			activityType = activity.type ?? "Unknown";
 			activityId = activity.id;
@@ -168,15 +167,17 @@ var FedifySpanExporter = class {
 		} catch {}
 		const inboxUrl = attrs["activitypub.inbox.url"];
 		const explicitActivityId = attrs["activitypub.activity.id"];
+		const explicitActivityType = attrs["activitypub.activity.type"];
+		const explicitActorId = attrs["activitypub.actor.id"];
 		return {
 			traceId,
 			spanId,
 			parentSpanId,
 			direction: "outbound",
-			activityType,
+			activityType: typeof explicitActivityType === "string" && explicitActivityType !== "" ? explicitActivityType : activityType,
 			activityId: activityId ?? (typeof explicitActivityId === "string" && explicitActivityId !== "" ? explicitActivityId : void 0),
-			actorId,
-			activityJson,
+			actorId: typeof explicitActorId === "string" && explicitActorId !== "" ? explicitActorId : actorId,
+			...typeof activityJson === "string" ? { activityJson } : {},
 			timestamp: (/* @__PURE__ */ new Date(event.time[0] * 1e3 + event.time[1] / 1e6)).toISOString(),
 			inboxUrl: typeof inboxUrl === "string" ? inboxUrl : void 0
 		};

package/dist/otel/mod.d.cts

@@ -1,4 +1,5 @@
-import { n as KvStore, t as KvKey } from "../kv-CbLNp3zQ.cjs";
+/// <reference lib="esnext.temporal" />
+import { n as KvStore, t as KvKey } from "../kv-gJ8LYbxX.cjs";
 import { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
 import { ExportResultCode } from "@opentelemetry/core";
 
@@ -77,9 +78,10 @@ interface TraceActivityRecord {
   */
   readonly actorId?: string;
   /**
-  * The full JSON representation of the activity.
+  * The full JSON representation of the activity, if the span event included
+  * it.
   */
-  readonly activityJson: string;
+  readonly activityJson?: string;
   /**
   * Whether the activity was verified (for inbound activities).
   */

package/dist/otel/mod.d.ts

@@ -1,6 +1,5 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
-import { n as KvStore, t as KvKey } from "../kv-GFYnFoOl.js";
+/// <reference lib="esnext.temporal" />
+import { n as KvStore, t as KvKey } from "../kv-D6hNiMTK.js";
 import { ExportResultCode } from "@opentelemetry/core";
 import { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
 
@@ -79,9 +78,10 @@ interface TraceActivityRecord {
   */
   readonly actorId?: string;
   /**
-  * The full JSON representation of the activity.
+  * The full JSON representation of the activity, if the span event included
+  * it.
   */
-  readonly activityJson: string;
+  readonly activityJson?: string;
   /**
   * Whether the activity was verified (for inbound activities).
   */

package/dist/otel/mod.js

@@ -1,5 +1,5 @@
-import "@js-temporal/polyfill";
-import "urlpattern-polyfill";
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
 import { getLogger } from "@logtape/logtape";
 import { ExportResultCode } from "@opentelemetry/core";
 //#region src/otel/exporter.ts
@@ -153,11 +153,10 @@ var FedifySpanExporter = class {
 		const attrs = event.attributes;
 		if (attrs == null) return null;
 		const activityJson = attrs["activitypub.activity.json"];
-		if (typeof activityJson !== "string") return null;
 		let activityType = "Unknown";
 		let activityId;
 		let actorId;
-		try {
+		if (typeof activityJson === "string") try {
 			const activity = JSON.parse(activityJson);
 			activityType = activity.type ?? "Unknown";
 			activityId = activity.id;
@@ -166,15 +165,17 @@ var FedifySpanExporter = class {
 		} catch {}
 		const inboxUrl = attrs["activitypub.inbox.url"];
 		const explicitActivityId = attrs["activitypub.activity.id"];
+		const explicitActivityType = attrs["activitypub.activity.type"];
+		const explicitActorId = attrs["activitypub.actor.id"];
 		return {
 			traceId,
 			spanId,
 			parentSpanId,
 			direction: "outbound",
-			activityType,
+			activityType: typeof explicitActivityType === "string" && explicitActivityType !== "" ? explicitActivityType : activityType,
 			activityId: activityId ?? (typeof explicitActivityId === "string" && explicitActivityId !== "" ? explicitActivityId : void 0),
-			actorId,
-			activityJson,
+			actorId: typeof explicitActorId === "string" && explicitActorId !== "" ? explicitActorId : actorId,
+			...typeof activityJson === "string" ? { activityJson } : {},
 			timestamp: (/* @__PURE__ */ new Date(event.time[0] * 1e3 + event.time[1] / 1e6)).toISOString(),
 			inboxUrl: typeof inboxUrl === "string" ? inboxUrl : void 0
 		};

package/dist/{outgoing-jsonld-CNmZLixq.mjs → outgoing-jsonld-L_DbOaFe.mjs}

@@ -1,9 +1,9 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as preloadedOnlyDocumentLoader, t as normalizePublicAudience } from "./public-audience-DYFHzm_c.mjs";
-import { preloadedContexts } from "@fedify/vocab-runtime";
+import { n as preloadedOnlyDocumentLoader, t as normalizePublicAudience } from "./public-audience-Cvbr2Gzt.mjs";
 import { getLogger } from "@logtape/logtape";
+import { preloadedContexts } from "@fedify/vocab-runtime";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 //#region src/compat/outgoing-jsonld.ts
 const logger = getLogger([

package/dist/{owner-C-tqfvxn.mjs → owner-B4LgOmzV.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-XBVlKnOX.mjs";
-import "./key-Bzx--sHD.mjs";
+import { n as version, t as name } from "./deno-BID9qTPk.mjs";
+import "./key-Dqdlo3mG.mjs";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";

package/dist/{owner-CptqhsOy.d.cts → owner-CnngXDNJ.d.ts}

@@ -1,6 +1,7 @@
+/// <reference lib="esnext.temporal" />
 import { Activity, Actor, CryptographicKey } from "@fedify/vocab";
-import { DocumentLoader } from "@fedify/vocab-runtime";
 import { TracerProvider } from "@opentelemetry/api";
+import { DocumentLoader } from "@fedify/vocab-runtime";
 
 //#region src/sig/owner.d.ts
 /**

package/dist/{owner-74ARJ5TL.d.ts → owner-DEvZuyOE.d.cts}

@@ -1,8 +1,7 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
+/// <reference lib="esnext.temporal" />
 import { Activity, Actor, CryptographicKey } from "@fedify/vocab";
-import { TracerProvider } from "@opentelemetry/api";
 import { DocumentLoader } from "@fedify/vocab-runtime";
+import { TracerProvider } from "@opentelemetry/api";
 
 //#region src/sig/owner.d.ts
 /**

package/dist/{proof-BlmRPzrK.mjs → proof-BoSGOq9q.mjs}

@@ -1,16 +1,26 @@
 import { Temporal } from "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-XBVlKnOX.mjs";
-import { n as fetchKey, o as validateCryptoKey } from "./key-Bzx--sHD.mjs";
-import { n as preloadedOnlyDocumentLoader } from "./public-audience-DYFHzm_c.mjs";
-import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-CNmZLixq.mjs";
+import { n as version, t as name } from "./deno-BID9qTPk.mjs";
+import { n as getDurationMs, r as getFederationMetrics, s as measureSignatureKeyFetch } from "./metrics-ColY3QKj.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-Dqdlo3mG.mjs";
+import { n as preloadedOnlyDocumentLoader } from "./public-audience-Cvbr2Gzt.mjs";
+import { r as normalizeOutgoingActivityJsonLd } from "./outgoing-jsonld-L_DbOaFe.mjs";
+import { getLogger } from "@logtape/logtape";
 import { Activity, DataIntegrityProof, Multikey, getTypeId } from "@fedify/vocab";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
-import { getLogger } from "@logtape/logtape";
 import { encodeHex } from "byte-encodings/hex";
 import serialize from "json-canon";
 //#region src/sig/proof.ts
+/**
+* Known Object Integrity Proof `cryptosuite` values, used to keep
+* `object_integrity_proofs.cryptosuite` on a bounded set of spec-defined
+* string values.  Fedify currently signs and verifies only
+* `eddsa-jcs-2022`; other values come in only from external proofs and are
+* dropped from the metric attribute to avoid attacker-controlled
+* cardinality.
+*/
+const OIP_KNOWN_CRYPTOSUITES = new Set(["eddsa-jcs-2022"]);
 const logger = getLogger([
 	"fedify",
 	"sig",
@@ -137,6 +147,10 @@ async function signObject(object, privateKey, keyId, options = {}) {
 */
 async function verifyProof(jsonLd, proof, options = {}) {
 	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("object_integrity_proofs.verify", async (span) => {
+		const start = performance.now();
+		let verified = false;
+		let threw = false;
+		const cryptosuite = proof.cryptosuite != null && OIP_KNOWN_CRYPTOSUITES.has(proof.cryptosuite) ? proof.cryptosuite : void 0;
 		if (span.isRecording()) {
 			if (proof.cryptosuite != null) span.setAttribute("object_integrity_proofs.cryptosuite", proof.cryptosuite);
 			if (proof.verificationMethodId != null) span.setAttribute("object_integrity_proofs.key_id", proof.verificationMethodId.href);
@@ -145,21 +159,25 @@ async function verifyProof(jsonLd, proof, options = {}) {
 		try {
 			const key = await verifyProofInternal(jsonLd, proof, options);
 			if (key == null) span.setStatus({ code: SpanStatusCode.ERROR });
+			else verified = true;
 			return key;
 		} catch (error) {
+			threw = true;
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
 				message: String(error)
 			});
 			throw error;
 		} finally {
+			const classified = threw ? "error" : verified ? "verified" : "rejected";
+			getFederationMetrics(options.meterProvider).recordSignatureVerificationDuration(getDurationMs(start), "object_integrity", classified, { cryptosuite });
 			span.end();
 		}
 	});
 }
 async function verifyProofInternal(jsonLd, proof, options) {
 	if (typeof jsonLd !== "object" || jsonLd == null || Array.isArray(jsonLd) || proof.cryptosuite !== "eddsa-jcs-2022" || proof.verificationMethodId == null || proof.proofPurpose !== "assertionMethod" || proof.proofValue == null || proof.created == null) return null;
-	const publicKeyPromise = fetchKey(proof.verificationMethodId, Multikey, options);
+	const publicKeyPromise = measureSignatureKeyFetch(options.meterProvider, "object_integrity", () => fetchKey(proof.verificationMethodId, Multikey, options));
 	const proofConfig = {
 		"@context": jsonLd["@context"],
 		type: "DataIntegrityProof",
@@ -199,7 +217,7 @@ async function verifyProofInternal(jsonLd, proof, options) {
 				proof,
 				keyId: proof.verificationMethodId.href
 			});
-			return await verifyProof(jsonLd, proof, {
+			return await verifyProofInternal(jsonLd, proof, {
 				...options,
 				keyCache: {
 					get: () => Promise.resolve(void 0),
@@ -230,7 +248,7 @@ async function verifyProofInternal(jsonLd, proof, options) {
 			keyId: proof.verificationMethodId.href,
 			proof
 		});
-		return await verifyProof(jsonLd, proof, {
+		return await verifyProofInternal(jsonLd, proof, {
 			...options,
 			keyCache: {
 				get: () => Promise.resolve(void 0),