@fedify/fedify 2.4.0-dev.1995 → 2.4.0-dev.2027

package/dist/{owner-BIPEZGiU.js → owner-B7lgRMdU.js}

@@ -1,11 +1,12 @@
 import { Temporal } from "temporal-polyfill";
 import { URLPattern } from "urlpattern-polyfill";
-import { I as name, L as version, c as fetchKey, f as validateCryptoKey, h as getFederationMetrics, m as getDurationMs, o as exportJwk, p as verifyKeyOwnership, s as fetchActorDocument, y as measureSignatureKeyFetch } from "./http-9WyuldYh.js";
+import { I as name, L as version, c as fetchKey, f as validateCryptoKey, h as getFederationMetrics, m as getDurationMs, o as exportJwk, p as verifyKeyOwnership, s as fetchActorDocument, y as measureSignatureKeyFetch } from "./http-KZWtR1H8.js";
 import { getLogger } from "@logtape/logtape";
 import { Activity, CryptographicKey, DataIntegrityProof, Multikey, Object as Object$1, PUBLIC_COLLECTION, getTypeId, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
 import { encodeHex } from "byte-encodings/hex";
-import { formatIri, getDocumentLoader, getFe34Origin, haveSameFe34Origin, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
+import { encodeMultibase, formatIri, getDocumentLoader, getFe34Origin, haveSameFe34Origin, parseIri, preloadedContexts } from "@fedify/vocab-runtime";
+import { isPlainJsonTree, retainSignedRepresentation } from "@fedify/vocab-runtime/internal/signed-representation";
 import jsonld from "@fedify/vocab-runtime/jsonld";
 import serialize from "json-canon";
 import { decodeBase64, encodeBase64 } from "byte-encodings/base64";
@@ -28,6 +29,37 @@ const preloadedOnlyDocumentLoader = (url) => {
 	return Promise.reject(/* @__PURE__ */ new Error("Refusing to fetch a non-preloaded JSON-LD context: " + url));
 };
 //#endregion
+//#region src/compat/secured-document.ts
+function isJsonMap$1(value) {
+	return typeof value === "object" && value != null && !Array.isArray(value);
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.length > 0;
+}
+function hasDataIntegrityProofType(value) {
+	return (Array.isArray(value) ? value : [value]).some((type) => type === "DataIntegrityProof" || type === "https://w3id.org/security#DataIntegrityProof");
+}
+/**
+* Checks whether a JSON value is a complete, self-contained secured document:
+* a map with its own `@context` and exactly one direct, map-valued `proof`
+* that carries every member `eddsa-jcs-2022` proof generation produces.
+*
+* This is deliberately stricter than {@link hasProofLike}, which exists to
+* decide whether a document is worth verifying.  Here a false positive would
+* silently suppress a wire-compatibility fix on an ordinary document, so a
+* partial or malformed proof does not qualify.
+*
+* @internal
+*/
+function isSelfContainedSecuredDocument(value) {
+	if (!isJsonMap$1(value)) return false;
+	if (!Object.hasOwn(value, "@context") || value["@context"] == null) return false;
+	if (!Object.hasOwn(value, "proof")) return false;
+	const proof = value.proof;
+	if (!isJsonMap$1(proof)) return false;
+	return hasDataIntegrityProofType(proof.type) && isNonEmptyString(proof.cryptosuite) && isNonEmptyString(proof.created) && isNonEmptyString(proof.verificationMethod) && isNonEmptyString(proof.proofPurpose) && isNonEmptyString(proof.proofValue);
+}
+//#endregion
 //#region src/compat/public-audience.ts
 const logger$4 = getLogger([
 	"fedify",
@@ -44,37 +76,39 @@ const PUBLIC_ADDRESSING_FIELDS = /* @__PURE__ */ new Set([
 const AS_CONTEXT_URL$1 = "https://www.w3.org/ns/activitystreams";
 const MAX_TRAVERSAL_DEPTH$1 = 64;
 const KNOWN_SAFE_CONTEXT_URLS$1 = new Set(Object.keys(preloadedContexts));
-function hasPublicCurieInAddressing(value, parentKey, depth = 0) {
+function hasPublicCurieInAddressing(value, preserveSecured, parentKey, depth = 0) {
 	if (typeof value === "string") return parentKey != null && PUBLIC_ADDRESSING_FIELDS.has(parentKey) && (value === "as:Public" || value === "Public");
 	if (depth >= MAX_TRAVERSAL_DEPTH$1) return false;
-	if (Array.isArray(value)) return value.some((item) => hasPublicCurieInAddressing(item, parentKey, depth + 1));
+	if (Array.isArray(value)) return value.some((item) => hasPublicCurieInAddressing(item, preserveSecured, parentKey, depth + 1));
 	if (typeof value !== "object" || value == null) return false;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(value)) return false;
 	const record = value;
 	for (const key of Object.keys(record)) {
 		if (record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public")) return true;
 		if (key === "@context") continue;
-		if (hasPublicCurieInAddressing(record[key], key, depth + 1)) return true;
+		if (hasPublicCurieInAddressing(record[key], preserveSecured, key, depth + 1)) return true;
 	}
 	return false;
 }
-function rewritePublicAudience(value, parentKey, depth = 0) {
+function rewritePublicAudience(value, preserveSecured, parentKey, depth = 0) {
 	if (typeof value === "string" && parentKey != null && PUBLIC_ADDRESSING_FIELDS.has(parentKey) && (value === "as:Public" || value === "Public")) return PUBLIC_COLLECTION.href;
 	if (depth >= MAX_TRAVERSAL_DEPTH$1) return value;
 	if (Array.isArray(value)) {
 		let changed = false;
 		const mapped = value.map((item) => {
-			const rewritten = rewritePublicAudience(item, parentKey, depth + 1);
+			const rewritten = rewritePublicAudience(item, preserveSecured, parentKey, depth + 1);
 			if (rewritten !== item) changed = true;
 			return rewritten;
 		});
 		return changed ? mapped : value;
 	}
 	if (typeof value !== "object" || value == null) return value;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(value)) return value;
 	const record = value;
 	let changed = false;
 	const normalized = Object.create(null);
 	for (const key of Object.keys(record)) {
-		const rewritten = key === "@context" ? record[key] : record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public") ? PUBLIC_COLLECTION.href : rewritePublicAudience(record[key], key, depth + 1);
+		const rewritten = key === "@context" ? record[key] : record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public") ? PUBLIC_COLLECTION.href : rewritePublicAudience(record[key], preserveSecured, key, depth + 1);
 		if (rewritten !== record[key]) changed = true;
 		normalized[key] = rewritten;
 	}
@@ -173,9 +207,10 @@ function hasKnownSafeContext$1(jsonLd) {
 * using the `eddsa-jcs-2022` cryptosuite), so the signed payload
 * matches what is sent on the wire.
 */
-async function normalizePublicAudience(jsonLd, contextLoader) {
-	if (!hasPublicCurieInAddressing(jsonLd)) return jsonLd;
-	const normalized = rewritePublicAudience(jsonLd);
+async function normalizePublicAudience(jsonLd, contextLoader, options = {}) {
+	const preserveSecured = options.preserveNestedSecuredDocuments ?? false;
+	if (!hasPublicCurieInAddressing(jsonLd, preserveSecured)) return jsonLd;
+	const normalized = rewritePublicAudience(jsonLd, preserveSecured);
 	if (hasKnownSafeContext$1(jsonLd)) return normalized;
 	const loader = contextLoader ?? preloadedOnlyDocumentLoader;
 	try {
@@ -253,13 +288,14 @@ function getKnownSafeContextUrls() {
 /**
 * Wraps scalar ActivityStreams attachment properties in arrays.
 */
-function wrapScalarAttachments(jsonLd, depth = 0) {
+function wrapScalarAttachments(jsonLd, preserveSecured, depth = 0) {
 	if (depth >= MAX_TRAVERSAL_DEPTH) return jsonLd;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(jsonLd)) return jsonLd;
 	if (Array.isArray(jsonLd)) {
 		let normalized = null;
 		for (let i = 0; i < jsonLd.length; i++) {
 			const item = jsonLd[i];
-			const next = wrapScalarAttachments(item, depth + 1);
+			const next = wrapScalarAttachments(item, preserveSecured, depth + 1);
 			if (normalized == null && next !== item) normalized = jsonLd.slice(0, i);
 			if (normalized != null) normalized[i] = next;
 		}
@@ -272,7 +308,7 @@ function wrapScalarAttachments(jsonLd, depth = 0) {
 	for (let i = 0; i < keys.length; i++) {
 		const key = keys[i];
 		const value = record[key];
-		const next = key === "@context" || key === "@value" && isJsonLdValueObject(jsonLd) ? value : wrapScalarAttachments(value, depth + 1);
+		const next = key === "@context" || key === "@value" && isJsonLdValueObject(jsonLd) ? value : wrapScalarAttachments(value, preserveSecured, depth + 1);
 		const output = ATTACHMENT_FIELDS.has(key) && next != null && !Array.isArray(next) && !isJsonLdListObject(next) ? [next] : next;
 		if (normalized == null && output !== value) {
 			const cloned = Object.create(null);
@@ -355,8 +391,8 @@ function getLogSafeJsonLdMetadata(jsonLd) {
 * the semantic-preservation check to succeed; otherwise canonicalization
 * failures leave the original document unchanged.
 */
-async function normalizeAttachmentArrays(jsonLd, contextLoader) {
-	const normalized = wrapScalarAttachments(jsonLd);
+async function normalizeAttachmentArrays(jsonLd, contextLoader, options = {}) {
+	const normalized = wrapScalarAttachments(jsonLd, options.preserveNestedSecuredDocuments ?? false);
 	if (normalized === jsonLd) return jsonLd;
 	if (exceedsTraversalDepth(jsonLd)) {
 		logger$3.debug("Skipping attachment array normalization because the JSON-LD document exceeds the safe traversal depth; leaving it unchanged.");
@@ -384,9 +420,9 @@ async function normalizeAttachmentArrays(jsonLd, contextLoader) {
 * to locally generated outgoing activities before they are signed, enqueued,
 * or sent.
 */
-async function normalizeOutgoingActivityJsonLd(jsonLd, contextLoader) {
-	jsonLd = await normalizePublicAudience(jsonLd, contextLoader);
-	return await normalizeAttachmentArrays(jsonLd, contextLoader);
+async function normalizeOutgoingActivityJsonLd(jsonLd, contextLoader, options = {}) {
+	jsonLd = await normalizePublicAudience(jsonLd, contextLoader, options);
+	return await normalizeAttachmentArrays(jsonLd, contextLoader, options);
 }
 //#endregion
 //#region src/sig/ld.ts
@@ -1055,17 +1091,49 @@ function hasProofLike(jsonLd) {
 	};
 	return Array.isArray(proof) ? proof.some(isProofLike) : isProofLike(proof);
 }
+function isJsonMap(value) {
+	return typeof value === "object" && value != null && !Array.isArray(value);
+}
 /**
-* Creates a proof for the given object.
-* @param object The object to create a proof for.
-* @param privateKey The private key to sign the proof with.
-* @param keyId The key ID to use in the proof. It will be used by the verifier.
-* @param options Additional options.  See also {@link CreateProofOptions}.
-* @returns The created proof.
-* @throws {TypeError} If the private key is invalid or unsupported.
-* @since 0.10.0
+* Assembles the secured JSON document from the bytes that were just signed.
+*
+* The document is not re-derived from the vocabulary object: it is
+* `compactMsg`, the value whose JCS form was hashed, with the serialized
+* proof added.  Every part of it is then checked against the digests and the
+* signature that {@link createProofInternal} produced, so a document that is
+* returned verifies under the map-local compound-proof profile by
+* construction.  Anything that does not check out yields `null`, and the
+* caller simply does not retain a representation.
 */
-async function createProof(object, privateKey, keyId, { contextLoader, context, created } = {}) {
+async function captureSecuredDocument(proof, compactMsg, msgCanon, proofCanon, proofValue, contextLoader) {
+	if (!isJsonMap(compactMsg)) return null;
+	const documentContext = compactMsg["@context"];
+	if (documentContext == null) return null;
+	if (globalThis.Object.hasOwn(compactMsg, "proof")) return null;
+	try {
+		const proofJson = await proof.toJsonLd({
+			format: "compact",
+			contextLoader,
+			context: documentContext
+		});
+		if (!isJsonMap(proofJson)) return null;
+		const { proofValue: serializedProofValue, ...proofConfiguration } = proofJson;
+		if (serializedProofValue !== proofValue) return null;
+		if (serialize(proofConfiguration) !== proofCanon) return null;
+		const securedDocument = {
+			...structuredClone(compactMsg),
+			proof: structuredClone(proofJson)
+		};
+		const { proof: _embeddedProof, ...unsecuredDocument } = securedDocument;
+		if (serialize(unsecuredDocument) !== msgCanon) return null;
+		if (!isPlainJsonTree(securedDocument)) return null;
+		return securedDocument;
+	} catch (error) {
+		logger$1.debug("Failed to capture the secured JSON document for a created proof; the signed object will not preserve its representation when it is embedded in another object.\n{error}", { error });
+		return null;
+	}
+}
+async function createProofInternal(object, privateKey, keyId, { contextLoader, context, created } = {}, capture = false) {
 	validateCryptoKey(privateKey, "private");
 	if (privateKey.algorithm.name !== "Ed25519") throw new TypeError("Unsupported algorithm: " + privateKey.algorithm.name);
 	let compactMsg = await object.clone({ proofs: [] }).toJsonLd({
@@ -1073,7 +1141,7 @@ async function createProof(object, privateKey, keyId, { contextLoader, context,
 		contextLoader,
 		context
 	});
-	compactMsg = await normalizeOutgoingActivityJsonLd(compactMsg, contextLoader);
+	compactMsg = await normalizeOutgoingActivityJsonLd(compactMsg, contextLoader, { preserveNestedSecuredDocuments: true });
 	const msgCanon = serialize(compactMsg);
 	const encoder = new TextEncoder();
 	const msgBytes = encoder.encode(msgCanon);
@@ -1092,14 +1160,32 @@ async function createProof(object, privateKey, keyId, { contextLoader, context,
 	const digest = new Uint8Array(proofDigest.byteLength + msgDigest.byteLength);
 	digest.set(new Uint8Array(proofDigest), 0);
 	digest.set(new Uint8Array(msgDigest), proofDigest.byteLength);
-	const sig = await crypto.subtle.sign("Ed25519", privateKey, digest);
-	return new DataIntegrityProof({
+	const sig = new Uint8Array(await crypto.subtle.sign("Ed25519", privateKey, digest));
+	const proof = new DataIntegrityProof({
 		cryptosuite: "eddsa-jcs-2022",
 		verificationMethod: keyId,
 		proofPurpose: "assertionMethod",
-		created: created ?? Temporal.Now.instant(),
-		proofValue: new Uint8Array(sig)
+		created,
+		proofValue: sig
 	});
+	return {
+		proof,
+		securedDocument: capture ? await captureSecuredDocument(proof, compactMsg, msgCanon, proofCanon, new TextDecoder().decode(encodeMultibase("base58btc", sig)), contextLoader) : null
+	};
+}
+/**
+* Creates a proof for the given object.
+* @param object The object to create a proof for.
+* @param privateKey The private key to sign the proof with.
+* @param keyId The key ID to use in the proof. It will be used by the verifier.
+* @param options Additional options.  See also {@link CreateProofOptions}.
+* @returns The created proof.
+* @throws {TypeError} If the private key is invalid or unsupported.
+* @since 0.10.0
+*/
+async function createProof(object, privateKey, keyId, options = {}) {
+	const { proof } = await createProofInternal(object, privateKey, keyId, options);
+	return proof;
 }
 /**
 * Signs the given object with the private key and returns the signed object.
@@ -1117,13 +1203,19 @@ async function signObject(object, privateKey, keyId, options = {}) {
 			if (object.id != null) span.setAttribute("activitypub.object.id", object.id.href);
 			const existingProofs = [];
 			for await (const proof of object.getProofs(options)) existingProofs.push(proof);
-			const proof = await createProof(object, privateKey, keyId, options);
+			const { proof, securedDocument } = await createProofInternal(object, privateKey, keyId, options, existingProofs.length < 1);
 			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);
 				if (proof.proofValue != null) span.setAttribute("object_integrity_proofs.signature", encodeHex(proof.proofValue));
 			}
-			return object.clone({ proofs: [...existingProofs, proof] });
+			const signed = object.clone({ proofs: [...existingProofs, proof] });
+			if (securedDocument != null) retainSignedRepresentation(signed, securedDocument);
+			else if (existingProofs.length > 0) logger$1.debug("The object {objectId} already had {proofCount} proof(s), so its signed representation is not retained for embedding; the map-local compound-proof profile accepts exactly one direct proof per map.", {
+				objectId: object.id?.href,
+				proofCount: existingProofs.length
+			});
+			return signed;
 		} catch (error) {
 			span.setStatus({
 				code: SpanStatusCode.ERROR,

package/dist/{owner-CRoq8Spb.mjs → owner-D53bUI-n.mjs}

@@ -1,8 +1,8 @@
 import "temporal-polyfill";
 import "urlpattern-polyfill";
 globalThis.addEventListener = () => {};
-import { n as version, t as name } from "./deno-CABhzCb_.mjs";
-import { c as verifyKeyOwnership, n as fetchActorDocument, t as exportJwk } from "./key-Ccs8cnd7.mjs";
+import { n as version, t as name } from "./deno-BcZNXlJn.mjs";
+import { c as verifyKeyOwnership, n as fetchActorDocument, t as exportJwk } from "./key-Xb1hVVZO.mjs";
 import { getLogger } from "@logtape/logtape";
 import { CryptographicKey, Object as Object$1, isActor } from "@fedify/vocab";
 import { SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";

package/dist/{owner-CVA7L9MA.cjs → owner-DffLVeYC.cjs}

@@ -1,11 +1,12 @@
 const { URLPattern } = require("urlpattern-polyfill");
 const require_rolldown_runtime = require("./rolldown-runtime-Dmm3t92W.cjs");
-const require_http = require("./http-CRFns-UE.cjs");
+const require_http = require("./http-CWXKwHPv.cjs");
 let _logtape_logtape = require("@logtape/logtape");
 let _fedify_vocab = require("@fedify/vocab");
 let _opentelemetry_api = require("@opentelemetry/api");
 let byte_encodings_hex = require("byte-encodings/hex");
 let _fedify_vocab_runtime = require("@fedify/vocab-runtime");
+let _fedify_vocab_runtime_internal_signed_representation = require("@fedify/vocab-runtime/internal/signed-representation");
 let _fedify_vocab_runtime_jsonld = require("@fedify/vocab-runtime/jsonld");
 _fedify_vocab_runtime_jsonld = require_rolldown_runtime.__toESM(_fedify_vocab_runtime_jsonld, 1);
 let json_canon = require("json-canon");
@@ -30,6 +31,37 @@ const preloadedOnlyDocumentLoader = (url) => {
 	return Promise.reject(/* @__PURE__ */ new Error("Refusing to fetch a non-preloaded JSON-LD context: " + url));
 };
 //#endregion
+//#region src/compat/secured-document.ts
+function isJsonMap$1(value) {
+	return typeof value === "object" && value != null && !Array.isArray(value);
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.length > 0;
+}
+function hasDataIntegrityProofType(value) {
+	return (Array.isArray(value) ? value : [value]).some((type) => type === "DataIntegrityProof" || type === "https://w3id.org/security#DataIntegrityProof");
+}
+/**
+* Checks whether a JSON value is a complete, self-contained secured document:
+* a map with its own `@context` and exactly one direct, map-valued `proof`
+* that carries every member `eddsa-jcs-2022` proof generation produces.
+*
+* This is deliberately stricter than {@link hasProofLike}, which exists to
+* decide whether a document is worth verifying.  Here a false positive would
+* silently suppress a wire-compatibility fix on an ordinary document, so a
+* partial or malformed proof does not qualify.
+*
+* @internal
+*/
+function isSelfContainedSecuredDocument(value) {
+	if (!isJsonMap$1(value)) return false;
+	if (!Object.hasOwn(value, "@context") || value["@context"] == null) return false;
+	if (!Object.hasOwn(value, "proof")) return false;
+	const proof = value.proof;
+	if (!isJsonMap$1(proof)) return false;
+	return hasDataIntegrityProofType(proof.type) && isNonEmptyString(proof.cryptosuite) && isNonEmptyString(proof.created) && isNonEmptyString(proof.verificationMethod) && isNonEmptyString(proof.proofPurpose) && isNonEmptyString(proof.proofValue);
+}
+//#endregion
 //#region src/compat/public-audience.ts
 const logger$4 = (0, _logtape_logtape.getLogger)([
 	"fedify",
@@ -46,37 +78,39 @@ const PUBLIC_ADDRESSING_FIELDS = /* @__PURE__ */ new Set([
 const AS_CONTEXT_URL$1 = "https://www.w3.org/ns/activitystreams";
 const MAX_TRAVERSAL_DEPTH$1 = 64;
 const KNOWN_SAFE_CONTEXT_URLS$1 = new Set(Object.keys(_fedify_vocab_runtime.preloadedContexts));
-function hasPublicCurieInAddressing(value, parentKey, depth = 0) {
+function hasPublicCurieInAddressing(value, preserveSecured, parentKey, depth = 0) {
 	if (typeof value === "string") return parentKey != null && PUBLIC_ADDRESSING_FIELDS.has(parentKey) && (value === "as:Public" || value === "Public");
 	if (depth >= MAX_TRAVERSAL_DEPTH$1) return false;
-	if (Array.isArray(value)) return value.some((item) => hasPublicCurieInAddressing(item, parentKey, depth + 1));
+	if (Array.isArray(value)) return value.some((item) => hasPublicCurieInAddressing(item, preserveSecured, parentKey, depth + 1));
 	if (typeof value !== "object" || value == null) return false;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(value)) return false;
 	const record = value;
 	for (const key of Object.keys(record)) {
 		if (record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public")) return true;
 		if (key === "@context") continue;
-		if (hasPublicCurieInAddressing(record[key], key, depth + 1)) return true;
+		if (hasPublicCurieInAddressing(record[key], preserveSecured, key, depth + 1)) return true;
 	}
 	return false;
 }
-function rewritePublicAudience(value, parentKey, depth = 0) {
+function rewritePublicAudience(value, preserveSecured, parentKey, depth = 0) {
 	if (typeof value === "string" && parentKey != null && PUBLIC_ADDRESSING_FIELDS.has(parentKey) && (value === "as:Public" || value === "Public")) return _fedify_vocab.PUBLIC_COLLECTION.href;
 	if (depth >= MAX_TRAVERSAL_DEPTH$1) return value;
 	if (Array.isArray(value)) {
 		let changed = false;
 		const mapped = value.map((item) => {
-			const rewritten = rewritePublicAudience(item, parentKey, depth + 1);
+			const rewritten = rewritePublicAudience(item, preserveSecured, parentKey, depth + 1);
 			if (rewritten !== item) changed = true;
 			return rewritten;
 		});
 		return changed ? mapped : value;
 	}
 	if (typeof value !== "object" || value == null) return value;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(value)) return value;
 	const record = value;
 	let changed = false;
 	const normalized = Object.create(null);
 	for (const key of Object.keys(record)) {
-		const rewritten = key === "@context" ? record[key] : record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public") ? _fedify_vocab.PUBLIC_COLLECTION.href : rewritePublicAudience(record[key], key, depth + 1);
+		const rewritten = key === "@context" ? record[key] : record.type === "Follow" && key === "object" && (record[key] === "as:Public" || record[key] === "Public") ? _fedify_vocab.PUBLIC_COLLECTION.href : rewritePublicAudience(record[key], preserveSecured, key, depth + 1);
 		if (rewritten !== record[key]) changed = true;
 		normalized[key] = rewritten;
 	}
@@ -175,9 +209,10 @@ function hasKnownSafeContext$1(jsonLd) {
 * using the `eddsa-jcs-2022` cryptosuite), so the signed payload
 * matches what is sent on the wire.
 */
-async function normalizePublicAudience(jsonLd, contextLoader) {
-	if (!hasPublicCurieInAddressing(jsonLd)) return jsonLd;
-	const normalized = rewritePublicAudience(jsonLd);
+async function normalizePublicAudience(jsonLd, contextLoader, options = {}) {
+	const preserveSecured = options.preserveNestedSecuredDocuments ?? false;
+	if (!hasPublicCurieInAddressing(jsonLd, preserveSecured)) return jsonLd;
+	const normalized = rewritePublicAudience(jsonLd, preserveSecured);
 	if (hasKnownSafeContext$1(jsonLd)) return normalized;
 	const loader = contextLoader ?? preloadedOnlyDocumentLoader;
 	try {
@@ -255,13 +290,14 @@ function getKnownSafeContextUrls() {
 /**
 * Wraps scalar ActivityStreams attachment properties in arrays.
 */
-function wrapScalarAttachments(jsonLd, depth = 0) {
+function wrapScalarAttachments(jsonLd, preserveSecured, depth = 0) {
 	if (depth >= MAX_TRAVERSAL_DEPTH) return jsonLd;
+	if (preserveSecured && depth > 0 && isSelfContainedSecuredDocument(jsonLd)) return jsonLd;
 	if (Array.isArray(jsonLd)) {
 		let normalized = null;
 		for (let i = 0; i < jsonLd.length; i++) {
 			const item = jsonLd[i];
-			const next = wrapScalarAttachments(item, depth + 1);
+			const next = wrapScalarAttachments(item, preserveSecured, depth + 1);
 			if (normalized == null && next !== item) normalized = jsonLd.slice(0, i);
 			if (normalized != null) normalized[i] = next;
 		}
@@ -274,7 +310,7 @@ function wrapScalarAttachments(jsonLd, depth = 0) {
 	for (let i = 0; i < keys.length; i++) {
 		const key = keys[i];
 		const value = record[key];
-		const next = key === "@context" || key === "@value" && isJsonLdValueObject(jsonLd) ? value : wrapScalarAttachments(value, depth + 1);
+		const next = key === "@context" || key === "@value" && isJsonLdValueObject(jsonLd) ? value : wrapScalarAttachments(value, preserveSecured, depth + 1);
 		const output = ATTACHMENT_FIELDS.has(key) && next != null && !Array.isArray(next) && !isJsonLdListObject(next) ? [next] : next;
 		if (normalized == null && output !== value) {
 			const cloned = Object.create(null);
@@ -357,8 +393,8 @@ function getLogSafeJsonLdMetadata(jsonLd) {
 * the semantic-preservation check to succeed; otherwise canonicalization
 * failures leave the original document unchanged.
 */
-async function normalizeAttachmentArrays(jsonLd, contextLoader) {
-	const normalized = wrapScalarAttachments(jsonLd);
+async function normalizeAttachmentArrays(jsonLd, contextLoader, options = {}) {
+	const normalized = wrapScalarAttachments(jsonLd, options.preserveNestedSecuredDocuments ?? false);
 	if (normalized === jsonLd) return jsonLd;
 	if (exceedsTraversalDepth(jsonLd)) {
 		logger$3.debug("Skipping attachment array normalization because the JSON-LD document exceeds the safe traversal depth; leaving it unchanged.");
@@ -386,9 +422,9 @@ async function normalizeAttachmentArrays(jsonLd, contextLoader) {
 * to locally generated outgoing activities before they are signed, enqueued,
 * or sent.
 */
-async function normalizeOutgoingActivityJsonLd(jsonLd, contextLoader) {
-	jsonLd = await normalizePublicAudience(jsonLd, contextLoader);
-	return await normalizeAttachmentArrays(jsonLd, contextLoader);
+async function normalizeOutgoingActivityJsonLd(jsonLd, contextLoader, options = {}) {
+	jsonLd = await normalizePublicAudience(jsonLd, contextLoader, options);
+	return await normalizeAttachmentArrays(jsonLd, contextLoader, options);
 }
 //#endregion
 //#region src/sig/ld.ts
@@ -1058,17 +1094,49 @@ function hasProofLike(jsonLd) {
 	};
 	return Array.isArray(proof) ? proof.some(isProofLike) : isProofLike(proof);
 }
+function isJsonMap(value) {
+	return typeof value === "object" && value != null && !Array.isArray(value);
+}
 /**
-* Creates a proof for the given object.
-* @param object The object to create a proof for.
-* @param privateKey The private key to sign the proof with.
-* @param keyId The key ID to use in the proof. It will be used by the verifier.
-* @param options Additional options.  See also {@link CreateProofOptions}.
-* @returns The created proof.
-* @throws {TypeError} If the private key is invalid or unsupported.
-* @since 0.10.0
+* Assembles the secured JSON document from the bytes that were just signed.
+*
+* The document is not re-derived from the vocabulary object: it is
+* `compactMsg`, the value whose JCS form was hashed, with the serialized
+* proof added.  Every part of it is then checked against the digests and the
+* signature that {@link createProofInternal} produced, so a document that is
+* returned verifies under the map-local compound-proof profile by
+* construction.  Anything that does not check out yields `null`, and the
+* caller simply does not retain a representation.
 */
-async function createProof(object, privateKey, keyId, { contextLoader, context, created } = {}) {
+async function captureSecuredDocument(proof, compactMsg, msgCanon, proofCanon, proofValue, contextLoader) {
+	if (!isJsonMap(compactMsg)) return null;
+	const documentContext = compactMsg["@context"];
+	if (documentContext == null) return null;
+	if (globalThis.Object.hasOwn(compactMsg, "proof")) return null;
+	try {
+		const proofJson = await proof.toJsonLd({
+			format: "compact",
+			contextLoader,
+			context: documentContext
+		});
+		if (!isJsonMap(proofJson)) return null;
+		const { proofValue: serializedProofValue, ...proofConfiguration } = proofJson;
+		if (serializedProofValue !== proofValue) return null;
+		if ((0, json_canon.default)(proofConfiguration) !== proofCanon) return null;
+		const securedDocument = {
+			...structuredClone(compactMsg),
+			proof: structuredClone(proofJson)
+		};
+		const { proof: _embeddedProof, ...unsecuredDocument } = securedDocument;
+		if ((0, json_canon.default)(unsecuredDocument) !== msgCanon) return null;
+		if (!(0, _fedify_vocab_runtime_internal_signed_representation.isPlainJsonTree)(securedDocument)) return null;
+		return securedDocument;
+	} catch (error) {
+		logger$1.debug("Failed to capture the secured JSON document for a created proof; the signed object will not preserve its representation when it is embedded in another object.\n{error}", { error });
+		return null;
+	}
+}
+async function createProofInternal(object, privateKey, keyId, { contextLoader, context, created } = {}, capture = false) {
 	require_http.validateCryptoKey(privateKey, "private");
 	if (privateKey.algorithm.name !== "Ed25519") throw new TypeError("Unsupported algorithm: " + privateKey.algorithm.name);
 	let compactMsg = await object.clone({ proofs: [] }).toJsonLd({
@@ -1076,7 +1144,7 @@ async function createProof(object, privateKey, keyId, { contextLoader, context,
 		contextLoader,
 		context
 	});
-	compactMsg = await normalizeOutgoingActivityJsonLd(compactMsg, contextLoader);
+	compactMsg = await normalizeOutgoingActivityJsonLd(compactMsg, contextLoader, { preserveNestedSecuredDocuments: true });
 	const msgCanon = (0, json_canon.default)(compactMsg);
 	const encoder = new TextEncoder();
 	const msgBytes = encoder.encode(msgCanon);
@@ -1095,14 +1163,32 @@ async function createProof(object, privateKey, keyId, { contextLoader, context,
 	const digest = new Uint8Array(proofDigest.byteLength + msgDigest.byteLength);
 	digest.set(new Uint8Array(proofDigest), 0);
 	digest.set(new Uint8Array(msgDigest), proofDigest.byteLength);
-	const sig = await crypto.subtle.sign("Ed25519", privateKey, digest);
-	return new _fedify_vocab.DataIntegrityProof({
+	const sig = new Uint8Array(await crypto.subtle.sign("Ed25519", privateKey, digest));
+	const proof = new _fedify_vocab.DataIntegrityProof({
 		cryptosuite: "eddsa-jcs-2022",
 		verificationMethod: keyId,
 		proofPurpose: "assertionMethod",
-		created: created ?? Temporal.Now.instant(),
-		proofValue: new Uint8Array(sig)
+		created,
+		proofValue: sig
 	});
+	return {
+		proof,
+		securedDocument: capture ? await captureSecuredDocument(proof, compactMsg, msgCanon, proofCanon, new TextDecoder().decode((0, _fedify_vocab_runtime.encodeMultibase)("base58btc", sig)), contextLoader) : null
+	};
+}
+/**
+* Creates a proof for the given object.
+* @param object The object to create a proof for.
+* @param privateKey The private key to sign the proof with.
+* @param keyId The key ID to use in the proof. It will be used by the verifier.
+* @param options Additional options.  See also {@link CreateProofOptions}.
+* @returns The created proof.
+* @throws {TypeError} If the private key is invalid or unsupported.
+* @since 0.10.0
+*/
+async function createProof(object, privateKey, keyId, options = {}) {
+	const { proof } = await createProofInternal(object, privateKey, keyId, options);
+	return proof;
 }
 /**
 * Signs the given object with the private key and returns the signed object.
@@ -1120,13 +1206,19 @@ async function signObject(object, privateKey, keyId, options = {}) {
 			if (object.id != null) span.setAttribute("activitypub.object.id", object.id.href);
 			const existingProofs = [];
 			for await (const proof of object.getProofs(options)) existingProofs.push(proof);
-			const proof = await createProof(object, privateKey, keyId, options);
+			const { proof, securedDocument } = await createProofInternal(object, privateKey, keyId, options, existingProofs.length < 1);
 			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);
 				if (proof.proofValue != null) span.setAttribute("object_integrity_proofs.signature", (0, byte_encodings_hex.encodeHex)(proof.proofValue));
 			}
-			return object.clone({ proofs: [...existingProofs, proof] });
+			const signed = object.clone({ proofs: [...existingProofs, proof] });
+			if (securedDocument != null) (0, _fedify_vocab_runtime_internal_signed_representation.retainSignedRepresentation)(signed, securedDocument);
+			else if (existingProofs.length > 0) logger$1.debug("The object {objectId} already had {proofCount} proof(s), so its signed representation is not retained for embedding; the map-local compound-proof profile accepts exactly one direct proof per map.", {
+				objectId: object.id?.href,
+				proofCount: existingProofs.length
+			});
+			return signed;
 		} catch (error) {
 			span.setStatus({
 				code: _opentelemetry_api.SpanStatusCode.ERROR,