@fedify/fedify 2.2.0-dev.610 → 2.2.0-dev.622

package/dist/{ld-5udwE1JY.js → ld-C3CO00YY.mjs}

@@ -1,18 +1,15 @@
-
-      import { Temporal } from "@js-temporal/polyfill";
-      import { URLPattern } from "urlpattern-polyfill";
-      globalThis.addEventListener = () => {};
-    
-import { deno_default } from "./deno-CMcbjYDs.js";
-import { fetchKey, validateCryptoKey } from "./key-OaS_196P.js";
+import "@js-temporal/polyfill";
+import "urlpattern-polyfill";
+globalThis.addEventListener = () => {};
+import { n as version, t as name } from "./deno-D682wzlW.mjs";
+import { n as fetchKey, o as validateCryptoKey } from "./key-vL60OvqM.mjs";
 import { Activity, CryptographicKey, Object as Object$1, getTypeId } from "@fedify/vocab";
+import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { getDocumentLoader } from "@fedify/vocab-runtime";
 import { getLogger } from "@logtape/logtape";
-import { SpanStatusCode, trace } from "@opentelemetry/api";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
 import { encodeHex } from "byte-encodings/hex";
 import jsonld from "@fedify/vocab-runtime/jsonld";
-
 //#region src/sig/ld.ts
 const logger = getLogger([
 	"fedify",
@@ -54,11 +51,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,
@@ -80,9 +74,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()) {
@@ -184,23 +176,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.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.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,
@@ -219,9 +209,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);
@@ -262,9 +250,7 @@ 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
-export { attachSignature, createSignature, detachSignature, hasSignature, signJsonLd, verifyJsonLd, verifySignature };
+export { signJsonLd as a, hasSignature as i, createSignature as n, verifyJsonLd as o, detachSignature as r, verifySignature as s, attachSignature as t };