@fedify/fedify 2.0.0-dev.1908 → 2.0.0-dev.196

package/dist/router-D9eI0s4b.js

@@ -0,0 +1,118 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
+    
+import { cloneDeep } from "es-toolkit";
+import { Router } from "uri-template-router";
+import { parseTemplate } from "url-template";
+
+//#region src/federation/router.ts
+function cloneInnerRouter(router) {
+	const clone = new Router();
+	clone.nid = router.nid;
+	clone.fsm = cloneDeep(router.fsm);
+	clone.routeSet = new Set(router.routeSet);
+	clone.templateRouteMap = new Map(router.templateRouteMap);
+	clone.valueRouteMap = new Map(router.valueRouteMap);
+	clone.hierarchy = cloneDeep(router.hierarchy);
+	return clone;
+}
+/**
+* URL router and constructor based on URI Template
+* ([RFC 6570](https://tools.ietf.org/html/rfc6570)).
+*/
+var Router$1 = class Router$1 {
+	#router;
+	#templates;
+	#templateStrings;
+	/**
+	* Whether to ignore trailing slashes when matching paths.
+	* @since 1.6.0
+	*/
+	trailingSlashInsensitive;
+	/**
+	* Create a new {@link Router}.
+	* @param options Options for the router.
+	*/
+	constructor(options = {}) {
+		this.#router = new Router();
+		this.#templates = {};
+		this.#templateStrings = {};
+		this.trailingSlashInsensitive = options.trailingSlashInsensitive ?? false;
+	}
+	clone() {
+		const clone = new Router$1({ trailingSlashInsensitive: this.trailingSlashInsensitive });
+		clone.#router = cloneInnerRouter(this.#router);
+		clone.#templates = { ...this.#templates };
+		clone.#templateStrings = { ...this.#templateStrings };
+		return clone;
+	}
+	/**
+	* Checks if a path name exists in the router.
+	* @param name The name of the path.
+	* @returns `true` if the path name exists, otherwise `false`.
+	*/
+	has(name) {
+		return name in this.#templates;
+	}
+	/**
+	* Adds a new path rule to the router.
+	* @param template The path pattern.
+	* @param name The name of the path.
+	* @returns The names of the variables in the path pattern.
+	*/
+	add(template, name) {
+		if (!template.startsWith("/")) throw new RouterError("Path must start with a slash.");
+		const rule = this.#router.addTemplate(template, {}, name);
+		this.#templates[name] = parseTemplate(template);
+		this.#templateStrings[name] = template;
+		return new Set(rule.variables.map((v) => v.varname));
+	}
+	/**
+	* Resolves a path name and values from a URL, if any match.
+	* @param url The URL to resolve.
+	* @returns The name of the path and its values, if any match.  Otherwise,
+	*          `null`.
+	*/
+	route(url) {
+		let match = this.#router.resolveURI(url);
+		if (match == null) {
+			if (!this.trailingSlashInsensitive) return null;
+			url = url.endsWith("/") ? url.replace(/\/+$/, "") : `${url}/`;
+			match = this.#router.resolveURI(url);
+			if (match == null) return null;
+		}
+		return {
+			name: match.matchValue,
+			template: this.#templateStrings[match.matchValue],
+			values: match.params
+		};
+	}
+	/**
+	* Constructs a URL/path from a path name and values.
+	* @param name The name of the path.
+	* @param values The values to expand the path with.
+	* @returns The URL/path, if the name exists.  Otherwise, `null`.
+	*/
+	build(name, values) {
+		if (name in this.#templates) return this.#templates[name].expand(values);
+		return null;
+	}
+};
+/**
+* An error thrown by the {@link Router}.
+*/
+var RouterError = class extends Error {
+	/**
+	* Create a new {@link RouterError}.
+	* @param message The error message.
+	*/
+	constructor(message) {
+		super(message);
+		this.name = "RouterError";
+	}
+};
+
+//#endregion
+export { Router$1 as Router, RouterError };

package/dist/{send-z5jueBCW.js → send-BdhhZ2MN.js}

@@ -3,8 +3,8 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { deno_default } from "./lookup-yP6Lo5JV.js";
-import { doubleKnock } from "./http-DO88HCOK.js";
+import { deno_default } from "./deno-i60L3ZJW.js";
+import { doubleKnock } from "./http-uzkhnm0W.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 
@@ -55,7 +55,7 @@ function sendActivity(options) {
 			await sendActivityInternal({
 				...options,
 				tracerProvider
-			});
+			}, span);
 		} catch (e) {
 			span.setStatus({
 				code: SpanStatusCode.ERROR,
@@ -67,7 +67,7 @@ function sendActivity(options) {
 		}
 	});
 }
-async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }) {
+async function sendActivityInternal({ activity, activityId, keys, inbox, headers, specDeterminer, tracerProvider }, span) {
 	const logger = getLogger([
 		"fedify",
 		"federation",
@@ -122,6 +122,11 @@ async function sendActivityInternal({ activity, activityId, keys, inbox, headers
 		});
 		throw new Error(`Failed to send activity ${activityId} to ${inbox.href} (${response.status} ${response.statusText}):\n${error}`);
 	}
+	span.addEvent("activitypub.activity.sent", {
+		"activitypub.activity.json": JSON.stringify(activity),
+		"activitypub.inbox.url": inbox.href,
+		"activitypub.activity.id": activityId ?? ""
+	});
 }
 
 //#endregion

package/dist/sig/http.test.js

@@ -3,20 +3,19 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import "../lookup-yP6Lo5JV.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../actor-DrFLTQdj.js";
-import { exportJwk } from "../key-CrKmngwF.js";
-import { createRfc9421SignatureBase, doubleKnock, formatRfc9421Signature, formatRfc9421SignatureParameters, parseRfc9421Signature, parseRfc9421SignatureInput, signRequest, timingSafeEqual, verifyRequest } from "../http-DO88HCOK.js";
-import { mockDocumentLoader, test } from "../testing-bgnt5CjE.js";
+import "../deno-i60L3ZJW.js";
+import { exportJwk } from "../key-DBHCloAO.js";
+import { createRfc9421SignatureBase, doubleKnock, formatRfc9421Signature, formatRfc9421SignatureParameters, parseRfc9421Signature, parseRfc9421SignatureInput, signRequest, timingSafeEqual, verifyRequest } from "../http-uzkhnm0W.js";
 import { assertExists, assertStringIncludes } from "../std__assert-DWivtrGR.js";
 import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
 import "../assert_not_equals-C80BG-_5.js";
-import { rsaPrivateKey2, rsaPublicKey1, rsaPublicKey2, rsaPublicKey5 } from "../keys-B2yaEG79.js";
-import { esm_default } from "../esm-vPU_GxaY.js";
+import { rsaPrivateKey2, rsaPublicKey1, rsaPublicKey2, rsaPublicKey5 } from "../keys-ZbcByPg9.js";
+import { esm_default } from "../esm-DGl7uK1r.js";
 import { exportSpki } from "@fedify/vocab-runtime";
 import { encodeBase64 } from "byte-encodings/base64";
 

package/dist/sig/key.test.js

@@ -3,18 +3,18 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey, Multikey } from "../lookup-yP6Lo5JV.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../actor-DrFLTQdj.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "../key-CrKmngwF.js";
-import { mockDocumentLoader, test } from "../testing-bgnt5CjE.js";
+import "../deno-i60L3ZJW.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, validateCryptoKey } from "../key-DBHCloAO.js";
 import "../std__assert-DWivtrGR.js";
 import { assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
 import "../assert_not_equals-C80BG-_5.js";
-import { ed25519Multikey, rsaPrivateKey2, rsaPublicKey1, rsaPublicKey2, rsaPublicKey3 } from "../keys-B2yaEG79.js";
+import { ed25519Multikey, rsaPrivateKey2, rsaPublicKey1, rsaPublicKey2, rsaPublicKey3 } from "../keys-ZbcByPg9.js";
+import { CryptographicKey, Multikey } from "@fedify/vocab";
 
 //#region src/sig/key.test.ts
 test("validateCryptoKey()", async () => {

package/dist/sig/ld.test.js

@@ -3,16 +3,16 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { CryptographicKey } from "../lookup-yP6Lo5JV.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
-import "../actor-DrFLTQdj.js";
-import { generateCryptoKeyPair } from "../key-CrKmngwF.js";
-import { attachSignature, createSignature, detachSignature, signJsonLd, verifyJsonLd, verifySignature } from "../ld-Ckl2k3lF.js";
-import { mockDocumentLoader, test } from "../testing-bgnt5CjE.js";
+import "../deno-i60L3ZJW.js";
+import { generateCryptoKeyPair } from "../key-DBHCloAO.js";
+import { attachSignature, createSignature, detachSignature, signJsonLd, verifyJsonLd, verifySignature } from "../ld-CZgNIUGN.js";
 import { assertFalse, assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import { assertThrows } from "../assert_throws-BNXdRGWP.js";
-import { ed25519Multikey, ed25519PrivateKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-B2yaEG79.js";
+import { ed25519Multikey, ed25519PrivateKey, rsaPrivateKey2, rsaPrivateKey3, rsaPublicKey2, rsaPublicKey3 } from "../keys-ZbcByPg9.js";
+import { CryptographicKey } from "@fedify/vocab";
 import { encodeBase64 } from "byte-encodings/base64";
 
 //#region src/sig/ld.test.ts

package/dist/sig/mod.cjs

@@ -2,11 +2,9 @@
           const { Temporal } = require("@js-temporal/polyfill");
           const { URLPattern } = require("urlpattern-polyfill");
         
-require('../lookup-D17ydBQd.cjs');
-require('../actor-C6x8UgbE.cjs');
-const require_http = require('../http-CTi-owaL.cjs');
-const require_proof = require('../proof-yc6sVqKg.cjs');
-require('../sig-YYj5tCnr.cjs');
+const require_http = require('../http-B_jtB30-.cjs');
+const require_proof = require('../proof-vmNsq1AQ.cjs');
+require('../sig-DeXX2xnj.cjs');
 
 exports.attachSignature = require_proof.attachSignature;
 exports.createProof = require_proof.createProof;

package/dist/sig/mod.d.cts

@@ -1,6 +1,4 @@
-import "../vocab-CeDBzu-f.cjs";
-import "../actor-f2NtjyCg.cjs";
-import { FetchKeyOptions, FetchKeyResult, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignRequestOptions, VerifyRequestOptions, exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-M8k5mKc0.cjs";
-import { DoesActorOwnKeyOptions, GetKeyOwnerOptions, doesActorOwnKey, getKeyOwner } from "../owner-B4HbyP8s.cjs";
-import { CreateProofOptions, CreateSignatureOptions, SignJsonLdOptions, SignObjectOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../mod-DgxG-byT.cjs";
+import { FetchKeyOptions, FetchKeyResult, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignRequestOptions, VerifyRequestOptions, exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-ClB3pLcL.cjs";
+import { DoesActorOwnKeyOptions, GetKeyOwnerOptions, doesActorOwnKey, getKeyOwner } from "../owner-C-zfmVAD.cjs";
+import { CreateProofOptions, CreateSignatureOptions, SignJsonLdOptions, SignObjectOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../mod-BrS8tiad.cjs";
 export { CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyOptions, FetchKeyResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/mod.d.ts

@@ -1,8 +1,6 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import "../vocab-BCWe1Ih5.js";
-import "../actor-DqFajh9s.js";
-import { FetchKeyOptions, FetchKeyResult, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignRequestOptions, VerifyRequestOptions, exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-BbO0ejuk.js";
-import { DoesActorOwnKeyOptions, GetKeyOwnerOptions, doesActorOwnKey, getKeyOwner } from "../owner-kQRGVXG1.js";
-import { CreateProofOptions, CreateSignatureOptions, SignJsonLdOptions, SignObjectOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../mod-D5Z2tISD.js";
+import { FetchKeyOptions, FetchKeyResult, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignRequestOptions, VerifyRequestOptions, exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-DLBDPal9.js";
+import { DoesActorOwnKeyOptions, GetKeyOwnerOptions, doesActorOwnKey, getKeyOwner } from "../owner-BgI8C-VY.js";
+import { CreateProofOptions, CreateSignatureOptions, SignJsonLdOptions, SignObjectOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../mod-jOa7W503.js";
 export { CreateProofOptions, CreateSignatureOptions, DoesActorOwnKeyOptions, FetchKeyOptions, FetchKeyResult, GetKeyOwnerOptions, HttpMessageSignaturesSpec, HttpMessageSignaturesSpecDeterminer, KeyCache, SignJsonLdOptions, SignObjectOptions, SignRequestOptions, VerifyJsonLdOptions, VerifyObjectOptions, VerifyProofOptions, VerifyRequestOptions, VerifySignatureOptions, attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/mod.js

@@ -2,10 +2,8 @@
           import { Temporal } from "@js-temporal/polyfill";
           import { URLPattern } from "urlpattern-polyfill";
         
-import "../lookup-DrCNfWHm.js";
-import "../actor-C76CDThG.js";
-import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-ByZmUHwe.js";
-import { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, getKeyOwner, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../proof-CDW6KgLA.js";
-import "../sig-C34-oHBl.js";
+import { exportJwk, fetchKey, generateCryptoKeyPair, importJwk, signRequest, verifyRequest } from "../http-B5BgMxiO.js";
+import { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, getKeyOwner, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature } from "../proof-DzFse-Bn.js";
+import "../sig-CwuONEzF.js";
 
 export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, exportJwk, fetchKey, generateCryptoKeyPair, getKeyOwner, importJwk, signJsonLd, signObject, signRequest, verifyJsonLd, verifyObject, verifyProof, verifyRequest, verifySignature };

package/dist/sig/owner.test.js

@@ -3,19 +3,19 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Create, lookupObject } from "../lookup-yP6Lo5JV.js";
+import { createTestTracerProvider, mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import { assert } from "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../actor-DrFLTQdj.js";
-import "../key-CrKmngwF.js";
-import { doesActorOwnKey, getKeyOwner } from "../owner-C8UEs7je.js";
-import { mockDocumentLoader, test } from "../testing-bgnt5CjE.js";
+import "../deno-i60L3ZJW.js";
+import "../key-DBHCloAO.js";
+import { doesActorOwnKey, getKeyOwner } from "../owner-BDvRiO5T.js";
 import "../std__assert-DWivtrGR.js";
 import { assertFalse } from "../assert_rejects-Ce45JcFg.js";
 import "../assert_throws-BNXdRGWP.js";
 import "../assert_not_equals-C80BG-_5.js";
-import { rsaPublicKey1, rsaPublicKey2 } from "../keys-B2yaEG79.js";
+import { rsaPublicKey1, rsaPublicKey2 } from "../keys-ZbcByPg9.js";
+import { Create, CryptographicKey, lookupObject } from "@fedify/vocab";
 
 //#region src/sig/owner.test.ts
 test("doesActorOwnKey()", async () => {
@@ -46,5 +46,28 @@ test("getKeyOwner()", async () => {
 	const noOwner2 = await getKeyOwner(new URL("https://example.com/object"), options);
 	assertEquals(noOwner2, null);
 });
+test("doesActorOwnKey() records OpenTelemetry span", async () => {
+	const [tracerProvider, exporter] = createTestTracerProvider();
+	const activity = new Create({
+		id: new URL("https://example.com/activity"),
+		actor: new URL("https://example.com/person")
+	});
+	const key = new CryptographicKey({
+		id: new URL("https://example.com/person#key"),
+		owner: new URL("https://example.com/person")
+	});
+	const result = await doesActorOwnKey(activity, key, {
+		documentLoader: mockDocumentLoader,
+		tracerProvider
+	});
+	assert(result);
+	const spans = exporter.getSpans("activitypub.verify_key_ownership");
+	assertEquals(spans.length, 1);
+	const span = spans[0];
+	assertEquals(span.attributes["activitypub.actor.id"], "https://example.com/person");
+	assertEquals(span.attributes["activitypub.key.id"], "https://example.com/person#key");
+	assertEquals(span.attributes["activitypub.key_ownership.verified"], true);
+	assertEquals(span.attributes["activitypub.key_ownership.method"], "owner_id");
+});
 
 //#endregion

package/dist/sig/proof.test.js

@@ -3,19 +3,19 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { Create, DataIntegrityProof, Multikey, Note, Place } from "../lookup-yP6Lo5JV.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import { assertInstanceOf } from "../assert_instance_of-DHz7EHNU.js";
-import "../actor-DrFLTQdj.js";
-import "../key-CrKmngwF.js";
-import { createProof, signObject, verifyObject, verifyProof } from "../proof-CWKgvgzL.js";
-import { mockDocumentLoader, test } from "../testing-bgnt5CjE.js";
+import "../deno-i60L3ZJW.js";
+import "../key-DBHCloAO.js";
+import { createProof, signObject, verifyObject, verifyProof } from "../proof-XEPY5YKg.js";
 import "../std__assert-DWivtrGR.js";
 import { assertRejects } from "../assert_rejects-Ce45JcFg.js";
 import "../assert_throws-BNXdRGWP.js";
 import "../assert_not_equals-C80BG-_5.js";
-import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPublicKey2 } from "../keys-B2yaEG79.js";
+import { ed25519Multikey, ed25519PrivateKey, ed25519PublicKey, rsaPrivateKey2, rsaPublicKey2 } from "../keys-ZbcByPg9.js";
+import { Create, DataIntegrityProof, Multikey, Note, Place } from "@fedify/vocab";
 import { decodeMultibase, importMultibaseKey } from "@fedify/vocab-runtime";
 import { decodeHex, encodeHex } from "byte-encodings/hex";