@fedify/fedify 2.3.0-dev.1110 → 2.3.0-dev.1119

package/dist/{assert_rejects-B-qJtC9Z.mjs → assert_rejects-DQP-q39h.mjs}

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { l as AssertionError } from "./assert_equals-Ew3jOFa3.mjs";
+import { l as AssertionError, s as format } from "./assert_equals-Ew3jOFa3.mjs";
 import { n as assertIsError } from "./assert_throws-4NwKEy2q.mjs";
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_false.js
 /**
@@ -21,6 +21,31 @@ import { n as assertIsError } from "./assert_throws-4NwKEy2q.mjs";
 	if (expr) throw new AssertionError(msg);
 }
 //#endregion
+//#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_greater_or_equal.js
+/**
+* Make an assertion that `actual` is greater than or equal to `expected`.
+* If not then throw.
+*
+* @example Usage
+* ```ts no-eval
+* import { assertGreaterOrEqual } from "@std/assert/assert-greater-or-equal";
+*
+* assertGreaterOrEqual(2, 1); // Doesn't throw
+* assertGreaterOrEqual(1, 1); // Doesn't throw
+* assertGreaterOrEqual(0, 1); // Throws
+* ```
+*
+* @typeParam T The type of the values to compare.
+* @param actual The actual value to compare.
+* @param expected The expected value to compare.
+* @param msg The optional message to display if the assertion fails.
+*/ function assertGreaterOrEqual(actual, expected, msg) {
+	if (actual >= expected) return;
+	const actualString = format(actual);
+	const expectedString = format(expected);
+	throw new AssertionError(msg ?? `Expect ${actualString} >= ${expectedString}`);
+}
+//#endregion
 //#region ../../node_modules/.pnpm/@jsr+std__assert@0.226.0/node_modules/@jsr/std__assert/assert_rejects.js
 async function assertRejects(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
 	let ErrorClass = void 0;
@@ -54,4 +79,4 @@ async function assertRejects(fn, errorClassOrMsg, msgIncludesOrMsg, msg) {
 	return err;
 }
 //#endregion
-export { assertFalse as n, assertRejects as t };
+export { assertGreaterOrEqual as n, assertFalse as r, assertRejects as t };

package/dist/{builder-B-Y6fwSu.mjs → builder-Ond_h57y.mjs}

@@ -2,8 +2,8 @@ import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError, t as Router } from "./router-BT_F5748.mjs";
-import { n as version, t as name } from "./deno-hqC7tKJn.mjs";
-import { t as ActivityListenerSet } from "./activity-listener-tztVvlNb.mjs";
+import { n as version, t as name } from "./deno-DVsHS7rA.mjs";
+import { t as ActivityListenerSet } from "./activity-listener-BeTGV3wc.mjs";
 import { getLogger } from "@logtape/logtape";
 import { Tombstone, getTypeId } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
@@ -59,7 +59,7 @@ var FederationBuilderImpl = class {
 		this.collectionTypeIds = {};
 	}
 	async build(options) {
-		const { FederationImpl } = await import("./middleware-D6FbOjuK.mjs");
+		const { FederationImpl } = await import("./middleware-BDKFRjue.mjs");
 		const f = new FederationImpl(options);
 		const trailingSlashInsensitiveValue = f.router.trailingSlashInsensitive;
 		f.router = this.router.clone();

package/dist/compat/mod.d.cts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { kt as ActivityTransformer, n as Context } from "../context-C0C_sRha.cjs";
+import { kt as ActivityTransformer, n as Context } from "../context-Ch-ZLyTQ.cjs";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/mod.d.ts

@@ -1,5 +1,5 @@
 /// <reference lib="esnext.temporal" />
-import { kt as ActivityTransformer, n as Context } from "../context-Dqgt8saU.js";
+import { kt as ActivityTransformer, n as Context } from "../context-cSUMk2da.js";
 import { Activity } from "@fedify/vocab";
 
 //#region src/compat/transformers.d.ts

package/dist/compat/outgoing-jsonld.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertStrictEquals } from "../assert_strict_equals-Dmjbg-bA.mjs";
-import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-BgFLCJQ_.mjs";
+import { n as normalizeAttachmentArrays, r as normalizeOutgoingActivityJsonLd, t as isPreloadedContextAttachmentSafe } from "../outgoing-jsonld-BNL8AC14.mjs";
 import { Create, Document, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/compat/outgoing-jsonld.test.ts

package/dist/compat/public-audience.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertNotEquals } from "../assert_not_equals--wG9hV7u.mjs";
-import { t as normalizePublicAudience } from "../public-audience-N3pyOx2p.mjs";
+import { t as normalizePublicAudience } from "../public-audience-c9zmYKgA.mjs";
 import { Create, Note, PUBLIC_COLLECTION } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 import { getDocumentLoader, preloadedContexts } from "@fedify/vocab-runtime";

package/dist/compat/transformers.test.mjs

@@ -4,8 +4,8 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-DA2WTBr4.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
+import { n as FederationImpl, v as actorDehydrator, y as autoIdAssigner } from "../middleware-t0jC8I99.mjs";
 import { Follow, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/compat/transformers.test.ts

package/dist/{context-C0C_sRha.d.cts → context-Ch-ZLyTQ.d.cts}

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CAM_bQXx.cjs";
-import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-C87EWkO0.cjs";
+import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-D6aw3j2U.cjs";
 import { n as GetKeyOwnerOptions } from "./owner-DEvZuyOE.cjs";
 import { n as KvStore, t as KvKey } from "./kv-gJ8LYbxX.cjs";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";

package/dist/{context-Dqgt8saU.d.ts → context-cSUMk2da.d.ts}

@@ -1,6 +1,6 @@
 /// <reference lib="esnext.temporal" />
 import { o as JsonValue, s as NodeInfo, t as GetNodeInfoOptions } from "./client-CSddvgWN.js";
-import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-BDZeS5om.js";
+import { o as VerifyRequestFailureReason, t as HttpMessageSignaturesSpec } from "./http-D6LP89UO.js";
 import { n as GetKeyOwnerOptions } from "./owner-CnngXDNJ.js";
 import { n as KvStore, t as KvKey } from "./kv-D6hNiMTK.js";
 import { Activity, Actor, Collection, CryptographicKey, Hashtag, Link, LookupObjectOptions, Multikey, Object as Object$1, Recipient, Tombstone, TraverseCollectionOptions } from "@fedify/vocab";

package/dist/{deno-hqC7tKJn.mjs → deno-DVsHS7rA.mjs}

@@ -3,6 +3,6 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 //#region deno.json
 var name = "@fedify/fedify";
-var version = "2.3.0-dev.1110+3ba84466";
+var version = "2.3.0-dev.1119+6cc02662";
 //#endregion
 export { version as n, name as t };

package/dist/{docloader-BOEuuXkX.mjs → docloader-WsWfKaE5.mjs}

@@ -1,8 +1,8 @@
 import "@js-temporal/polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { o as validateCryptoKey } from "./key-DW1EVmtP.mjs";
-import { n as doubleKnock } from "./http-BLopFpvC.mjs";
+import { o as validateCryptoKey } from "./key-BoWaYRHm.mjs";
+import { n as doubleKnock } from "./http-DUV8ysti.mjs";
 import { getLogger } from "@logtape/logtape";
 import { curry } from "es-toolkit";
 import { UrlError, createActivityPubRequest, getRemoteDocument, logRequest, validatePublicUrl } from "@fedify/vocab-runtime";

package/dist/federation/builder.test.mjs

@@ -3,10 +3,10 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as RouterError } from "../router-BT_F5748.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { i as assertExists } from "../std__assert-CRDpx_HF.mjs";
+import { r as assertExists } from "../std__assert-BTEgfoJo.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { r as createFederationBuilder } from "../builder-B-Y6fwSu.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
+import { r as createFederationBuilder } from "../builder-Ond_h57y.mjs";
 import { Activity, Note, Person } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/builder.test.ts

package/dist/federation/collection.test.mjs

@@ -2,8 +2,8 @@ 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 { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-CA3V5zyK.mjs";
+import "../std__assert-BTEgfoJo.mjs";
+import { n as digest, t as buildCollectionSynchronizationHeader } from "../collection-Cc3DVAhE.mjs";
 import { test } from "@fedify/fixture";
 import { decodeHex } from "byte-encodings/hex";
 //#region src/federation/collection.test.ts

package/dist/federation/handler.test.mjs

@@ -3,15 +3,16 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { n as createOutboxContext, r as createRequestContext, t as createInboxContext } from "../context-BAE7AKLA.mjs";
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
-import { r as assertGreaterOrEqual } from "../std__assert-CRDpx_HF.mjs";
+import "../std__assert-BTEgfoJo.mjs";
+import { n as assertGreaterOrEqual } from "../assert_rejects-DQP-q39h.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { r as parseAcceptSignature } from "../accept-CceiKpCy.mjs";
-import { s as signRequest } from "../http-BLopFpvC.mjs";
-import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-C3kae-6B.mjs";
-import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-DA2WTBr4.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
+import { r as parseAcceptSignature } from "../accept-CgDcxvjV.mjs";
+import { s as signRequest } from "../http-DUV8ysti.mjs";
+import { a as rsaPrivateKey3, c as rsaPublicKey3, s as rsaPublicKey2 } from "../keys-CSYsOMFG.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
+import { c as handleActor, d as handleInbox, f as handleObject, h as respondWithObjectIfAcceptable, l as handleCollection, m as respondWithObject, o as createFederation, p as handleOutbox, u as handleCustomCollection } from "../middleware-t0jC8I99.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-BeTGV3wc.mjs";
 import { Activity, Create, Note, Person, Tombstone } from "@fedify/vocab";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
 import { FetchError } from "@fedify/vocab-runtime";

package/dist/federation/idempotency.test.mjs

@@ -2,11 +2,11 @@ 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 { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-C3kae-6B.mjs";
-import { r as signObject } from "../proof-mfmHH9j0.mjs";
-import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
-import { o as createFederation } from "../middleware-DA2WTBr4.mjs";
+import "../std__assert-BTEgfoJo.mjs";
+import { n as ed25519PrivateKey, r as ed25519PublicKey, t as ed25519Multikey } from "../keys-CSYsOMFG.mjs";
+import { r as signObject } from "../proof-DhVuz4bc.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
+import { o as createFederation } from "../middleware-t0jC8I99.mjs";
 import { Create, Follow, Person } from "@fedify/vocab";
 import { mockDocumentLoader, test } from "@fedify/fixture";
 //#region src/federation/idempotency.test.ts

package/dist/federation/inbox.test.mjs

@@ -3,7 +3,7 @@ import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertThrows } from "../assert_throws-4NwKEy2q.mjs";
-import { t as ActivityListenerSet } from "../activity-listener-tztVvlNb.mjs";
+import { t as ActivityListenerSet } from "../activity-listener-BeTGV3wc.mjs";
 import { Activity, Create, Invite, Offer, Update } from "@fedify/vocab";
 import { test } from "@fedify/fixture";
 //#region src/federation/inbox.test.ts

package/dist/federation/keycache.test.mjs

@@ -4,7 +4,7 @@ globalThis.addEventListener = () => {};
 import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
 import { t as assertInstanceOf } from "../assert_instance_of-C4Ri6VuN.mjs";
 import { t as assert } from "../assert-DikXweDx.mjs";
-import { t as MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
 import { t as KvKeyCache } from "../keycache-BeU0LCII.mjs";
 import { CryptographicKey, Multikey } from "@fedify/vocab";
 import { test } from "@fedify/fixture";

package/dist/federation/kv.test.mjs

@@ -2,8 +2,8 @@ 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 MemoryKvStore } from "../kv-x2IvBUyq.mjs";
+import "../std__assert-BTEgfoJo.mjs";
+import { t as MemoryKvStore } from "../kv-QHE0oeM3.mjs";
 import { test } from "@fedify/fixture";
 //#region src/federation/kv.test.ts
 test("MemoryKvStore", async (t) => {

package/dist/federation/metrics.test.d.mts

@@ -0,0 +1,2 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";

package/dist/federation/metrics.test.mjs

@@ -0,0 +1,107 @@
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { t as assertEquals } from "../assert_equals-Ew3jOFa3.mjs";
+import "../std__assert-BTEgfoJo.mjs";
+import { c as recordOutboxActivity, l as recordOutboxEnqueue, o as recordFanoutRecipients, s as recordInboxActivity } from "../metrics-C4attqv0.mjs";
+import { createTestMeterProvider, test } from "@fedify/fixture";
+//#region src/federation/metrics.test.ts
+const noopQueue = {
+	enqueue() {
+		return Promise.resolve();
+	},
+	listen() {
+		return Promise.resolve();
+	}
+};
+test("recordFanoutRecipients() records the recipient count with activity type", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordFanoutRecipients(meterProvider, 7, "https://www.w3.org/ns/activitystreams#Create");
+	const measurements = recorder.getMeasurements("activitypub.fanout.recipients");
+	assertEquals(measurements.length, 1);
+	assertEquals(measurements[0].type, "histogram");
+	assertEquals(measurements[0].value, 7);
+	assertEquals(measurements[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+});
+test("recordFanoutRecipients() omits activity type when unknown", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordFanoutRecipients(meterProvider, 0);
+	const measurements = recorder.getMeasurements("activitypub.fanout.recipients");
+	assertEquals(measurements.length, 1);
+	assertEquals(measurements[0].value, 0);
+	assertEquals("activitypub.activity.type" in measurements[0].attributes, false);
+});
+test("recordInboxActivity() records counter with result and activity type", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	for (const result of [
+		"queued",
+		"processed",
+		"retried",
+		"rejected",
+		"abandoned"
+	]) recordInboxActivity(meterProvider, result, "https://www.w3.org/ns/activitystreams#Follow");
+	const measurements = recorder.getMeasurements("activitypub.inbox.activity");
+	assertEquals(measurements.length, 5);
+	for (const m of measurements) {
+		assertEquals(m.type, "counter");
+		assertEquals(m.value, 1);
+		assertEquals(m.attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Follow");
+	}
+	assertEquals(measurements.map((m) => m.attributes["activitypub.processing.result"]), [
+		"queued",
+		"processed",
+		"retried",
+		"rejected",
+		"abandoned"
+	]);
+});
+test("recordInboxActivity() omits activity type when unknown", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordInboxActivity(meterProvider, "rejected");
+	const measurements = recorder.getMeasurements("activitypub.inbox.activity");
+	assertEquals(measurements.length, 1);
+	assertEquals(measurements[0].attributes["activitypub.processing.result"], "rejected");
+	assertEquals("activitypub.activity.type" in measurements[0].attributes, false);
+});
+test("recordOutboxEnqueue() also records activitypub.outbox.activity{queued} on initial enqueue", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordOutboxEnqueue(meterProvider, noopQueue, {
+		activityType: "https://www.w3.org/ns/activitystreams#Create",
+		attempt: 0
+	});
+	const queued = recorder.getMeasurements("activitypub.outbox.activity");
+	assertEquals(queued.length, 1);
+	assertEquals(queued[0].type, "counter");
+	assertEquals(queued[0].attributes["activitypub.processing.result"], "queued");
+	assertEquals(queued[0].attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Create");
+});
+test("recordOutboxEnqueue() does not record outbox.activity{queued} on retry enqueues", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	recordOutboxEnqueue(meterProvider, noopQueue, {
+		activityType: "https://www.w3.org/ns/activitystreams#Create",
+		attempt: 1
+	});
+	assertEquals(recorder.getMeasurements("activitypub.outbox.activity").length, 0);
+});
+test("recordOutboxActivity() records counter with result and activity type", () => {
+	const [meterProvider, recorder] = createTestMeterProvider();
+	for (const result of [
+		"queued",
+		"retried",
+		"abandoned"
+	]) recordOutboxActivity(meterProvider, result, "https://www.w3.org/ns/activitystreams#Announce");
+	const measurements = recorder.getMeasurements("activitypub.outbox.activity");
+	assertEquals(measurements.length, 3);
+	for (const m of measurements) {
+		assertEquals(m.type, "counter");
+		assertEquals(m.value, 1);
+		assertEquals(m.attributes["activitypub.activity.type"], "https://www.w3.org/ns/activitystreams#Announce");
+	}
+	assertEquals(measurements.map((m) => m.attributes["activitypub.processing.result"]), [
+		"queued",
+		"retried",
+		"abandoned"
+	]);
+});
+//#endregion
+export {};