@fedify/fedify 1.9.6 → 1.9.8

package/dist/{proof-V1uQaB2y.js → proof-CmTtG_t-.js}

@@ -1,17 +1,14 @@
-
-          import { Temporal } from "@js-temporal/polyfill";
-          import { URLPattern } from "urlpattern-polyfill";
-        
-import { deno_default, getDocumentLoader } from "./docloader-fJgJeqiX.js";
-import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, getTypeId, isActor } from "./actor-CEGEmRll.js";
-import { fetchKey, validateCryptoKey } from "./key-ibMO03_0.js";
+import { Temporal } from "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+import { d as name, f as version, i as getDocumentLoader } from "./docloader-BoXhusJ1.js";
+import { G as Multikey, Tt as getTypeId, b as DataIntegrityProof, i as isActor, q as Object$1, s as Activity, y as CryptographicKey } from "./actor-BTA45fXF.js";
+import { n as fetchKey, o as validateCryptoKey } from "./key-DK3o0FEH.js";
 import { getLogger } from "@logtape/logtape";
 import { SpanStatusCode, trace } from "@opentelemetry/api";
 import jsonld from "jsonld";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
 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
 /**
@@ -322,9 +308,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;
 			}
 		}
 	}
@@ -342,7 +328,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([
@@ -360,29 +345,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);
@@ -408,13 +391,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);
@@ -444,9 +425,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);
@@ -470,15 +449,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);
@@ -529,8 +507,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,
@@ -567,7 +544,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"
@@ -579,17 +556,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 };