@fedify/fedify 2.1.0 → 2.1.2

package/dist/{proof-D5BQTIcU.js → proof-j-of9m5W.js}

@@ -1,17 +1,14 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import { deno_default, fetchKey, validateCryptoKey } from "./http-DhH623ma.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+import { _ as version, d as validateCryptoKey, g as name, s as fetchKey } from "./http-BLZWcpzg.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
-import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
+import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import serialize from "json-canon";
-
 //#region src/sig/ld.ts
 const logger$1 = getLogger([
 	"fedify",
@@ -53,11 +50,8 @@ async function createSignature(jsonLd, privateKey, keyId, { contextLoader, creat
 		creator: keyId.href,
 		created: created?.toString() ?? (/* @__PURE__ */ new Date()).toISOString()
 	};
-	const optionsHash = await hashJsonLd(options, contextLoader);
-	const docHash = await hashJsonLd(jsonLd, contextLoader);
-	const message = optionsHash + docHash;
-	const encoder = new TextEncoder();
-	const messageBytes = encoder.encode(message);
+	const message = await hashJsonLd(options, contextLoader) + await hashJsonLd(jsonLd, contextLoader);
+	const messageBytes = new TextEncoder().encode(message);
 	const signature = await crypto.subtle.sign("RSASSA-PKCS1-v1_5", privateKey, messageBytes);
 	return {
 		...options,
@@ -79,9 +73,7 @@ async function createSignature(jsonLd, privateKey, keyId, { contextLoader, creat
 * @since 1.0.0
 */
 async function signJsonLd(jsonLd, privateKey, keyId, options) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("ld_signatures.sign", { attributes: { "ld_signatures.key_id": keyId.href } }, async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("ld_signatures.sign", { attributes: { "ld_signatures.key_id": keyId.href } }, async (span) => {
 		try {
 			const signature = await createSignature(jsonLd, privateKey, keyId, options);
 			if (span.isRecording()) {
@@ -183,23 +175,21 @@ async function verifySignature(jsonLd, options = {}) {
 	const encoder = new TextEncoder();
 	const message = sigOptsHash + docHash;
 	const messageBytes = encoder.encode(message);
-	const verified = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes);
-	if (verified) return key;
+	if (await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes)) return key;
 	if (cached) {
 		logger$1.debug("Failed to verify with the cached key {keyId}; signature {signatureValue} is invalid.  Retrying with the freshly fetched key...", {
 			keyId: sig.creator,
 			...sig
 		});
-		const { key: key$1 } = await fetchKey(new URL(sig.creator), CryptographicKey, {
+		const { key } = await fetchKey(new URL(sig.creator), CryptographicKey, {
 			...options,
 			keyCache: {
 				get: () => Promise.resolve(void 0),
-				set: async (keyId, key$2) => await options.keyCache?.set(keyId, key$2)
+				set: async (keyId, key) => await options.keyCache?.set(keyId, key)
 			}
 		});
-		if (key$1 == null) return null;
-		const verified$1 = await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key$1.publicKey, signature.slice(), messageBytes);
-		return verified$1 ? key$1 : null;
+		if (key == null) return null;
+		return await crypto.subtle.verify("RSASSA-PKCS1-v1_5", key.publicKey, signature.slice(), messageBytes) ? key : null;
 	}
 	logger$1.debug("Failed to verify with the fetched key {keyId}; signature {signatureValue} is invalid.  Check if the key is correct or if the signed message is correct.  The message to sign is:\n{message}", {
 		keyId: sig.creator,
@@ -218,9 +208,7 @@ async function verifySignature(jsonLd, options = {}) {
 * @returns `true` if the document is authentic; `false` otherwise.
 */
 async function verifyJsonLd(jsonLd, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("ld_signatures.verify", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("ld_signatures.verify", async (span) => {
 		try {
 			const object = await Object$1.fromJsonLd(jsonLd, options);
 			if (object.id != null) span.setAttribute("activitypub.object.id", object.id.href);
@@ -261,10 +249,8 @@ async function hashJsonLd(jsonLd, contextLoader) {
 		documentLoader: contextLoader ?? getDocumentLoader()
 	});
 	const encoder = new TextEncoder();
-	const hash = await crypto.subtle.digest("SHA-256", encoder.encode(canon));
-	return encodeHex(hash);
+	return encodeHex(await crypto.subtle.digest("SHA-256", encoder.encode(canon)));
 }
-
 //#endregion
 //#region src/sig/owner.ts
 /**
@@ -275,9 +261,7 @@ async function hashJsonLd(jsonLd, contextLoader) {
 * @returns Whether the actor is the owner of the key.
 */
 async function doesActorOwnKey(activity, key, options) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("activitypub.verify_key_ownership", {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("activitypub.verify_key_ownership", {
 		kind: SpanKind.INTERNAL,
 		attributes: {
 			"activitypub.actor.id": activity.actorId?.href ?? "",
@@ -358,9 +342,9 @@ async function getKeyOwner(keyId, options) {
 					contextLoader,
 					tracerProvider
 				});
-			} catch (e$1) {
-				if (e$1 instanceof TypeError) return null;
-				throw e$1;
+			} catch (e) {
+				if (e instanceof TypeError) return null;
+				throw e;
 			}
 		}
 	}
@@ -378,7 +362,6 @@ async function getKeyOwner(keyId, options) {
 	for (const kid of owner.publicKeyIds) if (kid.href === keyId.href) return owner;
 	return null;
 }
-
 //#endregion
 //#region src/sig/proof.ts
 const logger = getLogger([
@@ -396,29 +379,27 @@ const logger = getLogger([
 * @throws {TypeError} If the private key is invalid or unsupported.
 * @since 0.10.0
 */
-async function createProof(object, privateKey, keyId, { contextLoader, context: context$1, created } = {}) {
+async function createProof(object, privateKey, keyId, { contextLoader, context, created } = {}) {
 	validateCryptoKey(privateKey, "private");
 	if (privateKey.algorithm.name !== "Ed25519") throw new TypeError("Unsupported algorithm: " + privateKey.algorithm.name);
-	const objectWithoutProofs = object.clone({ proofs: [] });
-	const compactMsg = await objectWithoutProofs.toJsonLd({
+	const compactMsg = await object.clone({ proofs: [] }).toJsonLd({
 		format: "compact",
 		contextLoader,
-		context: context$1
+		context
 	});
 	const msgCanon = serialize(compactMsg);
 	const encoder = new TextEncoder();
 	const msgBytes = encoder.encode(msgCanon);
 	const msgDigest = await crypto.subtle.digest("SHA-256", msgBytes);
 	created ??= Temporal.Now.instant();
-	const proofConfig = {
+	const proofCanon = serialize({
 		"@context": compactMsg["@context"],
 		type: "DataIntegrityProof",
 		cryptosuite: "eddsa-jcs-2022",
 		verificationMethod: keyId.href,
 		proofPurpose: "assertionMethod",
 		created: created.toString()
-	};
-	const proofCanon = serialize(proofConfig);
+	});
 	const proofBytes = encoder.encode(proofCanon);
 	const proofDigest = await crypto.subtle.digest("SHA-256", proofBytes);
 	const digest = new Uint8Array(proofDigest.byteLength + msgDigest.byteLength);
@@ -444,13 +425,11 @@ async function createProof(object, privateKey, keyId, { contextLoader, context:
 * @since 0.10.0
 */
 async function signObject(object, privateKey, keyId, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("object_integrity_proofs.sign", { attributes: { "activitypub.object.type": getTypeId(object).href } }, async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("object_integrity_proofs.sign", { attributes: { "activitypub.object.type": getTypeId(object).href } }, async (span) => {
 		try {
 			if (object.id != null) span.setAttribute("activitypub.object.id", object.id.href);
 			const existingProofs = [];
-			for await (const proof$1 of object.getProofs(options)) existingProofs.push(proof$1);
+			for await (const proof of object.getProofs(options)) existingProofs.push(proof);
 			const proof = await createProof(object, privateKey, keyId, options);
 			if (span.isRecording()) {
 				if (proof.cryptosuite != null) span.setAttribute("object_integrity_proofs.cryptosuite", proof.cryptosuite);
@@ -480,9 +459,7 @@ async function signObject(object, privateKey, keyId, options = {}) {
 * @since 0.10.0
 */
 async function verifyProof(jsonLd, proof, options = {}) {
-	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return await tracer.startActiveSpan("object_integrity_proofs.verify", async (span) => {
+	return await (options.tracerProvider ?? trace.getTracerProvider()).getTracer(name, version).startActiveSpan("object_integrity_proofs.verify", async (span) => {
 		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);
@@ -506,15 +483,14 @@ async function verifyProof(jsonLd, proof, options = {}) {
 async function verifyProofInternal(jsonLd, proof, options) {
 	if (typeof jsonLd !== "object" || 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 proofConfig = {
+	const proofCanon = serialize({
 		"@context": jsonLd["@context"],
 		type: "DataIntegrityProof",
 		cryptosuite: proof.cryptosuite,
 		verificationMethod: proof.verificationMethodId.href,
 		proofPurpose: proof.proofPurpose,
 		created: proof.created.toString()
-	};
-	const proofCanon = serialize(proofConfig);
+	});
 	const encoder = new TextEncoder();
 	const proofBytes = encoder.encode(proofCanon);
 	const proofDigest = await crypto.subtle.digest("SHA-256", proofBytes);
@@ -565,8 +541,7 @@ async function verifyProofInternal(jsonLd, proof, options) {
 		});
 		return null;
 	}
-	const verified = await crypto.subtle.verify("Ed25519", publicKey.publicKey, proof.proofValue.slice(), digest);
-	if (!verified) {
+	if (!await crypto.subtle.verify("Ed25519", publicKey.publicKey, proof.proofValue.slice(), digest)) {
 		if (fetchedKey.cached) {
 			logger.debug("Failed to verify the proof with the cached key {keyId}; retrying with the freshly fetched key...", {
 				keyId: proof.verificationMethodId.href,
@@ -603,7 +578,7 @@ async function verifyProofInternal(jsonLd, proof, options) {
 * @since 0.10.0
 */
 async function verifyObject(cls, jsonLd, options = {}) {
-	const logger$2 = getLogger([
+	const logger = getLogger([
 		"fedify",
 		"sig",
 		"proof"
@@ -615,17 +590,16 @@ async function verifyObject(cls, jsonLd, options = {}) {
 		const key = await verifyProof(jsonLd, proof, options);
 		if (key === null) return null;
 		if (key.controllerId == null) {
-			logger$2.debug("Key {keyId} does not have a controller.", { keyId: key.id?.href });
+			logger.debug("Key {keyId} does not have a controller.", { keyId: key.id?.href });
 			continue;
 		}
 		attributions.delete(key.controllerId.href);
 	}
 	if (attributions.size > 0) {
-		logger$2.debug("Some attributions are not authenticated by the proofs: {attributions}.", { attributions: [...attributions] });
+		logger.debug("Some attributions are not authenticated by the proofs: {attributions}.", { attributions: [...attributions] });
 		return null;
 	}
 	return object;
 }
-
 //#endregion
-export { attachSignature, createProof, createSignature, detachSignature, doesActorOwnKey, getKeyOwner, hasSignature, signJsonLd, signObject, verifyJsonLd, verifyObject, verifyProof, verifySignature };
+export { doesActorOwnKey as a, createSignature as c, signJsonLd as d, verifyJsonLd as f, verifyProof as i, detachSignature as l, signObject as n, getKeyOwner as o, verifySignature as p, verifyObject as r, attachSignature as s, createProof as t, hasSignature as u };

package/dist/{retry-mqLf4b-R.js → retry-B_E3V_Dx.mjs}

@@ -1,8 +1,6 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
 //#region src/federation/retry.ts
 /**
 * Creates an exponential backoff retry policy.  The delay between retries
@@ -32,6 +30,5 @@ function createExponentialBackoffPolicy(options = {}) {
 		return Temporal.Duration.compare(delay, maxDelay) > 0 ? maxDelay : delay;
 	};
 }
-
 //#endregion
-export { createExponentialBackoffPolicy };
+export { createExponentialBackoffPolicy as t };

package/dist/{router-D9eI0s4b.js → router-CrMLXoOr.mjs}

@@ -1,12 +1,9 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
+import "@js-temporal/polyfill";
+import "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();
@@ -113,6 +110,5 @@ var RouterError = class extends Error {
 		this.name = "RouterError";
 	}
 };
-
 //#endregion
-export { Router$1 as Router, RouterError };
+export { RouterError as n, Router$1 as t };

package/dist/runtime/mod.cjs

@@ -1,14 +1,12 @@
-
-          const { Temporal } = require("@js-temporal/polyfill");
-          const { URLPattern } = require("urlpattern-polyfill");
-        
-const require_runtime = require('../runtime-c2Njxsry.cjs');
-
-
-var __fedify_vocab_runtime = require("@fedify/vocab-runtime");
-Object.keys(__fedify_vocab_runtime).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return __fedify_vocab_runtime[k]; }
-  });
+const { Temporal } = require("@js-temporal/polyfill");
+const { URLPattern } = require("urlpattern-polyfill");
+require("../chunk-DDcVe30Y.cjs");
+var _fedify_vocab_runtime = require("@fedify/vocab-runtime");
+Object.keys(_fedify_vocab_runtime).forEach(function(k) {
+	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function() {
+			return _fedify_vocab_runtime[k];
+		}
+	});
 });

package/dist/runtime/mod.d.cts

@@ -1,2 +1,6 @@
-import "../mod-Bh8mqlYw.cjs";
-export * from "@fedify/vocab-runtime";
+export * from "@fedify/vocab-runtime";
+
+//#region \0rolldown/runtime.js
+
+//#endregion
+export { __reExport as n, __exportAll as t };

package/dist/runtime/mod.d.ts

@@ -1,4 +1,3 @@
 import { Temporal } from "@js-temporal/polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import "../mod-D6HodEq7.js";
 export * from "@fedify/vocab-runtime";

package/dist/runtime/mod.js

@@ -1,7 +1,4 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import "../runtime-poamPCMb.js";
-
-export * from "@fedify/vocab-runtime"
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+import "../chunk-nlSIicah.js";
+export * from "@fedify/vocab-runtime";

package/dist/{send-CE8h59oe.js → send-uLjD0uAe.mjs}

@@ -1,13 +1,10 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { deno_default } from "./deno-BRMCYThi.js";
-import { doubleKnock } from "./http-CKDim8Tw.js";
-import { getLogger } from "@logtape/logtape";
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { n as version, t as name } from "./deno-C5VMwnFV.mjs";
+import { n as doubleKnock } from "./http-BTLPIzFa.mjs";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
-
+import { getLogger } from "@logtape/logtape";
 //#region src/federation/send.ts
 /**
 * Extracts the inbox URLs from recipients.
@@ -44,8 +41,7 @@ function extractInboxes({ recipients, preferSharedInbox, excludeBaseUris }) {
 */
 function sendActivity(options) {
 	const tracerProvider = options.tracerProvider ?? trace.getTracerProvider();
-	const tracer = tracerProvider.getTracer(deno_default.name, deno_default.version);
-	return tracer.startActiveSpan("activitypub.send_activity", {
+	return tracerProvider.getTracer(name, version).startActiveSpan("activitypub.send_activity", {
 		kind: SpanKind.CLIENT,
 		attributes: { "activitypub.shared_inbox": options.sharedInbox ?? false }
 	}, async (span) => {
@@ -193,6 +189,5 @@ var SendActivityError = class extends Error {
 		this.responseBody = responseBody;
 	}
 };
-
 //#endregion
-export { SendActivityError, extractInboxes, sendActivity };
+export { extractInboxes as n, sendActivity as r, SendActivityError as t };

package/dist/sig/accept.test.d.mts

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

package/dist/sig/{accept.test.js → accept.test.mjs}

@@ -1,16 +1,12 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { formatAcceptSignature, fulfillAcceptSignature, parseAcceptSignature, validateAcceptSignature } from "../accept-D7sAxyNa.js";
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { i as validateAcceptSignature, n as fulfillAcceptSignature, r as parseAcceptSignature, t as formatAcceptSignature } from "../accept-Dd__NiUL.mjs";
 import { test } from "@fedify/fixture";
 import { deepStrictEqual, strictEqual } from "node:assert/strict";
-
 //#region src/sig/accept.test.ts
 test("parseAcceptSignature(): single entry", () => {
-	const result = parseAcceptSignature("sig1=(\"@method\" \"@target-uri\")");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"@method\" \"@target-uri\")"), [{
 		label: "sig1",
 		components: [{
 			value: "@method",
@@ -23,8 +19,7 @@ test("parseAcceptSignature(): single entry", () => {
 	}]);
 });
 test("parseAcceptSignature(): multiple entries", () => {
-	const result = parseAcceptSignature("sig1=(\"@method\"), sig2=(\"@authority\")");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"@method\"), sig2=(\"@authority\")"), [{
 		label: "sig1",
 		components: [{
 			value: "@method",
@@ -41,8 +36,7 @@ test("parseAcceptSignature(): multiple entries", () => {
 	}]);
 });
 test("parseAcceptSignature(): all six parameters", () => {
-	const result = parseAcceptSignature("sig1=(\"@method\");keyid=\"k1\";alg=\"rsa-v1_5-sha256\";created;expires;nonce=\"abc\";tag=\"t1\"");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"@method\");keyid=\"k1\";alg=\"rsa-v1_5-sha256\";created;expires;nonce=\"abc\";tag=\"t1\""), [{
 		label: "sig1",
 		components: [{
 			value: "@method",
@@ -59,8 +53,7 @@ test("parseAcceptSignature(): all six parameters", () => {
 	}]);
 });
 test("parseAcceptSignature(): preserves string component parameters", () => {
-	const result = parseAcceptSignature("sig1=(\"@query-param\";name=\"foo\" \"@method\")");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"@query-param\";name=\"foo\" \"@method\")"), [{
 		label: "sig1",
 		components: [{
 			value: "@query-param",
@@ -73,8 +66,7 @@ test("parseAcceptSignature(): preserves string component parameters", () => {
 	}]);
 });
 test("parseAcceptSignature(): preserves boolean component parameters", () => {
-	const result = parseAcceptSignature("sig1=(\"content-type\";sf \"content-digest\";bs)");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"content-type\";sf \"content-digest\";bs)"), [{
 		label: "sig1",
 		components: [{
 			value: "content-type",
@@ -87,8 +79,7 @@ test("parseAcceptSignature(): preserves boolean component parameters", () => {
 	}]);
 });
 test("parseAcceptSignature(): preserves multiple parameters on one component", () => {
-	const result = parseAcceptSignature("sig1=(\"@request-response\";key=\"sig1\";req)");
-	deepStrictEqual(result, [{
+	deepStrictEqual(parseAcceptSignature("sig1=(\"@request-response\";key=\"sig1\";req)"), [{
 		label: "sig1",
 		components: [{
 			value: "@request-response",
@@ -123,9 +114,7 @@ test("formatAcceptSignature(): single entry with created", () => {
 		],
 		parameters: { created: true }
 	}];
-	const header = formatAcceptSignature(members);
-	const parsed = parseAcceptSignature(header);
-	deepStrictEqual(parsed, members);
+	deepStrictEqual(parseAcceptSignature(formatAcceptSignature(members)), members);
 });
 test("formatAcceptSignature(): created + nonce", () => {
 	const members = [{
@@ -139,9 +128,7 @@ test("formatAcceptSignature(): created + nonce", () => {
 			nonce: "dBjftJeZ4CVP-mB92K27uhbUJU1p1r_wW1gFWFOEjXk"
 		}
 	}];
-	const header = formatAcceptSignature(members);
-	const parsed = parseAcceptSignature(header);
-	deepStrictEqual(parsed, members);
+	deepStrictEqual(parseAcceptSignature(formatAcceptSignature(members)), members);
 });
 test("formatAcceptSignature(): multiple entries", () => {
 	const members = [{
@@ -162,9 +149,7 @@ test("formatAcceptSignature(): multiple entries", () => {
 		}],
 		parameters: { tag: "app-123" }
 	}];
-	const header = formatAcceptSignature(members);
-	const parsed = parseAcceptSignature(header);
-	deepStrictEqual(parsed, members);
+	deepStrictEqual(parseAcceptSignature(formatAcceptSignature(members)), members);
 });
 test("formatAcceptSignature(): round-trip with all parameters", () => {
 	const input = [{
@@ -196,9 +181,7 @@ test("formatAcceptSignature(): round-trip with all parameters", () => {
 			tag: "app-123"
 		}
 	}];
-	const header = formatAcceptSignature(input);
-	const members = parseAcceptSignature(header);
-	deepStrictEqual(members, input);
+	deepStrictEqual(parseAcceptSignature(formatAcceptSignature(input)), input);
 });
 test("formatAcceptSignature(): round-trip with parameterized components", () => {
 	const input = [{
@@ -219,9 +202,7 @@ test("formatAcceptSignature(): round-trip with parameterized components", () =>
 		],
 		parameters: { created: true }
 	}];
-	const header = formatAcceptSignature(input);
-	const members = parseAcceptSignature(header);
-	deepStrictEqual(members, input);
+	deepStrictEqual(parseAcceptSignature(formatAcceptSignature(input)), input);
 });
 test("validateAcceptSignature(): filters out @status", () => {
 	const valid = {
@@ -246,12 +227,9 @@ test("validateAcceptSignature(): filters out @status", () => {
 		}],
 		parameters: {}
 	};
-	const validOnly = [valid];
-	deepStrictEqual(validateAcceptSignature(validOnly), [valid]);
-	const invalidOnly = [invalid];
-	deepStrictEqual(validateAcceptSignature(invalidOnly), []);
-	const mixed = [valid, invalid];
-	deepStrictEqual(validateAcceptSignature(mixed), [valid]);
+	deepStrictEqual(validateAcceptSignature([valid]), [valid]);
+	deepStrictEqual(validateAcceptSignature([invalid]), []);
+	deepStrictEqual(validateAcceptSignature([valid, invalid]), [valid]);
 });
 test("validateAcceptSignature(): passes entries with parameterized components", () => {
 	const members = [{
@@ -268,7 +246,7 @@ test("validateAcceptSignature(): passes entries with parameterized components",
 	deepStrictEqual(validateAcceptSignature(members), members);
 });
 test("fulfillAcceptSignature(): compatible alg and keyid", () => {
-	const entry = {
+	deepStrictEqual(fulfillAcceptSignature({
 		label: "sig1",
 		components: [
 			{
@@ -290,9 +268,7 @@ test("fulfillAcceptSignature(): compatible alg and keyid", () => {
 			nonce: "abc",
 			tag: "t1"
 		}
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
-	deepStrictEqual(result, {
+	}, "https://example.com/key", "rsa-v1_5-sha256"), {
 		label: "sig1",
 		components: [
 			{
@@ -314,46 +290,40 @@ test("fulfillAcceptSignature(): compatible alg and keyid", () => {
 	});
 });
 test("fulfillAcceptSignature(): incompatible alg", () => {
-	const entry = {
+	strictEqual(fulfillAcceptSignature({
 		label: "sig1",
 		components: [{
 			value: "@method",
 			params: {}
 		}],
 		parameters: { alg: "ecdsa-p256-sha256" }
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
-	strictEqual(result, null);
+	}, "https://example.com/key", "rsa-v1_5-sha256"), null);
 });
 test("fulfillAcceptSignature(): incompatible keyid", () => {
-	const entry = {
+	strictEqual(fulfillAcceptSignature({
 		label: "sig1",
 		components: [{
 			value: "@method",
 			params: {}
 		}],
 		parameters: { keyid: "https://other.example/key" }
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
-	strictEqual(result, null);
+	}, "https://example.com/key", "rsa-v1_5-sha256"), null);
 });
 test("fulfillAcceptSignature(): components returned exactly as requested", () => {
-	const entry = {
+	deepStrictEqual(fulfillAcceptSignature({
 		label: "sig1",
 		components: [{
 			value: "content-digest",
 			params: {}
 		}],
 		parameters: {}
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
-	deepStrictEqual(result.components, [{
+	}, "https://example.com/key", "rsa-v1_5-sha256").components, [{
 		value: "content-digest",
 		params: {}
 	}]);
 });
 test("fulfillAcceptSignature(): no alg/keyid constraints", () => {
-	const entry = {
+	deepStrictEqual(fulfillAcceptSignature({
 		label: "custom",
 		components: [
 			{
@@ -370,9 +340,7 @@ test("fulfillAcceptSignature(): no alg/keyid constraints", () => {
 			}
 		],
 		parameters: {}
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
-	deepStrictEqual(result, {
+	}, "https://example.com/key", "rsa-v1_5-sha256"), {
 		label: "custom",
 		components: [
 			{
@@ -394,7 +362,7 @@ test("fulfillAcceptSignature(): no alg/keyid constraints", () => {
 	});
 });
 test("fulfillAcceptSignature(): passes through expires when requested", () => {
-	const entry = {
+	const result = fulfillAcceptSignature({
 		label: "sig1",
 		components: [
 			{
@@ -411,13 +379,12 @@ test("fulfillAcceptSignature(): passes through expires when requested", () => {
 			}
 		],
 		parameters: { expires: true }
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
+	}, "https://example.com/key", "rsa-v1_5-sha256");
 	strictEqual(result != null, true);
 	strictEqual(result.expires, true);
 });
 test("fulfillAcceptSignature(): preserves component parameters in result", () => {
-	const entry = {
+	const result = fulfillAcceptSignature({
 		label: "sig1",
 		components: [
 			{
@@ -438,14 +405,12 @@ test("fulfillAcceptSignature(): preserves component parameters in result", () =>
 			}
 		],
 		parameters: {}
-	};
-	const result = fulfillAcceptSignature(entry, "https://example.com/key", "rsa-v1_5-sha256");
+	}, "https://example.com/key", "rsa-v1_5-sha256");
 	strictEqual(result != null, true);
-	const qp = result.components.find((c) => c.value === "@query-param");
-	deepStrictEqual(qp, {
+	deepStrictEqual(result.components.find((c) => c.value === "@query-param"), {
 		value: "@query-param",
 		params: { name: "foo" }
 	});
 });
-
-//#endregion
+//#endregion
+export {};